Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/, net-im/pidgin/files/
Date: Wed, 09 Sep 2020 15:17:59
Message-Id: 1599664668.b4a5d59dcba12a0a628269689b0e61dd9de2d319.polynomial-c@gentoo
1 commit: b4a5d59dcba12a0a628269689b0e61dd9de2d319
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 9 14:04:37 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 9 15:17:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a5d59d
7
8 net-im/pidgin: Removed old
9
10 Package-Manager: Portage-3.0.6, Repoman-3.0.1
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-im/pidgin/Manifest | 1 -
14 net-im/pidgin/files/pidgin-2.10.0-gold.patch | 30 ---
15 .../pidgin-2.13.0-fix-build-against-nm-1.0.patch | 54 ----
16 .../files/pidgin-2.13.0-gnutls_sni_support.patch | 33 ---
17 .../files/pidgin-2.13.0-python3_support.patch | 37 ---
18 net-im/pidgin/pidgin-2.13.0-r7.ebuild | 281 -------------------
19 net-im/pidgin/pidgin-2.13.0-r8.ebuild | 300 ---------------------
20 7 files changed, 736 deletions(-)
21
22 diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
23 index 19285a4611f..d5ad48d94d0 100644
24 --- a/net-im/pidgin/Manifest
25 +++ b/net-im/pidgin/Manifest
26 @@ -1,4 +1,3 @@
27 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
28 -DIST pidgin-2.13.0.tar.bz2 8994457 BLAKE2B 32be31509a90b924fba4a4dbaba304580d88dfc6d3bbe0c88ef12eef381f70e031af1a55ada2abfb6968a9967a9fdadfa69973482b80dea7bb554a983a96fa12 SHA512 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
29 DIST pidgin-2.14.1.tar.bz2 8849275 BLAKE2B 27cd58a79f36c0176147c2e5bac7c4c18ec74c446c556e2326465c3607a95c3a58c1bdbbf9b4fb9741783ae982a6ce8fe0556ccff5b1608c9bba98626560412c SHA512 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
30 DIST pidgin-eds-3.6.patch.bz2 2352 BLAKE2B 1d69dc55f43b9efe5d5278a017642702d67a297fe2587467ec0fdca7f9888e26640efe9ac2a18f77ae9c523bf125a2cec6d0bf621f0b2b16f55d30df1bf470df SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
31
32 diff --git a/net-im/pidgin/files/pidgin-2.10.0-gold.patch b/net-im/pidgin/files/pidgin-2.10.0-gold.patch
33 deleted file mode 100644
34 index 819bfdc5c6b..00000000000
35 --- a/net-im/pidgin/files/pidgin-2.10.0-gold.patch
36 +++ /dev/null
37 @@ -1,30 +0,0 @@
38 - pidgin/Makefile.am | 2 +-
39 - pidgin/Makefile.in | 2 +-
40 - 2 files changed, 2 insertions(+), 2 deletions(-)
41 -
42 -diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
43 -index b6a5bd4..96d207d 100644
44 ---- a/pidgin/Makefile.am
45 -+++ b/pidgin/Makefile.am
46 -@@ -158,7 +158,7 @@ pidgin_LDADD = \
47 - $(GTKSPELL_LIBS) \
48 - $(LIBXML_LIBS) \
49 - $(GTK_LIBS) \
50 -- $(top_builddir)/libpurple/libpurple.la
51 -+ $(top_builddir)/libpurple/libpurple.la -lm
52 -
53 - if USE_INTERNAL_LIBGADU
54 - INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
55 -diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in
56 -index 615c196..0293e5c 100644
57 ---- a/pidgin/Makefile.in
58 -+++ b/pidgin/Makefile.in
59 -@@ -607,7 +607,7 @@ EXTRA_DIST = \
60 - @ENABLE_GTK_TRUE@ $(GTKSPELL_LIBS) \
61 - @ENABLE_GTK_TRUE@ $(LIBXML_LIBS) \
62 - @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
63 --@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
64 -+@ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la -lm
65 -
66 - @ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
67 - @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
68
69 diff --git a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch b/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
70 deleted file mode 100644
71 index d9d27930439..00000000000
72 --- a/net-im/pidgin/files/pidgin-2.13.0-fix-build-against-nm-1.0.patch
73 +++ /dev/null
74 @@ -1,54 +0,0 @@
75 -https://src.fedoraproject.org/rpms/pidgin/raw/master/f/pidgin-2.13.0-fix-build-against-nm-1.0.patch
76 -
77 -diff --git a/configure.ac b/configure.ac
78 -index 04836fa..0a2d451 100644
79 ---- a/configure.ac
80 -+++ b/configure.ac
81 -@@ -1423,18 +1423,24 @@ fi
82 - dnl Check for NetworkManager.h; if we don't have it, oh well
83 - if test "x$enable_dbus" = "xyes" ; then
84 - if test "x$enable_nm" = "xyes" ; then
85 -- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
86 -+ PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
87 - AC_SUBST(NETWORKMANAGER_CFLAGS)
88 - AC_SUBST(NETWORKMANAGER_LIBS)
89 - AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
90 - ], [
91 -- enable_nm=no
92 -- if test "x$force_deps" = "xyes" ; then
93 -- AC_MSG_ERROR([
94 -+ PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
95 -+ AC_SUBST(NETWORKMANAGER_CFLAGS)
96 -+ AC_SUBST(NETWORKMANAGER_LIBS)
97 -+ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
98 -+ ], [
99 -+ enable_nm=no
100 -+ if test "x$force_deps" = "xyes" ; then
101 -+ AC_MSG_ERROR([
102 - NetworkManager development headers not found.
103 - Use --disable-nm if you do not need NetworkManager support.
104 - ])
105 -- fi])
106 -+ fi])
107 -+ ])
108 - fi
109 - else
110 - enable_nm=no
111 -diff --git a/libpurple/network.c b/libpurple/network.c
112 -index c43e3c7..b17e439 100644
113 ---- a/libpurple/network.c
114 -+++ b/libpurple/network.c
115 -@@ -939,8 +939,13 @@ nm_update_state(NMState state)
116 - #if NM_CHECK_VERSION(0,8,992)
117 - case NM_STATE_DISCONNECTING:
118 - #endif
119 -+#if NM_CHECK_VERSION(1,0,0)
120 -+ if (prev != NM_STATE_CONNECTED_GLOBAL && prev != NM_STATE_UNKNOWN)
121 -+ break;
122 -+#else
123 - if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN)
124 - break;
125 -+#endif
126 - if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
127 - ui_ops->network_disconnected();
128 - break;
129
130 diff --git a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch b/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
131 deleted file mode 100644
132 index df6b8e5cd03..00000000000
133 --- a/net-im/pidgin/files/pidgin-2.13.0-gnutls_sni_support.patch
134 +++ /dev/null
135 @@ -1,33 +0,0 @@
136 -# HG changeset patch
137 -# User Mihai Moldovan <ionic@×××××.de>
138 -# Date 1576498301 -3600
139 -# Branch release-2.x.y
140 -# Node ID 6dba8046e1b120c506e1d911c6aa8757d7774c57
141 -# Parent 7a975763d3b64bdd8dd5371d711a4add647ed726
142 -Implement SNI support for the gnutls SSL plugin.
143 -
144 -Note that gnutls is picky in regard to what it accepts as the server name - it
145 -MUST be a domain name. IP addresses are not supported according to the
146 -documentation.
147 -
148 -Hence, filter out IP addresses and hope that whatever is not recognized as
149 -such an address is actually a domain name. This will probably fail for more
150 -exotic addresses (especially in IPv6 realm), but wiring up a full-blown parser
151 -is too much effort and SSL plugins are not part of purple-3 anyway.
152 -
153 -Fixes #17300
154 -
155 -diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
156 ---- a/libpurple/plugins/ssl/ssl-gnutls.c
157 -+++ b/libpurple/plugins/ssl/ssl-gnutls.c
158 -@@ -403,6 +403,10 @@
159 -
160 - gnutls_transport_set_ptr(gnutls_data->session, GINT_TO_POINTER(gsc->fd));
161 -
162 -+ /* SNI support. */
163 -+ if (gsc->host && !g_hostname_is_ip_address(gsc->host))
164 -+ gnutls_server_name_set(gnutls_data->session, GNUTLS_NAME_DNS, gsc->host, strlen(gsc->host));
165 -+
166 - gnutls_data->handshake_handler = purple_input_add(gsc->fd,
167 - PURPLE_INPUT_READ, ssl_gnutls_handshake_cb, gsc);
168 -
169
170 diff --git a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch b/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch
171 deleted file mode 100644
172 index 19ece4a9a22..00000000000
173 --- a/net-im/pidgin/files/pidgin-2.13.0-python3_support.patch
174 +++ /dev/null
175 @@ -1,37 +0,0 @@
176 -# HG changeset patch
177 -# User John Bailey <rekkanoryo@××××××××××.org>
178 -# Date 1527918187 14400
179 -# Sat Jun 02 01:43:07 2018 -0400
180 -# Branch upstream-fedora-patches
181 -# Node ID ab3a54cf9afbd2a1cb6736c7ee424d8fc82e7b14
182 -# Parent de18cefddad5ffe593a192f3a20f6f91165ab516
183 -Modified Jan Synacek's purple-remote python3 compatibility patch to make it
184 -compatible with both python2 and python3.
185 -
186 -diff --git a/COPYRIGHT b/COPYRIGHT
187 ---- a/COPYRIGHT
188 -+++ b/COPYRIGHT
189 -@@ -544,6 +544,7 @@
190 - Sun Microsystems
191 - Marcus Sundberg
192 - Mårten Svantesson (fursten)
193 -+Jan Synacek <jsynacek@××××××.com>
194 - Amir Szekely (kichik)
195 - Gábor Szuromi (kukkerman)
196 - Jakub Szypulka
197 -diff --git a/libpurple/purple-remote b/libpurple/purple-remote
198 ---- a/libpurple/purple-remote
199 -+++ b/libpurple/purple-remote
200 -@@ -14,7 +14,11 @@
201 - import xml.dom.minidom
202 -
203 - sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
204 --sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
205 -+
206 -+if(sys.version_info > (3,0)):
207 -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.detach());
208 -+else:
209 -+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
210 -
211 - xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName
212 -
213
214 diff --git a/net-im/pidgin/pidgin-2.13.0-r7.ebuild b/net-im/pidgin/pidgin-2.13.0-r7.ebuild
215 deleted file mode 100644
216 index 4875939166f..00000000000
217 --- a/net-im/pidgin/pidgin-2.13.0-r7.ebuild
218 +++ /dev/null
219 @@ -1,281 +0,0 @@
220 -# Copyright 1999-2020 Gentoo Authors
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -EAPI=6
224 -
225 -GENTOO_DEPEND_ON_PERL=no
226 -PYTHON_COMPAT=( python3_{6,7} )
227 -
228 -inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils
229 -
230 -DESCRIPTION="GTK Instant Messenger client"
231 -HOMEPAGE="http://pidgin.im/"
232 -SRC_URI="
233 - mirror://sourceforge/${PN}/${P}.tar.bz2
234 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
235 - https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
236 -
237 -LICENSE="GPL-2"
238 -SLOT="0/2" # libpurple version
239 -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
240 -IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
241 -meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
242 -tk +xscreensaver zephyr zeroconf" # mono
243 -
244 -# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
245 -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
246 -# no way to build dbus and avoid libgnt linkage with python. If you want this
247 -# send patch upstream.
248 -# purple-url-handler and purple-remote require dbus-python thus in reality we
249 -# rdepend on python if dbus enabled. But it is possible to separate this dep.
250 -RDEPEND="
251 - >=dev-libs/glib-2.16
252 - >=dev-libs/libxml2-2.6.18
253 - ncurses? (
254 - sys-libs/ncurses:0=[unicode]
255 - dbus? ( ${PYTHON_DEPS} )
256 - python? ( ${PYTHON_DEPS} )
257 - )
258 - gtk? (
259 - >=x11-libs/gtk+-2.10:2[aqua=]
260 - x11-libs/libSM
261 - >=x11-libs/pango-1.4.0
262 - xscreensaver? ( x11-libs/libXScrnSaver )
263 - spell? ( >=app-text/gtkspell-2.0.2:2 )
264 - eds? ( >=gnome-extra/evolution-data-server-3.6:= )
265 - prediction? ( >=dev-db/sqlite-3.3:3 )
266 - )
267 - gstreamer? (
268 - media-libs/gstreamer:1.0
269 - media-libs/gst-plugins-base:1.0
270 - >=net-libs/farstream-0.2.7:0.2
271 - )
272 - zeroconf? ( net-dns/avahi[dbus] )
273 - dbus? (
274 - >=dev-libs/dbus-glib-0.71
275 - >=sys-apps/dbus-0.90
276 - $(python_gen_cond_dep '
277 - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
278 - ')
279 - )
280 - perl? ( >=dev-lang/perl-5.16:= )
281 - gadu? ( || (
282 - >=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
283 - >=net-libs/libgadu-1.11.0[-ssl]
284 - ) )
285 - gnutls? ( net-libs/gnutls:= )
286 - !gnutls? (
287 - dev-libs/nspr
288 - dev-libs/nss
289 - )
290 - meanwhile? ( net-libs/meanwhile )
291 - tcl? ( dev-lang/tcl:0= )
292 - tk? ( dev-lang/tk:0= )
293 - sasl? ( dev-libs/cyrus-sasl:2 )
294 - networkmanager? ( <net-misc/networkmanager-1.19 )
295 - idn? ( net-dns/libidn:= )
296 - !<x11-plugins/pidgin-facebookchat-1.69-r1"
297 - # Mono support crashes pidgin
298 - #mono? ( dev-lang/mono )"
299 -
300 -# We want nls in case gtk is enabled, bug #
301 -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
302 -
303 -DEPEND="$RDEPEND
304 - dev-lang/perl
305 - dev-perl/XML-Parser
306 - virtual/pkgconfig
307 - gtk? (
308 - x11-base/xorg-proto
309 - ${NLS_DEPEND}
310 - )
311 - dbus? ( ${PYTHON_DEPS} )
312 - doc? ( app-doc/doxygen )
313 - !gtk? ( nls? ( ${NLS_DEPEND} ) )"
314 -
315 -DOCS=( AUTHORS HACKING NEWS README ChangeLog )
316 -
317 -REQUIRED_USE="
318 - dbus? ( ${PYTHON_REQUIRED_USE} )
319 - networkmanager? ( dbus )
320 - python? ( ${PYTHON_REQUIRED_USE} )
321 -"
322 -
323 -# Enable Default protocols
324 -DYNAMIC_PRPLS="irc,jabber,oscar,simple"
325 -
326 -# List of plugins
327 -# app-accessibility/pidgin-festival
328 -# net-im/librvp
329 -# x11-plugins/guifications
330 -# x11-plugins/msn-pecan
331 -# x11-plugins/pidgin-encryption
332 -# x11-plugins/pidgin-extprefs
333 -# x11-plugins/pidgin-hotkeys
334 -# x11-plugins/pidgin-latex
335 -# x11-plugins/pidgintex
336 -# x11-plugins/pidgin-libnotify
337 -# x11-plugins/pidgin-mbpurple
338 -# x11-plugins/pidgin-bot-sentry
339 -# x11-plugins/pidgin-otr
340 -# x11-plugins/pidgin-rhythmbox
341 -# x11-plugins/purple-plugin_pack
342 -# x11-themes/pidgin-smileys
343 -# x11-plugins/pidgin-knotify
344 -# Plugins in Sunrise:
345 -# x11-plugins/pidgin-audacious-remote
346 -# x11-plugins/pidgin-autoanswer
347 -# x11-plugins/pidgin-birthday-reminder
348 -# x11-plugins/pidgin-blinklight
349 -# x11-plugins/pidgin-convreverse
350 -# x11-plugins/pidgin-embeddedvideo
351 -# x11-plugins/pidgin-extended-blist-sort
352 -# x11-plugins/pidgin-gfire
353 -# x11-plugins/pidgin-lastfm
354 -# x11-plugins/pidgin-sendscreenshot
355 -# x11-plugins/pidgimpd
356 -
357 -PATCHES=(
358 - "${FILESDIR}/${PN}-2.10.0-gold.patch"
359 - "${WORKDIR}/${PN}-eds-3.6.patch"
360 - "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
361 - "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
362 - "${FILESDIR}/${PN}-2.10.11-tinfo.patch"
363 - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
364 - "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
365 - "${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
366 - "${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
367 -)
368 -
369 -pkg_pretend() {
370 - if ! use gtk && ! use ncurses ; then
371 - elog "You did not pick the ncurses or gtk use flags, only libpurple"
372 - elog "will be built."
373 - fi
374 -
375 - # dbus is enabled, no way to disable linkage with python => python is enabled
376 - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
377 - if use gtk && ! use nls ; then
378 - ewarn "gtk build => nls is enabled!"
379 - fi
380 - if use dbus && ! use python ; then
381 - elog "dbus is enabled, no way to disable linkage with python => python is enabled"
382 - fi
383 -}
384 -
385 -pkg_setup() {
386 - if use python || use dbus ; then
387 - python-single-r1_pkg_setup
388 - fi
389 -}
390 -
391 -src_prepare() {
392 - default
393 - eautoreconf
394 -}
395 -
396 -src_configure() {
397 - # Stabilize things, for your own good
398 - strip-flags
399 - replace-flags -O? -O2
400 - use pie && append-cflags -fPIE -pie
401 -
402 - use gadu && DYNAMIC_PRPLS+=",gg"
403 - use groupwise && DYNAMIC_PRPLS+=",novell"
404 - use meanwhile && DYNAMIC_PRPLS+=",sametime"
405 - use zephyr && DYNAMIC_PRPLS+=",zephyr"
406 - use zeroconf && DYNAMIC_PRPLS+=",bonjour"
407 -
408 - local myconf=(
409 - --disable-mono
410 - --with-dynamic-prpls="${DYNAMIC_PRPLS}"
411 - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
412 - --x-includes="${EPREFIX}"/usr/include/X11
413 - $(use_enable ncurses consoleui)
414 - $(use_enable gtk gtkui)
415 - $(use_enable gtk sm)
416 - $(usex gtk '--enable-nls' "$(use_enable nls)")
417 - $(use gtk && use_enable xscreensaver screensaver)
418 - $(use gtk && use_enable prediction cap)
419 - $(use gtk && use_enable eds gevolution)
420 - $(use gtk && use_enable spell gtkspell)
421 - $(use_enable perl)
422 - $(use_enable tk)
423 - $(use_enable tcl)
424 - $(use_enable debug)
425 - $(use_enable dbus)
426 - $(use_enable meanwhile)
427 - $(use_enable gstreamer)
428 - $(use_with gstreamer gstreamer 1.0)
429 - $(use_enable gstreamer farstream)
430 - $(use_enable gstreamer vv)
431 - $(use_enable sasl cyrus-sasl )
432 - $(use_enable doc doxygen)
433 - $(use_enable networkmanager nm)
434 - $(use_enable zeroconf avahi)
435 - $(use_enable idn)
436 - )
437 -
438 - if use gnutls; then
439 - einfo "Disabling NSS, using GnuTLS"
440 - myconf+=( --enable-nss=no --enable-gnutls=yes )
441 - myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
442 - myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
443 - else
444 - einfo "Disabling GnuTLS, using NSS"
445 - myconf+=( --enable-gnutls=no --enable-nss=yes )
446 - fi
447 -
448 - if use dbus || { use ncurses && use python ; } ; then
449 - myconf+=( --with-python=${PYTHON} )
450 - else
451 - myconf+=( --without-python )
452 - fi
453 -
454 - econf "${myconf[@]}"
455 -}
456 -
457 -src_install() {
458 - gnome2_src_install
459 -
460 - if use gtk ; then
461 - # Fix tray paths for e16 (x11-wm/enlightenment) and other
462 - # implementations that are not complient with new hicolor theme yet, #323355
463 - local pixmapdir
464 - for d in 16 22 32 48; do
465 - pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
466 - mkdir "${pixmapdir}" || die
467 - pushd "${pixmapdir}" >/dev/null || die
468 - for f in ../status/*; do
469 - ln -s ${f} || die
470 - done
471 - popd >/dev/null || die
472 - done
473 - fi
474 - use perl && perl_delete_localpod
475 -
476 - if use python && use dbus ; then
477 - python_fix_shebang "${ED}"
478 - python_optimize
479 - fi
480 -
481 - dodoc ${DOCS} finch/plugins/pietray.py
482 - docompress -x /usr/share/doc/${PF}/pietray.py
483 -
484 - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
485 -}
486 -
487 -src_test() {
488 - # make default build logs slightly more useful
489 - emake check VERBOSE=1
490 -}
491 -
492 -pkg_postinst() {
493 - xdg_icon_cache_update
494 - xdg_desktop_database_update
495 -}
496 -
497 -pkg_postrm() {
498 - xdg_icon_cache_update
499 - xdg_desktop_database_update
500 -}
501
502 diff --git a/net-im/pidgin/pidgin-2.13.0-r8.ebuild b/net-im/pidgin/pidgin-2.13.0-r8.ebuild
503 deleted file mode 100644
504 index f3f3b6b1f4e..00000000000
505 --- a/net-im/pidgin/pidgin-2.13.0-r8.ebuild
506 +++ /dev/null
507 @@ -1,300 +0,0 @@
508 -# Copyright 1999-2020 Gentoo Authors
509 -# Distributed under the terms of the GNU General Public License v2
510 -
511 -EAPI=7
512 -
513 -GENTOO_DEPEND_ON_PERL=no
514 -PYTHON_COMPAT=( python3_{6,7} )
515 -
516 -inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
517 -
518 -DESCRIPTION="GTK Instant Messenger client"
519 -HOMEPAGE="https://pidgin.im/"
520 -SRC_URI="
521 - mirror://sourceforge/${PN}/${P}.tar.bz2
522 - https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
523 - https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
524 -
525 -LICENSE="GPL-2"
526 -SLOT="0/2" # libpurple version
527 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
528 -IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
529 -meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
530 -tk +xscreensaver zephyr zeroconf"
531 -
532 -# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
533 -# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
534 -# no way to build dbus and avoid libgnt linkage with python. If you want this
535 -# send patch upstream.
536 -# purple-url-handler and purple-remote require dbus-python thus in reality we
537 -# rdepend on python if dbus enabled. But it is possible to separate this dep.
538 -RDEPEND="
539 - >=dev-libs/glib-2.16
540 - >=dev-libs/libxml2-2.6.18
541 - ncurses? (
542 - sys-libs/ncurses:0=[unicode]
543 - dbus? ( ${PYTHON_DEPS} )
544 - python? ( ${PYTHON_DEPS} )
545 - )
546 - gtk? (
547 - >=x11-libs/gtk+-2.10:2[aqua=]
548 - x11-libs/libSM
549 - >=x11-libs/pango-1.4.0
550 - xscreensaver? ( x11-libs/libXScrnSaver )
551 - spell? ( >=app-text/gtkspell-2.0.2:2 )
552 - eds? ( >=gnome-extra/evolution-data-server-3.6:= )
553 - prediction? ( >=dev-db/sqlite-3.3:3 )
554 - )
555 - gstreamer? (
556 - media-libs/gstreamer:1.0
557 - media-libs/gst-plugins-base:1.0
558 - >=net-libs/farstream-0.2.7:0.2
559 - )
560 - zeroconf? ( net-dns/avahi[dbus] )
561 - dbus? (
562 - >=dev-libs/dbus-glib-0.71
563 - >=sys-apps/dbus-0.90
564 - $(python_gen_cond_dep '
565 - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
566 - ')
567 - )
568 - perl? ( >=dev-lang/perl-5.16:= )
569 - gadu? ( || (
570 - >=net-libs/libgadu-1.11.0[ssl,gnutls(+)]
571 - >=net-libs/libgadu-1.11.0[-ssl]
572 - ) )
573 - gnutls? ( net-libs/gnutls:= )
574 - !gnutls? (
575 - dev-libs/nspr
576 - dev-libs/nss
577 - )
578 - meanwhile? ( net-libs/meanwhile )
579 - tcl? ( dev-lang/tcl:0= )
580 - tk? ( dev-lang/tk:0= )
581 - sasl? ( dev-libs/cyrus-sasl:2 )
582 - networkmanager? ( net-misc/networkmanager )
583 - idn? ( net-dns/libidn:= )
584 - !<x11-plugins/pidgin-facebookchat-1.69-r1
585 -"
586 -
587 -# We want nls in case gtk is enabled, bug #
588 -NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
589 -
590 -DEPEND="${RDEPEND}
591 - gtk? (
592 - x11-base/xorg-proto
593 - ${NLS_DEPEND}
594 - )
595 - dbus? ( ${PYTHON_DEPS} )
596 -"
597 -BDEPEND="
598 - dev-lang/perl
599 - dev-perl/XML-Parser
600 - virtual/pkgconfig
601 - doc? ( app-doc/doxygen )
602 - !gtk? ( nls? ( ${NLS_DEPEND} ) )
603 -"
604 -
605 -DOCS=( AUTHORS HACKING NEWS README ChangeLog )
606 -
607 -REQUIRED_USE="
608 - dbus? ( ${PYTHON_REQUIRED_USE} )
609 - networkmanager? ( dbus )
610 - python? ( ${PYTHON_REQUIRED_USE} )
611 -"
612 -
613 -# Enable Default protocols
614 -DYNAMIC_PRPLS="irc,jabber,oscar,simple"
615 -
616 -# List of plugins
617 -# app-accessibility/pidgin-festival
618 -# net-im/librvp
619 -# x11-plugins/guifications
620 -# x11-plugins/msn-pecan
621 -# x11-plugins/pidgin-encryption
622 -# x11-plugins/pidgin-extprefs
623 -# x11-plugins/pidgin-hotkeys
624 -# x11-plugins/pidgin-latex
625 -# x11-plugins/pidgintex
626 -# x11-plugins/pidgin-libnotify
627 -# x11-plugins/pidgin-mbpurple
628 -# x11-plugins/pidgin-bot-sentry
629 -# x11-plugins/pidgin-otr
630 -# x11-plugins/pidgin-rhythmbox
631 -# x11-plugins/purple-plugin_pack
632 -# x11-themes/pidgin-smileys
633 -# x11-plugins/pidgin-knotify
634 -# Plugins in Sunrise:
635 -# x11-plugins/pidgin-audacious-remote
636 -# x11-plugins/pidgin-autoanswer
637 -# x11-plugins/pidgin-birthday-reminder
638 -# x11-plugins/pidgin-blinklight
639 -# x11-plugins/pidgin-convreverse
640 -# x11-plugins/pidgin-embeddedvideo
641 -# x11-plugins/pidgin-extended-blist-sort
642 -# x11-plugins/pidgin-gfire
643 -# x11-plugins/pidgin-lastfm
644 -# x11-plugins/pidgin-sendscreenshot
645 -# x11-plugins/pidgimpd
646 -
647 -PATCHES=(
648 - "${FILESDIR}/${PN}-2.10.0-gold.patch"
649 - "${WORKDIR}/${PN}-eds-3.6.patch"
650 - "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
651 - "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
652 - "${FILESDIR}/${PN}-2.10.11-tinfo.patch"
653 - "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
654 - "${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
655 - "${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
656 - "${FILESDIR}/${PN}-2.13.0-gnutls_sni_support.patch" #708226
657 - "${FILESDIR}/${PN}-2.13.0-fix-build-against-nm-1.0.patch"
658 - "${FILESDIR}/${PN}-2.13.0-metainfo.patch"
659 -)
660 -
661 -pkg_pretend() {
662 - if ! use gtk && ! use ncurses ; then
663 - elog "You did not pick the ncurses or gtk use flags, only libpurple"
664 - elog "will be built."
665 - fi
666 -
667 - # dbus is enabled, no way to disable linkage with python => python is enabled
668 - #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
669 - if use gtk && ! use nls ; then
670 - ewarn "gtk build => nls is enabled!"
671 - fi
672 - if use dbus && ! use python ; then
673 - elog "dbus is enabled, no way to disable linkage with python => python is enabled"
674 - fi
675 -}
676 -
677 -pkg_setup() {
678 - if use python || use dbus ; then
679 - python-single-r1_pkg_setup
680 - fi
681 -}
682 -
683 -src_prepare() {
684 - default
685 - eautoreconf
686 -}
687 -
688 -src_configure() {
689 - # Stabilize things, for your own good
690 - strip-flags
691 - replace-flags -O? -O2
692 - use pie && append-cflags -fPIE -pie
693 -
694 - use gadu && DYNAMIC_PRPLS+=",gg"
695 - use groupwise && DYNAMIC_PRPLS+=",novell"
696 - use meanwhile && DYNAMIC_PRPLS+=",sametime"
697 - use zephyr && DYNAMIC_PRPLS+=",zephyr"
698 - use zeroconf && DYNAMIC_PRPLS+=",bonjour"
699 -
700 - local myconf=(
701 - --disable-mono
702 - --with-dynamic-prpls="${DYNAMIC_PRPLS}"
703 - --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
704 - --x-includes="${EPREFIX}"/usr/include/X11
705 - $(use_enable ncurses consoleui)
706 - $(use_enable gtk gtkui)
707 - $(use_enable gtk sm)
708 - $(usex gtk '--enable-nls' "$(use_enable nls)")
709 - $(use gtk && use_enable xscreensaver screensaver)
710 - $(use gtk && use_enable prediction cap)
711 - $(use gtk && use_enable eds gevolution)
712 - $(use gtk && use_enable spell gtkspell)
713 - $(use_enable perl)
714 - $(use_enable tk)
715 - $(use_enable tcl)
716 - $(use_enable debug)
717 - $(use_enable dbus)
718 - $(use_enable meanwhile)
719 - $(use_enable gstreamer)
720 - $(use_with gstreamer gstreamer 1.0)
721 - $(use_enable gstreamer farstream)
722 - $(use_enable gstreamer vv)
723 - $(use_enable sasl cyrus-sasl )
724 - $(use_enable doc doxygen)
725 - $(use_enable networkmanager nm)
726 - $(use_enable zeroconf avahi)
727 - $(use_enable idn)
728 - )
729 -
730 - if use gnutls; then
731 - einfo "Disabling NSS, using GnuTLS"
732 - myconf+=(
733 - --enable-nss=no
734 - --enable-gnutls=yes
735 - --with-gnutls-includes="${EPREFIX}/usr/include/gnutls"
736 - --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)"
737 - )
738 - else
739 - einfo "Disabling GnuTLS, using NSS"
740 - myconf+=(
741 - --enable-gnutls=no
742 - --enable-nss=yes
743 - )
744 - fi
745 -
746 - if use dbus || { use ncurses && use python ; } ; then
747 - myconf+=( --with-python=${PYTHON} )
748 - else
749 - myconf+=( --without-python )
750 - fi
751 -
752 - econf "${myconf[@]}"
753 -}
754 -
755 -src_install() {
756 - # setting this here because gnome2.eclass is not EAPI-7 ready
757 - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
758 - default
759 -
760 - if use gtk ; then
761 - # Fix tray paths for e16 (x11-wm/enlightenment) and other
762 - # implementations that are not complient with new hicolor theme yet, #323355
763 - local pixmapdir
764 - for d in 16 22 32 48; do
765 - pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
766 - mkdir "${pixmapdir}" || die
767 - pushd "${pixmapdir}" >/dev/null || die
768 - for f in ../status/*; do
769 - ln -s ${f} || die
770 - done
771 - popd >/dev/null || die
772 - done
773 - fi
774 - use perl && perl_delete_localpod
775 -
776 - if use python && use dbus ; then
777 - python_fix_shebang "${ED}"
778 - python_optimize
779 - fi
780 -
781 - dodoc ${DOCS[@]} finch/plugins/pietray.py
782 - docompress -x /usr/share/doc/${PF}/pietray.py
783 -
784 - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
785 -}
786 -
787 -src_test() {
788 - # make default build logs slightly more useful
789 - emake check VERBOSE=1
790 -}
791 -
792 -pkg_preinst() {
793 - gnome2_gconf_savelist
794 - xdg_pkg_preinst
795 -}
796 -
797 -pkg_postinst() {
798 - gnome2_gconf_install
799 - gnome2_schemas_update
800 - xdg_pkg_postinst
801 -}
802 -
803 -pkg_postrm() {
804 - gnome2_gconf_uninstall
805 - gnome2_schemas_update
806 - xdg_pkg_postrm
807 -}