Gentoo Archives: gentoo-commits

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