net-im/pidgin: version bump to match upstream

2 files changed, 266 insertions, 0 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 614c702..959b5f5 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -11,7 +11,9 @@ AUX pidgin-gnome-keyring-2.patch 7680 SHA256 aae63e57a7dc50b1232a606f7824dc655f5
 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-2.10.9-irc_join_sleep.patch 534 SHA256 ee061505d04c994a36ea1d5eef346b7cbb2512afafa4985a678205ea69d87857 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf WHIRLPOOL 7aa9aa9e5ee7d97445da2c330329c6bfd4ad21347f43220e8377b7ec40eb5eac417be08cddfcdd48c7f847aac00a0f9ab39d0add09f1bee519f96f7586bdf5c9
 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-r1.ebuild 7555 SHA256 dbb93b226ed1575f2ef9ab30d7944c7f6411c6626c8f7fc951f3829becd55874 SHA512 620c9289aaeca1c2abe7fd52aab1477bbd85442470690a95f00b2875d4f5cb899855488ea9ba2e1ce5ccb709b067356166c219afaf5595a81e92e9ab8c6a60d7 WHIRLPOOL 5b94524db77ce93191e91cfb2891c11ef51146224230543cff0a6e23086e55c6524d2a2de429df443d4c603fff2a3146289be4eb4b4def6a7608da9e060d2f40
+EBUILD pidgin-2.10.12-r2.ebuild 7963 SHA256 d32844277c219485a87593bb77a5382883325297bc4acae07c7f0abd7642e8c4 SHA512 6a985ec742302f6ebe9fe451d1ee8da26eb3868571ee80962396252a317e6863e0578ec319a1d1b6c5ef71e76eedc97f2b2cdeeeb12f11908fe18f8b65259791 WHIRLPOOL 4ce2bda0cf772061c82478b4a00623a59fd7d859babc7d0190399c0f78fed7a32039568480af314755be37b4a9731522c0d479c4f7364f39380682dfc998e267
 EBUILD pidgin-2.10.12.ebuild 7509 SHA256 7d6e936c8d33d367bac9f6d162cb35c8262ce34083c77dbda8abb9db53ad5778 SHA512 fe2fdd298f03a529a4c8864d9593055653553812f3f037f4e750521ef0cc39d72edb25dd9a50bb8fc9d2271dbccb33b342f30edcf119227657fee450f62a14ea WHIRLPOOL c61e6a9a41434a29b8dddb1f6fc5471901b8e1997e720ac31f53c7066aaf9f2855daa59f5850c2132fbd935dfc72dfd408a8bb0568f00bb5e13379749cc68089
diff --git a/net-im/pidgin/pidgin-2.10.12-r2.ebuild b/net-im/pidgin/pidgin-2.10.12-r2.ebuild
new file mode 100644
index 0000000..31c0441
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.10.12-r2.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-module 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
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+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 pie"
+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
+
+PATCHES=(
+	"${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"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+)
+
+PATCHES+=("${FILESDIR}/pidgin-gnome-keyring-3.patch")
+
+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() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && CFLAGS="${CFLAGS} -fPIE -pie"
+
+	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() {
+	# mimicking gnome2_src_install as that one is banned for >=EAPI-6 (*sigh*)
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	emake DESTDIR="${D}" install
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_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 ${DOCS} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	prune_libtool_files --all
+}