From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Fri, 19 Jan 2007 12:31:10 +0000 (+0000)
Subject: Even if not keyworded, fix this for Gentoo/FreeBSD by not enabling shadow whenever... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d19f56c71e1a3d50ad432f87e6a953d8f431d39b;p=gentoo.git

Even if not keyworded, fix this for Gentoo/FreeBSD by not enabling shadow whenever pam is disabled.
Package-Manager: portage-2.1.2
---

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 81a01422fc80..31fdc4c33cc9 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.333 2007/01/18 16:02:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.334 2007/01/19 12:31:10 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.5.6.ebuild:
+  Even if not keyworded, fix this for Gentoo/FreeBSD by not enabling shadow
+  whenever pam is disabled.
 
   18 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.5.6.ebuild:
   Don't put an explicit dependency over arts, leave it to the eclass. This way
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 68d147e3126d..7e74a5c3c48a 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -127,14 +127,14 @@ EBUILD kdebase-3.5.5-r3.ebuild 6173 RMD160 b42aae21ec3fce420bf72b9d188fe2b57f264
 MD5 0de4fe383b8617b3c5e5aa65c0943212 kdebase-3.5.5-r3.ebuild 6173
 RMD160 b42aae21ec3fce420bf72b9d188fe2b57f264270 kdebase-3.5.5-r3.ebuild 6173
 SHA256 52d377a441388463a88d5513e9decbccd1d64bafd9f049f94b7246ade1a3c153 kdebase-3.5.5-r3.ebuild 6173
-EBUILD kdebase-3.5.6.ebuild 5978 RMD160 05d6e17794ec1d0d2cfc19c2aeb55726fdce5935 SHA1 1f3fde8de178de211776088ceff77bd74f68becf SHA256 c179c41c9269e0b1bc32d4bcdb1c6ca6ab56498c7b62e39fd0183ed774639b0e
-MD5 2f599704d5ffa6c11f4e683d83ded9fd kdebase-3.5.6.ebuild 5978
-RMD160 05d6e17794ec1d0d2cfc19c2aeb55726fdce5935 kdebase-3.5.6.ebuild 5978
-SHA256 c179c41c9269e0b1bc32d4bcdb1c6ca6ab56498c7b62e39fd0183ed774639b0e kdebase-3.5.6.ebuild 5978
-MISC ChangeLog 57033 RMD160 3a3bd2e286b7b09a0f5f227425cefe21bffa881c SHA1 b0e14c0c567692b7ec69f3bb5ee7fcfbc5207e9a SHA256 90af762e0dd462587f7995f2df5c2779a631dc8765aa5647eabbd93227b76078
-MD5 937925317c66491f963cbfb207648521 ChangeLog 57033
-RMD160 3a3bd2e286b7b09a0f5f227425cefe21bffa881c ChangeLog 57033
-SHA256 90af762e0dd462587f7995f2df5c2779a631dc8765aa5647eabbd93227b76078 ChangeLog 57033
+EBUILD kdebase-3.5.6.ebuild 5959 RMD160 21b6a70d4b59d7ec059144b932f23fb857270776 SHA1 92175e26296094fc4f927c36669f80f6f5265f6c SHA256 8a28f0c08bca55a1032ec313666d93face20ab943c5f4c537cd932091a878bff
+MD5 9ede4efcf8c11ac82fd747d2f5a07556 kdebase-3.5.6.ebuild 5959
+RMD160 21b6a70d4b59d7ec059144b932f23fb857270776 kdebase-3.5.6.ebuild 5959
+SHA256 8a28f0c08bca55a1032ec313666d93face20ab943c5f4c537cd932091a878bff kdebase-3.5.6.ebuild 5959
+MISC ChangeLog 57213 RMD160 da369db378818b148388901cdbf78307f1a36d8d SHA1 fd9ccac14e7711152d58eda7c721a7f1e9141c19 SHA256 134f22c71f460dcb18671ca2f8aa7999c038bf4e00324219386d2b3540234f05
+MD5 8ad584ee1358bc5b0b6b6b76914866c1 ChangeLog 57213
+RMD160 da369db378818b148388901cdbf78307f1a36d8d ChangeLog 57213
+SHA256 134f22c71f460dcb18671ca2f8aa7999c038bf4e00324219386d2b3540234f05 ChangeLog 57213
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -157,7 +157,7 @@ SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFr5oeAiZjviIA2XgRAifzAKCOinXfP7SQNAzovhwBh/80Qx1sFwCeJBtk
-gp+jCmHxyICZZ6X0Xp7IhbM=
-=yQf/
+iD8DBQFFsLoeAiZjviIA2XgRArzFAKDBmV/DhgldupCD43PcQIdjPhuygQCfR3WM
+yp6jP2nXXxMqxAji9ZvVGGw=
+=KVUf
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/kdebase-3.5.6.ebuild b/kde-base/kdebase/kdebase-3.5.6.ebuild
index cbcf60bdebc4..bca359e55a5c 100644
--- a/kde-base/kdebase/kdebase-3.5.6.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6.ebuild,v 1.3 2007/01/18 16:02:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6.ebuild,v 1.4 2007/01/19 12:31:10 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -110,13 +110,11 @@ src_compile() {
 				  $(use_enable zeroconf dnssd)
 				  $(use_with xcomposite composite)
 				  $(use_with xscreensaver)
-				  $(use_with xinerama)
+				  $(use_with xinerama) $(use_with pam)
 				  --with-usbids=/usr/share/misc/usb.ids"
 
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
+	if ! use pam && use elibc_glibc; then
+		myconf="${myconf} --with-shadow"
 	fi
 
 	# the java test is problematic (see kde bug 100729) and