Restore alpha, arm, ia64, ppc, ppc64, sparc keywords since p11-kit is now keyworded on these arches. Drop old.

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

5 files changed, 40 insertions, 126 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index c7155702c75e..75b75b98b026 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.220 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.221 2012/05/06 10:04:50 tetromino Exp $
+
+  06 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-keyring-3.2.1.ebuild, gnome-keyring-3.2.2.ebuild:
+  Restore alpha, arm, ia64, ppc, ppc64, sparc keywords since p11-kit is now
+  keyworded on these arches. Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-keyring-2.32.1.ebuild,
   gnome-keyring-2.32.1-r1.ebuild, gnome-keyring-3.2.1.ebuild,
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a82769e4f3ed..35021292bbc9 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-keyring-2.32.1-fix-undefined.patch 783 RMD160 76c20ef4bf5aaa1ed4d7b06a48fb6951729fa375 SHA1 f15c02accedad0890fcbcd98c2125dac582d6296 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408
 AUX gnome-keyring-3.2.2-gold-glib-2.32.patch 1418 RMD160 0a58649d79d562c3913025f608a9814cf15e8085 SHA1 45f7a6c3f6f8946e86cf62189edd6cdbabe1d6e5 SHA256 523a2332dcc1db82f2897bf370c4c82b0e4ef3725ce06799b39554fe5ebe1587
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
-DIST gnome-keyring-3.2.1.tar.xz 1580488 RMD160 76d657a926efa077f3303251bd872dbb1fce3cfa SHA1 77b035c91d387bd4982170b13d1268899e84ece7 SHA256 49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9
 DIST gnome-keyring-3.2.2.tar.xz 1579860 RMD160 190391c13d2a988801c023c0293bb56953901f3f SHA1 5b4a7868266d11855dea8aa488b730a4eaec3838 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2045 RMD160 986bbaa3d89dab306bbea209aad8bf0dadaa9924 SHA1 c28d2a261421a8937299abd5618fa820e1630353 SHA256 f8faf53ba09ae9f81399407397888d324910ac167d5d0b08978bd82952cc5c1d
 EBUILD gnome-keyring-2.32.1.ebuild 1972 RMD160 2a1f3e5b78c90d68b1726b4042ca04701556955e SHA1 ac52a828fb1466609d0bd07630dc334cf9e4c309 SHA256 e4814e4778de56d491b7f15950b0614e64ef83f3e5298acd9e17de4ff8bc9d44
-EBUILD gnome-keyring-3.2.1.ebuild 3308 RMD160 124691485048a55ba34f942ce48833c1d9af60e5 SHA1 597a724f9d68287f99330a14203f378d2cffdd02 SHA256 1191ad64e0f2a59673684581d9a4718d366e7938d1439ff6f3866051c5e37736
-EBUILD gnome-keyring-3.2.2.ebuild 3453 RMD160 df24e605b301034358a1568ffad3e1d1c5bf7086 SHA1 8302ac2f75f59c801732ae9e5da4f20ea74442ca SHA256 5f853117e945e61daab98faa92d344d4fd779d14a3564bcf75fb75bc0535460d
-MISC ChangeLog 31373 RMD160 4d2e8420bb9ba93add65c482047a319747f9a7e6 SHA1 3e6d8de2bfcfa58b8a540ce940e493c0ae73aaac SHA256 2613e86adb2c086bf37250a507f39d94b74831a96aa697a277dcf1211bb27b39
+EBUILD gnome-keyring-3.2.2.ebuild 3493 RMD160 d4c1ec3c6f67c82835960f898ab0317e646875d1 SHA1 a74683887c928545ebebc1c129f96d9d7dcb680d SHA256 0f4584f7c31b18d69c60b7f42a31d8121b5303699c233060475bff1a6de1a84b
+MISC ChangeLog 31610 RMD160 7c052852779b2650b51fa83812cbf2e69fc615e7 SHA1 ba672d7af81a4034dd87eff6781b72d107877663 SHA256 07e456e65208463653167b5f4b74ef22891fe41ea9371cb63e628a5e34cad4da
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPpkzHAAoJEJ0WA1zPCt1hRJYH/iMNu2iAgoysSb63UwuQQEvS
+uJRF2UYsyoPPlu3FkDv1gNRi9UbzFNp1O5/nBxLVUY36TBI2iwCyLGc9IkpGwDtt
+tdRkjBy1V4pQiM46yVAZ7nOnWq2UQrz+n2Nj+FB/MXwngauJ6g/wT1axDOIk22GT
+S6M5iN9MGvd5wf3vypGAzMtVO5nw+z807x3Zc3Mu6BLgKe736E1Ma8qxgT1h2etI
+mpF513qaxxz9uSHwCgQO2oyZ94S4UbEvJDfuPk8uoODFKGsPqPhWIYwpKm6nVqHg
+p3QN2dt1DzD6rHdfejWa31/ueK8/TcfGc7gEKOYtBeCCnt6bReSr0ryQVsZbWbI=
+=OURL
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
deleted file mode 100644
index e104ec20020b..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.5 2012/05/05 05:38:10 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-
-# USE=valgrind is probably not a good idea for the tree
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.90.0:3
-	>=app-crypt/p11-kit-0.6
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1
-	>=sys-apps/dbus-1.0
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-#	valgrind? ( dev-util/valgrind )
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--disable-update-mime"
-#		$(use_enable valgrind)
-}
-
-src_prepare() {
-	# Disable gcr tests due to weirdness with opensc
-	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
-	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
-		-i gcr/Makefile.* || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: /gkm/transaction/ tests fail
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
-
-pkg_postinst() {
-	use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
-
-	gnome2_pkg_postinst
-}
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-# Requires versionator.eclass
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
-		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
-		ewarn "where <FS> is the filesystem to store ${path}"
-		if ! version_is_at_least 2.6.33 "$(uname -r)"; then
-			ewarn "For kernel 2.6.32 or older, you will also need to enable"
-			ewarn "SECURITY_FILE_CAPABILITIES."
-		fi
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
index 2163c34994b2..529f5de089db 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.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/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.6 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.7 2012/05/06 10:04:50 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="+caps debug doc pam test"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
 
 # USE=valgrind is probably not a good idea for the tree
 RDEPEND=">=dev-libs/glib-2.25:2
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index c571f10adb95..2e1fc08f7db2 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libgnome-keyring-2.32.0-drop-test.patch 3415 RMD160 dfe6b9b0b017cddf1eb4ee216c0bf7d40836ea37 SHA1 3859d1c49dc1c1816cb80e068e220021a1bc764b SHA256 4928c561f46b6dabab93d19a82ff3cb6afa76a62bbba19312c417372b28eba89
 AUX libgnome-keyring-2.32.0-hang-tests.patch 607 RMD160 13926efd8ba29ead2648bd345cf3453a1353f4a7 SHA1 1f7117a9ebf87a337d6956d923f318e0011d1242 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 RMD160 58b7eb297dd901a0bb4d1abd54091f36ce82847a SHA1 c93f326daf89f0a91c86ad05b638375e77a7f15f SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 RMD160 201df6c60a931a43edd58c994dea5bb20d5d378f SHA1 9d7c9dc923e03ed2f201cb563e28922e35b88ea0 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
 DIST libgnome-keyring-3.2.2.tar.xz 358976 RMD160 ea1483361d3865b00f90d4ca24fc6f0af0329c35 SHA1 1c8c02bcfa68d8457437ac9ea8f5ad76e9a997d8 SHA256 2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3
 EBUILD libgnome-keyring-2.32.0.ebuild 1658 RMD160 4f17b53bcd9ee39258ff84495f9613097e645bf5 SHA1 2c7effcbd3c1a8dad9703fc069154e87af204055 SHA256 4dfb7354f6d5e8d5ee8a1a4e76b5d528e01fafe809e31408f91218c38c58fc11
-EBUILD libgnome-keyring-3.2.2.ebuild 1313 RMD160 d9ef62e1a3d51ef3e92d98972614e561ebfb6b9a SHA1 dc693937a4cde9ce2ebe0f70e3aab002f142f341 SHA256 fb258f4a4036f00ed57b3237cecb0579cdfec22604e719ef95594567d2697569
-MISC ChangeLog 5609 RMD160 e6af10c89ed0d47489ec1faaf3fcc7a29b7512c3 SHA1 aaeecebe251553d01947d74f925a7c865e2bc3d5 SHA256 bd719c41c6dba2561b7c4917a47aa4fd04c7af452b7456872ca3a22568f5ddd1
+EBUILD libgnome-keyring-3.2.2.ebuild 1353 RMD160 9a6ee1584acfe5d3c204241587c8ad5b07d36f81 SHA1 f20fe5e53fd3723e0a2ed62d0f5f7c8bb8769921 SHA256 fba9548f90bd7e085f7c9d17aa97dbb6534a189f8889cb4b8b1847bff1391988
+MISC ChangeLog 5810 RMD160 f876c8f15bd30499624c85c1715f7f768b4d44de SHA1 0db9c50ad926d0b26fa4cc0271fd7d2227f3e865 SHA256 98730afc2352780456c08d6f01e098548f3f26c1de58607221e5380c050d1808
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPpkzVAAoJEJ0WA1zPCt1hH50IAIGingEMc3KFDqVaqELo+MTY
+/P0QrlIep0UQWOCHiDL9Jvs6NfAjf0Qrfm1wbM+CEp5pZESszFiOe+4OhcSH5PY9
+Z6Z4xXvHWcA/iezT9zlucFdWsAWKS1o8BX4yuqvlLwWg7h+QG7e3T1hNQ5IyoL/i
+srFGyWKxFbPR3JYjJcCwxAtNyyHzjJdlW2EAckB1uYwse4FdiGE3EHLnIpepAuIZ
+2SvAxBqwhTDv2NGK8it/rO3Y97ibVZ4ilgDwF9Iv1XtHOVeMTm5enWZafXm3nCMJ
+7xtJ3n1bVY8X0F7oJ9/ooIhHIJcjZ3KXeuizSD/lLcSVjFOIduy8Rd2Ha4iYgro=
+=tjvo
+-----END PGP SIGNATURE-----