| 1 |
Closes: https://bugs.gentoo.org/717100 |
| 2 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 3 |
--- |
| 4 |
leio noted that the previous patch would potentially change the |
| 5 |
installed .la files in EAPI 5 and 6 ebuilds. So just continue using |
| 6 |
ltprune in those EAPIs and ban GNOME2_LA_PUNT in EAPI 7. |
| 7 |
|
| 8 |
eclass/gnome2.eclass | 18 +++++++++++++----- |
| 9 |
1 file changed, 13 insertions(+), 5 deletions(-) |
| 10 |
|
| 11 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 12 |
index 341802f8c80..546438f289c 100644 |
| 13 |
--- a/eclass/gnome2.eclass |
| 14 |
+++ b/eclass/gnome2.eclass |
| 15 |
@@ -4,7 +4,7 @@ |
| 16 |
# @ECLASS: gnome2.eclass |
| 17 |
# @MAINTAINER: |
| 18 |
# gnome@g.o |
| 19 |
-# @SUPPORTED_EAPIS: 5 6 |
| 20 |
+# @SUPPORTED_EAPIS: 5 6 7 |
| 21 |
# @BLURB: Provides phases for Gnome/Gtk+ based packages. |
| 22 |
# @DESCRIPTION: |
| 23 |
# Exports portage base functions used by ebuilds written for packages using the |
| 24 |
@@ -17,13 +17,14 @@ |
| 25 |
GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} |
| 26 |
|
| 27 |
[[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools |
| 28 |
-inherit eutils libtool ltprune gnome.org gnome2-utils xdg |
| 29 |
+[[ ${EAPI} == [56] ]] && inherit eutils ltprune |
| 30 |
+inherit libtool gnome.org gnome2-utils xdg |
| 31 |
|
| 32 |
case ${EAPI:-0} in |
| 33 |
5) |
| 34 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
| 35 |
;; |
| 36 |
- 6) |
| 37 |
+ 6|7) |
| 38 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
| 39 |
;; |
| 40 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 41 |
@@ -75,7 +76,14 @@ fi |
| 42 |
# - "no": will not clean any .la files |
| 43 |
# - "yes": will run prune_libtool_files --modules |
| 44 |
# - If it is not set, it will run prune_libtool_files |
| 45 |
-GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} |
| 46 |
+# Banned since eapi7. |
| 47 |
+if has ${EAPI} 5 6; then |
| 48 |
+ GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} |
| 49 |
+elif [[ -n $GNOME_LA_PUNT ]]; then |
| 50 |
+ die "GNOME2_LA_PUNT is banned since eapi7" |
| 51 |
+else |
| 52 |
+ GNOME2_LA_PUNT="no" |
| 53 |
+fi |
| 54 |
|
| 55 |
# @FUNCTION: gnome2_src_unpack |
| 56 |
# @DESCRIPTION: |
| 57 |
@@ -85,7 +93,7 @@ gnome2_src_unpack() { |
| 58 |
unpack ${A} |
| 59 |
cd "${S}" |
| 60 |
else |
| 61 |
- die "gnome2_src_unpack is banned from eapi6" |
| 62 |
+ die "gnome2_src_unpack is banned since eapi6" |
| 63 |
fi |
| 64 |
} |
| 65 |
|
| 66 |
-- |
| 67 |
2.26.2 |
Archives