Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/weechat/
Date: Sun, 03 Dec 2017 21:15:17
Message-Id: 1512335669.943925b6b1dc408400b8a0141c36b081482c6514.radhermit@gentoo
1 commit: 943925b6b1dc408400b8a0141c36b081482c6514
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 3 21:11:54 2017 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 3 21:14:29 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943925b6
7
8 net-irc/weechat: version bump to 2.0
9
10 net-irc/weechat/Manifest | 1 +
11 net-irc/weechat/metadata.xml | 21 +++++++++++----------
12 .../{weechat-9999.ebuild => weechat-2.0.ebuild} | 18 +++++++++++++++---
13 net-irc/weechat/weechat-9999.ebuild | 18 +++++++++++++++---
14 4 files changed, 42 insertions(+), 16 deletions(-)
15
16 diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
17 index aacb2cf577f..fae4f9b0000 100644
18 --- a/net-irc/weechat/Manifest
19 +++ b/net-irc/weechat/Manifest
20 @@ -1 +1,2 @@
21 DIST weechat-1.9.1.tar.xz 1877428 SHA256 c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa WHIRLPOOL 01513b276a77cf6849c6dd96945ecc069e00094be6d00d83f8884943bb7dc29b66938b6a3c5d42ed338e31633c397e6ce0fd875d5365e6a2748ecb72c490fa79
22 +DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
23
24 diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
25 index e04464bc80b..39474809b46 100644
26 --- a/net-irc/weechat/metadata.xml
27 +++ b/net-irc/weechat/metadata.xml
28 @@ -5,16 +5,17 @@
29 <email>radhermit@g.o</email>
30 </maintainer>
31 <use>
32 - <flag name="alias">Enable plugin for alias control.</flag>
33 - <flag name="buflist">Enable buflist plugin.</flag>
34 - <flag name="charset">Enable encoding conversions.</flag>
35 - <flag name="exec">Enable exec plugin.</flag>
36 - <flag name="fifo">Enable FIFO support (sh pipes).</flag>
37 - <flag name="logger">Enable support for logging.</flag>
38 + <flag name="alias">Enable plugin for alias control</flag>
39 + <flag name="buflist">Enable buflist plugin</flag>
40 + <flag name="charset">Enable encoding conversions</flag>
41 + <flag name="exec">Enable exec plugin</flag>
42 + <flag name="fset">Enable fast set plugin</flag>
43 + <flag name="fifo">Enable FIFO support (sh pipes)</flag>
44 + <flag name="logger">Enable support for logging</flag>
45 <flag name="relay">Enable relay plugin (experimental)</flag>
46 - <flag name="scripts">Build infrastructure for scripting.</flag>
47 - <flag name="trigger">Enable trigger plugin.</flag>
48 - <flag name="xfer">Enable xfer plugin support.</flag>
49 - <flag name="irc">Enable IRC protocol support.</flag>
50 + <flag name="scripts">Build infrastructure for scripting</flag>
51 + <flag name="trigger">Enable trigger plugin</flag>
52 + <flag name="xfer">Enable xfer plugin support</flag>
53 + <flag name="irc">Enable IRC protocol support</flag>
54 </use>
55 </pkgmetadata>
56
57 diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-2.0.ebuild
58 similarity index 86%
59 copy from net-irc/weechat/weechat-9999.ebuild
60 copy to net-irc/weechat/weechat-2.0.ebuild
61 index 674f4cb5e57..59575ed9f9d 100644
62 --- a/net-irc/weechat/weechat-9999.ebuild
63 +++ b/net-irc/weechat/weechat-2.0.ebuild
64 @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
65 EGIT_REPO_URI="https://github.com/weechat/weechat.git"
66 else
67 SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
68 - KEYWORDS="~amd64 ~x86"
69 + KEYWORDS="~amd64 ~x86 ~x64-macos"
70 fi
71
72 DESCRIPTION="Portable and multi-interface IRC client"
73 @@ -21,9 +21,9 @@ LICENSE="GPL-3"
74 SLOT="0"
75
76 NETWORKS="+irc"
77 -PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
78 +PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
79 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
80 -SCRIPT_LANGS="guile lua +perl +python ruby tcl"
81 +SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
82 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
83 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
84 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
85 @@ -38,6 +38,7 @@ RDEPEND="
86 lua? ( dev-lang/lua:0[deprecated] )
87 nls? ( virtual/libintl )
88 perl? ( dev-lang/perl:= )
89 + php? ( >=dev-lang/php-7.0:* )
90 python? ( ${PYTHON_DEPS} )
91 ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
92 ssl? ( net-libs/gnutls )
93 @@ -95,6 +96,15 @@ src_prepare() {
94
95 # install docs in correct directory
96 sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
97 +
98 + if [[ ${CHOST} == *-darwin* ]]; then
99 + # fix linking error on Darwin
100 + sed -i "s/+ get_config_var('LINKFORSHARED')//" \
101 + cmake/FindPython.cmake || die
102 + # allow to find the plugins by default
103 + sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
104 + src/core/wee-config.c || die
105 + fi
106 }
107
108 src_configure() {
109 @@ -108,6 +118,7 @@ src_configure() {
110 -DENABLE_BUFLIST=$(usex buflist)
111 -DENABLE_CHARSET=$(usex charset)
112 -DENABLE_EXEC=$(usex exec)
113 + -DENABLE_FSET=$(usex fset)
114 -DENABLE_FIFO=$(usex fifo)
115 -DENABLE_IRC=$(usex irc)
116 -DENABLE_LOGGER=$(usex logger)
117 @@ -115,6 +126,7 @@ src_configure() {
118 -DENABLE_SCRIPT=$(usex scripts)
119 -DENABLE_SCRIPTS=$(usex scripts)
120 -DENABLE_PERL=$(usex perl)
121 + -DENABLE_PHP=$(usex php)
122 -DENABLE_PYTHON=$(usex python)
123 -DENABLE_RUBY=$(usex ruby)
124 -DENABLE_LUA=$(usex lua)
125
126 diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
127 index 674f4cb5e57..59575ed9f9d 100644
128 --- a/net-irc/weechat/weechat-9999.ebuild
129 +++ b/net-irc/weechat/weechat-9999.ebuild
130 @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
131 EGIT_REPO_URI="https://github.com/weechat/weechat.git"
132 else
133 SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
134 - KEYWORDS="~amd64 ~x86"
135 + KEYWORDS="~amd64 ~x86 ~x64-macos"
136 fi
137
138 DESCRIPTION="Portable and multi-interface IRC client"
139 @@ -21,9 +21,9 @@ LICENSE="GPL-3"
140 SLOT="0"
141
142 NETWORKS="+irc"
143 -PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
144 +PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer"
145 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
146 -SCRIPT_LANGS="guile lua +perl +python ruby tcl"
147 +SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
148 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
149 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
150 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
151 @@ -38,6 +38,7 @@ RDEPEND="
152 lua? ( dev-lang/lua:0[deprecated] )
153 nls? ( virtual/libintl )
154 perl? ( dev-lang/perl:= )
155 + php? ( >=dev-lang/php-7.0:* )
156 python? ( ${PYTHON_DEPS} )
157 ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
158 ssl? ( net-libs/gnutls )
159 @@ -95,6 +96,15 @@ src_prepare() {
160
161 # install docs in correct directory
162 sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
163 +
164 + if [[ ${CHOST} == *-darwin* ]]; then
165 + # fix linking error on Darwin
166 + sed -i "s/+ get_config_var('LINKFORSHARED')//" \
167 + cmake/FindPython.cmake || die
168 + # allow to find the plugins by default
169 + sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
170 + src/core/wee-config.c || die
171 + fi
172 }
173
174 src_configure() {
175 @@ -108,6 +118,7 @@ src_configure() {
176 -DENABLE_BUFLIST=$(usex buflist)
177 -DENABLE_CHARSET=$(usex charset)
178 -DENABLE_EXEC=$(usex exec)
179 + -DENABLE_FSET=$(usex fset)
180 -DENABLE_FIFO=$(usex fifo)
181 -DENABLE_IRC=$(usex irc)
182 -DENABLE_LOGGER=$(usex logger)
183 @@ -115,6 +126,7 @@ src_configure() {
184 -DENABLE_SCRIPT=$(usex scripts)
185 -DENABLE_SCRIPTS=$(usex scripts)
186 -DENABLE_PERL=$(usex perl)
187 + -DENABLE_PHP=$(usex php)
188 -DENABLE_PYTHON=$(usex python)
189 -DENABLE_RUBY=$(usex ruby)
190 -DENABLE_LUA=$(usex lua)
Report Message
Find on MARC Find on Google Groups