Version bump, bug #322699

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 22 insertions, 194 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index da93d584941d..72a82590a0f2 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.165 2010/05/27 12:21:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.166 2010/06/04 00:45:23 tester Exp $
+
+*pidgin-2.7.1 (04 Jun 2010)
+
+  04 Jun 2010; Olivier Crête <tester@gentoo.org> -pidgin-2.7.0.ebuild,
+  -pidgin-2.7.0-r1.ebuild, +pidgin-2.7.1.ebuild:
+  Version bump, bug #322699
 
   27 May 2010; Peter Volkov <pva@gentoo.org> pidgin-2.7.0-r1.ebuild:
   Fixed build issue with USE="-zephyr krb4", bug 320167, thank Martin Jansa
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 531d496ead83..58dff15ec289 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,9 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e
 DIST pidgin-2.6.6.tar.bz2 9479337 RMD160 6e2ca8fb05b2575c758537d9adc154678b36cd55 SHA1 d74459152f9598139a3fd8aee385e3366722155c SHA256 6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9
-DIST pidgin-2.7.0-mtn20100526.patch.bz2 41359 RMD160 4293d87cd285fb9ae24a2dcc9729510af17bbf3a SHA1 ea2e2d0c57cef56a446670d98d5b17420e51be23 SHA256 4d5080b256f653d9b49bf1bba6de750cd7d4ca5c7533417650bd170d93efaa3e
-DIST pidgin-2.7.0.tar.bz2 9795914 RMD160 45e4b5a9acb9c4080ce6b33cedbf9b962883ca25 SHA1 7170aaae5e6f4039870eb5e0c5837d55285b758f SHA256 dc59cbae75db8ecf2850c35e82fc11ac33bbf2542e901e6e1e4525688635783d
+DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 EBUILD pidgin-2.6.6.ebuild 5214 RMD160 7b8ba0f30aecf8cf62036bfc164ed9632f1d30a3 SHA1 0d3175fa2a0964c86cbacb106cbe3045c8028fc6 SHA256 4bcb6e451bec0f2f19d1d8215adf4943c3ea5d072da66104c88f2955b225a4bb
-EBUILD pidgin-2.7.0-r1.ebuild 5348 RMD160 8bd106e768b44dc0888db967b75b619af81f0737 SHA1 b89749cd8ed5538076ae83363021243c493d9594 SHA256 25a272d905b3a3a27cc8f11420ad1352912f482bfa39792481412fb0b7936223
-EBUILD pidgin-2.7.0.ebuild 5167 RMD160 40e3e27b7479740016931379f9331a575f6b5e4f SHA1 ddb9920a588cc16243622d17dcc277e7359645e0 SHA256 03da54e3635d08dcbda03379f095ece2aa613aae70697b95ddbd44f80c8d62e6
-MISC ChangeLog 22616 RMD160 85b79bb31522630b19d204545c26bfdcd9e7856d SHA1 e97be553a141b1d8e40888b6f069742e8d406244 SHA256 44af6a0b7b15322022a93dd461cec254c55d066ed00df4fbff3c6f3f22d063bc
+EBUILD pidgin-2.7.1.ebuild 5174 RMD160 61145fea459c83451e0af023e2b5a12b6b66f538 SHA1 e71f18a5a35977871d362887a6b36ba5fd06f790 SHA256 ee4bcc82c94d5c422bf8f935738432d02ac7ec03f6f71dc4e8da90d51e864f0d
+MISC ChangeLog 22798 RMD160 0ed00c6d91c9e52843be3e098ffe89c4a5cdf0da SHA1 1ecc1728a1b0ee83c36daa4b196b006b56b40da2 SHA256 697f50cd7ea1056edaa1ac9c22f0dbd459ec310b15d4ecda5625d16cb9f0b1c6
 MISC metadata.xml 996 RMD160 41d69c6dbf62b0f4799be40f8a8cd275e438c4b5 SHA1 a5448c0bbe50de6a1d9d3b8ec13109061310ca48 SHA256 11016ae15bdab77c9defc20530a646fa909a66861ad98d1ec03b5e4d6c194573
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwITKoACgkQmOfEJZHYOKftmQCZAQXa9TVNf7aEAk+JsHOy6vAc
+MSMAnih+YXT5FrSo2gn9HcU3UTcTtFsF
+=4nqL
+-----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.7.0.ebuild b/net-im/pidgin/pidgin-2.7.0.ebuild
deleted file mode 100644
index 251b84c83183..000000000000
--- a/net-im/pidgin/pidgin-2.7.0.ebuild
+++ /dev/null
@@ -1,179 +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.0.ebuild,v 1.2 2010/05/17 00:59:23 tester Exp $
-
-EAPI=2
-
-GENTOO_DEPEND_ON_PERL=no
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus debug doc eds gadu gnutls idn meanwhile networkmanager"
-IUSE+=" perl silc tcl tk spell qq gadu +gtk sasl +startup-notification"
-IUSE+=" ncurses groupwise prediction +xscreensaver zephyr zeroconf" # mono"
-
-RDEPEND="
-	>=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode] )
-	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-2.30 )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	=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
-		>=dev-python/dbus-python-0.71
-		>=sys-apps/dbus-0.90
-		>=dev-lang/python-2.4 )
-	perl? ( >=dev-lang/perl-5.8.2-r1[-build] )
-	gadu?  ( net-libs/libgadu[-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] )
-	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 )"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	gtk? ( x11-proto/scrnsaverproto )
-	doc? ( app-doc/doxygen )"
-
-# 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
-		einfo
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		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() {
-	epatch "${FILESDIR}/${P}-icq-fix.patch"
-	intltoolize --automake --copy --force || die
-	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="${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 gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(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 sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_with zephyr krb4) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--enable-gstreamer \
-		--enable-farsight \
-		--enable-vv \
-		--x-includes=/usr/include/X11 \
-		${myconf}
-		#$(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.7.0-r1.ebuild b/net-im/pidgin/pidgin-2.7.1.ebuild
index 5bf3137aa9fa..28c39d6ad854 100644
--- a/net-im/pidgin/pidgin-2.7.0-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.1.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.7.0-r1.ebuild,v 1.2 2010/05/27 12:21:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1.ebuild,v 1.1 2010/06/04 00:45:23 tester Exp $
 
 EAPI=2
 
@@ -9,8 +9,7 @@ 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
-	mirror://gentoo/pidgin-2.7.0-mtn20100526.patch.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -106,12 +105,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Fixes from upstream as of 20100526
-	epatch "${WORKDIR}/pidgin-2.7.0-mtn20100526.patch"
-	eautoreconf
-}
-
 src_configure() {
 	# Stabilize things, for your own good
 	strip-flags