1 |
commit: 57ef9de44cf76b5b67bf3158c53a4ec4bcda95e8 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 5 17:22:55 2012 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 5 17:22:55 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=57ef9de4 |
7 |
|
8 |
pidgin version bump |
9 |
|
10 |
--- |
11 |
net-im/pidgin/Manifest | 26 +-- |
12 |
net-im/pidgin/pidgin-2.10.0-r1.ebuild | 225 -------------------- |
13 |
net-im/pidgin/pidgin-2.10.0.ebuild | 224 ------------------- |
14 |
...idgin-2.10.0-r2.ebuild => pidgin-2.10.3.ebuild} | 16 +- |
15 |
4 files changed, 10 insertions(+), 481 deletions(-) |
16 |
|
17 |
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest |
18 |
index 40618e2..ef5db7b 100644 |
19 |
--- a/net-im/pidgin/Manifest |
20 |
+++ b/net-im/pidgin/Manifest |
21 |
@@ -1,30 +1,8 @@ |
22 |
------BEGIN PGP SIGNED MESSAGE----- |
23 |
-Hash: SHA256 |
24 |
- |
25 |
AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb |
26 |
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab |
27 |
AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 |
28 |
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 |
29 |
-DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd |
30 |
DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8 |
31 |
-EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da |
32 |
-EBUILD pidgin-2.10.0-r2.ebuild 7097 RMD160 f1863d895cd6970470c6de2e15c588da28706ff7 SHA1 7c62d84323b093f7cd9b1c4bcda2d439ebcfe411 SHA256 c6d17d2384c89cd7d687a7e1099b665895b5224f8e9701b7d21dd790cf2ee497 |
33 |
-EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c |
34 |
+DIST pidgin-2.10.3.tar.bz2 9970676 RMD160 10af4caee9f22a251f867e3befebcc659e2b42f3 SHA1 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee SHA256 0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b |
35 |
EBUILD pidgin-2.10.1.ebuild 7147 RMD160 7ab996af7067ab7764a9944c2903a98e4d3816c1 SHA1 cfc748af3d532119cdb8dcd6271045a59b7dbbd7 SHA256 814bfb9f568980ebc848ad5fa8b31b24c71b2d2e6e19b5c4b81f22208257781d |
36 |
------BEGIN PGP SIGNATURE----- |
37 |
-Version: GnuPG v2.0.18 (GNU/Linux) |
38 |
- |
39 |
-iQIcBAEBCAAGBQJO5nbeAAoJEHy/RO9cNQiDkO4P/0pwtBcAwsWtYQfvlp/n4UZ7 |
40 |
-0g7Ri62LfOIHsPzGjUaq3qwed5E61R4bfiEm3F6PQZHnbOcZtjz5bAJmfJo/J07w |
41 |
-yNJmLG9h920RaVNu4AHcvl5oiHHV97T6vLJhIjJ7Ki6NLQ82Yi/wiv7xZbEA9dGd |
42 |
-wIISVCxYB2XnijxgKBfXxP3tRGSVu0lm0sldMVssN+zyiZRtv9TyU0FzQuozWYvr |
43 |
-bAL7w3+BEpceUt7YTqOncy09eAejF0uWx22RvaLPqZAs0cl3fdKOQxJ5Wx0N6V9M |
44 |
-hZOIqxVjn/PAI7KenAZ8AzgmlO2zbWBx3zOZf5vv4aNG3qehKuNx2S/0rCHMVSct |
45 |
-aDa+AbKfSDDSx7BDXoJ5elxmOakZoYKSN3X6bh0Aa4FCOKhFZCwdtbhg/NqFeYKM |
46 |
-7wX6GFkO/TtuS25uY9cynG2LO5Gxd5oErQGx9vRfyRirsISXmQbEXMt9KmUza2xD |
47 |
-QzszdFJW1mg8sDTq9AooTGQU2pw7wPHV/uqXVHaDGBjYkjLy7x2B+lS+rCF5379c |
48 |
-FaoU6wbPTvZM/qi6ocVlDLGKjJridvvzt+EottEcDYHimiKJTDExxk15gc8WAeKY |
49 |
-UDeIljJXDpHfd+CnWtfzG0EkRdyFdOeFIodxkrGolLgpPmpmb39xHGjXXsZoTOEE |
50 |
-N1eB0dOHf6SioUgF8GwJ |
51 |
-=IJiD |
52 |
------END PGP SIGNATURE----- |
53 |
+EBUILD pidgin-2.10.3.ebuild 7084 RMD160 b37994990a0bb3ca7f7ed21d56b762f83da57aa9 SHA1 59a81775ed54ca936967ace0a9eb2ef3ae427081 SHA256 60ce9d9b210db5207340afaf7a9a0b583c9f8297d8fa41f42759c57ac510592f |
54 |
|
55 |
diff --git a/net-im/pidgin/pidgin-2.10.0-r1.ebuild b/net-im/pidgin/pidgin-2.10.0-r1.ebuild |
56 |
deleted file mode 100644 |
57 |
index b50ad5d..0000000 |
58 |
--- a/net-im/pidgin/pidgin-2.10.0-r1.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,225 +0,0 @@ |
61 |
-# Copyright 1999-2011 Gentoo Foundation |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.0-r1.ebuild,v 1.1 2011/10/02 18:13:16 pva Exp $ |
64 |
- |
65 |
-EAPI=3 |
66 |
- |
67 |
-GENTOO_DEPEND_ON_PERL=no |
68 |
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python |
69 |
-inherit autotools |
70 |
- |
71 |
-DESCRIPTION="GTK Instant Messenger client" |
72 |
-HOMEPAGE="http://pidgin.im/" |
73 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
74 |
- |
75 |
-LICENSE="GPL-2" |
76 |
-SLOT="0" |
77 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
78 |
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" |
79 |
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" |
80 |
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" |
81 |
-IUSE+=" gnome-keyring" |
82 |
- |
83 |
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only). |
84 |
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is |
85 |
-# no way to build dbus and avoid libgnt linkage with python. If you want this |
86 |
-# send patch upstream. |
87 |
-# purple-url-handler and purple-remote require dbus-python thus in reality we |
88 |
-# rdepend on python if dbus enabled. But it is possible to separate this dep. |
89 |
-RDEPEND=" |
90 |
- >=dev-libs/glib-2.16 |
91 |
- >=dev-libs/libxml2-2.6.18 |
92 |
- ncurses? ( sys-libs/ncurses[unicode] |
93 |
- dbus? ( <dev-lang/python-3 ) |
94 |
- python? ( <dev-lang/python-3 ) ) |
95 |
- gtk? ( |
96 |
- >=x11-libs/gtk+-2.10:2 |
97 |
- x11-libs/libSM |
98 |
- xscreensaver? ( x11-libs/libXScrnSaver ) |
99 |
- spell? ( >=app-text/gtkspell-2.0.2 ) |
100 |
- eds? ( gnome-extra/evolution-data-server ) |
101 |
- prediction? ( >=dev-db/sqlite-3.3:3 ) ) |
102 |
- gstreamer? ( =media-libs/gstreamer-0.10* |
103 |
- =media-libs/gst-plugins-good-0.10* |
104 |
- >=net-libs/farsight2-0.0.14 |
105 |
- media-plugins/gst-plugins-meta |
106 |
- media-plugins/gst-plugins-gconf ) |
107 |
- zeroconf? ( net-dns/avahi[dbus] ) |
108 |
- dbus? ( >=dev-libs/dbus-glib-0.71 |
109 |
- >=sys-apps/dbus-0.90 |
110 |
- dev-python/dbus-python ) |
111 |
- perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) |
112 |
- gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] |
113 |
- >=net-libs/libgadu-1.11.0[-ssl] ) ) |
114 |
- gnutls? ( net-libs/gnutls ) |
115 |
- !gnutls? ( >=dev-libs/nss-3.11 ) |
116 |
- meanwhile? ( net-libs/meanwhile ) |
117 |
- silc? ( >=net-im/silc-toolkit-1.0.1 ) |
118 |
- tcl? ( dev-lang/tcl ) |
119 |
- tk? ( dev-lang/tk ) |
120 |
- sasl? ( dev-libs/cyrus-sasl:2 ) |
121 |
- networkmanager? ( net-misc/networkmanager ) |
122 |
- gnome-keyring? ( gnome-base/gnome-keyring ) |
123 |
- idn? ( net-dns/libidn ) |
124 |
- !<x11-plugins/pidgin-facebookchat-1.69-r1" |
125 |
- # Mono support crashes pidgin |
126 |
- #mono? ( dev-lang/mono )" |
127 |
- |
128 |
-# We want nls in case gtk is enabled, bug # |
129 |
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" |
130 |
- |
131 |
-DEPEND="$RDEPEND |
132 |
- dev-lang/perl |
133 |
- dev-perl/XML-Parser |
134 |
- dev-util/pkgconfig |
135 |
- gtk? ( x11-proto/scrnsaverproto |
136 |
- ${NLS_DEPEND} ) |
137 |
- dbus? ( <dev-lang/python-3 ) |
138 |
- doc? ( app-doc/doxygen ) |
139 |
- !gtk? ( nls? ( ${NLS_DEPEND} ) )" |
140 |
- |
141 |
-DOCS="AUTHORS HACKING NEWS README ChangeLog" |
142 |
- |
143 |
-# Enable Default protocols |
144 |
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace" |
145 |
- |
146 |
-# List of plugins |
147 |
-# app-accessibility/pidgin-festival |
148 |
-# net-im/librvp |
149 |
-# x11-plugins/guifications |
150 |
-# x11-plugins/msn-pecan |
151 |
-# x11-plugins/pidgin-encryption |
152 |
-# x11-plugins/pidgin-extprefs |
153 |
-# x11-plugins/pidgin-hotkeys |
154 |
-# x11-plugins/pidgin-latex |
155 |
-# x11-plugins/pidgintex |
156 |
-# x11-plugins/pidgin-libnotify |
157 |
-# x11-plugins/pidgin-bot-sentry |
158 |
-# x11-plugins/pidgin-otr |
159 |
-# x11-plugins/pidgin-rhythmbox |
160 |
-# x11-plugins/purple-plugin_pack |
161 |
-# x11-themes/pidgin-smileys |
162 |
-# x11-plugins/pidgin-knotify |
163 |
-# Plugins in Sunrise: |
164 |
-# x11-plugins/pidgimpd |
165 |
-# x11-plugins/pidgin-birthday |
166 |
-# x11-plugins/pidgin-convreverse |
167 |
-# x11-plugins/pidgin-extended-blist-sort |
168 |
-# x11-plugins/pidgin-lastfm |
169 |
-# x11-plugins/pidgin-mbpurple |
170 |
- |
171 |
-pkg_setup() { |
172 |
- if ! use gtk && ! use ncurses ; then |
173 |
- elog "You did not pick the ncurses or gtk use flags, only libpurple" |
174 |
- elog "will be built." |
175 |
- fi |
176 |
- if use dbus || { use ncurses && use python; }; then |
177 |
- python_set_active_version 2 |
178 |
- python_pkg_setup |
179 |
- fi |
180 |
- |
181 |
- # dbus is enabled, no way to disable linkage with python => python is enabled |
182 |
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" |
183 |
- if use gtk && ! use nls; then |
184 |
- ewarn "gtk build => nls is enabled!" |
185 |
- fi |
186 |
- if use dbus && ! use python; then |
187 |
- elog "dbus is enabled, no way to disable linkage with python => python is enabled" |
188 |
- fi |
189 |
-} |
190 |
- |
191 |
-src_prepare() { |
192 |
- epatch "${FILESDIR}/${P}-utf8-validation.patch" |
193 |
- epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch |
194 |
- eautoreconf || die "eautoreconf failed" |
195 |
-} |
196 |
- |
197 |
-src_configure() { |
198 |
- # Stabilize things, for your own good |
199 |
- strip-flags |
200 |
- replace-flags -O? -O2 |
201 |
- |
202 |
- local myconf |
203 |
- |
204 |
- if use gadu; then |
205 |
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" |
206 |
- myconf="${myconf} --with-gadu-includes=." |
207 |
- myconf="${myconf} --with-gadu-libs=." |
208 |
- fi |
209 |
- |
210 |
- use silc && DYNAMIC_PRPLS+=",silc" |
211 |
- use meanwhile && DYNAMIC_PRPLS+=",sametime" |
212 |
- use zeroconf && DYNAMIC_PRPLS+=",bonjour" |
213 |
- use groupwise && DYNAMIC_PRPLS+=",novell" |
214 |
- use zephyr && DYNAMIC_PRPLS+=",zephyr" |
215 |
- |
216 |
- if use gnutls; then |
217 |
- einfo "Disabling NSS, using GnuTLS" |
218 |
- myconf+=" --enable-nss=no --enable-gnutls=yes" |
219 |
- myconf+=" --with-gnutls-includes=/usr/include/gnutls" |
220 |
- myconf+=" --with-gnutls-libs=/usr/$(get_libdir)" |
221 |
- else |
222 |
- einfo "Disabling GnuTLS, using NSS" |
223 |
- myconf+=" --enable-gnutls=no --enable-nss=yes" |
224 |
- fi |
225 |
- |
226 |
- if use dbus || { use ncurses && use python; }; then |
227 |
- myconf+=" --with-python=$(PYTHON)" |
228 |
- else |
229 |
- myconf+=" --without-python" |
230 |
- fi |
231 |
- |
232 |
- econf \ |
233 |
- --disable-silent-rules \ |
234 |
- $(use_enable ncurses consoleui) \ |
235 |
- $(use_enable gtk gtkui) \ |
236 |
- $(use_enable gtk sm) \ |
237 |
- $(use gtk || use_enable nls) \ |
238 |
- $(use gtk && echo "--enable-nls") \ |
239 |
- $(use gtk && use_enable xscreensaver screensaver) \ |
240 |
- $(use gtk && use_enable prediction cap) \ |
241 |
- $(use gtk && use_enable eds gevolution) \ |
242 |
- $(use gtk && use_enable spell gtkspell) \ |
243 |
- $(use_enable perl) \ |
244 |
- $(use_enable tk) \ |
245 |
- $(use_enable tcl) \ |
246 |
- $(use_enable debug) \ |
247 |
- $(use_enable dbus) \ |
248 |
- $(use_enable meanwhile) \ |
249 |
- $(use_enable gstreamer) \ |
250 |
- $(use_enable gnome-keyring) \ |
251 |
- $(use_enable gstreamer farsight) \ |
252 |
- $(use_enable gstreamer vv) \ |
253 |
- $(use_enable sasl cyrus-sasl ) \ |
254 |
- $(use_enable doc doxygen) \ |
255 |
- $(use_enable networkmanager nm) \ |
256 |
- $(use_enable zeroconf avahi) \ |
257 |
- $(use_enable idn) \ |
258 |
- --with-system-ssl-certs="/etc/ssl/certs/" \ |
259 |
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ |
260 |
- --disable-mono \ |
261 |
- --x-includes=/usr/include/X11 \ |
262 |
- ${myconf} |
263 |
- #$(use_enable mono) \ |
264 |
-} |
265 |
- |
266 |
-src_install() { |
267 |
- gnome2_src_install |
268 |
- if use gtk; then |
269 |
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other |
270 |
- # implementations that are not complient with new hicolor theme yet, #323355 |
271 |
- local pixmapdir |
272 |
- for d in 16 22 32 48; do |
273 |
- pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions |
274 |
- mkdir "${pixmapdir}" || die |
275 |
- pushd "${pixmapdir}" >/dev/null || die |
276 |
- for f in ../status/*; do |
277 |
- ln -s ${f} || die |
278 |
- done |
279 |
- popd >/dev/null |
280 |
- done |
281 |
- fi |
282 |
- use perl && fixlocalpod |
283 |
- |
284 |
- find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
285 |
-} |
286 |
|
287 |
diff --git a/net-im/pidgin/pidgin-2.10.0.ebuild b/net-im/pidgin/pidgin-2.10.0.ebuild |
288 |
deleted file mode 100644 |
289 |
index 05154bb..0000000 |
290 |
--- a/net-im/pidgin/pidgin-2.10.0.ebuild |
291 |
+++ /dev/null |
292 |
@@ -1,224 +0,0 @@ |
293 |
-# Copyright 1999-2011 Gentoo Foundation |
294 |
-# Distributed under the terms of the GNU General Public License v2 |
295 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.0.ebuild,v 1.3 2011/08/25 14:20:26 jer Exp $ |
296 |
- |
297 |
-EAPI=3 |
298 |
- |
299 |
-GENTOO_DEPEND_ON_PERL=no |
300 |
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python |
301 |
-inherit autotools |
302 |
- |
303 |
-DESCRIPTION="GTK Instant Messenger client" |
304 |
-HOMEPAGE="http://pidgin.im/" |
305 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
306 |
- |
307 |
-LICENSE="GPL-2" |
308 |
-SLOT="0" |
309 |
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86" |
310 |
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" |
311 |
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" |
312 |
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" |
313 |
-IUSE+=" gnome-keyring" |
314 |
- |
315 |
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only). |
316 |
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is |
317 |
-# no way to build dbus and avoid libgnt linkage with python. If you want this |
318 |
-# send patch upstream. |
319 |
-# purple-url-handler and purple-remote require dbus-python thus in reality we |
320 |
-# rdepend on python if dbus enabled. But it is possible to separate this dep. |
321 |
-RDEPEND=" |
322 |
- >=dev-libs/glib-2.16 |
323 |
- >=dev-libs/libxml2-2.6.18 |
324 |
- ncurses? ( sys-libs/ncurses[unicode] |
325 |
- dbus? ( <dev-lang/python-3 ) |
326 |
- python? ( <dev-lang/python-3 ) ) |
327 |
- gtk? ( |
328 |
- >=x11-libs/gtk+-2.10:2 |
329 |
- x11-libs/libSM |
330 |
- xscreensaver? ( x11-libs/libXScrnSaver ) |
331 |
- spell? ( >=app-text/gtkspell-2.0.2 ) |
332 |
- eds? ( gnome-extra/evolution-data-server ) |
333 |
- prediction? ( >=dev-db/sqlite-3.3:3 ) ) |
334 |
- gstreamer? ( =media-libs/gstreamer-0.10* |
335 |
- =media-libs/gst-plugins-good-0.10* |
336 |
- >=net-libs/farsight2-0.0.14 |
337 |
- media-plugins/gst-plugins-meta |
338 |
- media-plugins/gst-plugins-gconf ) |
339 |
- zeroconf? ( net-dns/avahi[dbus] ) |
340 |
- dbus? ( >=dev-libs/dbus-glib-0.71 |
341 |
- >=sys-apps/dbus-0.90 |
342 |
- dev-python/dbus-python ) |
343 |
- perl? ( >=dev-lang/perl-5.8.2-r1[-build] ) |
344 |
- gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] |
345 |
- >=net-libs/libgadu-1.11.0[-ssl] ) ) |
346 |
- gnutls? ( net-libs/gnutls ) |
347 |
- !gnutls? ( >=dev-libs/nss-3.11 ) |
348 |
- meanwhile? ( net-libs/meanwhile ) |
349 |
- silc? ( >=net-im/silc-toolkit-1.0.1 ) |
350 |
- tcl? ( dev-lang/tcl ) |
351 |
- tk? ( dev-lang/tk ) |
352 |
- sasl? ( dev-libs/cyrus-sasl:2 ) |
353 |
- networkmanager? ( net-misc/networkmanager ) |
354 |
- gnome-keyring? ( gnome-base/gnome-keyring ) |
355 |
- idn? ( net-dns/libidn ) |
356 |
- !<x11-plugins/pidgin-facebookchat-1.69-r1" |
357 |
- # Mono support crashes pidgin |
358 |
- #mono? ( dev-lang/mono )" |
359 |
- |
360 |
-# We want nls in case gtk is enabled, bug # |
361 |
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext" |
362 |
- |
363 |
-DEPEND="$RDEPEND |
364 |
- dev-lang/perl |
365 |
- dev-perl/XML-Parser |
366 |
- dev-util/pkgconfig |
367 |
- gtk? ( x11-proto/scrnsaverproto |
368 |
- ${NLS_DEPEND} ) |
369 |
- dbus? ( <dev-lang/python-3 ) |
370 |
- doc? ( app-doc/doxygen ) |
371 |
- !gtk? ( nls? ( ${NLS_DEPEND} ) )" |
372 |
- |
373 |
-DOCS="AUTHORS HACKING NEWS README ChangeLog" |
374 |
- |
375 |
-# Enable Default protocols |
376 |
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace" |
377 |
- |
378 |
-# List of plugins |
379 |
-# app-accessibility/pidgin-festival |
380 |
-# net-im/librvp |
381 |
-# x11-plugins/guifications |
382 |
-# x11-plugins/msn-pecan |
383 |
-# x11-plugins/pidgin-encryption |
384 |
-# x11-plugins/pidgin-extprefs |
385 |
-# x11-plugins/pidgin-hotkeys |
386 |
-# x11-plugins/pidgin-latex |
387 |
-# x11-plugins/pidgintex |
388 |
-# x11-plugins/pidgin-libnotify |
389 |
-# x11-plugins/pidgin-bot-sentry |
390 |
-# x11-plugins/pidgin-otr |
391 |
-# x11-plugins/pidgin-rhythmbox |
392 |
-# x11-plugins/purple-plugin_pack |
393 |
-# x11-themes/pidgin-smileys |
394 |
-# x11-plugins/pidgin-knotify |
395 |
-# Plugins in Sunrise: |
396 |
-# x11-plugins/pidgimpd |
397 |
-# x11-plugins/pidgin-birthday |
398 |
-# x11-plugins/pidgin-convreverse |
399 |
-# x11-plugins/pidgin-extended-blist-sort |
400 |
-# x11-plugins/pidgin-lastfm |
401 |
-# x11-plugins/pidgin-mbpurple |
402 |
- |
403 |
-pkg_setup() { |
404 |
- if ! use gtk && ! use ncurses ; then |
405 |
- elog "You did not pick the ncurses or gtk use flags, only libpurple" |
406 |
- elog "will be built." |
407 |
- fi |
408 |
- if use dbus || { use ncurses && use python; }; then |
409 |
- python_set_active_version 2 |
410 |
- python_pkg_setup |
411 |
- fi |
412 |
- |
413 |
- # dbus is enabled, no way to disable linkage with python => python is enabled |
414 |
- #REQUIRED_USE="gtk? ( nls ) dbus? ( python )" |
415 |
- if use gtk && ! use nls; then |
416 |
- ewarn "gtk build => nls is enabled!" |
417 |
- fi |
418 |
- if use dbus && ! use python; then |
419 |
- elog "dbus is enabled, no way to disable linkage with python => python is enabled" |
420 |
- fi |
421 |
-} |
422 |
- |
423 |
-src_prepare() { |
424 |
- epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch |
425 |
- eautoreconf || die "eautoreconf failed" |
426 |
-} |
427 |
- |
428 |
-src_configure() { |
429 |
- # Stabilize things, for your own good |
430 |
- strip-flags |
431 |
- replace-flags -O? -O2 |
432 |
- |
433 |
- local myconf |
434 |
- |
435 |
- if use gadu; then |
436 |
- DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg" |
437 |
- myconf="${myconf} --with-gadu-includes=." |
438 |
- myconf="${myconf} --with-gadu-libs=." |
439 |
- fi |
440 |
- |
441 |
- use silc && DYNAMIC_PRPLS+=",silc" |
442 |
- use meanwhile && DYNAMIC_PRPLS+=",sametime" |
443 |
- use zeroconf && DYNAMIC_PRPLS+=",bonjour" |
444 |
- use groupwise && DYNAMIC_PRPLS+=",novell" |
445 |
- use zephyr && DYNAMIC_PRPLS+=",zephyr" |
446 |
- |
447 |
- if use gnutls; then |
448 |
- einfo "Disabling NSS, using GnuTLS" |
449 |
- myconf+=" --enable-nss=no --enable-gnutls=yes" |
450 |
- myconf+=" --with-gnutls-includes=/usr/include/gnutls" |
451 |
- myconf+=" --with-gnutls-libs=/usr/$(get_libdir)" |
452 |
- else |
453 |
- einfo "Disabling GnuTLS, using NSS" |
454 |
- myconf+=" --enable-gnutls=no --enable-nss=yes" |
455 |
- fi |
456 |
- |
457 |
- if use dbus || { use ncurses && use python; }; then |
458 |
- myconf+=" --with-python=$(PYTHON)" |
459 |
- else |
460 |
- myconf+=" --without-python" |
461 |
- fi |
462 |
- |
463 |
- econf \ |
464 |
- --disable-silent-rules \ |
465 |
- $(use_enable ncurses consoleui) \ |
466 |
- $(use_enable gtk gtkui) \ |
467 |
- $(use_enable gtk sm) \ |
468 |
- $(use gtk || use_enable nls) \ |
469 |
- $(use gtk && echo "--enable-nls") \ |
470 |
- $(use gtk && use_enable xscreensaver screensaver) \ |
471 |
- $(use gtk && use_enable prediction cap) \ |
472 |
- $(use gtk && use_enable eds gevolution) \ |
473 |
- $(use gtk && use_enable spell gtkspell) \ |
474 |
- $(use_enable perl) \ |
475 |
- $(use_enable tk) \ |
476 |
- $(use_enable tcl) \ |
477 |
- $(use_enable debug) \ |
478 |
- $(use_enable dbus) \ |
479 |
- $(use_enable meanwhile) \ |
480 |
- $(use_enable gstreamer) \ |
481 |
- $(use_enable gnome-keyring) \ |
482 |
- $(use_enable gstreamer farsight) \ |
483 |
- $(use_enable gstreamer vv) \ |
484 |
- $(use_enable sasl cyrus-sasl ) \ |
485 |
- $(use_enable doc doxygen) \ |
486 |
- $(use_enable networkmanager nm) \ |
487 |
- $(use_enable zeroconf avahi) \ |
488 |
- $(use_enable idn) \ |
489 |
- --with-system-ssl-certs="/etc/ssl/certs/" \ |
490 |
- --with-dynamic-prpls="${DYNAMIC_PRPLS}" \ |
491 |
- --disable-mono \ |
492 |
- --x-includes=/usr/include/X11 \ |
493 |
- ${myconf} |
494 |
- #$(use_enable mono) \ |
495 |
-} |
496 |
- |
497 |
-src_install() { |
498 |
- gnome2_src_install |
499 |
- if use gtk; then |
500 |
- # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other |
501 |
- # implementations that are not complient with new hicolor theme yet, #323355 |
502 |
- local pixmapdir |
503 |
- for d in 16 22 32 48; do |
504 |
- pixmapdir=${D}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions |
505 |
- mkdir "${pixmapdir}" || die |
506 |
- pushd "${pixmapdir}" >/dev/null || die |
507 |
- for f in ../status/*; do |
508 |
- ln -s ${f} || die |
509 |
- done |
510 |
- popd >/dev/null |
511 |
- done |
512 |
- fi |
513 |
- use perl && fixlocalpod |
514 |
- |
515 |
- find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
516 |
-} |
517 |
|
518 |
diff --git a/net-im/pidgin/pidgin-2.10.0-r2.ebuild b/net-im/pidgin/pidgin-2.10.3.ebuild |
519 |
similarity index 94% |
520 |
rename from net-im/pidgin/pidgin-2.10.0-r2.ebuild |
521 |
rename to net-im/pidgin/pidgin-2.10.3.ebuild |
522 |
index 5c6f887..3d63656 100644 |
523 |
--- a/net-im/pidgin/pidgin-2.10.0-r2.ebuild |
524 |
+++ b/net-im/pidgin/pidgin-2.10.3.ebuild |
525 |
@@ -1,8 +1,8 @@ |
526 |
-# Copyright 1999-2011 Gentoo Foundation |
527 |
+# Copyright 1999-2012 Gentoo Foundation |
528 |
# Distributed under the terms of the GNU General Public License v2 |
529 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.0-r2.ebuild,v 1.1 2011/10/27 08:28:21 jlec Exp $ |
530 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.3.ebuild,v 1.4 2012/04/03 21:55:49 ago Exp $ |
531 |
|
532 |
-EAPI=3 |
533 |
+EAPI=4 |
534 |
|
535 |
GENTOO_DEPEND_ON_PERL=no |
536 |
inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python |
537 |
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
538 |
|
539 |
LICENSE="GPL-2" |
540 |
SLOT="0" |
541 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
542 |
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86" |
543 |
IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile" |
544 |
IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses" |
545 |
IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono" |
546 |
@@ -59,7 +59,6 @@ RDEPEND=" |
547 |
tk? ( dev-lang/tk ) |
548 |
sasl? ( dev-libs/cyrus-sasl:2 ) |
549 |
networkmanager? ( net-misc/networkmanager ) |
550 |
- gnome-keyring? ( gnome-base/gnome-keyring ) |
551 |
idn? ( net-dns/libidn ) |
552 |
!<x11-plugins/pidgin-facebookchat-1.69-r1" |
553 |
# Mono support crashes pidgin |
554 |
@@ -135,9 +134,7 @@ pkg_setup() { |
555 |
} |
556 |
|
557 |
src_prepare() { |
558 |
- epatch \ |
559 |
- "${FILESDIR}/${P}-utf8-validation.patch" \ |
560 |
- "${FILESDIR}/${P}-gold.patch" |
561 |
+ epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" |
562 |
|
563 |
epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch |
564 |
eautoreconf || die "eautoreconf failed" |
565 |
@@ -230,5 +227,8 @@ src_install() { |
566 |
fi |
567 |
use perl && fixlocalpod |
568 |
|
569 |
+ dodoc finch/plugins/pietray.py |
570 |
+ docompress -x /usr/share/doc/${PF}/pietray.py |
571 |
+ |
572 |
find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed" |
573 |
} |