Revision bump. Removes pam patch which has no effect. Is fixed in kde-base/libkworkspace bug #398333.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 56 insertions, 15 deletions

diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index f82b4255f404..df0ddbc7dd3b 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.209 2012/01/25 18:16:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.210 2012/02/03 15:58:55 johu Exp $
+
+*kcheckpass-4.8.0-r1 (03 Feb 2012)
+*kcheckpass-4.7.4-r1 (03 Feb 2012)
+
+  03 Feb 2012; Johannes Huber <johu@gentoo.org> +kcheckpass-4.7.4-r1.ebuild,
+  +kcheckpass-4.8.0-r1.ebuild, -kcheckpass-4.8.0.ebuild:
+  Revision bump. Removes pam patch which has no effect. Is fixed in kde-
+  base/libkworkspace bug #398333.
 
 *kcheckpass-4.8.0 (25 Jan 2012)
 
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index 78554f9169a8..b1138e1f8e2b 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -7,18 +7,19 @@ DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210
 DIST kde-workspace-4.8.0.tar.bz2 35364809 RMD160 05481e904d1ab00f6fbca54f37cf444ad7c513f3 SHA1 4c471b159315b084c65196b0c93c34981a9105c5 SHA256 116b9655984c1e6544a3b011960122c2ba821c0c21dced27518e8604ff04bbee
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD kcheckpass-4.6.3.ebuild 802 RMD160 8851b727ee58cacc2b53c768f74c07e9c55ca94e SHA1 f59d3e6cbf0b5ce4ba6d73b1528de4cc5a45cfac SHA256 2d5edd874739a88f5bbaf41284f51bc385db59b534cd0dce67ee5082f67efc44
+EBUILD kcheckpass-4.7.4-r1.ebuild 764 RMD160 7277a6415b1c44aa3299fae33ab76ef100769f1c SHA1 896a659022c18177f6a516ca2740991dbba41294 SHA256 c380c0a882e86263311eafb711510779b4df75ccbcc940a41173da3c42b96361
 EBUILD kcheckpass-4.7.4.ebuild 819 RMD160 1fa320dcfeb6ac60d3906d0814a1ce55d0cb40ff SHA1 1dc8ab1ca74edd6d0d412d2b2c76a487f4f616ca SHA256 96111a2ad890a93d0ce143a2fa15751b6a44ab528ca23f8e2630b77fbe8d8c48
-EBUILD kcheckpass-4.8.0.ebuild 805 RMD160 4e936b245feefdf8f583c6d7d19defd06b019952 SHA1 03622bac3cea6b99384210f1b786e9ad02ddb8d8 SHA256 86580b2b701b5e08daece19372e96365862fc42ef6539c35dc19200357206808
-MISC ChangeLog 26214 RMD160 31ebcf1ea0124fc7a517a892ef909dcac553fffe SHA1 9979ab201635b60e97367bcaf47ffb6f431ffc28 SHA256 f1e483c2d68733f8ea6c6b1178fa5131d11208d3936f50092808ecc5a51433ce
+EBUILD kcheckpass-4.8.0-r1.ebuild 747 RMD160 e082b23a8bf8d434b79e26ff6e1d22cc67bcce48 SHA1 f1f84f808b98396f504ca48025f2ba8a9db33532 SHA256 c9129118ba674fe404991a5fec46673b832a23f18b1b4040628711d02348312c
+MISC ChangeLog 26527 RMD160 6d7269aa25a8e889b8827b326bcc26cb332cfbe1 SHA1 2af56f6510698bd64020b345b91dd34ef10d7f8d SHA256 32d603708970b89edb1383b26dcff4fc2269b0dbd90791f9b54da5a870a9a87b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIEgtAAoJEO+t9ga+3I3anfUH/iKTFFs61r4p3nObaP6wYnXm
-Kxl75KBqISB7ez2H+xcMvFxwYBOhLtxY5UZ2zuhkWdDtH3FeLO3DkPmOsl9eGDSZ
-sAY4qR+uX1LGCrjh5c+q+ERKbzqGUx2Tw+42EJOZ6LBja/LWS53GhCw/h+t8CFT3
-5jp9vGv0dbLc18B/fx5+uTYdUrdskrPsM5WO4evQZg9vtngYEiUHo2I5dCk2udGh
-vZVZwkNLVAW9IcmwGWsk2LXKDLF6mafqG25Gkl1b5bv27ZoyjvklcMTc3Yj4QI+q
-s5PaxypQGAOVSkWt5q55SZ8Kvh2kj+CzdEnXwS34qDzQJBbhJxh2v5ahBf7w+oA=
-=x3nA
+iQEcBAEBCgAGBQJPLAP8AAoJEO+t9ga+3I3a1lUH/AwQOpMGuXejTkINPJQIFE/0
+8MhKi2tQHp+4inEUhKIJ42yvz2nA8umg4NyTgul2xSMlhEWwQXc6t1uGE/aLcsoG
+VwdI0NLuzYgnmgBcXERu9MDj7b2KzqordrC1JhJMLGrGDU3i31eXThgDrkUe3ANJ
+O39y9y1+ziN2ZlmZH6WTkAk52RfbOjNidU42ZDQ/jpbeqrzqq5qYya8wz1VbhOoc
+e1H98zU5uGbmsN046TwyFBmZLk4rkJMb+co2LC7ztM9+TbfAIdf1NNIHXllh0Kwd
+L8bLnVaYb3T/g6v0s02Oxk16uYegnxRLcDnhy6iQoRrF/90f7nQtB2a40Ssle7U=
+=yhzA
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kcheckpass/kcheckpass-4.7.4-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.7.4-r1.ebuild
new file mode 100644
index 000000000000..c5f67f299cab
--- /dev/null
+++ b/kde-base/kcheckpass/kcheckpass-4.7.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.7.4-r1.ebuild,v 1.1 2012/02/03 15:58:55 johu Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pam"
+
+RDEPEND="
+	pam? (
+		>=kde-base/kdebase-pam-7
+		virtual/pam
+	)
+"
+DEPEND="${RDEPEND}
+	x11-libs/libxkbfile
+"
+
+src_prepare() {
+	kde4-meta_src_prepare
+
+	use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with pam)
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kcheckpass/kcheckpass-4.8.0.ebuild b/kde-base/kcheckpass/kcheckpass-4.8.0-r1.ebuild
index 19b642c852af..44df64d31de6 100644
--- a/kde-base/kcheckpass/kcheckpass-4.8.0.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.8.0.ebuild,v 1.1 2012/01/25 18:16:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-4.8.0-r1.ebuild,v 1.1 2012/02/03 15:58:55 johu Exp $
 
 EAPI=4
 
@@ -21,10 +21,6 @@ DEPEND="${RDEPEND}
 	x11-libs/libxkbfile
 "
 
-PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
-)
-
 src_prepare() {
 	kde4-meta_src_prepare