1 |
commit: df259a18b9224191c6c409c7027d265469e9812c |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 04:06:50 2016 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 04:11:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df259a18 |
7 |
|
8 |
net-irc/weechat: respect PYTHON_SINGLE_TARGET setting |
9 |
|
10 |
Previously it would only build against python2.7. |
11 |
|
12 |
Patch thanks to Oleg in bug #577638. |
13 |
|
14 |
.../weechat/{weechat-9999.ebuild => weechat-1.4-r1.ebuild} | 12 +++++++++--- |
15 |
net-irc/weechat/weechat-9999.ebuild | 10 ++++++++-- |
16 |
2 files changed, 17 insertions(+), 5 deletions(-) |
17 |
|
18 |
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-1.4-r1.ebuild |
19 |
similarity index 94% |
20 |
copy from net-irc/weechat/weechat-9999.ebuild |
21 |
copy to net-irc/weechat/weechat-1.4-r1.ebuild |
22 |
index da16374..a348523 100644 |
23 |
--- a/net-irc/weechat/weechat-9999.ebuild |
24 |
+++ b/net-irc/weechat/weechat-1.4-r1.ebuild |
25 |
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then |
26 |
EGIT_REPO_URI="https://github.com/weechat/weechat.git" |
27 |
else |
28 |
SRC_URI="https://weechat.org/files/src/${P}.tar.bz2" |
29 |
- KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
30 |
+ KEYWORDS="~amd64 ~x86" |
31 |
fi |
32 |
|
33 |
DESCRIPTION="Portable and multi-interface IRC client" |
34 |
@@ -107,7 +107,6 @@ src_configure() { |
35 |
"-DENABLE_DEMO=OFF" |
36 |
"-DENABLE_GTK=OFF" |
37 |
"-DENABLE_JAVASCRIPT=OFF" |
38 |
- "-DPYTHON_EXECUTABLE=${PYTHON}" |
39 |
$(cmake-utils_use_enable alias) |
40 |
$(cmake-utils_use_enable doc) |
41 |
$(cmake-utils_use_enable charset) |
42 |
@@ -131,7 +130,14 @@ src_configure() { |
43 |
$(cmake-utils_use_enable trigger) |
44 |
$(cmake-utils_use_enable xfer) |
45 |
) |
46 |
- [[ ${EPYTHON} == python3* ]] && mycmakeargs+=( $(cmake-utils_use_enable python PYTHON3) ) |
47 |
+ |
48 |
+ if use python; then |
49 |
+ python_export PYTHON_LIBPATH |
50 |
+ mycmakeargs+=( |
51 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
52 |
+ -DPYTHON_LIBRARY="${PYTHON_LIBPATH}" |
53 |
+ ) |
54 |
+ fi |
55 |
|
56 |
cmake-utils_src_configure |
57 |
} |
58 |
|
59 |
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild |
60 |
index da16374..2c9d55e 100644 |
61 |
--- a/net-irc/weechat/weechat-9999.ebuild |
62 |
+++ b/net-irc/weechat/weechat-9999.ebuild |
63 |
@@ -107,7 +107,6 @@ src_configure() { |
64 |
"-DENABLE_DEMO=OFF" |
65 |
"-DENABLE_GTK=OFF" |
66 |
"-DENABLE_JAVASCRIPT=OFF" |
67 |
- "-DPYTHON_EXECUTABLE=${PYTHON}" |
68 |
$(cmake-utils_use_enable alias) |
69 |
$(cmake-utils_use_enable doc) |
70 |
$(cmake-utils_use_enable charset) |
71 |
@@ -131,7 +130,14 @@ src_configure() { |
72 |
$(cmake-utils_use_enable trigger) |
73 |
$(cmake-utils_use_enable xfer) |
74 |
) |
75 |
- [[ ${EPYTHON} == python3* ]] && mycmakeargs+=( $(cmake-utils_use_enable python PYTHON3) ) |
76 |
+ |
77 |
+ if use python; then |
78 |
+ python_export PYTHON_LIBPATH |
79 |
+ mycmakeargs+=( |
80 |
+ -DPYTHON_EXECUTABLE="${PYTHON}" |
81 |
+ -DPYTHON_LIBRARY="${PYTHON_LIBPATH}" |
82 |
+ ) |
83 |
+ fi |
84 |
|
85 |
cmake-utils_src_configure |
86 |
} |