| 1 |
Mostly by porting away from ltprune.eclass. |
| 2 |
|
| 3 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 4 |
--- |
| 5 |
eclass/gnome2.eclass | 19 +++++++++---------- |
| 6 |
1 file changed, 9 insertions(+), 10 deletions(-) |
| 7 |
|
| 8 |
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass |
| 9 |
index 341802f8c80..4d8dc6c08d6 100644 |
| 10 |
--- a/eclass/gnome2.eclass |
| 11 |
+++ b/eclass/gnome2.eclass |
| 12 |
@@ -4,7 +4,7 @@ |
| 13 |
# @ECLASS: gnome2.eclass |
| 14 |
# @MAINTAINER: |
| 15 |
# gnome@g.o |
| 16 |
-# @SUPPORTED_EAPIS: 5 6 |
| 17 |
+# @SUPPORTED_EAPIS: 5 6 7 |
| 18 |
# @BLURB: Provides phases for Gnome/Gtk+ based packages. |
| 19 |
# @DESCRIPTION: |
| 20 |
# Exports portage base functions used by ebuilds written for packages using the |
| 21 |
@@ -17,13 +17,14 @@ |
| 22 |
GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} |
| 23 |
|
| 24 |
[[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools |
| 25 |
-inherit eutils libtool ltprune gnome.org gnome2-utils xdg |
| 26 |
+[[ ${EAPI} == [56] ]] && inherit eutils |
| 27 |
+inherit libtool gnome.org gnome2-utils xdg |
| 28 |
|
| 29 |
case ${EAPI:-0} in |
| 30 |
5) |
| 31 |
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
| 32 |
;; |
| 33 |
- 6) |
| 34 |
+ 6|7) |
| 35 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm |
| 36 |
;; |
| 37 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 38 |
@@ -70,12 +71,11 @@ fi |
| 39 |
|
| 40 |
# @ECLASS-VARIABLE: GNOME2_LA_PUNT |
| 41 |
# @DESCRIPTION: |
| 42 |
-# It relies on prune_libtool_files (from ltprune.eclass) |
| 43 |
-# for this. Available values for GNOME2_LA_PUNT: |
| 44 |
+# Available values for GNOME2_LA_PUNT: |
| 45 |
# - "no": will not clean any .la files |
| 46 |
-# - "yes": will run prune_libtool_files --modules |
| 47 |
-# - If it is not set, it will run prune_libtool_files |
| 48 |
-GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} |
| 49 |
+# - "yes": will run "find "${ED}" -name '*.la' -delete" |
| 50 |
+# - If it is not set, it will prune libtool files |
| 51 |
+GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"yes"} |
| 52 |
|
| 53 |
# @FUNCTION: gnome2_src_unpack |
| 54 |
# @DESCRIPTION: |
| 55 |
@@ -265,9 +265,8 @@ gnome2_src_install() { |
| 56 |
|
| 57 |
# Delete all .la files |
| 58 |
case "${GNOME2_LA_PUNT}" in |
| 59 |
- yes) prune_libtool_files --modules;; |
| 60 |
no) ;; |
| 61 |
- *) prune_libtool_files;; |
| 62 |
+ *) find "${ED}" -name '*.la' -delete || die;; |
| 63 |
esac |
| 64 |
} |
| 65 |
|
| 66 |
-- |
| 67 |
2.26.2 |
Archives