commit: 9044ef902c30aa13feb716ca17b098af21f458ac
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 01:48:15 2016 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 01:48:15 2016 +0000
URL: https://gitweb.gentoo.org/dev/chutzpah.git/commit/?id=9044ef90
net-im/pidgin: version bump to 2.10.12
net-im/pidgin/Manifest | 3 +
net-im/pidgin/files/pidgin-2.10.11-tinfo.patch | 24 +++
net-im/pidgin/pidgin-2.10.12.ebuild | 254 +++++++++++++++++++++++++
3 files changed, 281 insertions(+)
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index c08150b..7941f7b 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,7 @@ AUX pidgin-2.10.0-gold.patch 1003 SHA256
26657c717f4e624b0b3af8746b61b0861ba4da6
AUX pidgin-2.10.0-networkmanager-0.9.patch 1994 SHA256
d91ce4a7236ea9b0bc730ec07a994bf5dc2c834e2df04e4615d9ada4a03af7ab SHA512
9925dec9f09642f441a732d8c229150469056d885410fecd3ce13a96e52b0320af6bb9910b2c5b8cdca526fae9ad6a0a2e764405c34dd3befa966c1f821158d9
WHIRLPOOL
d33c52da786aad3993959d8bc3585627fe98e0f575e1714264e5c9cac183721bae059fab7c1eed16668464cee0b325504ed0ba839f73ca802cdb768a6a002b28
AUX pidgin-2.10.0-utf8-validation.patch 908 SHA256
288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 SHA512
605f95955a7b813465607966dece36db7b8e91b27c8d73caeb29159f4b3de0b6906be718aab537dbab1f1f9fca8afc7b0ca7b5827122dd30503e19fae02e9bcd
WHIRLPOOL
01b1985dd8b9985dd2331c316d74823eb7a0cf2bd7bdbac2a1da232bf96a363f89b2b6ccf0c20d6bd7eb67c9299ed5b27018b23e87154d90a33ebbd6c0ea9242
AUX pidgin-2.10.10-eds-3.6-configure.ac.patch 1088 SHA256
548d459f17970d963147db19a2959b19da7d1f6c1958ae3ed3b609cf6be8b775 SHA512
d6d0a925803484311fcb78aecc383f4f572886551edc326c7e34cf1376ee80e1f65a4c564c3473d64233120c20d8143b0d63c4af065a15bfde02d830c83ab2f0
WHIRLPOOL
55183fdb3057a79e367566196abfa368962202eca3f63676cb80d791e0c0baa9245d67733b88d6af523524ec9d0ed941fe284552fe1bdfd91daf1b33ca67ffed
+AUX pidgin-2.10.11-tinfo.patch 892 SHA256
f722ea593f2ec0d9061ca051519bbbb389f2056dbda4fd4e80df545af78a6a16 SHA512
019148522e6851e1e52cf52a3b855f0d5fb10dd5a3e7236e5abfe21f270b9feb1b998aaaa668768c85e855019eb69f7b7458c220ca06a189aba3e77947b158db
WHIRLPOOL
b5a3a5bd8c3d8428aac1e2fe20ec740a03cd397a5b79db2c2df593ed5ace7217871b27ad33bae0ab034f7d229526afc2688617b8fca666de26937b1575cb1a02
AUX pidgin-2.10.7-fix-cap.patch 692 SHA256
4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512
0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc
WHIRLPOOL
8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
AUX pidgin-2.10.7-link_sasl_in_irc_plugin.patch 642 SHA256
8f91df48549004c80d5989bfdcc11f7a7805f3770b6aa2a5676d86eb334cf5b8 SHA512
3bc39f994473e01ab532e804481a858b0e1ddc3252a27fc29cb32c550e207699ee39da0057b6e86f4a33870b29f44b701a1614e93ff223930208ef0e8061fed1
WHIRLPOOL
5d0ce684e06fbe8c507310947696fed1910f631f93b0e71fc44610e06c6b1d93b966af89d4def15d8fcaa1b11001ab7066e94c732f58423046bc9e645816a91e
AUX pidgin-2.10.9-fix-gtkmedia.patch 267 SHA256
c0bc25b05a5cfa8583d97533a9c052dc94bb186053ce11cb52b9e79ca3a0b11c SHA512
e78c95e1e4b86c4e702ed9e184de75940f4b93265cfce73d0d6b2145d4a07c79f41dbaa996cbb76e5ac19d9fd1a606d1dd31982e948ac58376b24c1ab866e6bd
WHIRLPOOL
3cb215078dfbed61f3d49ecd3c3fc1f2739fc02787f2ef3fdf41cde371f5c91ade1d4a6fff28db69878f7ba1995eed14aa8c0b8eb4961650d33dfaa88a3cafe1
@@ -9,5 +10,7 @@ AUX pidgin-eds-3.6.patch 9895 SHA256
f7dcb08b14cbb2320a01afb59a815f8e11890cf9c41
AUX pidgin-gnome-keyring-2.patch 7680 SHA256
aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 SHA512
e6c93e4c5fc0ea283b8e5b9d660cfb5e8ab502ebda115a95d900f8d864d35098658b3b98b79e26e8aa26f60e63a89bc748778c5188d5c1013c861148b786d669
WHIRLPOOL
09104c9f2dde20e034272b940a92a9339a3fb5e253d265a489c68f27ccb6d9195835a97aefcb29db3f5f9553e3a230b9daf3c4dfa2be1cfb00787402b3406456
AUX pidgin-gnome-keyring-3.patch 8966 SHA256
4cf873682a4e2d7218f14f498a3c38d982b46175ef57fb8022b607528d2d844e SHA512
5786a0baa9d874fda882a7d9955e0b2c4234fef3db3957130c4b9ebc580412a6217fbb8da538c1451d7d34c3ce1d404eaa4037486e72e091c2bcc22c97bda30f
WHIRLPOOL
72c23432a50837d78c9d7dceafe9a069a871e50750f4f7d194bb1818bc0aca99d9634c0c1d5c90a33cb375d48c837781f679b256de169de7018594b492108b80
DIST pidgin-2.10.11.tar.bz2 9458050 SHA256
f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007 SHA512
774710ab087cb56e349dc1d5e45dbfcbe06b9a8f792abe5d201b0860620d502009f31563cfe5316f4c815345427b6c273b8f9694deb600848957c825fd967029
WHIRLPOOL
24f31ee6ce40e69f644d55f2135644172e8314a64080384eb901ae2b7aba631fbde98cab6cb798f10dd870ecd96374b451cb3ad11d567dc48dcb25f5cf499223
+DIST pidgin-2.10.12.tar.bz2 9837598 SHA256
2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd SHA512
4756bed3ae78b48bfeaa586def3c7a0014db76ce14ae8c6773c96bdca24b65e92b2805270af43960e2a11a600aeac35e030faa3f79dbe3301084ca9d970a5f03
WHIRLPOOL
52f16cdd76b1aa3e76a877136070e3c4875827df621757d35656eb79e7d9921635f9373d33f9bc87275200e91c25a2763b4a64d90953322fd82d03860ce6a0da
DIST pidgin-eds-3.6.patch.bz2 2352 SHA256
321185dd5f44e502f671b17e84fa1ca2e08a3f7c79ed211c0bb92710700bcc41 SHA512
a0195679ab55ed9c7ea18ace6dbf0fc994698f1f4eea9d8335dfdcdcd6a68975c0191bd22f150bf5a9a0a691ce7e9e73d79598e1e8be541efa1d9824a633d877
WHIRLPOOL
5c1d3e933bdfa4b1f20f98dbf8b5c1669eb857b9db60dacae488fa04331300618df2f1265e4fb2e58ed31b24229df0edb8c30970d8172fd65ca7fa03bc0e3805
EBUILD pidgin-2.10.11.ebuild 7541 SHA256
22226232e8f1c941cdf6769529cf11a137b31a25da87ac2e7ca7b38fe88563f3 SHA512
5f35cefb5012c73b0974ef019d1af56042cce35ab17f49e503bf00ac0b72c7a2869d28e837d1e5b3bda1984c511161de1bdc5c1f445f2db841ac40e5e07197e5
WHIRLPOOL
9c02539c1c0e8bec3ea0ee76c214dcf446976aaa58ff6b14452acf68cd906683fb9cce9525e080976603fa09639b2dca6adea133ea8bacd91cd27359b8307b93
+EBUILD pidgin-2.10.12.ebuild 7509 SHA256
7d6e936c8d33d367bac9f6d162cb35c8262ce34083c77dbda8abb9db53ad5778 SHA512
fe2fdd298f03a529a4c8864d9593055653553812f3f037f4e750521ef0cc39d72edb25dd9a50bb8fc9d2271dbccb33b342f30edcf119227657fee450f62a14ea
WHIRLPOOL
c61e6a9a41434a29b8dddb1f6fc5471901b8e1997e720ac31f53c7066aaf9f2855daa59f5850c2132fbd935dfc72dfd408a8bb0568f00bb5e13379749cc68089
diff --git a/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
new file mode 100644
index 0000000..370ac62
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.11-tinfo.patch
@@ -0,0 +1,24 @@
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 51471b1..81c57ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -635,6 +635,8 @@ AC_ARG_WITH(ncurses-headers,
[AC_HELP_STRING([--with-ncurses-headers=DIR],
+ [compile finch against the ncurses includes in DIR])],
+ [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
+ if test "x$enable_consoleui" = "xyes"; then
++ PKG_CHECK_MODULES([GNT], [ncursesw panelw], [], [
++ PKG_CHECK_MODULES([GNT], [ncurses panel], [], [
+ AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"],
[enable_consoleui=no])
+ AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
+ [enable_consoleui=no], [$GNT_LIBS])
+@@ -699,6 +701,7 @@ if test "x$enable_consoleui" = "xyes"; then
+ fi
+ fi
+ fi
++ ])])
+ fi
+
+ if test "x$force_finch" = "xyes" -a "x$enable_consoleui" != "xyes"; then
diff --git a/net-im/pidgin/pidgin-2.10.12.ebuild
b/net-im/pidgin/pidgin-2.10.12.ebuild
new file mode 100644
index 0000000..ffa3823
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.12.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
python-single-r1
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/";
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd
~amd64-linux ~x86-linux ~x86-macos"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" aqua"
+IUSE+=" gnome-keyring"
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ >=dev-libs/glib-2.16
+ >=dev-libs/libxml2-2.6.18
+ ncurses? ( sys-libs/ncurses:0=[unicode]
+ dbus? ( ${PYTHON_DEPS} )
+ python? ( ${PYTHON_DEPS} ) )
+ gtk? (
+ >=x11-libs/gtk+-2.10:2[aqua=]
+ x11-libs/libSM
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ spell? ( >=app-text/gtkspell-2.0.2:2 )
+ eds? ( >=gnome-extra/evolution-data-server-3.6:= )
+ prediction? ( >=dev-db/sqlite-3.3:3 ) )
+ gstreamer? ( media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ >=net-libs/farstream-0.2.7:0.2 )
+ zeroconf? ( net-dns/avahi[dbus] )
+ dbus? ( >=dev-libs/dbus-glib-0.71
+ >=sys-apps/dbus-0.90
+ dev-python/dbus-python )
+ perl? ( >=dev-lang/perl-5.16:= )
+ gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
+ >=net-libs/libgadu-1.11.0[-ssl] ) )
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ meanwhile? ( net-libs/meanwhile )
+ silc? ( >=net-im/silc-toolkit-1.0.1 )
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ networkmanager? ( net-misc/networkmanager )
+ idn? ( net-dns/libidn )
+ !<x11-plugins/pidgin-facebookchat-1.69-r1"
+ # Mono support crashes pidgin
+ #mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+ dev-lang/perl
+ dev-perl/XML-Parser
+ virtual/pkgconfig
+ gtk? ( x11-proto/scrnsaverproto
+ ${NLS_DEPEND} )
+ dbus? ( ${PYTHON_DEPS} )
+ doc? ( app-doc/doxygen )
+ !gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS="AUTHORS HACKING NEWS README ChangeLog"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ dbus? ( ${PYTHON_REQUIRED_USE} )"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+
+# List of plugins
+# app-accessibility/pidgin-festival
+# net-im/librvp
+# x11-plugins/guifications
+# x11-plugins/msn-pecan
+# x11-plugins/pidgin-encryption
+# x11-plugins/pidgin-extprefs
+# x11-plugins/pidgin-hotkeys
+# x11-plugins/pidgin-latex
+# x11-plugins/pidgintex
+# x11-plugins/pidgin-libnotify
+# x11-plugins/pidgin-mbpurple
+# x11-plugins/pidgin-bot-sentry
+# x11-plugins/pidgin-otr
+# x11-plugins/pidgin-rhythmbox
+# x11-plugins/purple-plugin_pack
+# x11-themes/pidgin-smileys
+# x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+# x11-plugins/pidgin-audacious-remote
+# x11-plugins/pidgin-autoanswer
+# x11-plugins/pidgin-birthday-reminder
+# x11-plugins/pidgin-blinklight
+# x11-plugins/pidgin-convreverse
+# x11-plugins/pidgin-embeddedvideo
+# x11-plugins/pidgin-extended-blist-sort
+# x11-plugins/pidgin-gfire
+# x11-plugins/pidgin-lastfm
+# x11-plugins/pidgin-sendscreenshot
+# x11-plugins/pidgimpd
+
+pkg_setup() {
+ if ! use gtk && ! use ncurses ; then
+ elog "You did not pick the ncurses or gtk use flags, only
libpurple"
+ elog "will be built."
+ fi
+ if use python || use dbus ; then
+ python-single-r1_pkg_setup
+ fi
+
+ # dbus is enabled, no way to disable linkage with python => python is
enabled
+ #REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+ if use gtk && ! use nls; then
+ ewarn "gtk build => nls is enabled!"
+ fi
+ if use dbus && ! use python; then
+ elog "dbus is enabled, no way to disable linkage with python =>
python is enabled"
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.10.0-gold.patch \
+ "${WORKDIR}"/${PN}-eds-3.6.patch \
+ "${FILESDIR}"/${PN}-2.10.9-fix-gtkmedia.patch \
+ "${FILESDIR}"/${PN}-2.10.10-eds-3.6-configure.ac.patch \
+ "${FILESDIR}"/${PN}-2.10.11-tinfo.patch
+ epatch_user
+ epatch "${FILESDIR}/pidgin-gnome-keyring-3.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ # Stabilize things, for your own good
+ strip-flags
+ replace-flags -O? -O2
+
+ local myconf
+
+ if use gadu; then
+ DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
+ myconf="${myconf} --with-gadu-includes=."
+ myconf="${myconf} --with-gadu-libs=."
+ fi
+
+ use groupwise && DYNAMIC_PRPLS+=",novell"
+ use silc && DYNAMIC_PRPLS+=",silc"
+ use meanwhile && DYNAMIC_PRPLS+=",sametime"
+ use mxit && DYNAMIC_PRPLS+=",mxit"
+ use zephyr && DYNAMIC_PRPLS+=",zephyr"
+ use zeroconf && DYNAMIC_PRPLS+=",bonjour"
+
+ if use gnutls; then
+ einfo "Disabling NSS, using GnuTLS"
+ myconf+=" --enable-nss=no --enable-gnutls=yes"
+ myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
+ myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
+ else
+ einfo "Disabling GnuTLS, using NSS"
+ myconf+=" --enable-gnutls=no --enable-nss=yes"
+ fi
+
+ if use dbus || { use ncurses && use python; }; then
+ myconf+=" --with-python=${PYTHON}"
+ else
+ myconf+=" --without-python"
+ fi
+
+ econf \
+ $(use_enable ncurses consoleui) \
+ $(use_enable gtk gtkui) \
+ $(use_enable gtk sm) \
+ $(use gtk || use_enable nls) \
+ $(use gtk && echo "--enable-nls") \
+ $(use gtk && use_enable xscreensaver screensaver) \
+ $(use gtk && use_enable prediction cap) \
+ $(use gtk && use_enable eds gevolution) \
+ $(use gtk && use_enable spell gtkspell) \
+ $(use_enable perl) \
+ $(use_enable tk) \
+ $(use_enable tcl) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable meanwhile) \
+ $(use_enable gstreamer) \
+ $(use_with gstreamer gstreamer 1.0) \
+ $(use_enable gnome-keyring) \
+ $(use_enable gstreamer farstream) \
+ $(use_enable gstreamer vv) \
+ $(use_enable sasl cyrus-sasl ) \
+ $(use_enable doc doxygen) \
+ $(use_enable networkmanager nm) \
+ $(use_enable zeroconf avahi) \
+ $(use_enable idn) \
+ --with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
+ --with-dynamic-prpls="${DYNAMIC_PRPLS}" \
+ --disable-mono \
+ --x-includes="${EPREFIX}"/usr/include/X11 \
+ ${myconf}
+ #$(use_enable mono) \
+}
+
+src_install() {
+ gnome2_src_install
+ if use gtk; then
+ # Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and
other
+ # implementations that are not complient with new hicolor theme
yet, #323355
+ local pixmapdir
+ for d in 16 22 32 48; do
+
pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+ mkdir "${pixmapdir}" || die
+ pushd "${pixmapdir}" >/dev/null || die
+ for f in ../status/*; do
+ ln -s ${f} || die
+ done
+ popd >/dev/null
+ done
+ fi
+ use perl && perl_delete_localpod
+
+ if use python || use dbus ; then
+ python_fix_shebang "${D}"
+ python_optimize
+ fi
+
+ dodoc finch/plugins/pietray.py
+ docompress -x /usr/share/doc/${PF}/pietray.py
+
+ prune_libtool_files --all
+}
