Remove USE="krb4" because app-crypt/mit-krb5 doesn't have krb4 support anymore.

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

5 files changed, 13 insertions, 14 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 121efe711d93..3e83f4618aa5 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.182 2010/07/24 16:48:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.183 2010/08/05 16:15:09 ssuominen Exp $
+
+  05 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  pidgin-2.7.1-r1.ebuild, pidgin-2.7.2.ebuild:
+  Remove USE="krb4" because app-crypt/mit-krb5 doesn't have krb4 support anymore.
 
   24 Jul 2010; Jeroen Roovers <jer@gentoo.org> pidgin-2.7.2.ebuild:
   Stable for HPPA (bug #328667).
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index db67a4247081..d254745cdc2f 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,7 +1,7 @@
 AUX pidgin-2.7.0-icq-fix.patch 1991 RMD160 7158710b27950bec2d8dec47e02a4494f8dfaac9 SHA1 8589601e86bd8077f8dd50afac49ee38b71cfba1 SHA256 c2e9e1bf1921e2e2e9f1594a348be5103298f28bc4ab5fcbd6c3cb6543fea24e
 DIST pidgin-2.7.1.tar.bz2 9647234 RMD160 5e5deec529b1c8d75cd3f925b3f5e4f5310e42e5 SHA1 b746720cc3e65b3d6da6eab0729f26673f997849 SHA256 f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1
 DIST pidgin-2.7.2.tar.bz2 9681708 RMD160 c277e26f5fe91425033cb8fe6c8913d965dffec0 SHA1 03232f7befcfbe1c457d50d697493924fe5f9b49 SHA256 8ab5f126f384197727db8f61306663325c2779c25e54e61ff95366448a0861c0
-EBUILD pidgin-2.7.1-r1.ebuild 6046 RMD160 f9af8c91845729e18d735f2228d2abc2329ec2d4 SHA1 433a777fdf50d3fd401a192c8420ee9327494fed SHA256 3e7c895e2d5a40faf41dc8cd73947b675b73494fb313ff7c5e2892576a81f19c
-EBUILD pidgin-2.7.2.ebuild 6045 RMD160 b53bcf658e2df87573b239a7ef19c247c4a66cf3 SHA1 90cae5d6573bbe639fe118e66b030dcc2218fe26 SHA256 21a60135c152bf014232632163a7056ac07b29a780515345ad6a828d9ea6c8d2
-MISC ChangeLog 25320 RMD160 3275f76c1419a3312106163eb2b98025de7c641a SHA1 c1795e58666ca38797f206954abfa95c4a955a3b SHA256 43eaa6410e4acafdd992b0937aaa2664268f40ecc62fe2ac24b93784539ef424
-MISC metadata.xml 1419 RMD160 9a49db6933c6bddb88313953c4eafa7aa30bb6f1 SHA1 fc329d0345a8a9a3b6431e08d445fda6439eb315 SHA256 4eb55147a6b0c8a636487908c1f84b797d43994cb11afd2f3ecf21cb7d5e70c8
+EBUILD pidgin-2.7.1-r1.ebuild 5963 RMD160 39723d94d3eee63e2fb626a61925ec05e8092d90 SHA1 dfa1d302e8e97735caeacaa80c0e445e3c2e2403 SHA256 c1a894845aaaf1b837eeae1c581a149163a0bd57079e76edbdb95eeca178c92a
+EBUILD pidgin-2.7.2.ebuild 5961 RMD160 72f02548217805858c12ffce00989799454e34cc SHA1 dc08dcfdfa7e4e18934585bf454a8820f1d8ec11 SHA256 10b63f3ab4aa2b256f146b0164493f15806e68896ee0469da1bcd7ad6eaeb34e
+MISC ChangeLog 25510 RMD160 b5f514893db76555375ac2f8c211909bb038a5fc SHA1 7c9fde8eee46635dcf5e67c783fe0181ae384306 SHA256 1f4cfc927bccf03cde84898373e638afdaf6aa4c9e18d5ea6f301f18006f9c38
+MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 8fe023c50e96..75dbcf61b2c3 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -10,7 +10,6 @@ Pidgin is an instant messaging program for Windows, Linux, BSD, and other Unixes
 	<flag name='groupwise'>Enable Novell Groupwise protocol support</flag>
 	<flag name='gstreamer'>Enables voice and video sessions</flag>
 	<flag name='gtk'>Builds Pidgin, the GTK+ interface</flag>
-	<flag name='krb4'>Compile Zephyr plugin with Kerberos 4 support</flag>
 	<flag name='meanwhile'>Enable meanwhile support for Sametime protocol</flag>
 	<flag name='ncurses'>Build finch, console interface</flag>
 	<flag name='prediction'>Enable Contact Availability Prediction plugin</flag>
diff --git a/net-im/pidgin/pidgin-2.7.1-r1.ebuild b/net-im/pidgin/pidgin-2.7.1-r1.ebuild
index 0205d55efdb9..6c8bb9a373a1 100644
--- a/net-im/pidgin/pidgin-2.7.1-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.7.1-r1.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.1-r1.ebuild,v 1.9 2010/07/22 13:29:31 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.1-r1.ebuild,v 1.10 2010/08/05 16:15:09 ssuominen Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ 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 +gstreamer +gtk idn krb4 meanwhile"
+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"
 
@@ -50,7 +50,6 @@ RDEPEND="
 	!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 )
@@ -173,7 +172,6 @@ src_configure() {
 		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		$(use_enable networkmanager nm) \
-		$(use zephyr && use_with krb4) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \
diff --git a/net-im/pidgin/pidgin-2.7.2.ebuild b/net-im/pidgin/pidgin-2.7.2.ebuild
index 8579bed17d4f..69d3c1b7ce67 100644
--- a/net-im/pidgin/pidgin-2.7.2.ebuild
+++ b/net-im/pidgin/pidgin-2.7.2.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.2.ebuild,v 1.5 2010/07/24 16:48:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.2.ebuild,v 1.6 2010/08/05 16:15:09 ssuominen Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ 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 +gstreamer +gtk idn krb4 meanwhile"
+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"
 
@@ -50,7 +50,6 @@ RDEPEND="
 	!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 )
@@ -173,7 +172,6 @@ src_configure() {
 		$(use_enable sasl cyrus-sasl ) \
 		$(use_enable doc doxygen) \
 		$(use_enable networkmanager nm) \
-		$(use zephyr && use_with krb4) \
 		$(use_enable zeroconf avahi) \
 		$(use_enable idn) \
 		"--with-dynamic-prpls=${DYNAMIC_PRPLS}" \