aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-08-10 21:41:03 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-09-25 22:07:34 +0100
commitf17f44aa5d5765f94f70395a995416b05279a39f (patch)
tree859bdfe5fe56de1abaf02df4016226f847a08085
parent9a5de1a1916acd3be7765db8085441e29c384ac3 (diff)
downloadpaludis-f17f44aa5d5765f94f70395a995416b05279a39f.tar.gz
paludis-f17f44aa5d5765f94f70395a995416b05279a39f.tar.xz
EAPI 2
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/eapis/2.conf30
-rw-r--r--paludis/repositories/e/eapis/Makefile.am1
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 \