aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2016-01-31 16:28:27 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2016-02-01 19:08:59 +0000
commitbd3f7da01b59236c94921c1eace23792436c0564 (patch)
treea47755dd3dac62115ba0f405663a06cad8ffa21c
parentc39c79c8a7a2d08979e1d13d97b700286a194c80 (diff)
downloadpaludis-bd3f7da01b59236c94921c1eace23792436c0564.tar.gz
paludis-bd3f7da01b59236c94921c1eace23792436c0564.tar.xz
Support pbins for EAPI 6
Fixes: ticket:1338
-rw-r--r--paludis/repositories/e/eapis/Makefile.am1
-rw-r--r--paludis/repositories/e/eapis/pbin-1+6.conf56
-rw-r--r--paludis/repositories/e/ebuild_entries_suffixes.conf4
3 files changed, 61 insertions, 0 deletions
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index fcd6dd3..3922c2c 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -20,6 +20,7 @@ eapis = \
pbin-1+3.conf \
pbin-1+4.conf \
pbin-1+5.conf \
+ pbin-1+6.conf \
pbin-1+paludis-1.conf \
pbin-1+exheres-0.conf
diff --git a/paludis/repositories/e/eapis/pbin-1+6.conf b/paludis/repositories/e/eapis/pbin-1+6.conf
new file mode 100644
index 0000000..2e41af8
--- /dev/null
+++ b/paludis/repositories/e/eapis/pbin-1+6.conf
@@ -0,0 +1,56 @@
+# Configuration for EAPI 6, used by Paludis binary format 1.
+# EAPI 6 is specified in PMS.
+
+source ${PALUDIS_EAPIS_DIR}/6.conf
+can_be_pbin = false
+is_pbin = true
+
+ebuild_module_suffixes = pbin-1 ${ebuild_module_suffixes}
+support_eclasses = false
+fix_mtimes = false
+
+non_empty_variables = \
+ P PV PR PN PVR PF CATEGORY build:FILESDIR build:PORTDIR \
+ build:DISTDIR PALUDIS_TMPDIR PALUDIS_EBUILD_LOG_LEVEL PALUDIS_EBUILD_DIR \
+ build:USERLAND build:KERNEL build:ARCH ROOT
+
+directory_variables = \
+ build:PORTDIR build:DISTDIR
+
+ignore_pivot_env_variables = \
+ A S D WORKDIR
+
+ignore_pivot_env_functions = \
+ src_unpack src_prepare src_configure src_compile src_test src_install
+
+ebuild_functions = ${ebuild_functions} builtin_pivotbin builtin_installbin
+
+ebuild_install = \
+ skipname=killold : killold ; \
+ skipname=init userpriv sandbox : init saveenv ; \
+ skipname=pretend sandbox userpriv : loadenv pivotbin pretend ; \
+ skipname=setup clearenv : loadenv pivotbin setup saveenv ; \
+ skipname=installbin sandbox clearenv : loadenv installbin saveenv ; \
+ skipname=strip strip : ; \
+ skipname=preinst clearenv prepost : loadenv preinst saveenv ; \
+ skipname=check_merge check_merge : ; \
+ skipname=merge merge : ; \
+ skipname=postinst clearenv prepost : loadenv postinst saveenv ; \
+ skipname=tidyup tidyup clearenv : loadenv tidyup
+
+description_generated_using = Generated using
+description_generated_time = Generated time
+description_generated_from = Generated from
+description_keywords = Binary keywords
+description_src_uri = Binary URI
+description_use = Selected USE flags
+
+metadata_generated_using = GENERATED_USING
+metadata_generated_time = GENERATED_TIME
+metadata_generated_from = GENERATED_FROM_REPOSITORY
+metadata_keywords = BINARY_KEYWORDS
+metadata_src_uri = BINARY_URI
+metadata_use = USE
+
+flat_list_minimum_size = -1
+
diff --git a/paludis/repositories/e/ebuild_entries_suffixes.conf b/paludis/repositories/e/ebuild_entries_suffixes.conf
index 19613e0..620d381 100644
--- a/paludis/repositories/e/ebuild_entries_suffixes.conf
+++ b/paludis/repositories/e/ebuild_entries_suffixes.conf
@@ -30,6 +30,10 @@ suffix_pbin-1+5_known = yes
guess_eapi_pbin-1+5 = pbin-1+5
manifest_key_pbin-1+5 = PBIN
+suffix_pbin-1+6_known = yes
+guess_eapi_pbin-1+6 = pbin-1+6
+manifest_key_pbin-1+6 = PBIN
+
suffix_pbin-1+exheres-0_known = yes
guess_eapi_pbin-1+exheres-0 = pbin-1+exheres-0
manifest_key_pbin-1+exheres-0 = PBIN