Version bump, bug #305715, thank Dani Soufi for report. Drop old.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 14 insertions, 372 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index a2b4f7f8e989..a69c461e03d2 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.151 2010/02/03 20:28:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.152 2010/02/18 20:29:14 pva Exp $
+
+*pidgin-2.6.6 (18 Feb 2010)
+
+  18 Feb 2010; Peter Volkov <pva@gentoo.org> -pidgin-2.5.9-r1.ebuild,
+  -files/pidgin-2.5.9-xmpp-old-ssl.patch, -pidgin-2.6.4.ebuild,
+  -pidgin-2.6.4-r1.ebuild, +pidgin-2.6.6.ebuild:
+  Version bump, bug #305715, thank Dani Soufi for report. Drop old.
 
   03 Feb 2010; Markus Meier <maekke@gentoo.org> pidgin-2.6.5.ebuild:
   amd64 stable, bug #299751
diff --git a/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch b/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch
deleted file mode 100644
index ac3db77c26a8..000000000000
--- a/net-im/pidgin/files/pidgin-2.5.9-xmpp-old-ssl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libpurple/protocols/jabber/auth.c.orig	2009-06-25 19:25:47.000000000 -0400
-+++ libpurple/protocols/jabber/auth.c	2009-08-31 12:01:12.000000000 -0400
-@@ -691,6 +691,18 @@
- 	JabberIq *iq;
- 	xmlnode *query, *username;
- 
-+	/* We can end up here without encryption if the server doesn't support
-+	 * <stream:features/> and we're not using old-style SSL.  If the user
-+	 * is requiring SSL/TLS, we need to enforce it.
-+	 */
-+	if (!js->gsc &&
-+			purple_account_get_bool(purple_connection_get_account(js->gc), "require_tls", FALSE)) {
-+		purple_connection_error_reason (js->gc,
-+			PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-+			_("You require encryption, but it is not available on this server."));
-+		return;
-+	}
-+
- #ifdef HAVE_CYRUS_SASL
- 	/* If we have Cyrus SASL, then passwords will have been set
- 	 * to OPTIONAL for this protocol. So, we need to do our own
diff --git a/net-im/pidgin/pidgin-2.5.9-r1.ebuild b/net-im/pidgin/pidgin-2.5.9-r1.ebuild
deleted file mode 100644
index 284457ab4547..000000000000
--- a/net-im/pidgin/pidgin-2.5.9-r1.ebuild
+++ /dev/null
@@ -1,171 +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-r1.ebuild,v 1.7 2009/09/26 19:07:32 volkmar 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_prepare() {
-	epatch "${FILESDIR}/pidgin-2.5.9-xmpp-old-ssl.patch"
-}
-
-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.4.ebuild b/net-im/pidgin/pidgin-2.6.4.ebuild
deleted file mode 100644
index c96ce4d73ad5..000000000000
--- a/net-im/pidgin/pidgin-2.6.4.ebuild
+++ /dev/null
@@ -1,177 +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.6.4.ebuild,v 1.1 2009/12/19 15:49:08 scarabeus 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 ~ppc ~x86"
-IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer idn 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.4
-		>=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*
-		>=net-libs/farsight2-0.0.14
-		media-plugins/gst-plugins-meta
-		media-plugins/gst-plugins-gconf )
-	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-2.6.18
-	networkmanager? ( net-misc/networkmanager )
-	prediction? ( =dev-db/sqlite-3* )
-	ncurses? ( sys-libs/ncurses[unicode] )
-	idn? ( net-dns/libidn )"
-	# 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_prepare() {
-	intltoolize --automake --copy --force
-}
-
-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 gstreamer vv) \
-		$(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) \
-		$(use_enable idn) \
-		"--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.4-r1.ebuild b/net-im/pidgin/pidgin-2.6.6.ebuild
index 6e53f92a50a1..3b41e80b099d 100644
--- a/net-im/pidgin/pidgin-2.6.4-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.4-r1.ebuild,v 1.4 2010/01/11 16:03:36 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.6.6.ebuild,v 1.1 2010/02/18 20:29:14 pva Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer idn meanwhile networkmanager"
 IUSE+=" nls perl silc tcl tk spell qq gadu +gtk sasl +startup-notification"
 IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
@@ -98,6 +98,10 @@ pkg_setup() {
 		elog "will be built."
 		einfo
 	fi
+	if ! use xscreensaver; then
+		elog "Note: xscreensaver USE flag is disabled. Thus pidgin will be unable"
+		elog "to monitor idle/active status based on mouse/keyboard events"
+	fi
 }
 
 src_prepare() {