| 1 |
commit: 5d0ed3214adad91152c80dc62b05d81f33d04157 |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 10 10:15:16 2018 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 10 10:48:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0ed321 |
| 7 |
|
| 8 |
dev-libs/glib-2.54: add back gtester-report with USE=utils |
| 9 |
|
| 10 |
Apparently it was fixed up for python3 upstream in 2.54.3, so add it |
| 11 |
back, as no special handling needed regarding python versions. However |
| 12 |
keep it behind USE=utils as before, deleting it when not enabled, and |
| 13 |
fixing up shebang when kept. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 16 |
|
| 17 |
.../glib/{glib-2.54.3-r5.ebuild => glib-2.54.3-r6.ebuild} | 14 ++++++++++---- |
| 18 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/glib/glib-2.54.3-r5.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild |
| 21 |
similarity index 95% |
| 22 |
rename from dev-libs/glib/glib-2.54.3-r5.ebuild |
| 23 |
rename to dev-libs/glib/glib-2.54.3-r6.ebuild |
| 24 |
index 6f4824c6ad8..424d46671f5 100644 |
| 25 |
--- a/dev-libs/glib/glib-2.54.3-r5.ebuild |
| 26 |
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild |
| 27 |
@@ -122,6 +122,9 @@ src_prepare() { |
| 28 |
# gdbus-codegen is a separate package |
| 29 |
eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch |
| 30 |
|
| 31 |
+ # Leave gtester-report python shebang alone - handled by python_fix_shebang |
| 32 |
+ sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die |
| 33 |
+ |
| 34 |
# Also needed to prevent cross-compile failures, see bug #267603 |
| 35 |
eautoreconf |
| 36 |
|
| 37 |
@@ -220,10 +223,13 @@ multilib_src_install() { |
| 38 |
multilib_src_install_all() { |
| 39 |
einstalldocs |
| 40 |
|
| 41 |
- # gtester-report works only with python2 and is heavily deprecated - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
| 42 |
- # Remove it instead of bothering with making it work with python3 in PYTHON_COMPAT |
| 43 |
- rm "${ED}usr/bin/gtester-report" |
| 44 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
| 45 |
+ if use utils ; then |
| 46 |
+ python_fix_shebang "${ED}"/usr/bin/gtester-report |
| 47 |
+ else |
| 48 |
+ # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
| 49 |
+ rm "${ED}usr/bin/gtester-report" |
| 50 |
+ rm "${ED}usr/share/man/man1/gtester-report.1" |
| 51 |
+ fi |
| 52 |
|
| 53 |
# Do not install charset.alias even if generated, leave it to libiconv |
| 54 |
rm -f "${ED}/usr/lib/charset.alias" |
Archives