Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/pidgin: ChangeLog pidgin-2.10.5.ebuild
Date: Fri, 06 Jul 2012 16:25:36
Message-Id: 20120706162524.3E05E2004B@flycatcher.gentoo.org
1 polynomial-c 12/07/06 16:25:24
2
3 Modified: ChangeLog
4 Added: pidgin-2.10.5.ebuild
5 Log:
6 Security bump (bug #425076)
7
8 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.286 net-im/pidgin/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?rev=1.286&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?rev=1.286&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/ChangeLog?r1=1.285&r2=1.286
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v
20 retrieving revision 1.285
21 retrieving revision 1.286
22 diff -u -r1.285 -r1.286
23 --- ChangeLog 8 Jun 2012 18:20:33 -0000 1.285
24 +++ ChangeLog 6 Jul 2012 16:25:24 -0000 1.286
25 @@ -1,6 +1,11 @@
26 # ChangeLog for net-im/pidgin
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.285 2012/06/08 18:20:33 hasufell Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.286 2012/07/06 16:25:24 polynomial-c Exp $
30 +
31 +*pidgin-2.10.5 (06 Jul 2012)
32 +
33 + 06 Jul 2012; Lars Wendler <polynomial-c@g.o> +pidgin-2.10.5.ebuild:
34 + Security bump (bug #425076).
35
36 08 Jun 2012; Julian Ospald <hasufell@g.o>
37 -files/pidgin-2.10.0-networkmanager-0.9.patch,
38
39
40
41 1.1 net-im/pidgin/pidgin-2.10.5.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/pidgin-2.10.5.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/pidgin/pidgin-2.10.5.ebuild?rev=1.1&content-type=text/plain
45
46 Index: pidgin-2.10.5.ebuild
47 ===================================================================
48 # Copyright 1999-2012 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.5.ebuild,v 1.1 2012/07/06 16:25:24 polynomial-c Exp $
51
52 EAPI=4
53
54 GENTOO_DEPEND_ON_PERL=no
55 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python
56
57 DESCRIPTION="GTK Instant Messenger client"
58 HOMEPAGE="http://pidgin.im/"
59 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
60
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
64 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
65 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
66 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
67 IUSE+=" aqua"
68
69 # dbus requires python to generate C code for dbus bindings (thus DEPEND only).
70 # finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
71 # no way to build dbus and avoid libgnt linkage with python. If you want this
72 # send patch upstream.
73 # purple-url-handler and purple-remote require dbus-python thus in reality we
74 # rdepend on python if dbus enabled. But it is possible to separate this dep.
75 RDEPEND="
76 >=dev-libs/glib-2.16
77 >=dev-libs/libxml2-2.6.18
78 ncurses? ( sys-libs/ncurses[unicode]
79 dbus? ( <dev-lang/python-3 )
80 python? ( <dev-lang/python-3 ) )
81 gtk? (
82 >=x11-libs/gtk+-2.10:2[aqua=]
83 x11-libs/libSM
84 xscreensaver? ( x11-libs/libXScrnSaver )
85 spell? ( >=app-text/gtkspell-2.0.2:2 )
86 eds? ( gnome-extra/evolution-data-server )
87 prediction? ( >=dev-db/sqlite-3.3:3 ) )
88 gstreamer? ( =media-libs/gstreamer-0.10*
89 =media-libs/gst-plugins-good-0.10*
90 || ( net-libs/farstream net-libs/farsight2 )
91 media-plugins/gst-plugins-meta
92 media-plugins/gst-plugins-gconf )
93 zeroconf? ( net-dns/avahi[dbus] )
94 dbus? ( >=dev-libs/dbus-glib-0.71
95 >=sys-apps/dbus-0.90
96 dev-python/dbus-python )
97 perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
98 gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
99 >=net-libs/libgadu-1.11.0[-ssl] ) )
100 gnutls? ( net-libs/gnutls )
101 !gnutls? ( >=dev-libs/nss-3.11 )
102 meanwhile? ( net-libs/meanwhile )
103 silc? ( >=net-im/silc-toolkit-1.0.1 )
104 tcl? ( dev-lang/tcl )
105 tk? ( dev-lang/tk )
106 sasl? ( dev-libs/cyrus-sasl:2 )
107 networkmanager? ( net-misc/networkmanager )
108 idn? ( net-dns/libidn )
109 !<x11-plugins/pidgin-facebookchat-1.69-r1"
110 # Mono support crashes pidgin
111 #mono? ( dev-lang/mono )"
112
113 # We want nls in case gtk is enabled, bug #
114 NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
115
116 DEPEND="$RDEPEND
117 dev-lang/perl
118 dev-perl/XML-Parser
119 virtual/pkgconfig
120 gtk? ( x11-proto/scrnsaverproto
121 ${NLS_DEPEND} )
122 dbus? ( <dev-lang/python-3 )
123 doc? ( app-doc/doxygen )
124 !gtk? ( nls? ( ${NLS_DEPEND} ) )"
125
126 DOCS="AUTHORS HACKING NEWS README ChangeLog"
127
128 # Enable Default protocols
129 DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
130
131 # List of plugins
132 # app-accessibility/pidgin-festival
133 # net-im/librvp
134 # x11-plugins/guifications
135 # x11-plugins/msn-pecan
136 # x11-plugins/pidgin-encryption
137 # x11-plugins/pidgin-extprefs
138 # x11-plugins/pidgin-hotkeys
139 # x11-plugins/pidgin-latex
140 # x11-plugins/pidgintex
141 # x11-plugins/pidgin-libnotify
142 # x11-plugins/pidgin-mbpurple
143 # x11-plugins/pidgin-bot-sentry
144 # x11-plugins/pidgin-otr
145 # x11-plugins/pidgin-rhythmbox
146 # x11-plugins/purple-plugin_pack
147 # x11-themes/pidgin-smileys
148 # x11-plugins/pidgin-knotify
149 # Plugins in Sunrise:
150 # x11-plugins/pidgin-audacious-remote
151 # x11-plugins/pidgin-autoanswer
152 # x11-plugins/pidgin-birthday-reminder
153 # x11-plugins/pidgin-blinklight
154 # x11-plugins/pidgin-convreverse
155 # x11-plugins/pidgin-embeddedvideo
156 # x11-plugins/pidgin-extended-blist-sort
157 # x11-plugins/pidgin-gfire
158 # x11-plugins/pidgin-lastfm
159 # x11-plugins/pidgin-sendscreenshot
160 # x11-plugins/pidgimpd
161
162 pkg_setup() {
163 if ! use gtk && ! use ncurses ; then
164 elog "You did not pick the ncurses or gtk use flags, only libpurple"
165 elog "will be built."
166 fi
167 if use dbus || { use ncurses && use python; }; then
168 python_set_active_version 2
169 python_pkg_setup
170 fi
171
172 # dbus is enabled, no way to disable linkage with python => python is enabled
173 #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
174 if use gtk && ! use nls; then
175 ewarn "gtk build => nls is enabled!"
176 fi
177 if use dbus && ! use python; then
178 elog "dbus is enabled, no way to disable linkage with python => python is enabled"
179 fi
180 }
181
182 src_prepare() {
183 epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
184 }
185
186 src_configure() {
187 # Stabilize things, for your own good
188 strip-flags
189 replace-flags -O? -O2
190
191 local myconf
192
193 if use gadu; then
194 DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
195 myconf="${myconf} --with-gadu-includes=."
196 myconf="${myconf} --with-gadu-libs=."
197 fi
198
199 use silc && DYNAMIC_PRPLS+=",silc"
200 use meanwhile && DYNAMIC_PRPLS+=",sametime"
201 use zeroconf && DYNAMIC_PRPLS+=",bonjour"
202 use groupwise && DYNAMIC_PRPLS+=",novell"
203 use zephyr && DYNAMIC_PRPLS+=",zephyr"
204
205 if use gnutls; then
206 einfo "Disabling NSS, using GnuTLS"
207 myconf+=" --enable-nss=no --enable-gnutls=yes"
208 myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
209 myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
210 else
211 einfo "Disabling GnuTLS, using NSS"
212 myconf+=" --enable-gnutls=no --enable-nss=yes"
213 fi
214
215 if use dbus || { use ncurses && use python; }; then
216 myconf+=" --with-python=$(PYTHON)"
217 else
218 myconf+=" --without-python"
219 fi
220
221 econf \
222 --disable-silent-rules \
223 $(use_enable ncurses consoleui) \
224 $(use_enable gtk gtkui) \
225 $(use_enable gtk sm) \
226 $(use gtk || use_enable nls) \
227 $(use gtk && echo "--enable-nls") \
228 $(use gtk && use_enable xscreensaver screensaver) \
229 $(use gtk && use_enable prediction cap) \
230 $(use gtk && use_enable eds gevolution) \
231 $(use gtk && use_enable spell gtkspell) \
232 $(use_enable perl) \
233 $(use_enable tk) \
234 $(use_enable tcl) \
235 $(use_enable debug) \
236 $(use_enable dbus) \
237 $(use_enable meanwhile) \
238 $(use_enable gstreamer) \
239 $(use_enable gstreamer farstream) \
240 $(use_enable gstreamer vv) \
241 $(use_enable sasl cyrus-sasl ) \
242 $(use_enable doc doxygen) \
243 $(use_enable networkmanager nm) \
244 $(use_enable zeroconf avahi) \
245 $(use_enable idn) \
246 --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
247 --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
248 --disable-mono \
249 --x-includes="${EPREFIX}"/usr/include/X11 \
250 ${myconf}
251 #$(use_enable mono) \
252 }
253
254 src_install() {
255 gnome2_src_install
256 if use gtk; then
257 # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
258 # implementations that are not complient with new hicolor theme yet, #323355
259 local pixmapdir
260 for d in 16 22 32 48; do
261 pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
262 mkdir "${pixmapdir}" || die
263 pushd "${pixmapdir}" >/dev/null || die
264 for f in ../status/*; do
265 ln -s ${f} || die
266 done
267 popd >/dev/null
268 done
269 fi
270 use perl && fixlocalpod
271
272 dodoc finch/plugins/pietray.py
273 docompress -x /usr/share/doc/${PF}/pietray.py
274
275 find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
276 }