1 |
commit: f3e63d6637a47cf00fc6684e431c92ba0ece7a86 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 10 06:35:07 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 10 08:25:19 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e63d66 |
7 |
|
8 |
dev-libs/glib-2.54: handle py glib-{mkenums,genmarshal} more properly |
9 |
|
10 |
glib-2.54 ported glib-mkenums and glib-genmarshal to python. Handle them |
11 |
more properly via python_replicate_script and PYTHON_DEPS, so we actually |
12 |
ensure that the deps are in place for the tools to work. |
13 |
This is meant to be temporary and not a stable candidate until at least |
14 |
these python tools are moved out into a separate package, like |
15 |
gdbus-codegen is. But we are delayed in providing a newer glib for |
16 |
~arch long enough now, so go with the simpler way to start with, as |
17 |
separate package would involve consumer transition as well, including |
18 |
addition of the new package into various packages DEPEND, which is hard |
19 |
to know when it's needed (probably requiring some sort of QA check). |
20 |
|
21 |
Bug: https://bugs.gentoo.org/651830 |
22 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
23 |
|
24 |
dev-libs/glib/glib-2.54.3-r5.ebuild | 24 ++++++++++++------------ |
25 |
1 file changed, 12 insertions(+), 12 deletions(-) |
26 |
|
27 |
diff --git a/dev-libs/glib/glib-2.54.3-r5.ebuild b/dev-libs/glib/glib-2.54.3-r5.ebuild |
28 |
index ba26e66bb6b..31c751756ab 100644 |
29 |
--- a/dev-libs/glib/glib-2.54.3-r5.ebuild |
30 |
+++ b/dev-libs/glib/glib-2.54.3-r5.ebuild |
31 |
@@ -6,7 +6,7 @@ |
32 |
# then to be think very closely. |
33 |
|
34 |
EAPI=6 |
35 |
-PYTHON_COMPAT=( python2_7 ) |
36 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
37 |
# Completely useless with or without USE static-libs, people need to use |
38 |
# pkg-config |
39 |
GNOME2_LA_PUNT="yes" |
40 |
@@ -23,9 +23,9 @@ LICENSE="LGPL-2.1+" |
41 |
SLOT="2" |
42 |
IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
43 |
REQUIRED_USE=" |
44 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
45 |
+ ${PYTHON_REQUIRED_USE} |
46 |
test? ( ${PYTHON_REQUIRED_USE} ) |
47 |
-" |
48 |
+" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson |
49 |
|
50 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
51 |
|
52 |
@@ -44,8 +44,8 @@ RDEPEND=" |
53 |
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
54 |
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
55 |
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
56 |
+ ${PYTHON_DEPS} |
57 |
utils? ( |
58 |
- ${PYTHON_DEPS} |
59 |
>=dev-util/gdbus-codegen-${PV} |
60 |
virtual/libelf:0= |
61 |
) |
62 |
@@ -123,8 +123,6 @@ src_prepare() { |
63 |
# Leave python shebang alone - handled by python_replicate_script |
64 |
# We could call python_setup and give configure a valid --with-python |
65 |
# arg, but that would mean a build dep on python when USE=utils. |
66 |
- sed -e '/${PYTHON}/d' \ |
67 |
- -i glib/Makefile.{am,in} || die |
68 |
sed -e 's:@PYTHON@:python:' \ |
69 |
-i gobject/glib-{genmarshal.in,mkenums.in} || die |
70 |
# Also needed to prevent cross-compile failures, see bug #267603 |
71 |
@@ -224,12 +222,14 @@ multilib_src_install() { |
72 |
multilib_src_install_all() { |
73 |
einstalldocs |
74 |
|
75 |
- if use utils ; then |
76 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
77 |
- else |
78 |
- rm "${ED}usr/bin/gtester-report" |
79 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
80 |
- fi |
81 |
+ # FIXME: Move python deps that are only required at build time of other packages to a split package |
82 |
+ python_replicate_script "${ED}"/usr/bin/glib-mkenums |
83 |
+ python_replicate_script "${ED}"/usr/bin/glib-genmarshal |
84 |
+ |
85 |
+ # gtester-report works only with python2 and is heavily deprecated - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
86 |
+ # Remove it instead of bothering with making it work with python3 in PYTHON_COMPAT |
87 |
+ rm "${ED}usr/bin/gtester-report" |
88 |
+ rm "${ED}usr/share/man/man1/gtester-report.1" |
89 |
|
90 |
# Do not install charset.alias even if generated, leave it to libiconv |
91 |
rm -f "${ED}/usr/lib/charset.alias" |