Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/
Date: Mon, 09 Jul 2012 21:35:40
Message-Id: 1341867758.1e9cdcd6860407ecabd83b044fb99bd5b18f8165.chutzpah@gentoo
1 commit: 1e9cdcd6860407ecabd83b044fb99bd5b18f8165
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 9 21:02:38 2012 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 9 21:02:38 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=1e9cdcd6
7
8 pidgin version bump
9
10 ---
11 net-im/pidgin/Manifest | 22 ++--
12 net-im/pidgin/pidgin-2.10.6.ebuild | 235 ++++++++++++++++++++++++++++++++++++
13 2 files changed, 247 insertions(+), 10 deletions(-)
14
15 diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
16 index 0fce54d..3e0535d 100644
17 --- a/net-im/pidgin/Manifest
18 +++ b/net-im/pidgin/Manifest
19 @@ -1,10 +1,12 @@
20 -AUX pidgin-2.10.0-gold.patch 1003 RMD160 947502ee3c055b80ba35b0fe0d4e5fa26f44b6ae SHA1 2f01a80b9391e15083e009c492ece3771094d46a SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb
21 -AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 RMD160 76311be8823e809128e5862a2d4019682040b89d SHA1 7582f01f672117a094666c08d03fc114d1184eb6 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab
22 -AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4
23 -AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221
24 -DIST pidgin-2.10.1.tar.bz2 9961580 RMD160 f73c5540fd01f62ae2a0ae236436f06770a896ef SHA1 045ed0fd7dfedada6e082e7a4564648b55950064 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
25 -DIST pidgin-2.10.3.tar.bz2 9970676 RMD160 10af4caee9f22a251f867e3befebcc659e2b42f3 SHA1 7dfeabdb1ade4311c91ac9c9f988276f67ead6ee SHA256 0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b
26 -DIST pidgin-2.10.4.tar.bz2 9970850 RMD160 5193a7f5dbd122198d474bd7e11dc9bf307befb3 SHA1 f9ce34e69f97bcd1bb216aefb6d687b5b47f0796 SHA256 8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e
27 -EBUILD pidgin-2.10.1.ebuild 7147 RMD160 7ab996af7067ab7764a9944c2903a98e4d3816c1 SHA1 cfc748af3d532119cdb8dcd6271045a59b7dbbd7 SHA256 814bfb9f568980ebc848ad5fa8b31b24c71b2d2e6e19b5c4b81f22208257781d
28 -EBUILD pidgin-2.10.3.ebuild 7084 RMD160 b37994990a0bb3ca7f7ed21d56b762f83da57aa9 SHA1 59a81775ed54ca936967ace0a9eb2ef3ae427081 SHA256 60ce9d9b210db5207340afaf7a9a0b583c9f8297d8fa41f42759c57ac510592f
29 -EBUILD pidgin-2.10.4.ebuild 7165 RMD160 f36325853913962e2b2e742cf24ff58c89290ed5 SHA1 26aaf233681722304c346185fc32960dfcb1cee1 SHA256 13757567ede98c20c141c5b0f7dacd2bbcda0ae9c90c7e86fbb40bafcf5f0656
30 +AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
31 +AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256 d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512 9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9 WHIRLPOOL d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
32 +AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512 605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd WHIRLPOOL 01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
33 +AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512 e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669 WHIRLPOOL 09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
34 +DIST pidgin-2.10.1.tar.bz2 9961580 SHA256 2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8
35 +DIST pidgin-2.10.3.tar.bz2 9970676 SHA256 0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b SHA512 4349d91f192a2c5989df0251682a1c044d1ca4bab3367d6860666d589709635f1397430b1e3fd61247802aa70383176e1f6442b6371f7f4e155d7089cde1ff86 WHIRLPOOL e86635a75133d9a1a55c8e9cd9dc4906369e59a4ad195fa0c9b0514a8b17ea9e1725d448c964a5c212237cc41d9e24c1fa1089ff629f74394a6484cb839d3d92
36 +DIST pidgin-2.10.4.tar.bz2 9970850 SHA256 8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e SHA512 8399a1f8f48aabcd598fa03b80680d230bec26ee7cf616373ddfbf174e214d60ecfc37f82130258bca6cca0717ac2d3deb843e7e95907b75fef5b7433d9674be WHIRLPOOL f257a9e387360ba66d66d51d4d7b13dd74fd4f68f694c098e3b17d5dc46807e89511187ca7d61c3232453b24bf1e1151afcb974c9299cad18c126cbaa7410940
37 +DIST pidgin-2.10.6.tar.bz2 10007092 SHA256 3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96 SHA512 fffc8721ebe5dbaa53c213ec07a6ad5045ba336829cf9bce11aef8b5968f0f0b49289cfe1818e183a3807b6b8b7ebb75387a81d7135835859e0188a05f3be1ef WHIRLPOOL 7d044ad2cad68e223c3c20d867b4ebf23956982b9ecbc1f91264857abea2555b6ae07b963671eaa49fd2b85d648b6f5692c561e0cc060fb0762458880b5e9145
38 +EBUILD pidgin-2.10.1.ebuild 7147 SHA256 814bfb9f568980ebc848ad5fa8b31b24c71b2d2e6e19b5c4b81f22208257781d SHA512 984dfb7bb7cf24dbb01ef27f8f6fdd53aeec586a871fb918e54cf1b66d712fd83a0b48b9e166536a4086d27f38d532ebf79379f8243a3ef8bb92036a7c780c75 WHIRLPOOL 24d64ed5ed646b2ce5587af3e0520e17bb824e87f41b500fa635bca42cc82b88284ea34e932b9bb202fe35697a168bdb4c636fda2c9a1f92918e792b32f5c6ba
39 +EBUILD pidgin-2.10.3.ebuild 7084 SHA256 60ce9d9b210db5207340afaf7a9a0b583c9f8297d8fa41f42759c57ac510592f SHA512 90679374356e3101d35fd1cfd5f3c6ab1f5176631cb8fc963f05bccb0cf4a491557d8900f2859597ca3e9781514eeb4057e2923dc410ef8452c885a9a060eea2 WHIRLPOOL 3244478b2a4dc97c04aca151d12f78a26acb9d46ad141334d0a96d7f9ebe858a689565d3ea26f7ad6bae3e00c4fcf5daa0cbc83bb9046629f147c2b9962554fd
40 +EBUILD pidgin-2.10.4.ebuild 7165 SHA256 13757567ede98c20c141c5b0f7dacd2bbcda0ae9c90c7e86fbb40bafcf5f0656 SHA512 2ea3ced7e8d41e56f5fa87c16867a80f5130636a4ce6a367564a588973873899a4eee0c57ff309a5eb616ed6b32d86994207f5ba6fffd1957c97589c163c3d8f WHIRLPOOL 956cabaa7e6171c0761e0c40bebaa08b05c35ce7adb564b3d73b3b7de552daf48964301df416321e532da7ae796f8c0cb22ae910336b7a0ba3811fc4d6180ba6
41 +EBUILD pidgin-2.10.6.ebuild 7225 SHA256 97eb0d7e5f3dd3b53d2182e3ddf1a786d26b99c2179a9a805a83ad3cb73b155d SHA512 061348eb3d787b31cda1e2eb477749550dc40c1ee715d7289b3124b6160944b2b1c1f07898d1c330cbd89050ed667821cedbbf7e633575d9bdc8f982d8b282ee WHIRLPOOL 6a44fb73dd623ec88d02dd35ba95ecac9a6a241a8979531e2a7e9fdd05c2c18ae0e1a08d4bd8bfec7b4a9f0541a9ff381e346f53b96d955a051ce59ea0182d46
42
43 diff --git a/net-im/pidgin/pidgin-2.10.6.ebuild b/net-im/pidgin/pidgin-2.10.6.ebuild
44 new file mode 100644
45 index 0000000..7ae48d1
46 --- /dev/null
47 +++ b/net-im/pidgin/pidgin-2.10.6.ebuild
48 @@ -0,0 +1,235 @@
49 +# Copyright 1999-2012 Gentoo Foundation
50 +# Distributed under the terms of the GNU General Public License v2
51 +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.6.ebuild,v 1.1 2012/07/09 14:01:46 polynomial-c Exp $
52 +
53 +EAPI=4
54 +
55 +GENTOO_DEPEND_ON_PERL=no
56 +inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
57 +inherit autotools
58 +
59 +DESCRIPTION="GTK Instant Messenger client"
60 +HOMEPAGE="http://pidgin.im/"
61 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
62 +
63 +LICENSE="GPL-2"
64 +SLOT="0"
65 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
66 +IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
67 +IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
68 +IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
69 +IUSE+=" aqua"
70 +IUSE+=" gnome-keyring"
71 +
72 +# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
73 +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
74 +# no way to build dbus and avoid libgnt linkage with python. If you want this
75 +# send patch upstream.
76 +# purple-url-handler and purple-remote require dbus-python thus in reality we
77 +# rdepend on python if dbus enabled. But it is possible to separate this dep.
78 +RDEPEND="
79 + >=dev-libs/glib-2.16
80 + >=dev-libs/libxml2-2.6.18
81 + ncurses? ( sys-libs/ncurses[unicode]
82 + dbus? ( <dev-lang/python-3 )
83 + python? ( <dev-lang/python-3 ) )
84 + gtk? (
85 + >=x11-libs/gtk+-2.10:2[aqua=]
86 + x11-libs/libSM
87 + xscreensaver? ( x11-libs/libXScrnSaver )
88 + spell? ( >=app-text/gtkspell-2.0.2:2 )
89 + eds? ( gnome-extra/evolution-data-server )
90 + prediction? ( >=dev-db/sqlite-3.3:3 ) )
91 + gstreamer? ( =media-libs/gstreamer-0.10*
92 + =media-libs/gst-plugins-good-0.10*
93 + || ( net-libs/farstream net-libs/farsight2 )
94 + media-plugins/gst-plugins-meta
95 + media-plugins/gst-plugins-gconf )
96 + zeroconf? ( net-dns/avahi[dbus] )
97 + dbus? ( >=dev-libs/dbus-glib-0.71
98 + >=sys-apps/dbus-0.90
99 + dev-python/dbus-python )
100 + perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
101 + gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
102 + >=net-libs/libgadu-1.11.0[-ssl] ) )
103 + gnutls? ( net-libs/gnutls )
104 + !gnutls? ( >=dev-libs/nss-3.11 )
105 + meanwhile? ( net-libs/meanwhile )
106 + silc? ( >=net-im/silc-toolkit-1.0.1 )
107 + tcl? ( dev-lang/tcl )
108 + tk? ( dev-lang/tk )
109 + sasl? ( dev-libs/cyrus-sasl:2 )
110 + networkmanager? ( net-misc/networkmanager )
111 + idn? ( net-dns/libidn )
112 + !<x11-plugins/pidgin-facebookchat-1.69-r1"
113 + # Mono support crashes pidgin
114 + #mono? ( dev-lang/mono )"
115 +
116 +# We want nls in case gtk is enabled, bug #
117 +NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
118 +
119 +DEPEND="$RDEPEND
120 + dev-lang/perl
121 + dev-perl/XML-Parser
122 + virtual/pkgconfig
123 + gtk? ( x11-proto/scrnsaverproto
124 + ${NLS_DEPEND} )
125 + dbus? ( <dev-lang/python-3 )
126 + doc? ( app-doc/doxygen )
127 + !gtk? ( nls? ( ${NLS_DEPEND} ) )"
128 +
129 +DOCS="AUTHORS HACKING NEWS README ChangeLog"
130 +
131 +# Enable Default protocols
132 +DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
133 +
134 +# List of plugins
135 +# app-accessibility/pidgin-festival
136 +# net-im/librvp
137 +# x11-plugins/guifications
138 +# x11-plugins/msn-pecan
139 +# x11-plugins/pidgin-encryption
140 +# x11-plugins/pidgin-extprefs
141 +# x11-plugins/pidgin-hotkeys
142 +# x11-plugins/pidgin-latex
143 +# x11-plugins/pidgintex
144 +# x11-plugins/pidgin-libnotify
145 +# x11-plugins/pidgin-mbpurple
146 +# x11-plugins/pidgin-bot-sentry
147 +# x11-plugins/pidgin-otr
148 +# x11-plugins/pidgin-rhythmbox
149 +# x11-plugins/purple-plugin_pack
150 +# x11-themes/pidgin-smileys
151 +# x11-plugins/pidgin-knotify
152 +# Plugins in Sunrise:
153 +# x11-plugins/pidgin-audacious-remote
154 +# x11-plugins/pidgin-autoanswer
155 +# x11-plugins/pidgin-birthday-reminder
156 +# x11-plugins/pidgin-blinklight
157 +# x11-plugins/pidgin-convreverse
158 +# x11-plugins/pidgin-embeddedvideo
159 +# x11-plugins/pidgin-extended-blist-sort
160 +# x11-plugins/pidgin-gfire
161 +# x11-plugins/pidgin-lastfm
162 +# x11-plugins/pidgin-sendscreenshot
163 +# x11-plugins/pidgimpd
164 +
165 +pkg_setup() {
166 + if ! use gtk && ! use ncurses ; then
167 + elog "You did not pick the ncurses or gtk use flags, only libpurple"
168 + elog "will be built."
169 + fi
170 + if use dbus || { use ncurses && use python; }; then
171 + python_set_active_version 2
172 + python_pkg_setup
173 + fi
174 +
175 + # dbus is enabled, no way to disable linkage with python => python is enabled
176 + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
177 + if use gtk && ! use nls; then
178 + ewarn "gtk build => nls is enabled!"
179 + fi
180 + if use dbus && ! use python; then
181 + elog "dbus is enabled, no way to disable linkage with python => python is enabled"
182 + fi
183 +}
184 +
185 +src_prepare() {
186 + epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
187 +
188 + epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch
189 + eautoreconf || die "eautoreconf failed"
190 +}
191 +
192 +src_configure() {
193 + # Stabilize things, for your own good
194 + strip-flags
195 + replace-flags -O? -O2
196 +
197 + local myconf
198 +
199 + if use gadu; then
200 + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
201 + myconf="${myconf} --with-gadu-includes=."
202 + myconf="${myconf} --with-gadu-libs=."
203 + fi
204 +
205 + use silc && DYNAMIC_PRPLS+=",silc"
206 + use meanwhile && DYNAMIC_PRPLS+=",sametime"
207 + use zeroconf && DYNAMIC_PRPLS+=",bonjour"
208 + use groupwise && DYNAMIC_PRPLS+=",novell"
209 + use zephyr && DYNAMIC_PRPLS+=",zephyr"
210 +
211 + if use gnutls; then
212 + einfo "Disabling NSS, using GnuTLS"
213 + myconf+=" --enable-nss=no --enable-gnutls=yes"
214 + myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
215 + myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
216 + else
217 + einfo "Disabling GnuTLS, using NSS"
218 + myconf+=" --enable-gnutls=no --enable-nss=yes"
219 + fi
220 +
221 + if use dbus || { use ncurses && use python; }; then
222 + myconf+=" --with-python=$(PYTHON)"
223 + else
224 + myconf+=" --without-python"
225 + fi
226 +
227 + econf \
228 + --disable-silent-rules \
229 + $(use_enable ncurses consoleui) \
230 + $(use_enable gtk gtkui) \
231 + $(use_enable gtk sm) \
232 + $(use gtk || use_enable nls) \
233 + $(use gtk && echo "--enable-nls") \
234 + $(use gtk && use_enable xscreensaver screensaver) \
235 + $(use gtk && use_enable prediction cap) \
236 + $(use gtk && use_enable eds gevolution) \
237 + $(use gtk && use_enable spell gtkspell) \
238 + $(use_enable perl) \
239 + $(use_enable tk) \
240 + $(use_enable tcl) \
241 + $(use_enable debug) \
242 + $(use_enable dbus) \
243 + $(use_enable meanwhile) \
244 + $(use_enable gstreamer) \
245 + $(use_enable gnome-keyring) \
246 + $(use_enable gstreamer farstream) \
247 + $(use_enable gstreamer vv) \
248 + $(use_enable sasl cyrus-sasl ) \
249 + $(use_enable doc doxygen) \
250 + $(use_enable networkmanager nm) \
251 + $(use_enable zeroconf avahi) \
252 + $(use_enable idn) \
253 + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
254 + --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
255 + --disable-mono \
256 + --x-includes="${EPREFIX}"/usr/include/X11 \
257 + ${myconf}
258 + #$(use_enable mono) \
259 +}
260 +
261 +src_install() {
262 + gnome2_src_install
263 + if use gtk; then
264 + # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
265 + # implementations that are not complient with new hicolor theme yet, #323355
266 + local pixmapdir
267 + for d in 16 22 32 48; do
268 + pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
269 + mkdir "${pixmapdir}" || die
270 + pushd "${pixmapdir}" >/dev/null || die
271 + for f in ../status/*; do
272 + ln -s ${f} || die
273 + done
274 + popd >/dev/null
275 + done
276 + fi
277 + use perl && fixlocalpod
278 +
279 + dodoc finch/plugins/pietray.py
280 + docompress -x /usr/share/doc/${PF}/pietray.py
281 +
282 + find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
283 +}