Gentoo Archives: gentoo-commits

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