1 |
commit: 6cf75d7c54903a2126db2da905688c0b6d6d61ef |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 27 23:31:05 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 31 05:54:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf75d7c |
7 |
|
8 |
x11-base/xcb-proto: Install 1.14 for the correct Python versions |
9 |
|
10 |
On my system, I had 3.7 and 3.8 selected but it was installing for |
11 |
2.7, even though that's not one of the targets! 2.7 had accidentally |
12 |
become my eselected Python. configure was picking this up, detecting |
13 |
the sitedir, and locking it into the Makefile, preventing |
14 |
python_foreach_impl from having any effect. It is simpler and safer to |
15 |
override the Makefile's pythondir with the sitedir value returned by |
16 |
the eclass. |
17 |
|
18 |
Package-Manager: Portage-2.3.96, Repoman-2.3.20 |
19 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
20 |
Closes: https://github.com/gentoo/gentoo/pull/15143 |
21 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
22 |
|
23 |
...-proto-1.14.ebuild => xcb-proto-1.14-r1.ebuild} | 40 ++++++++++++++-------- |
24 |
1 file changed, 25 insertions(+), 15 deletions(-) |
25 |
|
26 |
diff --git a/x11-base/xcb-proto/xcb-proto-1.14.ebuild b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild |
27 |
similarity index 60% |
28 |
rename from x11-base/xcb-proto/xcb-proto-1.14.ebuild |
29 |
rename to x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild |
30 |
index 8d5daa5d6cc..094dba7a380 100644 |
31 |
--- a/x11-base/xcb-proto/xcb-proto-1.14.ebuild |
32 |
+++ b/x11-base/xcb-proto/xcb-proto-1.14-r1.ebuild |
33 |
@@ -17,26 +17,36 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" |
34 |
|
35 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
36 |
IUSE="" |
37 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
38 |
|
39 |
DEPEND="" |
40 |
-RDEPEND="${PYTHON_DEPS}" |
41 |
-BDEPEND="dev-libs/libxml2" |
42 |
- |
43 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
44 |
+RDEPEND=" |
45 |
+ ${PYTHON_DEPS} |
46 |
+" |
47 |
+BDEPEND=" |
48 |
+ ${PYTHON_DEPS} |
49 |
+ dev-libs/libxml2 |
50 |
+" |
51 |
+ |
52 |
+ECONF_SOURCE="${S}" |
53 |
+ |
54 |
+multilib_src_configure() { |
55 |
+ # Don't use Python to find sitedir here. |
56 |
+ PYTHON=true default |
57 |
+} |
58 |
|
59 |
-multilib_src_compile() { |
60 |
- default |
61 |
+src_compile() { |
62 |
+ : |
63 |
+} |
64 |
|
65 |
- if multilib_is_native_abi; then |
66 |
- python_foreach_impl emake -C xcbgen top_builddir="${BUILD_DIR}" |
67 |
- fi |
68 |
+xcbgen_install() { |
69 |
+ # Use eclass to find sitedir instead. |
70 |
+ emake -C xcbgen install DESTDIR="${D}" pythondir="$(python_get_sitedir)" |
71 |
+ python_optimize |
72 |
} |
73 |
|
74 |
multilib_src_install() { |
75 |
- default |
76 |
- |
77 |
- if multilib_is_native_abi; then |
78 |
- python_foreach_impl emake -C xcbgen top_builddir="${BUILD_DIR}" |
79 |
- python_foreach_impl python_optimize |
80 |
- fi |
81 |
+ # Restrict SUBDIRS to prevent xcbgen with empty sitedir. |
82 |
+ emake install DESTDIR="${D}" SUBDIRS=src |
83 |
+ multilib_is_native_abi && python_foreach_impl xcbgen_install |
84 |
} |