Remove Kerberos 4 support; if you need Kerberos use sys-auth/pam_krb5.

Package-Manager: portage-2.1.1_pre3-r1

3 files changed, 16 insertions, 39 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 25be1130f4ee..61881101e5a5 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.144 2006/07/12 20:23:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.145 2006/07/20 23:26:21 exg Exp $
+
+  20 Jul 2006; Emanuele Giaquinta <exg@gentoo.org> xscreensaver-5.00.ebuild:
+  Remove Kerberos 4 support; if you need Kerberos use sys-auth/pam_krb5.
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> xscreensaver-4.24.ebuild:
   Mark 4.24 stable on ia64. #136620
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 374261b6ed26..4bcfb4b75988 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX desktop_entries/screensaver-properties.desktop 1000 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 SHA1 f55ab9f6430ee339edc6aab428bc277d1b84e03d SHA256 b2a5d44a6a6463beab7cb1d3b9d9f5613c765b48ce319232517b6097afad1fbd
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 RMD160 9e331cdba7b943c9e5dc076c3a60e32bf0340111 files/desktop_entries/screensaver-properties.desktop 1000
@@ -93,14 +90,14 @@ EBUILD xscreensaver-4.24.ebuild 5257 RMD160 722572df7ff84a1b6d9448ce4de2eaf77989
 MD5 9439e5904b0bcc2af778c82876d6b372 xscreensaver-4.24.ebuild 5257
 RMD160 722572df7ff84a1b6d9448ce4de2eaf77989645e xscreensaver-4.24.ebuild 5257
 SHA256 7e4d924d30f9450ce01f61f51e7ea968dd5820b004c2fdc73400813cce05d2f9 xscreensaver-4.24.ebuild 5257
-EBUILD xscreensaver-5.00.ebuild 5224 RMD160 4419163eeacfbe7c7f679241fed8a94dd715ac5d SHA1 64875957091a21e8648e6389ece3e8d32fc9ae4d SHA256 e391861d3a55354c4a2864f7f065073b3598579f447d5d5c685a81c147b99531
-MD5 87802d206aba497868c73cfc4cfb2b4d xscreensaver-5.00.ebuild 5224
-RMD160 4419163eeacfbe7c7f679241fed8a94dd715ac5d xscreensaver-5.00.ebuild 5224
-SHA256 e391861d3a55354c4a2864f7f065073b3598579f447d5d5c685a81c147b99531 xscreensaver-5.00.ebuild 5224
-MISC ChangeLog 24206 RMD160 d951e1a39242eb965117b9f7b393a3b5aaab9041 SHA1 d49f2d35fa46a240a094361e61f545720b61997c SHA256 edd691796c128e4ee6156d941f025244460f96de5828340773e524ebe2a25acf
-MD5 47081c3948b55fc36f60a81196f3f8c7 ChangeLog 24206
-RMD160 d951e1a39242eb965117b9f7b393a3b5aaab9041 ChangeLog 24206
-SHA256 edd691796c128e4ee6156d941f025244460f96de5828340773e524ebe2a25acf ChangeLog 24206
+EBUILD xscreensaver-5.00.ebuild 4703 RMD160 ca833ccc033f36e6e595ba627b4654829cf23a03 SHA1 85c599297aed29ea283e57455809a84fbbf70882 SHA256 769d02a638e5f0b839cc4feb7a91f00d9a9442f3c88080d8de3c72f69894bee7
+MD5 797bf5c110179fdc72e69ae0c990fd24 xscreensaver-5.00.ebuild 4703
+RMD160 ca833ccc033f36e6e595ba627b4654829cf23a03 xscreensaver-5.00.ebuild 4703
+SHA256 769d02a638e5f0b839cc4feb7a91f00d9a9442f3c88080d8de3c72f69894bee7 xscreensaver-5.00.ebuild 4703
+MISC ChangeLog 24352 RMD160 1b5fff19a71a725c53510d19b6ee9b49a56fc2cc SHA1 805db63b5bfe7b6c5ad7addaab793cfd85e46e58 SHA256 0c58cd79dc79de5011e7b210de0805dba0324e4961d2e348366a7708b7e6aaf5
+MD5 a55f4cc3601d8f80ad813c22d3954080 ChangeLog 24352
+RMD160 1b5fff19a71a725c53510d19b6ee9b49a56fc2cc ChangeLog 24352
+SHA256 0c58cd79dc79de5011e7b210de0805dba0324e4961d2e348366a7708b7e6aaf5 ChangeLog 24352
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -117,10 +114,3 @@ SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/di
 MD5 25589d3b5c32825b66ba9676e0d2ad01 files/digest-xscreensaver-5.00 256
 RMD160 b132ef56665cf2e1c437724a4d908d0457210ab6 files/digest-xscreensaver-5.00 256
 SHA256 d8690348f22d988fb3f25fc858fd7c83a1be057c7a4feda8ba9114a6d0aa0f5f files/digest-xscreensaver-5.00 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEtVslJrHF4yAQTrARAumEAJ9RnMYil7QgeJ8ZHGY9Se/++xAS6gCgvEDN
-Rsqbnae+ePYhGMZH+DBgLz8=
-=Gn58
------END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
index 0da35e15f2da..4c5d5b24794a 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00.ebuild,v 1.3 2006/06/11 13:08:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00.ebuild,v 1.4 2006/07/20 23:26:21 exg Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
-IUSE="gnome jpeg kerberos krb4 insecure-savers new-login nls offensive opengl pam xinerama"
+IUSE="gnome jpeg insecure-savers new-login nls offensive opengl pam xinerama"
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -27,7 +27,6 @@ RDEPEND="|| ( (
 	>=gnome-base/libglade-1.99
 	>=dev-libs/glib-2
 	pam? ( virtual/pam )
-	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
 	jpeg? ( media-libs/jpeg )
 	opengl? ( virtual/opengl
 	          >=media-libs/gle-3.0.1 )
@@ -52,17 +51,6 @@ append-flags -U__VEC__
 
 pkg_setup() {
 
-	if use kerberos && ! use krb4 ; then
-		ewarn
-		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
-		ewarn "disabled unless kerberos 4 support has been compiled with your"
-		ewarn "kerberos libraries. To do that, you should abort now and do:"
-		ewarn
-		ewarn " USE=\"krb4\" emerge mit-krb5"
-		ewarn
-		epause
-	fi
-
 	if use arm && use new-login; then
 		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
 		ewarn "available for the arm platform. please disable this use flag"
@@ -91,11 +79,6 @@ src_unpack() {
 
 src_compile() {
 
-	local myconf
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
 	unset BC_ENV_ARGS
 	econf \
 		--with-hackdir=/usr/lib/misc/xscreensaver \
@@ -113,6 +96,7 @@ src_compile() {
 		--enable-locking \
 		--with-gtk \
 		--with-xml \
+		--without-kerberos \
 		$(use_with insecure-savers setuid-hacks) \
 		$(use_with new-login login-manager) \
 		$(use_with xinerama xinerama-ext) \
@@ -120,7 +104,7 @@ src_compile() {
 		$(use_with opengl gl) $(use_with opengl gle) \
 		$(use_with jpeg) \
 		$(use_enable nls) \
-		${myconf} || die "econf failed"
+		|| die "econf failed"
 
 	emake || die "emake failed"