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, 27 Jun 2016 18:20:10
Message-Id: 1467051581.0b5b81874d96fa66e24d8446eeb4d62e78823415.chutzpah@gentoo
1 commit: 0b5b81874d96fa66e24d8446eeb4d62e78823415
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 27 18:19:41 2016 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 27 18:19:41 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/chutzpah.git/commit/?id=0b5b8187
7
8 net-im/pidgin: version bump to match upstream
9
10 net-im/pidgin/Manifest | 2 +
11 net-im/pidgin/pidgin-2.11.0.ebuild | 269 +++++++++++++++++++++++++++++++++++++
12 2 files changed, 271 insertions(+)
13
14 diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
15 index 959b5f5..e96aca7 100644
16 --- a/net-im/pidgin/Manifest
17 +++ b/net-im/pidgin/Manifest
18 @@ -12,8 +12,10 @@ AUX pidgin-gnome-keyring-3.patch 8966 SHA256 4cf873682a4e2d7218f14f498a3c38d982b
19 DIST pidgin-2.10.11.tar.bz2 9458050 SHA256 f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512 774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029 WHIRLPOOL 24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
20 DIST pidgin-2.10.12.tar.bz2 9837598 SHA256 2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd SHA512 4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03 WHIRLPOOL 52f16cdd76b1aa3e76a877136070e3c4875827df621757d35656eb79e7d9921635f9373d33f9bc87275200e91c25a2763b4a64d90953322fd82d03860ce6a0da
21 DIST pidgin-2.10.9-irc_join_sleep.patch 534 SHA256 ee061505d04c994a36ea1d5eef346b7cbb2512afafa4985a678205ea69d87857 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf WHIRLPOOL 7aa9aa9e5ee7d97445da2c330329c6bfd4ad21347f43220e8377b7ec40eb5eac417be08cddfcdd48c7f847aac00a0f9ab39d0add09f1bee519f96f7586bdf5c9
22 +DIST pidgin-2.11.0.tar.bz2 10037480 SHA256 f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333 SHA512 d6a9bb8075b475e5204d730075b432ca0f1cb91b6337f98e506587132581e6928a826b47e0b94fb9eaedc79c5be0a8237c4671fc26dba97dedad1adb74c9abfa WHIRLPOOL e7f91d92bece8611986c35f17d3d263a197f8c7cf71d514d1f409fbe31fd57cf8a1beabab3d028a0882a79a115ae021b2e64dd2c6b3ec6c29a783a3df28af948
23 DIST pidgin-eds-3.6.patch.bz2 2352 SHA256 321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512 a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877 WHIRLPOOL 5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
24 EBUILD pidgin-2.10.11.ebuild 7541 SHA256 22226232e8f1c941cdf6769529cf11a137b31a25da87ac2e7ca7b38fe88563f3 SHA512 5f35cefb5012c73b0974ef019d1af56042cce35ab17f49e503bf00ac0b72c7a2869d28e837d1e5b3bda1984c511161de1bdc5c1f445f2db841ac40e5e07197e5 WHIRLPOOL 9c02539c1c0e8bec3ea0ee76c214dcf446976aaa58ff6b14452acf68cd906683fb9cce9525e080976603fa09639b2dca6adea133ea8bacd91cd27359b8307b93
25 EBUILD pidgin-2.10.12-r1.ebuild 7555 SHA256 dbb93b226ed1575f2ef9ab30d7944c7f6411c6626c8f7fc951f3829becd55874 SHA512 620c9289aaeca1c2abe7fd52aab1477bbd85442470690a95f00b2875d4f5cb899855488ea9ba2e1ce5ccb709b067356166c219afaf5595a81e92e9ab8c6a60d7 WHIRLPOOL 5b94524db77ce93191e91cfb2891c11ef51146224230543cff0a6e23086e55c6524d2a2de429df443d4c603fff2a3146289be4eb4b4def6a7608da9e060d2f40
26 EBUILD pidgin-2.10.12-r2.ebuild 7963 SHA256 d32844277c219485a87593bb77a5382883325297bc4acae07c7f0abd7642e8c4 SHA512 6a985ec742302f6ebe9fe451d1ee8da26eb3868571ee80962396252a317e6863e0578ec319a1d1b6c5ef71e76eedc97f2b2cdeeeb12f11908fe18f8b65259791 WHIRLPOOL 4ce2bda0cf772061c82478b4a00623a59fd7d859babc7d0190399c0f78fed7a32039568480af314755be37b4a9731522c0d479c4f7364f39380682dfc998e267
27 EBUILD pidgin-2.10.12.ebuild 7509 SHA256 7d6e936c8d33d367bac9f6d162cb35c8262ce34083c77dbda8abb9db53ad5778 SHA512 fe2fdd298f03a529a4c8864d9593055653553812f3f037f4e750521ef0cc39d72edb25dd9a50bb8fc9d2271dbccb33b342f30edcf119227657fee450f62a14ea WHIRLPOOL c61e6a9a41434a29b8dddb1f6fc5471901b8e1997e720ac31f53c7066aaf9f2855daa59f5850c2132fbd935dfc72dfd408a8bb0568f00bb5e13379749cc68089
28 +EBUILD pidgin-2.11.0.ebuild 7979 SHA256 c11accf70d10f8b6b1f48903b5efc1238deacf071107aaa3236441022759d779 SHA512 992bf8b0d52e5993a802373f01663dc9aceec5c9aa68aecc752790cf420054aab6b06d3415d32aa87651b1a24afba87759e0e940a2cf9e8aa766352485cd01f1 WHIRLPOOL 69bd8952e2e8d93e0f873d649ce2f4f653c18ca6df0a88d48bbf69d951a3dbe3fc4eedace5e61f565b1e480b18937259a620cefcbca917d8df3c5e7f846c3b5d
29
30 diff --git a/net-im/pidgin/pidgin-2.11.0.ebuild b/net-im/pidgin/pidgin-2.11.0.ebuild
31 new file mode 100644
32 index 0000000..606c972
33 --- /dev/null
34 +++ b/net-im/pidgin/pidgin-2.11.0.ebuild
35 @@ -0,0 +1,269 @@
36 +# Copyright 1999-2016 Gentoo Foundation
37 +# Distributed under the terms of the GNU General Public License v2
38 +# $Id$
39 +
40 +EAPI=6
41 +
42 +GENTOO_DEPEND_ON_PERL=no
43 +PYTHON_COMPAT=( python2_7 python3_{3,4} )
44 +
45 +inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-module python-single-r1
46 +
47 +DESCRIPTION="GTK Instant Messenger client"
48 +HOMEPAGE="http://pidgin.im/"
49 +SRC_URI="
50 + mirror://sourceforge/${PN}/${P}.tar.bz2
51 + https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
52 + https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
53 +
54 +LICENSE="GPL-2"
55 +SLOT="0/2" # libpurple version
56 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
57 +IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit pie"
58 +IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
59 +IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
60 +IUSE+=" aqua"
61 +IUSE+=" gnome-keyring"
62 +
63 +# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
64 +# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
65 +# no way to build dbus and avoid libgnt linkage with python. If you want this
66 +# send patch upstream.
67 +# purple-url-handler and purple-remote require dbus-python thus in reality we
68 +# rdepend on python if dbus enabled. But it is possible to separate this dep.
69 +RDEPEND="
70 + >=dev-libs/glib-2.16
71 + >=dev-libs/libxml2-2.6.18
72 + ncurses? ( sys-libs/ncurses:0=[unicode]
73 + dbus? ( ${PYTHON_DEPS} )
74 + python? ( ${PYTHON_DEPS} ) )
75 + gtk? (
76 + >=x11-libs/gtk+-2.10:2[aqua=]
77 + x11-libs/libSM
78 + xscreensaver? ( x11-libs/libXScrnSaver )
79 + spell? ( >=app-text/gtkspell-2.0.2:2 )
80 + eds? ( >=gnome-extra/evolution-data-server-3.6:= )
81 + prediction? ( >=dev-db/sqlite-3.3:3 )
82 + )
83 + gstreamer? ( media-libs/gstreamer:1.0
84 + media-libs/gst-plugins-base:1.0
85 + >=net-libs/farstream-0.2.7:0.2 )
86 + zeroconf? ( net-dns/avahi[dbus] )
87 + dbus? ( >=dev-libs/dbus-glib-0.71
88 + >=sys-apps/dbus-0.90
89 + dev-python/dbus-python )
90 + perl? ( >=dev-lang/perl-5.16:= )
91 + gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
92 + >=net-libs/libgadu-1.11.0[-ssl] ) )
93 + gnutls? ( net-libs/gnutls )
94 + !gnutls? (
95 + dev-libs/nspr
96 + dev-libs/nss
97 + )
98 + meanwhile? ( net-libs/meanwhile )
99 + silc? ( >=net-im/silc-toolkit-1.0.1 )
100 + tcl? ( dev-lang/tcl:0= )
101 + tk? ( dev-lang/tk:0= )
102 + sasl? ( dev-libs/cyrus-sasl:2 )
103 + networkmanager? ( net-misc/networkmanager )
104 + idn? ( net-dns/libidn )
105 + !<x11-plugins/pidgin-facebookchat-1.69-r1"
106 + # Mono support crashes pidgin
107 + #mono? ( dev-lang/mono )"
108 +
109 +RDEPEND+=" gnome-keyring? ( gnome-base/gnome-keyring )"
110 +
111 +# We want nls in case gtk is enabled, bug #
112 +NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
113 +
114 +DEPEND="$RDEPEND
115 + dev-lang/perl
116 + dev-perl/XML-Parser
117 + virtual/pkgconfig
118 + gtk? ( x11-proto/scrnsaverproto
119 + ${NLS_DEPEND} )
120 + dbus? ( ${PYTHON_DEPS} )
121 + doc? ( app-doc/doxygen )
122 + !gtk? ( nls? ( ${NLS_DEPEND} ) )"
123 +
124 +DOCS="AUTHORS HACKING NEWS README ChangeLog"
125 +
126 +REQUIRED_USE="dbus? ( ${PYTHON_REQUIRED_USE} )
127 + networkmanager? ( dbus )
128 + python? ( ${PYTHON_REQUIRED_USE} )"
129 +
130 +# Enable Default protocols
131 +DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
132 +
133 +# List of plugins
134 +# app-accessibility/pidgin-festival
135 +# net-im/librvp
136 +# x11-plugins/guifications
137 +# x11-plugins/msn-pecan
138 +# x11-plugins/pidgin-encryption
139 +# x11-plugins/pidgin-extprefs
140 +# x11-plugins/pidgin-hotkeys
141 +# x11-plugins/pidgin-latex
142 +# x11-plugins/pidgintex
143 +# x11-plugins/pidgin-libnotify
144 +# x11-plugins/pidgin-mbpurple
145 +# x11-plugins/pidgin-bot-sentry
146 +# x11-plugins/pidgin-otr
147 +# x11-plugins/pidgin-rhythmbox
148 +# x11-plugins/purple-plugin_pack
149 +# x11-themes/pidgin-smileys
150 +# x11-plugins/pidgin-knotify
151 +# Plugins in Sunrise:
152 +# x11-plugins/pidgin-audacious-remote
153 +# x11-plugins/pidgin-autoanswer
154 +# x11-plugins/pidgin-birthday-reminder
155 +# x11-plugins/pidgin-blinklight
156 +# x11-plugins/pidgin-convreverse
157 +# x11-plugins/pidgin-embeddedvideo
158 +# x11-plugins/pidgin-extended-blist-sort
159 +# x11-plugins/pidgin-gfire
160 +# x11-plugins/pidgin-lastfm
161 +# x11-plugins/pidgin-sendscreenshot
162 +# x11-plugins/pidgimpd
163 +
164 +PATCHES=(
165 + "${FILESDIR}/${PN}-2.10.0-gold.patch"
166 + "${WORKDIR}/${PN}-eds-3.6.patch"
167 + "${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
168 + "${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
169 + "${FILESDIR}/${PN}-2.10.11-tinfo.patch"
170 + "${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
171 +)
172 +
173 +PATCHES+=("${FILESDIR}/pidgin-gnome-keyring-3.patch")
174 +
175 +pkg_setup() {
176 + if ! use gtk && ! use ncurses ; then
177 + elog "You did not pick the ncurses or gtk use flags, only libpurple"
178 + elog "will be built."
179 + fi
180 + if use python || use dbus ; then
181 + python-single-r1_pkg_setup
182 + fi
183 +
184 + # dbus is enabled, no way to disable linkage with python => python is enabled
185 + #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
186 + if use gtk && ! use nls; then
187 + ewarn "gtk build => nls is enabled!"
188 + fi
189 + if use dbus && ! use python; then
190 + elog "dbus is enabled, no way to disable linkage with python => python is enabled"
191 + fi
192 +}
193 +
194 +src_prepare() {
195 + default
196 +
197 + eautoreconf
198 +}
199 +
200 +src_configure() {
201 + # Stabilize things, for your own good
202 + strip-flags
203 + replace-flags -O? -O2
204 + use pie && append-cflags -fPIE -pie
205 +
206 + local myconf=()
207 +
208 + if use gadu; then
209 + DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
210 + fi
211 +
212 + use groupwise && DYNAMIC_PRPLS+=",novell"
213 + use silc && DYNAMIC_PRPLS+=",silc"
214 + use meanwhile && DYNAMIC_PRPLS+=",sametime"
215 + use mxit && DYNAMIC_PRPLS+=",mxit"
216 + use zephyr && DYNAMIC_PRPLS+=",zephyr"
217 + use zeroconf && DYNAMIC_PRPLS+=",bonjour"
218 +
219 + if use gnutls; then
220 + einfo "Disabling NSS, using GnuTLS"
221 + myconf+=( --enable-nss=no --enable-gnutls=yes )
222 + myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
223 + myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
224 + else
225 + einfo "Disabling GnuTLS, using NSS"
226 + myconf+=( --enable-gnutls=no --enable-nss=yes )
227 + fi
228 +
229 + if use dbus || { use ncurses && use python; }; then
230 + myconf+=( --with-python=${PYTHON} )
231 + else
232 + myconf+=( --without-python )
233 + fi
234 +
235 + econf \
236 + $(use_enable ncurses consoleui) \
237 + $(use_enable gtk gtkui) \
238 + $(use_enable gtk sm) \
239 + $(use gtk || use_enable nls) \
240 + $(use gtk && echo "--enable-nls") \
241 + $(use gtk && use_enable xscreensaver screensaver) \
242 + $(use gtk && use_enable prediction cap) \
243 + $(use gtk && use_enable eds gevolution) \
244 + $(use gtk && use_enable spell gtkspell) \
245 + $(use_enable perl) \
246 + $(use_enable tk) \
247 + $(use_enable tcl) \
248 + $(use_enable debug) \
249 + $(use_enable dbus) \
250 + $(use_enable meanwhile) \
251 + $(use_enable gstreamer) \
252 + $(use_with gstreamer gstreamer 1.0) \
253 + $(use_enable gnome-keyring) \
254 + $(use_enable gstreamer farstream) \
255 + $(use_enable gstreamer vv) \
256 + $(use_enable sasl cyrus-sasl ) \
257 + $(use_enable doc doxygen) \
258 + $(use_enable networkmanager nm) \
259 + $(use_enable zeroconf avahi) \
260 + $(use_enable idn) \
261 + --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
262 + --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
263 + --disable-mono \
264 + --x-includes="${EPREFIX}"/usr/include/X11 \
265 + ${myconf[@]}
266 + #$(use_enable mono) \
267 +}
268 +
269 +src_install() {
270 + # mimicking gnome2_src_install as that one is banned for >=EAPI-6 (*sigh*)
271 + export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
272 + emake DESTDIR="${D}" install
273 + unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
274 +
275 + if use gtk; then
276 + # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
277 + # implementations that are not complient with new hicolor theme yet, #323355
278 + local pixmapdir
279 + for d in 16 22 32 48; do
280 + pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
281 + mkdir "${pixmapdir}" || die
282 + pushd "${pixmapdir}" >/dev/null || die
283 + for f in ../status/*; do
284 + ln -s ${f} || die
285 + done
286 + popd >/dev/null
287 + done
288 + fi
289 + use perl && perl_delete_localpod
290 +
291 + if use python || use dbus ; then
292 + python_fix_shebang "${D}"
293 + python_optimize
294 + fi
295 +
296 + dodoc ${DOCS} finch/plugins/pietray.py
297 + docompress -x /usr/share/doc/${PF}/pietray.py
298 +
299 + prune_libtool_files --all
300 +}
301 +
302 +src_test() {
303 + emake check
304 +}