Disable pam when not requested by -pam useflag. Resolves bug #114115.

Package-Manager: portage-2.0.53_rc7

diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 69bad9c8ce8f69b4f8b9886f6b5f575eef9dc335..b53b2c37c6b47a98d48ec0a1257e527a6ea88ce5 100644 (file)
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.30 2005/11/29 03:59:36 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.31 2005/12/01 12:53:56 flameeyes Exp $
+
+  01 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kcheckpass-3.5.0.ebuild:
+  Disable pam when not requested by -pam useflag. Resolves bug #114115.
 
   29 Nov 2005; Jason Wever <weeve@gentoo.org> kcheckpass-3.5.0.ebuild:
   Added ~sparc keyword.

diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 72034eb7dce19f6d9b7306b1df91dcd1bc7db9c0..0a36a9f1de7742c48bd5adb30624a7a2a768d22b 100644 (file)
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,10 +1,20 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517
-MD5 b04887af4849af14a8ca6040b8fe1b3a kcheckpass-3.5.0.ebuild 514
-MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529
-MD5 78333738cf8abd7ee02f8554c9f0d647 ChangeLog 4104
-MD5 b3abc7fc8c9fc2596aaa23157cb58739 kcheckpass-3.4.3.ebuild 525
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 eb5f2b8ead1cc04d80dcc28ca2d26da1 ChangeLog 4261
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcheckpass-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcheckpass-3.4.2 287
-MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcheckpass-3.5.0 68
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcheckpass-3.4.3 68
+MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kcheckpass-3.5.0 68
+MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517
+MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529
+MD5 b3abc7fc8c9fc2596aaa23157cb58739 kcheckpass-3.4.3.ebuild 525
+MD5 70f50d91eaffaef74c8a3d332f6fa1c5 kcheckpass-3.5.0.ebuild 584
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDjvJ+AiZjviIA2XgRAic6AKDF+9GhPN2MuPYjyMwM0TVxEOTkNwCfaUbu
+u/HcTGK9lDsFwja9tCdKMhM=
+=4y9i
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
index df509c9f6b25245de477a726d16098ae94b77fe5..6b21c53f67d4b9d15a99b127fc338d487a940f1f 100644 (file)
--- a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.2 2005/11/29 03:59:36 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.3 2005/12/01 12:53:56 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -12,3 +12,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
+src_compile() {
+       myconf="$(use_with pam)"
+       kde-meta_src_compile
+}