Version bump per bug #295160. Drop not-required ebuilds.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 3 insertions, 171 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6deafccf2ebe..8bde2809ed0c 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,10 +1,9 @@
 AUX pidgin-2.5.9-xmpp-old-ssl.patch 861 RMD160 388263fa1453577e1dee876f85a0d8be1ea0ac68 SHA1 20f3692c7ddcaaad513741e2ed2c91535cdd7965 SHA256 dafec2ef3547744b2256c3473a8b7ef42c3c9d7240a238c00f1cb7f43da46ef8
 DIST pidgin-2.5.9.tar.bz2 8404331 RMD160 221144f65c462e1ba989a1a4c5df0d89f1b51100 SHA1 f9a92976c7993fb7ffca1b5e2761e8d45f4c531f SHA256 78396da7e18e8d92c602aca3b46c4316dd8f01d3ff548dbf1414246422f33575
-DIST pidgin-2.6.2.tar.bz2 9093010 RMD160 a070ebe07a40d650c173065e4c448034e096963b SHA1 730b9bfaf79045f13e5d8dd736b91726bb11d332 SHA256 acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6
 DIST pidgin-2.6.3.tar.bz2 9093452 RMD160 3768e30abb54aca6c80343d4fc0f11da0d54d8fe SHA1 552f3cbfb2cb2026342777efc9102e3511b0b29f SHA256 0515a0add6b0b541160a5d13484f665964072ed331c3e59c65fb6086a070d2a1
+DIST pidgin-2.6.4.tar.bz2 9325043 RMD160 3b5edf2cecb72149f2cd01a723070b2c417a1b12 SHA1 1b67a5bef64d0bbe9576b3b2c9356df276cc5e6c SHA256 fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
 EBUILD pidgin-2.5.9-r1.ebuild 4502 RMD160 0da18ffe460ca89a9b4c41db7e271f0923a4f766 SHA1 9b46fce89acf41c0d8d018a11b161d603946b470 SHA256 b8b3b8df1d21f93e3408e6ff38730bdf058cfbfb5bc84e27fd6cee4fd965c3ae
-EBUILD pidgin-2.5.9.ebuild 4425 RMD160 8886c1a86b3a4c8f69c1e6c16d12612bb66fb331 SHA1 2a2772077ad23078f7c6d40ca64cf9cf0213c144 SHA256 b7e4e12838c095464787344e44fa3b7990e7e09daa2274847193f30afe86ef5a
-EBUILD pidgin-2.6.2.ebuild 4650 RMD160 4ba0f2ee396a906dc65cedda3d726c4d081b47a3 SHA1 487007d852234a02eb34e428619fa7e0ad7d2d7c SHA256 5779ea7fefe1a4a113b305cbbd8b88630bcb2eb299adbd27bbf18bf0fba55d17
 EBUILD pidgin-2.6.3.ebuild 4644 RMD160 462a31b9104094d7fd6ded3f536ff6590c665b8d SHA1 60864bbb2b13e664356eded0324c68f1dd02a742 SHA256 5cfd007a1e7ab70bb902fa4d5e87c441ef2595bc253fcc0b13e102959532578c
+EBUILD pidgin-2.6.4.ebuild 4652 RMD160 d3b8f23cc016920bc91293e2d3c7ccb6cd4fdc93 SHA1 fde8e2e1e66244777289c3fdce6d5612df50c99b SHA256 08e818f55f04aa53f6dc61685850989ca5e3b684b267d043e2d02416fe609d8b
 MISC ChangeLog 18623 RMD160 1cdfcbfd9d79529486f65e7981f261fd71217870 SHA1 cd495d0770b0e793725e6ae8cc0284492a07696a SHA256 02efea936e0f4c5388519bf24f51f09f4c44c049cfef5bbc5532ae18edc55e8e
 MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
diff --git a/net-im/pidgin/pidgin-2.5.9.ebuild b/net-im/pidgin/pidgin-2.5.9.ebuild
deleted file mode 100644
index 9e19fd569705..000000000000
--- a/net-im/pidgin/pidgin-2.5.9.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.9.ebuild,v 1.8 2009/08/30 23:33:15 ranger Exp $
-
-EAPI=2
-
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
-
-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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer meanwhile"
-IUSE="${IUSE} networkmanager nls perl silc tcl tk spell qq gadu"
-IUSE="${IUSE} +gtk sasl ncurses groupwise prediction zephyr" # mono"
-
-RDEPEND="
-	bonjour? ( net-dns/avahi )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	gtk? (
-		spell? ( >=app-text/gtkspell-2.0.2 )
-		>=x11-libs/gtk+-2.0
-		>=x11-libs/startup-notification-0.5
-		x11-libs/libXScrnSaver
-		eds? ( gnome-extra/evolution-data-server ) 	)
-	>=dev-libs/glib-2.0
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10* )
-	perl? ( >=dev-lang/perl-5.8.2-r1 )
-	gadu?  ( net-libs/libgadu[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	dev-libs/libxml2
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )
-	ncurses? ( sys-libs/ncurses[unicode] )"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	dev-util/intltool
-	gtk? ( x11-proto/scrnsaverproto )
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )"
-
-# 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/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgin-libnotify
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-		einfo
-	fi
-}
-
-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
-
-	if use silc; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},silc"
-	fi
-
-	if use qq; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},qq"
-	fi
-
-	if use meanwhile; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},sametime"
-	fi
-
-	if use bonjour; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
-	fi
-
-	if use groupwise; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
-	fi
-
-	if use zephyr; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
-	fi
-
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable nls) \
-		$(use_enable perl) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk startup-notification) \
-		$(use_enable gtk screensaver) \
-		$(use_enable gtk sm) \
-		$(use_enable tcl) \
-		$(use_enable spell gtkspell) \
-		$(use_enable tk) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable eds gevolution) \
-		$(use_enable gstreamer) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable prediction cap) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		$(use_enable bonjour avahi) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes=/usr/include/X11 \
-		${myconf} || die "Configuration failed"
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	use perl && fixlocalpod
-	dodoc AUTHORS HACKING INSTALL NEWS README ChangeLog
-}
diff --git a/net-im/pidgin/pidgin-2.6.2.ebuild b/net-im/pidgin/pidgin-2.6.4.ebuild
index d128ea7506c9..c96ce4d73ad5 100644
--- a/net-im/pidgin/pidgin-2.6.2.ebuild
+++ b/net-im/pidgin/pidgin-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.6.2.ebuild,v 1.2 2009/09/11 22:03:38 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.6.4.ebuild,v 1.1 2009/12/19 15:49:08 scarabeus Exp $
 
 EAPI=2