removing krb4 use flag, after accidentally re-adding it

Package-Manager: portage-2.1.1_pre1-r5

3 files changed, 14 insertions, 31 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 0f8c035bf652..84c68503d504 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.402 2006/07/08 22:41:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.403 2006/07/10 17:47:00 gothgirl Exp $
+
+  10 Jul 2006; gothgirl <gothgirl@gentoo.org> gaim-2.0.0_beta3-r1.ebuild:
+  Removing krb4 support after accidentally re-adding it
 
   08 Jul 2006; Doug Goldstein <cardoe@gentoo.org> gaim-1.5.0.ebuild,
   gaim-2.0.0_beta3-r1.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 324cb189503e..a9a4b5114fa2 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
@@ -19,14 +16,14 @@ EBUILD gaim-1.5.0.ebuild 4081 RMD160 ba7e5e30b72621e6e466483d15956ff745cd5e2a SH
 MD5 1fb2f9636acdc364ba6dd09562da826c gaim-1.5.0.ebuild 4081
 RMD160 ba7e5e30b72621e6e466483d15956ff745cd5e2a gaim-1.5.0.ebuild 4081
 SHA256 0cdb18e3ee347bfb38691f4aa1973a402f4ef2266abc3b19f9029031e74f1ed0 gaim-1.5.0.ebuild 4081
-EBUILD gaim-2.0.0_beta3-r1.ebuild 6760 RMD160 cd93a1901873f4f2b68d99f225ad25b313bfae4f SHA1 278dad83b00e052985fd76caaa2b6652f91b5218 SHA256 3d3b20f4ae2a0d7df2f1e03c2b5f8e3a826f4d4397e9addca45fd182ca95b0cc
-MD5 86b7f674bf41f10deee7f0e5398658fb gaim-2.0.0_beta3-r1.ebuild 6760
-RMD160 cd93a1901873f4f2b68d99f225ad25b313bfae4f gaim-2.0.0_beta3-r1.ebuild 6760
-SHA256 3d3b20f4ae2a0d7df2f1e03c2b5f8e3a826f4d4397e9addca45fd182ca95b0cc gaim-2.0.0_beta3-r1.ebuild 6760
-MISC ChangeLog 58496 RMD160 d8bf43f742bb2d5faded5f3a0a2dc1f3c7fda8a9 SHA1 7f56868bac61bcb192021c32dc646de35557d325 SHA256 ea933810f2d84ce17ab38f8f84ba045f96442a00b150fb594b5f04fd24982812
-MD5 040ac3e78b33e0cb018cdc2c5ddc50b7 ChangeLog 58496
-RMD160 d8bf43f742bb2d5faded5f3a0a2dc1f3c7fda8a9 ChangeLog 58496
-SHA256 ea933810f2d84ce17ab38f8f84ba045f96442a00b150fb594b5f04fd24982812 ChangeLog 58496
+EBUILD gaim-2.0.0_beta3-r1.ebuild 6443 RMD160 e122d95819f118b8f91895246dd50bbe6a1cfb32 SHA1 68fc9d3d0f06d0378560a3c59a538b1506bc02d3 SHA256 2583f14c2e717334a81e3bed36e81a133355fa0eb50e948fcad992bd245b063e
+MD5 d17e88ebbdd85b489b348f8f23dbf9e7 gaim-2.0.0_beta3-r1.ebuild 6443
+RMD160 e122d95819f118b8f91895246dd50bbe6a1cfb32 gaim-2.0.0_beta3-r1.ebuild 6443
+SHA256 2583f14c2e717334a81e3bed36e81a133355fa0eb50e948fcad992bd245b063e gaim-2.0.0_beta3-r1.ebuild 6443
+MISC ChangeLog 58629 RMD160 910c5390c3b66f9569c3754e3782c08d4a5ee903 SHA1 bf839020f6fd1dcdf32e5dca1df9600d7531372b SHA256 4591556503be4dabbfd3077563a1bc0bb8e178844c5f9a9426226f5022e68662
+MD5 606e67fe87fc6a996d969af8053c3360 ChangeLog 58629
+RMD160 910c5390c3b66f9569c3754e3782c08d4a5ee903 ChangeLog 58629
+SHA256 4591556503be4dabbfd3077563a1bc0bb8e178844c5f9a9426226f5022e68662 ChangeLog 58629
 MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
@@ -37,10 +34,3 @@ SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/di
 MD5 18ac09d4d582248a50d0f68546832419 files/digest-gaim-2.0.0_beta3-r1 253
 RMD160 f5f547a5d04a6d1e1a3dc043abeabbe930ab8d55 files/digest-gaim-2.0.0_beta3-r1 253
 SHA256 4e8269e2659d7e240380f43cef0fa13244ce16c29457d81ba55a20ac071f62e4 files/digest-gaim-2.0.0_beta3-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEsDaKoeSe8B0zEfwRAmMcAJ9Fz4K9WLirqvNGU8qb4pENK+oGfgCfatPY
-Ij05EBMqkSkJpUS1avLFrXM=
-=0St0
------END PGP SIGNATURE-----
diff --git a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
index ee73317a5312..292a8ff25f0d 100644
--- a/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.11 2006/07/08 22:41:52 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3-r1.ebuild,v 1.12 2006/07/10 17:47:00 gothgirl Exp $
 
-inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-module perl-app
+inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-app
 
 MY_PV=${PV/_beta/beta}
 MY_P="${PN}-${MY_PV}"
@@ -40,7 +40,6 @@ RDEPEND="
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	eds? ( gnome-extra/evolution-data-server )
-	krb4? ( >=app-crypt/mit-krb5-1.3.6-r1 )
 	tcl? ( dev-lang/tcl )
 	tk? ( dev-lang/tk )
 	startup-notification? ( >=x11-libs/startup-notification-0.5 )
@@ -123,14 +122,6 @@ print_gaim_warning() {
 pkg_setup() {
 	print_gaim_warning
 
-	if use krb4 && ! built_with_use app-crypt/mit-krb5 krb4 ; then
-	eerror
-	eerror You need to rebuild app-crypt/mit-krb5 with USE=krb4 in order to
-	eerror enable krb4 support for the zephyr protocol in gaim.
-	eerror
-	die "Configure failed"
-	fi
-
 	if use avahi && ! built_with_use net-dns/avahi howl-compat ; then
 	eerror
 	eerror You need to rebuild net-dns/avavhi with USE=howl-compat in order
@@ -213,7 +204,6 @@ src_compile() {
 		$(use_enable tcl) \
 		$(use_enable tk) \
 		$(use_enable mono) \
-		$(use_enable krb4) \
 		$(use_enable debug) \
 		$(use_enable dbus) \
 		$(use_enable meanwhile) \