Version bump, fixes security bug #358403, thank tman for report. Drop old.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 14 insertions, 234 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index fae8a01a9eed..088e8dc9a8a3 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.225 2011/02/14 20:41:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.226 2011/03/12 15:54:44 pva Exp $
+
+*pidgin-2.7.11 (12 Mar 2011)
+
+  12 Mar 2011; Peter Volkov <pva@gentoo.org> -pidgin-2.7.5.ebuild,
+  -pidgin-2.7.9.ebuild, +pidgin-2.7.11.ebuild:
+  Version bump, fixes security bug #358403, thank tman for report. Drop old.
 
   14 Feb 2011; Jeroen Roovers <jer@gentoo.org> pidgin-2.7.10.ebuild:
   Stable for HPPA (bug #353953).
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6782701e2e81..22cafd4dd4de 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,10 +1,8 @@
 AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44
 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a
 DIST pidgin-2.7.10.tar.bz2 9970363 RMD160 a79e53ba1ecef4c17e2ebf8121a712cf03eac6ca SHA1 ebce0b8c6130849e0df1bdc4557470b1d99da45a SHA256 269708d519537d74ff316ff88f5c39e0c04617073a07dce920fa85321586950e
-DIST pidgin-2.7.5.tar.bz2 9811543 RMD160 0e01cfe8e6d2557f0000724d291a66a710d0ea8e SHA1 f8ac5bef7d2bde898d43a5d97c967bc915c22b40 SHA256 f3f5ee7a7f968a590874b4c40019ae1f9f9889b5723b1417ba691e90fafbd878
-DIST pidgin-2.7.9.tar.bz2 9965575 RMD160 4e913f608fa4ad3da81c4872c7202f567dfa4b95 SHA1 9fb36d788a644528ca1132befa553a3cb4228012 SHA256 9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e
+DIST pidgin-2.7.11.tar.bz2 9978175 RMD160 2bee3fe39c02948d10e1fdb6fff2840941148786 SHA1 3da07577c15257108d61c7f2d3f63cd422cdb4d7 SHA256 a24e2c3118bd47983955d398c9cf5543c12e95527cdf7de9d273a6e92f9d160b
 EBUILD pidgin-2.7.10.ebuild 6558 RMD160 e78184d08061fef2474c55aef1e17657db888b71 SHA1 44fd9d7bec31c6e4bdefe68fbfa2c683b27b8d67 SHA256 aaa0dca6f2d4e00d69efa3b2d26582935e43e7548734268cf5152ca9d223a91b
-EBUILD pidgin-2.7.5.ebuild 6435 RMD160 7b05b343cb1318b09421baa8c0a410711f12dfd0 SHA1 90596749a90cc06464ecb6b8282a1db4c0ab2197 SHA256 6b109590ac7a315b3aa1aacf55bc900d19ea714e653421bcc319b411810a94eb
-EBUILD pidgin-2.7.9.ebuild 6664 RMD160 44efa2c2931d7e3165deaf29d0f3dacd13960613 SHA1 5517d21875cff42ee7de98fd7ab59b606578a7c0 SHA256 c95bf8bfca462eea088eb5c2bfd34b11611b8e59206570869bd8c5eea0385591
-MISC ChangeLog 31710 RMD160 85fcebbaa1428fb4360e593b83b6b5b18164d181 SHA1 149ce2e8d5fcc15e14a5709ee341c6e1057f175b SHA256 b95ea0be3e4a023057ae49ee3aa4e1c8eb19a63c4e6d65309b973e5cd2e3db0c
+EBUILD pidgin-2.7.11.ebuild 6430 RMD160 b82a6811468f03f7bbac9f61369d5e01f8f5b448 SHA1 662c171f9edf2f684514da4a71b39bab7e1b77eb SHA256 e4534c9f6211651ff32591b36ab38342823fc56c1fe9d00f65ecea3699ed826c
+MISC ChangeLog 31932 RMD160 15b3199178934c98d223fe92d44a033e75ad7dcb SHA1 d03d2f570b78bd89e6e3354bb79ec43dd467a557 SHA256 3e5edd4467473d7f56fd6fc5c1dfdc5960a3650ca8f293a53447a7d829755e41
 MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba
diff --git a/net-im/pidgin/pidgin-2.7.9.ebuild b/net-im/pidgin/pidgin-2.7.11.ebuild
index 77aa3c804ed9..f182c40eea1c 100644
--- a/net-im/pidgin/pidgin-2.7.9.ebuild
+++ b/net-im/pidgin/pidgin-2.7.11.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.8 2011/01/10 13:25:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.11.ebuild,v 1.1 2011/03/12 15:54:44 pva Exp $
 
 EAPI=2
 
@@ -13,10 +13,10 @@ 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 +startup-notification"
-IUSE+=" ncurses groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
+IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl ncurses"
+IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
 
 # 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
@@ -34,7 +34,6 @@ RDEPEND="
 		>=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 ) )
@@ -122,12 +121,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	gnome2_src_prepare
-	epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch
-	eautoreconf
-}
-
 src_configure() {
 	# Stabilize things, for your own good
 	strip-flags
@@ -171,7 +164,6 @@ src_configure() {
 		$(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) \
diff --git a/net-im/pidgin/pidgin-2.7.5.ebuild b/net-im/pidgin/pidgin-2.7.5.ebuild
deleted file mode 100644
index 47d3a6d4c663..000000000000
--- a/net-im/pidgin/pidgin-2.7.5.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.5.ebuild,v 1.7 2010/12/28 01:39:20 ranger Exp $
-
-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"
-
-# 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.
-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 )
-	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 )
-	idn? ( net-dns/libidn )"
-	# 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-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-botsentry
-#	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 enalbed!"
-	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}-2.7.3-ldflags.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 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"
-}