[paludis-commits] paludis.git (0.30) -- 5d2dae2 by David Leverton

[git at git.pioto.org]

Module:    paludis.git
Branch:    0.30
Commit:    5d2dae200768d359039fbc64af75ec894744f1ef
URL:       http://git.pioto.org/?p=paludis.git;a=commit;h=5d2dae200768d359039fbc64af75ec894744f1ef

Author:    David Leverton <levertond at googlemail.com>
Committer: Ciaran McCreesh <ciaran.mccreesh at googlemail.com>
Date:      Sun Aug 10 21:41:03 2008 +0100

----

EAPI 2

----

 paludis/repositories/e/e_repository_TEST.cc |    2 -
 paludis/repositories/e/eapis/2.conf         |   30 +++++++++++++++++++++++++++
 paludis/repositories/e/eapis/Makefile.am    |    1 +
 3 files changed, 31 insertions(+), 2 deletions(-)


diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 902e78d..3e3bacf 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1357,7 +1357,6 @@ namespace test_cases
         }
     } test_e_repository_install_eapi_1;
 
-#if 0
     struct ERepositoryInstallEAPI2Test : TestCase
     {
         ERepositoryInstallEAPI2Test() : TestCase("install_eapi_2") { }
@@ -1482,7 +1481,6 @@ namespace test_cases
             }
         }
     } test_e_repository_install_eapi_2;
-#endif
 
     struct ERepositoryInstallEAPIKdebuild1Test : TestCase
     {
diff --git a/paludis/repositories/e/eapis/2.conf b/paludis/repositories/e/eapis/2.conf
new file mode 100644
index 0000000..9aedde9
--- /dev/null
+++ b/paludis/repositories/e/eapis/2.conf
@@ -0,0 +1,30 @@
+# Configuration for EAPI 2
+# EAPI 2 is specified in PMS.
+
+source ${PALUDIS_EAPIS_DIR}/1.conf
+exported_name = 2
+can_be_pbin = true
+
+package_dep_spec_parse_options = allow_slot_deps allow_use_deps_portage
+dependency_spec_tree_parse_options = uri_supports_arrow hard_soft_blocks
+ebuild_module_suffixes = 2 1 0
+
+ebuild_functions = ${ebuild_functions} src_prepare src_configure
+
+ebuild_install = \
+    : killold ; \
+    userpriv sandbox : init saveenv ; \
+    : loadenv setup saveenv ; \
+    sandbox userpriv : loadenv unpack prepare configure compile saveenv ; \
+    sandbox userpriv checkphase checks=always : loadenv test saveenv ; \
+    sandbox : loadenv install saveenv ; \
+    strip : ; \
+    prepost : loadenv preinst saveenv ; \
+    merge : ; \
+    prepost : loadenv postinst saveenv ; \
+    : tidyup
+
+ebuild_new_upgrade_phase_order = true
+
+doman_lang_filenames = true
+
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index 7854515..253e724 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS =
 eapis = \
 	0.conf \
 	1.conf \
+	2.conf \
 	exheres-0.conf \
 	kdebuild-1.conf \
 	paludis-1.conf \
---