[gentoo-commits] dev/chutzpah:master commit in: net-im/pidgin/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     7be5c0f2f8fcdeafd08b8771c0bcf276278282f6
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 20:40:51 2011 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 20:40:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=7be5c0f2

Pidgin version bump

---
 net-im/pidgin/Manifest                             |   34 ++--
 net-im/pidgin/pidgin-2.7.10.ebuild                 |  223 --------------------
 .../{pidgin-2.7.11.ebuild => pidgin-2.8.0.ebuild}  |   30 ++--
 3 files changed, 33 insertions(+), 254 deletions(-)

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index ccded2b..dbeb45e 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 AUX pidgin-gnome-keyring-1.patch 7457 RMD160 0d8345675a073c8585bf0be7678f52d63d14ec95 SHA1 b3dd0d336e4773578cc6e20dc9b317b27f383077 SHA256 f56bc4a1a678ad749848108ecef76f4bb2b16501908197bb645518e1a3027619
-DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e
-DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
-EBUILD pidgin-2.7.10.ebuild 6666 RMD160 6cfcd6ba7bb286e84d6be4d9fd28593d8276f84b SHA1 eb517dee2bcf70c6bb5eb737edbb605b481a071f SHA256 37cb2a4787e9ed6ad22bad073f95499795ad998824b88bcf5ad4056345eb680a
-EBUILD pidgin-2.7.11.ebuild 6632 RMD160 36673abb129cf01421e1c20c1aacd91ef62699bc SHA1 ead6dcc42d55a3c80db870922eae30a810537c3c SHA256 20af8703f70721800aa905339e13f47e1b230783dfd1f82ed36a354f97430bce
+DIST pidgin-2.8.0.tar.bz2 9921362 RMD160 92bed10284e2d88e18dbabaa2eac214c938c9adb SHA1 c5b4f06fc88d57054953044c75563a473bb352fd SHA256 71ced93efecd48a1114eaf6370adebf591ace31158457baf023d15892d663c78
+EBUILD pidgin-2.8.0.ebuild 7008 RMD160 9f8dda528cdfc98096661fe3a755ee62678f092d SHA1 28c7d53b5bf6bd8a9ddf914a5d550937c696a16a SHA256 4948c69a339f19cd13f30af944eb03d0a37d943ed8b9ea0d51da77e611113d90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNfWb8AAoJEHy/RO9cNQiDx1wQAKrTc27ZBypPukAQZCb5d902
-cvQ4is1uB41YsqrEbWOfeqU48UUCOC6TUENtU4DCKEOlKHkt5EPwZdxSmOcAZz0w
-3edwnh7jdVsDSk1uisDpJje/CF2I/RCPkJ+YYiWAeLkVD4q+4whGx3wZ2T5wpjie
-wzc18b2vzFzKeZRUqZCzg41GS+V2pAgrkYVoEmRy4SxbKMTOk9nheZXA/p+nTu9U
-nvd6ulkLNN0VuIga4F3Arzn4pj54piFxO9jMiuCeHZy+nuJOoYH+og+y0fWGsadG
-XZevkha5Fh/JYgH5qmD6urDY4pmfNbLF7fTchJA0acoqRd3G405Ez/MhcmCr2F4u
-zXs3FLKd4McZ0FbheZz99ePMkEu928KzwcqcviZrIn50nmQGhGM0S0RekE8h5j5M
-mbu2u359I5wH0XHGGaXY2ipEJ7F2GHVb1NHeXjQHyXMypxHyvZWZYLtLTwqLNzzk
-Lu/yDwW59Y/9cmdEwBTCTvmeH4++SwyR71bJebZpX+dO2SQ6UBZQQcmPfBjgEZQd
-4IAaLECuggF2cbZcVTy8W6voSmIWCHS6rYzAeqMva6j8bYIhBgyjF8hvepiFDBXg
-JqPx/XuDALtPU2yHRPBO+PHhBC3yN9R3mvX4SDNk10AGBHl7k4MErdrdrnB++0L/
-s/7SltPjY3H5RVlEFrcW
-=BAFy
+iQIcBAEBCAAGBQJN+RjFAAoJEHy/RO9cNQiD+Z4QAKL5VVuOYIyvTitA31HW3nsf
+X8sJ7tUCIQagbVICV4mU6sd9fOVBRPagEmjKUKY4nj0KYZxjTNGtqbXckgjQYZti
+G3QGOuDXLlW4ggvL775pOCjjXar1UzUTFWklLnChju3wtCxhtKXdkNq+/63XPVWq
+nkmIar9wA4j3EqC0fclk+8BD/njJHNPWupCA2Em/no2OtEAKyOb6OFOfAQiZadan
+ibtKq8STvCzlxMcYFC7W9HSnTM6Lu5YfLBHAHrgEJZgD2ecvb1fxfXkwf7DBB+Nt
+UwobwkrK3Dve9Lg4ohWDZmVJDZc4fVx87QfqmK+IUnGFYF6kt9hS3AUs92co6HXS
+BZF3Hq+az53WW/vEZqZ5KQ43FUnXOz1DA7DNtB6gXhP0q5OgUH+izlpFk2IJnVOO
+QiPl49PwvJSVM6CUVYhwpD4A+atByQJg3ZyWuzSf9OA23i4SQ4N/WO7gaLd6aXsO
+vknwbIdmTqpG6B2Lu4QyhJPKMc2KPkTp4Lz1wolM3294sDx7ysMQ0r6FBxtgx84V
+JdUZgiUn/AmK6ottMS6qvLq7GHSJs8wvwsfUFSE1ZbQv0wn7McDf1MQWHsZrgUVY
+Bp9KvwUSwpn3uXsmnInJekGY5IDLNv1ffNtNe45XFVyKwdTktAAW6JEZJ2ulcRg3
+7GhjWdxXyFq7QXS3q+LL
+=iSd0
 -----END PGP SIGNATURE-----

diff --git a/net-im/pidgin/pidgin-2.7.10.ebuild b/net-im/pidgin/pidgin-2.7.10.ebuild
deleted file mode 100644
index 37d50a0..0000000
--- a/net-im/pidgin/pidgin-2.7.10.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
-
-EAPI=2
-
-GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
-IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-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="
-	>=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( <dev-lang/python-3 )
-		python? ( <dev-lang/python-3 ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		startup-notification? ( >=x11-libs/startup-notification-0.5 )
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		eds? ( gnome-extra/evolution-data-server )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		>=net-libs/farsight2-0.0.14
-		media-plugins/gst-plugins-meta
-		media-plugins/gst-plugins-gconf )
-	zeroconf? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		dev-python/dbus-python )
-	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( >=net-libs/libgadu-1.9.0[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	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
-	dev-util/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto
-		${NLS_DEPEND} )
-	dbus? ( <dev-lang/python-3 )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-# 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-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/pidgimpd
-#	x11-plugins/pidgin-birthday
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-mbpurple
-
-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 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
-	if use dbus || { use ncurses && use python; }; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-gnome-keyring-1.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 silc && DYNAMIC_PRPLS+=",silc"
-	use qq && DYNAMIC_PRPLS+=",qq"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=/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 \
-		--disable-silent-rules \
-		$(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 startup-notification) \
-		$(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_enable gstreamer farsight) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable gnome-keyring) \
-		$(use_enable idn) \
-		--with-system-ssl-certs="/etc/ssl/certs/" \
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/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=${D}/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 && fixlocalpod
-
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
-}

diff --git a/net-im/pidgin/pidgin-2.7.11.ebuild b/net-im/pidgin/pidgin-2.8.0.ebuild
similarity index 88%
rename from net-im/pidgin/pidgin-2.7.11.ebuild
rename to net-im/pidgin/pidgin-2.8.0.ebuild
index d248b0e..b84fc69 100644
--- a/net-im/pidgin/pidgin-2.7.11.ebuild
+++ b/net-im/pidgin/pidgin-2.8.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.11.ebuild,v 1.5 2011/03/13 18:53:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.8.0.ebuild,v 1.1 2011/06/14 10:27:08 pva Exp $
 
-EAPI=2
+EAPI=3
 
 GENTOO_DEPEND_ON_PERL=no
 inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools
@@ -13,9 +13,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile"
-IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl ncurses"
+IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
 IUSE+=" gnome-keyring"
 
@@ -26,7 +26,7 @@ IUSE+=" gnome-keyring"
 # 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="
-	>=dev-libs/glib-2.12
+	>=dev-libs/glib-2.16
 	>=dev-libs/libxml2-2.6.18
 	ncurses? ( sys-libs/ncurses[unicode]
 		dbus? ( <dev-lang/python-3 )
@@ -48,7 +48,7 @@ RDEPEND="
 		>=sys-apps/dbus-0.90
 		dev-python/dbus-python )
 	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( >=net-libs/libgadu-1.9.0[-ssl] )
+	gadu? ( >=net-libs/libgadu-1.11.0[ssl,gnutls] )
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( >=dev-libs/nss-3.11 )
 	meanwhile? ( net-libs/meanwhile )
@@ -111,20 +111,25 @@ pkg_setup() {
 		elog "You did not pick the ncurses or gtk use flags, only libpurple"
 		elog "will be built."
 	fi
+	if use dbus || { use ncurses && use python; }; then
+		python_set_active_version 2
+		python_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
-	if use dbus || { use ncurses && use python; }; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
 }
 
 src_prepare() {
-	gnome2_src_prepare
+	# Fix build issue.
+	# http://developer.pidgin.im/viewmtn/revision/diff/9e7616dbab2878bcc9f4b412bca1f55c903a337e/with/aebefd6d98382ce0f7b42b41e4bf2611044d4182/pidgin/plugins/gevolution/gevolution.c
+	sed 's:\<GTK_POLICY_AUTO\>:GTK_POLICY_AUTOMATIC:' -i pidgin/plugins/gevolution/gevolution.c || die
 	epatch "${FILESDIR}"/${PN}-gnome-keyring-1.patch
 	eautoreconf
 }
@@ -143,7 +148,6 @@ src_configure() {
 	fi
 
 	use silc && DYNAMIC_PRPLS+=",silc"
-	use qq && DYNAMIC_PRPLS+=",qq"
 	use meanwhile && DYNAMIC_PRPLS+=",sametime"
 	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
 	use groupwise && DYNAMIC_PRPLS+=",novell"
@@ -217,5 +221,5 @@ src_install() {
 	fi
 	use perl && fixlocalpod
 
-	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }