Version bump, use fcaps.eclass (#454908 by SpanKY), fix dependencies (#467416 by Tolga Dalman), drop unexisting configure options. Drop old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 92 insertions, 132 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 7cb640775ee3..b48b7bf3d660 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.230 2013/03/30 23:01:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.231 2013/04/28 13:38:52 pacho Exp $
+
+*gnome-keyring-3.8.1 (28 Apr 2013)
+
+  28 Apr 2013; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-3.8.1.ebuild,
+  -gnome-keyring-3.6.2.ebuild:
+  Version bump, use fcaps.eclass (#454908 by SpanKY), fix dependencies (#467416
+  by Tolga Dalman), drop unexisting configure options. Drop old
 
 *gnome-keyring-3.6.3 (30 Mar 2013)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 7de4b13517ae..fb561b134ec7 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 AUX gnome-keyring-2.32.1-fix-undefined.patch 783 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408 SHA512 2f60202c4b07c37cc59d19838344ac666371495b9230c8f6b3a3030e58364dbb9a012ee8eeb6d89ed1e8dbb9324340971259a5b75e7666563a402c88735dc916 WHIRLPOOL 7030408d34850a6ac827149b3aaf1dd1f7f80ea7fa9731e4c76b5c95fedfec2bad51797f428685cdc9232fa455f2d78c814d35c06b905b2126d9a7aa8c2661e2
 AUX gnome-keyring-2.32.1-glib-2.32.patch 1355 SHA256 042bf9bc95f8e37bf9733531cc4d38db5c33d382f15152afdd7288ea09145fee SHA512 5745e64d77ec48cb8fe5b76bfc902f97749ee125e0c6db6ee7aed87f996cbae92e3c835792e76e33f49386ac8a9a4ec3613212f6ff5f470d038f2abf737c4aa7 WHIRLPOOL 23c45dd081eebaf9da75d159c71c3addd40e6f15b88c167ae932c6d3e0c261296c5e9222a0ed8cdf47045e9e30dc9f27bf331cb0482b26acfd5d2ac3f0ca611a
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
-DIST gnome-keyring-3.6.2.tar.xz 1139836 SHA256 ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6 SHA512 d469e7cf5721aa3fd22bcf87799f303d01135698af7919f9bb9421ae043729bc8924d6e245b1e7c16d501897c259df35e9e015e79ae4d4c17af473a48dc337c5 WHIRLPOOL 0b24551a964d68e9f6dab211d409e80c49808640cd613a9d8b0cc47edfe288ac167dbc71e3164a81cbad64a1a3f1376f84ecbd023a3443b442da13770969d2ec
 DIST gnome-keyring-3.6.3.tar.xz 1141948 SHA256 e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151 SHA512 aff1de6831be7b1e3e8383f14bcf408153c8729cea247e63be852bd527d4221238f182f2d2c73b081dab4bd6564e5c4df5d6848cfa311ba66c0fcf0dcacaa4bf WHIRLPOOL 141632220bed40b9faa9a1a481860ba0207986c78ba4072ad9726acc8cc24cc39e61f197d25b709c2380f8b06ad349f7179f39ab11d389ff4a8a199ca172c7b8
 DIST gnome-keyring-3.8.0.tar.xz 1137888 SHA256 5ef9f4b7ff983a4fbc3d049aafee0fd3ecaf4d5cc7573517ac17c1b1a56bca6c SHA512 105ed4f37b080b79b3fafdcd8d4bec2d56fe39eafdc0f2e76549999fb574038252d7935bcda78352ea910602bf4478e66adfb934952009a2e980d96f8e7d03ac WHIRLPOOL 693cad3dd1fa820b2cc8fcd9c80d7861be6a7487e46baa44c770c562034cfedd8a6da71074b87af9177b5016cd863f88094a99923e252c06294f7599356fcf4d
+DIST gnome-keyring-3.8.1.tar.xz 1140232 SHA256 56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37 SHA512 a31ebada5528082c511ad3cb6a11aab03a76a3fc2b1012ea505483a1078f6ad229fd32fe846cbd77703ca4644225091aa05870c870c7c31262bc0338fe011fad WHIRLPOOL 9c0e561ab6047ff59d917c51a90311b320c533dfd076d66030efac15a55292d893d6b3c78813f0ea05eaa8a93a0c91527e26d82cc5eb87d93e413a64cfe6b671
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2050 SHA256 3a06de08fda7f013e5f2ec5dd2bcd2d3e44f98fb1036404bc0862caf1094f39a SHA512 3dc6362f2687a3989879937abd67d43e925b46c0822b41fe0b530d8feecd41f39c15c00ee6b8bc12576c789c980fa5ca585ad93731b35ca1d1c537439e330f53 WHIRLPOOL dfe94dff29550f966515b202d7392f5340604da3ed7fa1d4e9b8dac76746c62fd9330064896435f7a800c6b0ab213f2fee4ebc1d42c41d67e36eb36df6e08065
-EBUILD gnome-keyring-3.6.2.ebuild 3673 SHA256 7728a6a945132c6174267f3fe2031b84a2f4ea38730687dc72b7a442c4c415cf SHA512 dbb4f914cba91cae625896a7564b7a1187677f4f68677e6ad8f8cc6d2cea512a1c1b5ed8f2b9d17312ad81dbdc5f9446151ff0abfe78ed938186a7183d14493e WHIRLPOOL 8d5a0021df1405f990cb3bc19e380369c7302b48e8ef8856c224681fa6bbc9483b00b199ad38d7c0db7b2c50d6ef00b5c7ada9c407781a1e2186df20aa6b5426
 EBUILD gnome-keyring-3.6.3.ebuild 3656 SHA256 e2fa6c3aacc64af11ef6660bf1ac4a763552d96f8734c1e392a3729b3d23ba78 SHA512 34400878f1e4dea9e02fadd24be683df024536a5f652d0c39ae3578ec5cb8597cfd51c6a9106d6c01138bb10493f597690040a98da45629f84a2077d8fa69650 WHIRLPOOL 35d5ce0bb086cd85d50f9aefd21958c5751d2419a9eb2bcfecb3b83451a613a16fe22ba506b6ab20764ebc9ab45acae0da749cda45f1a59d769625be9557e74a
 EBUILD gnome-keyring-3.8.0.ebuild 3635 SHA256 5a72c4b00410e9fa10ebe875ed0d400cbfbf26b6923f1f91cc92ba88ce816054 SHA512 dcadaeb849fc3311cb4a87d1f9983c4d68590cde75f87b73cad42dc4096ee5c89fd5a03df30280410b6ef8532732d02163d1396755470d9e0178a773f04edd03 WHIRLPOOL d7f0e9915d1589190f6b2370e43f4f9adbfbcd7b46d9909cfb8805984a81c8166496df8e54562a5afd10318bb44fe8b8b4176dc5d81afe82fb6e78b76d53900b
-MISC ChangeLog 33855 SHA256 0e4727417e2cf28351f82b6ac109e46ac1a0e45568b6c4df23f12e5651a1dc64 SHA512 dc97704e7e53c02ac9b36a9986af63d1a6bb617fa6bf8edbdc812045133d17f561e1008891ceb83b021fead19202dae63bda7da8bc5a1326e228fe4dec5510fe WHIRLPOOL cd37a868a485a20de49d8001585587f17ea2e190d9df6cbcb8328c73725cca3f676cc562f08d4c389668f62b9f2801303ea21080a662456cee5b4148d094f993
+EBUILD gnome-keyring-3.8.1.ebuild 2261 SHA256 4a811504b9164d4df8375cd280042423d425df28772ac6aa202f0bc20e772fa3 SHA512 6c48088d2c1e4f8c59e5e80763da986a2732848547ead9ad1c8d807db700033e17a915ef9dc7e42467f6dd281046a8a76f805a0a85048f35842e2356fe8201d7 WHIRLPOOL 74717cc66281e920e2e6cd670806b3ce4aeb83d686016970fd5e9ee728b0f31080054694d35558e09099f6ef5030aead618590387c1225c10af13ac120406549
+MISC ChangeLog 34144 SHA256 9e2e0ae314f4143acecf4913dc251e5dd039637e583b11814dea268affbc4c31 SHA512 ad66409fb5a444ccc385cbf6008b32ca37898bcbad722335987b3a84521c618ccc5f026c2fc55c59f1e49297d367c58aa98f8074391cf30a6b7f5fe0c98f11d5 WHIRLPOOL 0f2c05949de31b37597dfe7704733e628820f82997f9b7b160598db2f2421691f53b874bc9ffe488e28197a6f4fb74fc352f7dc599ac9b90d41836c0318948c5
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFXbroACgkQ1fmVwcYIWAYlgQCdHP4GqRwL+6LLBiqhMi0vYR/a
-DPIAoKzRilf3hn/rXxeMS4t32KFn0qcW
-=7l0J
+iEYEAREIAAYFAlF9Jm0ACgkQCaWpQKGI+9RWFACeLb2q7bb+mBJptgnBWfW7X9RK
+rNwAn1Ylb2JCWLncNpAFOqGeI0X82LZQ
+=BpWE
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
deleted file mode 100644
index f98acf5a889c..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 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.6.2.ebuild,v 1.2 2013/02/25 09:18:12 zmedico Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=
-	>=dev-libs/glib-2.32.0:2
-	>=x11-libs/gtk+-3.0:3
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=sys-apps/dbus-1.0
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e '/g_test_add.*test_remove_file_abort/d' \
-	    -e '/g_test_add.*test_write_file/d' \
-	    -e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
-	    -e '/g_test_add.*test_write_file_abort_.*/d' \
-	    -e '/g_test_add.*test_unique_file_conflict.*/d' \
-		-i pkcs11/gkm/tests/test-transaction.c || die
-	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
-		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
-	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
-		-i pkcs11/gnome2-store/tests/test-import.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	G2CONF="${G2CONF}
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable selinux)
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		--enable-ssh-agent
-		--enable-gpg-agent"
-	gnome2_src_configure
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-pkg_postinst() {
-	use caps && fcaps 0:0 755 cap_ipc_lock "${EROOT}"/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 capability 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.8.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
new file mode 100644
index 000000000000..c55688ca9f2f
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 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.8.1.ebuild,v 1.1 2013/04/28 13:38:52 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+
+inherit fcaps gnome2 pam versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps debug pam selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.32.0:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+# gtk-doc-am is not needed otherwise (no gtk-docs are installed)
+
+src_prepare() {
+	# Disable stupid CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	# FIXME: some tests write to /tmp (instead of TMPDIR)
+	# Disable failing tests
+	sed -e '/g_test_add.*test_remove_file_abort/d' \
+		-e '/g_test_add.*test_write_file/d' \
+		-e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
+		-e '/g_test_add.*test_write_file_abort_.*/d' \
+		-e '/g_test_add.*test_unique_file_conflict.*/d' \
+		-i pkcs11/gkm/tests/test-transaction.c || die
+	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
+		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
+	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
+		-i pkcs11/gnome2-store/tests/test-import.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		--enable-ssh-agent \
+		--enable-gpg-agent
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+pkg_postinst() {
+	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}