1 |
commit: fe50051b158b98f8011b8cc0a427a15405410857 |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 25 06:28:11 2017 +0000 |
4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 25 06:29:06 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe50051b |
7 |
|
8 |
net-im/bitlbee: remove old |
9 |
|
10 |
net-im/bitlbee/Manifest | 1 - |
11 |
net-im/bitlbee/bitlbee-3.4.1.ebuild | 178 ------------------------------------ |
12 |
net-im/bitlbee/bitlbee-3.5.ebuild | 168 ---------------------------------- |
13 |
net-im/bitlbee/metadata.xml | 1 - |
14 |
4 files changed, 348 deletions(-) |
15 |
|
16 |
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest |
17 |
index aa75627..1afab0c 100644 |
18 |
--- a/net-im/bitlbee/Manifest |
19 |
+++ b/net-im/bitlbee/Manifest |
20 |
@@ -1,3 +1,2 @@ |
21 |
-DIST bitlbee-3.4.1.tar.gz 688072 SHA256 500a0b19943040d67458eb3beb0a63d004abb2aa54a777addeb2a895d4f5c0e1 SHA512 fad297c7a792c932ba74daf7dc894883037842ae5d39a4c831c6615100580073001806c1af60555aa1c775399e8a484d99a4e601e96c6a075e12546e5d153532 WHIRLPOOL 431faa8f065233ee7345d4950d147fea9fc627ba4b78ca0f25bed9627804d3dd4d512a12c9f98bd29a01ebfb680c8cf7e756bb53b38a484b304a0e973c657993 |
22 |
DIST bitlbee-3.4.2.tar.gz 719456 SHA256 69c85554def74f314e3b6e390389a30b0e748f23ef37883e9d7545ee2c45ea57 SHA512 2b839c014cfad037d815aa0e0867dda1b4628ff076d8de6fec1e80ab1499bca565d9afbe104929d492ff68c86b745cc3f76acbeba102766d656f2d359b70302e WHIRLPOOL 43803ba2bbe6297e05e465912d22b0547bb0f9c3cd184a6c0c924dc023b9d505e3666aa732de83c79249e59aa0e2d6f621ee15c508ccc17eed1898b755f0112e |
23 |
DIST bitlbee-3.5.tar.gz 657177 SHA256 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 SHA512 7f044474fff5b1213dddc29e19aae102d1bbe4361cddcf9e58f965c01a58b6f7ed41cbf6ecec050a96f91f55dca15f6df948dee105eff001086d9daa15ba0499 WHIRLPOOL 72434e9d7d43a0d1bf6d1f8c0eda10a099fca262d5431430d0001a7dc7b34e7594e5a6dc0942eebc04f7073bc73d4d8b3f7d00991b21b47d1cfb15ea542715c7 |
24 |
|
25 |
diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild |
26 |
deleted file mode 100644 |
27 |
index 02ea33f..00000000 |
28 |
--- a/net-im/bitlbee/bitlbee-3.4.1.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,178 +0,0 @@ |
31 |
-# Copyright 1999-2016 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
-# $Id$ |
34 |
- |
35 |
-EAPI=5 |
36 |
-PYTHON_COMPAT=( python2_7 ) |
37 |
- |
38 |
-inherit eutils multilib user python-single-r1 systemd |
39 |
- |
40 |
-DESCRIPTION="irc to IM gateway that support multiple IM protocols" |
41 |
-HOMEPAGE="http://www.bitlbee.org/" |
42 |
-SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" |
43 |
- |
44 |
-LICENSE="GPL-2" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" |
47 |
-IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux |
48 |
- skype ssl test twitter +yahoo xinetd libressl" |
49 |
- |
50 |
-COMMON_DEPEND=" |
51 |
- >=dev-libs/glib-2.16 |
52 |
- purple? ( net-im/pidgin ) |
53 |
- libevent? ( dev-libs/libevent ) |
54 |
- otr? ( >=net-libs/libotr-4 ) |
55 |
- gnutls? ( net-libs/gnutls ) |
56 |
- !gnutls? ( |
57 |
- nss? ( dev-libs/nss ) |
58 |
- !nss? ( ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= ) ) ) |
59 |
- ) |
60 |
- " |
61 |
-DEPEND="${COMMON_DEPEND} |
62 |
- dev-lang/python |
63 |
- virtual/pkgconfig |
64 |
- selinux? ( sec-policy/selinux-bitlbee ) |
65 |
- test? ( dev-libs/check )" |
66 |
- |
67 |
-RDEPEND="${COMMON_DEPEND} |
68 |
- virtual/logger |
69 |
- skype? ( |
70 |
- dev-python/skype4py[${PYTHON_USEDEP}] |
71 |
- net-im/skype |
72 |
- ) |
73 |
- xinetd? ( sys-apps/xinetd )" |
74 |
- |
75 |
-REQUIRED_USE="|| ( purple xmpp msn oscar yahoo ) |
76 |
- msn? ( || ( gnutls nss ssl ) ) |
77 |
- xmpp? ( !nss )" |
78 |
- |
79 |
-pkg_setup() { |
80 |
- if use xmpp && ! use gnutls && ! use ssl ; then |
81 |
- einfo |
82 |
- elog "You have enabled support for Jabber but do not have SSL" |
83 |
- elog "support enabled. This *will* prevent bitlbee from being" |
84 |
- elog "able to connect to SSL enabled Jabber servers. If you need to" |
85 |
- elog "connect to Jabber over SSL, enable ONE of the following use" |
86 |
- elog "flags: gnutls or ssl" |
87 |
- einfo |
88 |
- fi |
89 |
- |
90 |
- use skype && python-single-r1_pkg_setup |
91 |
- |
92 |
- enewgroup bitlbee |
93 |
- enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee |
94 |
-} |
95 |
- |
96 |
-src_prepare() { |
97 |
- sed -i \ |
98 |
- -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ |
99 |
- -e "s/nobody/bitlbee/" \ |
100 |
- -e "s/}/ disable = yes\n}/" \ |
101 |
- doc/bitlbee.xinetd || die "sed failed in xinetd" |
102 |
- |
103 |
- sed -i \ |
104 |
- -e "s@mozilla-nss@nss@g" \ |
105 |
- configure || die "sed failed in configure" |
106 |
- |
107 |
- use skype && python_fix_shebang protocols/skype/skyped.py |
108 |
- |
109 |
- epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch |
110 |
-} |
111 |
- |
112 |
-src_configure() { |
113 |
- # setup plugins, protocol, ipv6 and debug |
114 |
- use xmpp && myconf="${myconf} --jabber=1" |
115 |
- for flag in debug ipv6 msn oscar plugins purple skype twitter yahoo ; do |
116 |
- if use ${flag} ; then |
117 |
- myconf="${myconf} --${flag}=1" |
118 |
- else |
119 |
- myconf="${myconf} --${flag}=0" |
120 |
- fi |
121 |
- done |
122 |
- |
123 |
- # set otr |
124 |
- if use otr && use plugins ; then |
125 |
- myconf="${myconf} --otr=plugin" |
126 |
- else |
127 |
- if use otr ; then |
128 |
- ewarn "OTR support has been disabled automatically because it" |
129 |
- ewarn "requires the plugins USE flag." |
130 |
- fi |
131 |
- myconf="${myconf} --otr=0" |
132 |
- fi |
133 |
- |
134 |
- # setup ssl use flags |
135 |
- if use gnutls ; then |
136 |
- myconf="${myconf} --ssl=gnutls" |
137 |
- einfo "Using gnutls for SSL support" |
138 |
- elif use ssl ; then |
139 |
- myconf="${myconf} --ssl=openssl" |
140 |
- einfo "Using openssl for SSL support" |
141 |
- elif use nss ; then |
142 |
- myconf="${myconf} --ssl=nss" |
143 |
- einfo "Using nss for SSL support" |
144 |
- else |
145 |
- myconf="${myconf} --ssl=bogus" |
146 |
- einfo "You will not have any encryption support enabled." |
147 |
- fi |
148 |
- |
149 |
- # set event handler |
150 |
- if use libevent ; then |
151 |
- myconf="${myconf} --events=libevent" |
152 |
- else |
153 |
- myconf="${myconf} --events=glib" |
154 |
- fi |
155 |
- |
156 |
- # NOTE: bitlbee's configure script is not an autotool creation, |
157 |
- # so that is why we don't use econf. |
158 |
- ./configure \ |
159 |
- --prefix=/usr --datadir=/usr/share/bitlbee \ |
160 |
- --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ |
161 |
- --systemdsystemunitdir=$(systemd_get_unitdir) \ |
162 |
- --doc=1 --strip=0 ${myconf} || die "econf failed" |
163 |
- |
164 |
- sed -i \ |
165 |
- -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ |
166 |
- Makefile.settings || die "sed failed" |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- emake install install-etc install-doc install-dev install-systemd DESTDIR="${D}" |
171 |
- |
172 |
- keepdir /var/lib/bitlbee |
173 |
- fperms 700 /var/lib/bitlbee |
174 |
- fowners bitlbee:bitlbee /var/lib/bitlbee |
175 |
- |
176 |
- dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} |
177 |
- |
178 |
- if use skype ; then |
179 |
- newdoc protocols/skype/NEWS NEWS-skype |
180 |
- newdoc protocols/skype/README README-skype |
181 |
- fi |
182 |
- |
183 |
- if use xinetd ; then |
184 |
- insinto /etc/xinetd.d |
185 |
- newins doc/bitlbee.xinetd bitlbee |
186 |
- fi |
187 |
- |
188 |
- newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee |
189 |
- newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee |
190 |
- |
191 |
- exeinto /usr/share/bitlbee |
192 |
- doexe utils/{convert_purple.py,bitlbee-ctl.pl} |
193 |
-} |
194 |
- |
195 |
-pkg_postinst() { |
196 |
- chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee |
197 |
- [[ -d "${ROOT}"/var/run/bitlbee ]] && |
198 |
- chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee |
199 |
- |
200 |
- einfo |
201 |
- elog "The bitlbee init script will now attempt to stop all processes owned by the" |
202 |
- elog "bitlbee user, including per-client forks." |
203 |
- elog |
204 |
- elog "Tell the init script not to touch anything besides the main bitlbee process" |
205 |
- elog "by changing the BITLBEE_STOP_ALL variable in" |
206 |
- elog " /etc/conf.d/bitlbee" |
207 |
- einfo |
208 |
-} |
209 |
|
210 |
diff --git a/net-im/bitlbee/bitlbee-3.5.ebuild b/net-im/bitlbee/bitlbee-3.5.ebuild |
211 |
deleted file mode 100644 |
212 |
index d010143..00000000 |
213 |
--- a/net-im/bitlbee/bitlbee-3.5.ebuild |
214 |
+++ /dev/null |
215 |
@@ -1,168 +0,0 @@ |
216 |
-# Copyright 1999-2017 Gentoo Foundation |
217 |
-# Distributed under the terms of the GNU General Public License v2 |
218 |
-# $Id$ |
219 |
- |
220 |
-EAPI=6 |
221 |
- |
222 |
-inherit user systemd toolchain-funcs |
223 |
- |
224 |
-if [[ ${PV} == "9999" ]]; then |
225 |
- EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git" |
226 |
- inherit git-r3 |
227 |
-else |
228 |
- SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz" |
229 |
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" |
230 |
-fi |
231 |
- |
232 |
-DESCRIPTION="irc to IM gateway that support multiple IM protocols" |
233 |
-HOMEPAGE="https://www.bitlbee.org/" |
234 |
- |
235 |
-LICENSE="GPL-2" |
236 |
-SLOT="0" |
237 |
-IUSE_PROTOCOLS="msn oscar purple twitter +xmpp yahoo" |
238 |
-IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd |
239 |
- ${IUSE_PROTOCOLS}" |
240 |
- |
241 |
-REQUIRED_USE=" |
242 |
- || ( purple xmpp msn oscar yahoo ) |
243 |
- xmpp? ( !nss ) |
244 |
-" |
245 |
- |
246 |
-COMMON_DEPEND=" |
247 |
- >=dev-libs/glib-2.16 |
248 |
- purple? ( net-im/pidgin ) |
249 |
- libevent? ( dev-libs/libevent:= ) |
250 |
- otr? ( >=net-libs/libotr-4 ) |
251 |
- gnutls? ( net-libs/gnutls:= ) |
252 |
- !gnutls? ( |
253 |
- nss? ( dev-libs/nss ) |
254 |
- !nss? ( |
255 |
- libressl? ( dev-libs/libressl:= ) |
256 |
- !libressl? ( dev-libs/openssl:0= ) |
257 |
- ) |
258 |
- ) |
259 |
-" |
260 |
-DEPEND="${COMMON_DEPEND} |
261 |
- virtual/pkgconfig |
262 |
- selinux? ( sec-policy/selinux-bitlbee ) |
263 |
- test? ( dev-libs/check )" |
264 |
- |
265 |
-RDEPEND="${COMMON_DEPEND} |
266 |
- virtual/logger |
267 |
- xinetd? ( sys-apps/xinetd )" |
268 |
- |
269 |
-pkg_setup() { |
270 |
- enewgroup bitlbee |
271 |
- enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee |
272 |
-} |
273 |
- |
274 |
-src_prepare() { |
275 |
- if [[ ${PV} != "9999" ]]; then |
276 |
- eapply \ |
277 |
- "${FILESDIR}"/${P}-systemd-user.patch \ |
278 |
- "${FILESDIR}"/${P}-verbose-build.patch |
279 |
- fi |
280 |
- |
281 |
- eapply_user |
282 |
-} |
283 |
- |
284 |
-src_configure() { |
285 |
- local myconf |
286 |
- |
287 |
- # setup plugins, protocol, ipv6 and debug |
288 |
- myconf+=( --jabber=$(usex xmpp 1 0) ) |
289 |
- for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do |
290 |
- myconf+=( --${flag}=$(usex ${flag} 1 0) ) |
291 |
- done |
292 |
- |
293 |
- # set otr |
294 |
- if use otr && use plugins ; then |
295 |
- myconf+=( --otr=plugin ) |
296 |
- else |
297 |
- if use otr ; then |
298 |
- ewarn "OTR support has been disabled automatically because it" |
299 |
- ewarn "requires the plugins USE flag." |
300 |
- fi |
301 |
- myconf+=( --otr=0 ) |
302 |
- fi |
303 |
- |
304 |
- # setup ssl use flags |
305 |
- if use gnutls ; then |
306 |
- myconf+=( --ssl=gnutls ) |
307 |
- einfo "Using gnutls for SSL support" |
308 |
- else |
309 |
- ewarn "Only gnutls is officially supported by upstream." |
310 |
- if use nss ; then |
311 |
- myconf+=( --ssl=nss ) |
312 |
- einfo "Using nss for SSL support" |
313 |
- else |
314 |
- myconf+=( --ssl=openssl ) |
315 |
- einfo "Using openssl for SSL support" |
316 |
- fi |
317 |
- fi |
318 |
- |
319 |
- # set event handler |
320 |
- if use libevent ; then |
321 |
- myconf+=( --events=libevent ) |
322 |
- else |
323 |
- myconf+=( --events=glib ) |
324 |
- fi |
325 |
- |
326 |
- # not autotools-based |
327 |
- ./configure \ |
328 |
- --prefix=/usr \ |
329 |
- --datadir=/usr/share/bitlbee \ |
330 |
- --etcdir=/etc/bitlbee \ |
331 |
- --plugindir=/usr/$(get_libdir)/bitlbee \ |
332 |
- --systemdsystemunitdir=$(systemd_get_systemunitdir) \ |
333 |
- --doc=1 \ |
334 |
- --strip=0 \ |
335 |
- --verbose=1 \ |
336 |
- "${myconf[@]}" || die |
337 |
- |
338 |
- sed -i \ |
339 |
- -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ |
340 |
- Makefile.settings || die |
341 |
-} |
342 |
- |
343 |
-src_compile() { |
344 |
- emake CC="$(tc-getCC)" LD="$(tc-getLD)" |
345 |
-} |
346 |
- |
347 |
-src_install() { |
348 |
- emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd |
349 |
- |
350 |
- keepdir /var/lib/bitlbee |
351 |
- fperms 700 /var/lib/bitlbee |
352 |
- fowners bitlbee:bitlbee /var/lib/bitlbee |
353 |
- |
354 |
- dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} |
355 |
- |
356 |
- if use xinetd ; then |
357 |
- insinto /etc/xinetd.d |
358 |
- newins doc/bitlbee.xinetd bitlbee |
359 |
- fi |
360 |
- |
361 |
- newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee |
362 |
- newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee |
363 |
- |
364 |
- exeinto /usr/share/bitlbee |
365 |
- doexe utils/{convert_purple.py,bitlbee-ctl.pl} |
366 |
-} |
367 |
- |
368 |
-pkg_postinst() { |
369 |
- chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee |
370 |
- [[ -d "${ROOT}"/var/run/bitlbee ]] && |
371 |
- chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee |
372 |
- |
373 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
374 |
- einfo |
375 |
- elog "The bitlbee init script will now attempt to stop all processes owned by the" |
376 |
- elog "bitlbee user, including per-client forks." |
377 |
- elog |
378 |
- elog "Tell the init script not to touch anything besides the main bitlbee process" |
379 |
- elog "by changing the BITLBEE_STOP_ALL variable in" |
380 |
- elog " /etc/conf.d/bitlbee" |
381 |
- einfo |
382 |
- fi |
383 |
-} |
384 |
|
385 |
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml |
386 |
index 3251066..7f107c3 100644 |
387 |
--- a/net-im/bitlbee/metadata.xml |
388 |
+++ b/net-im/bitlbee/metadata.xml |
389 |
@@ -11,7 +11,6 @@ |
390 |
<flag name="otr">Enable support for encrypted conversations</flag> |
391 |
<flag name="plugins">Enable support for plugins</flag> |
392 |
<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag> |
393 |
- <flag name="skype">Enable Skype support</flag> |
394 |
<flag name="twitter">Enable Twitter protocol support</flag> |
395 |
</use> |
396 |
<longdescription> |