Added upstream fixes, in particular, don't force gstreamer, bug 320167, thank Milan Nikolic for report and Polynomial-C for this fix. Drop old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 27 insertions, 192 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 601dd68a5eee..b4a98c8f78d9 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.163 2010/05/17 00:59:23 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.164 2010/05/26 20:50:38 pva Exp $
+
+*pidgin-2.7.0-r1 (26 May 2010)
+
+  26 May 2010; Peter Volkov <pva@gentoo.org> -pidgin-2.6.3.ebuild,
+  -pidgin-2.6.5.ebuild, +pidgin-2.7.0-r1.ebuild, metadata.xml:
+  Added upstream fixes, in particular, don't force gstreamer, bug 320167,
+  thank Milan Nikolic for report and Polynomial-C for this fix. Drop old.
 
   17 May 2010; Olivier Crête <tester@gentoo.org> pidgin-2.7.0.ebuild,
   +files/pidgin-2.7.0-icq-fix.patch:
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index e5295ee3cd10..a7ea0668493c 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -9,6 +9,7 @@ Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes
 	<flag name='bonjour'>Enable bonjour (zeroconf) support</flag>
 	<flag name='gadu'>Enable Gadu Gadu protocol support</flag>
 	<flag name='groupwise'>Enable Novell Groupwise protocol support</flag>
+	<flag name='krb4'>Compile Zephyr plugin with Kerberos 4 support</flag>
 	<flag name='meanwhile'>Enable meanwhile support for Sametime protocol</flag>
 	<flag name='prediction'>Enable Contact Availability Prediction plugin</flag>
 	<flag name='qq'>Enable QQ protocol support</flag>
diff --git a/net-im/pidgin/pidgin-2.6.3.ebuild b/net-im/pidgin/pidgin-2.6.3.ebuild
deleted file mode 100644
index 25067383d53a..000000000000
--- a/net-im/pidgin/pidgin-2.6.3.ebuild
+++ /dev/null
@@ -1,177 +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.6.3.ebuild,v 1.9 2010/04/12 13:55:43 tester 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"
-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-2.30 ) 	)
-	>=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.5.ebuild b/net-im/pidgin/pidgin-2.7.0-r1.ebuild
index fcf18d6d5f20..868f3ccb928e 100644
--- a/net-im/pidgin/pidgin-2.6.5.ebuild
+++ b/net-im/pidgin/pidgin-2.7.0-r1.ebuild
@@ -1,29 +1,30 @@
 # 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.5.ebuild,v 1.11 2010/04/12 13:55:43 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.0-r1.ebuild,v 1.1 2010/05/26 20:50:38 pva Exp $
 
 EAPI=2
 
 GENTOO_DEPEND_ON_PERL=no
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 autotools
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://gentoo/pidgin-2.7.0-mtn20100526.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn krb4 meanwhile"
+IUSE+=" networkmanager nls perl silc tcl tk spell qq sasl +startup-notification"
 IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
 
 RDEPEND="
-	>=dev-libs/glib-2.4
+	>=dev-libs/glib-2.12
 	>=dev-libs/libxml2-2.6.18
 	ncurses? ( sys-libs/ncurses[unicode] )
 	gtk? (
-		>=x11-libs/gtk+-2.4:2
+		>=x11-libs/gtk+-2.10:2
 		x11-libs/libSM
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		startup-notification? ( >=x11-libs/startup-notification-0.5 )
@@ -41,12 +42,12 @@ RDEPEND="
 		>=sys-apps/dbus-0.90
 		>=dev-lang/python-2.4 )
 	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( net-libs/libgadu[-ssl] )
+	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 )
-	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
+	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4?] )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
 	sasl? ( dev-libs/cyrus-sasl:2 )
@@ -59,10 +60,10 @@ 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 )"
+	nls? ( >=dev-util/intltool-0.41.1
+		sys-devel/gettext )"
 
 # Enable Default protocols
 DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
@@ -82,6 +83,7 @@ DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
 #   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
@@ -105,7 +107,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	intltoolize --automake --copy --force
+	# Fixes from upstream as of 20100526
+	epatch "${WORKDIR}/pidgin-2.7.0-mtn20100526.patch"
+	eautoreconf
 }
 
 src_configure() {
@@ -160,7 +164,7 @@ src_configure() {
 		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
+		$(use_with krb4) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \