Version bump for Gnome 3.10

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

4 files changed, 22 insertions, 96 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 9159bb0b3e16..5adb64c2c66c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # 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.237 2013/12/08 18:31:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.238 2013/12/24 16:30:51 pacho Exp $
+
+*gnome-keyring-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-3.10.1.ebuild,
+  -gnome-keyring-3.6.3.ebuild, -gnome-keyring-3.8.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-keyring-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index d0ef2539095c..11615ef9bb2e 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,19 +4,17 @@ 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.3.tar.xz 1141948 SHA256 e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151 SHA512 aff1de6831be7b1e3e8383f14bcf408153c8729cea247e63be852bd527d4221238f182f2d2c73b081dab4bd6564e5c4df5d6848cfa311ba66c0fcf0dcacaa4bf WHIRLPOOL 141632220bed40b9faa9a1a481860ba0207986c78ba4072ad9726acc8cc24cc39e61f197d25b709c2380f8b06ad349f7179f39ab11d389ff4a8a199ca172c7b8
-DIST gnome-keyring-3.8.1.tar.xz 1140232 SHA256 56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37 SHA512 a31ebada5528082c511ad3cb6a11aab03a76a3fc2b1012ea505483a1078f6ad229fd32fe846cbd77703ca4644225091aa05870c870c7c31262bc0338fe011fad WHIRLPOOL 9c0e561ab6047ff59d917c51a90311b320c533dfd076d66030efac15a55292d893d6b3c78813f0ea05eaa8a93a0c91527e26d82cc5eb87d93e413a64cfe6b671
+DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 SHA512 ed37e64aed6963ee97894df58e380af2efa4995515891f36bce9aadeea29eef8b25d28d1b30adc0a3e912eb9ddf7662de92dc7b4962ed5aeaacaa7b60dd5b39b WHIRLPOOL 4e025fa3a3f9744ffb377e5dda40c3c194f3f4929805f530b59638d4750eb49f1975311b25b97b980d41305fa5062c11866924dd5d2bb711e9b0b03e64097c06
 DIST gnome-keyring-3.8.2.tar.xz 1138808 SHA256 f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868 SHA512 513c92ac3b5095b33dc075cdf318e750bf2c53d1344da93300c8888122abd6063f83227d6ae4de3903823c227281e51b4a15783770f86e222aeaeae89f8f2302 WHIRLPOOL c47605f594ebf133e91a585741a8fa4e8d8139f0f4d50d310d0d0cde1df6a8ae6fea569480cd948b3c7fa341045b2ba6a34e10c4c48357de70354edd06483701
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2050 SHA256 3a06de08fda7f013e5f2ec5dd2bcd2d3e44f98fb1036404bc0862caf1094f39a SHA512 3dc6362f2687a3989879937abd67d43e925b46c0822b41fe0b530d8feecd41f39c15c00ee6b8bc12576c789c980fa5ca585ad93731b35ca1d1c537439e330f53 WHIRLPOOL dfe94dff29550f966515b202d7392f5340604da3ed7fa1d4e9b8dac76746c62fd9330064896435f7a800c6b0ab213f2fee4ebc1d42c41d67e36eb36df6e08065
-EBUILD gnome-keyring-3.6.3.ebuild 2399 SHA256 493e2f667caaaf023763e97584fac536fbbba9052295f79c514d3f7dcc55b6ac SHA512 a37a09ee22b5af85ee666a3225b794ba9a01af2e8b1ee0b2e3fc689477236cee348b47ebe72ff60ed3e4c0e080950777f21596228dde8bd2d516f60367b52f72 WHIRLPOOL ddb69b23413cafdc28719ac40e5b837f3d3570c7de6f2baaf170e5f2f477d78f9d6135956590b238c47e8dba5bffbe28ecb05d073684ec28190f7552dd32f5e9
-EBUILD gnome-keyring-3.8.1.ebuild 2261 SHA256 4a811504b9164d4df8375cd280042423d425df28772ac6aa202f0bc20e772fa3 SHA512 6c48088d2c1e4f8c59e5e80763da986a2732848547ead9ad1c8d807db700033e17a915ef9dc7e42467f6dd281046a8a76f805a0a85048f35842e2356fe8201d7 WHIRLPOOL 74717cc66281e920e2e6cd670806b3ce4aeb83d686016970fd5e9ee728b0f31080054694d35558e09099f6ef5030aead618590387c1225c10af13ac120406549
+EBUILD gnome-keyring-3.10.1.ebuild 2375 SHA256 81e13fdf2542b2087f3a010b634d9dceacf1c236c3a52c3b58f03d6312170011 SHA512 885338bc4dc3d944113e3ce3ef5dd2fd0449ee7742a405dfaf43472748030b78a4a6119bf2d5e4286bf069127d2f41923b110488f1764cf4a58e37d9ce547a6c WHIRLPOOL 8087147399058cfde28f37ce41c5dd01d8e468bcd1dfa5111b5d8c3b54d5b6f1e0ecb0e5e063bcccc7390d9f60aa6bf3346de96de83c46d388220ff190db39dd
 EBUILD gnome-keyring-3.8.2.ebuild 2421 SHA256 8d1a928e47f0bb17e489cb32de3e93c63f68b1d2ee5051133fbe43e33a1f398a SHA512 fa5012c68cbc7a140faf311781fe500c8a88bc06a476aac5d88677f712d1ea9c5c297a1a0bac579ed12342928ed3df489acd14271c11e59364f6ea7f6d7d7d38 WHIRLPOOL 314d6bd22f1c4d68ce7809c5f547c4df0ab19bc575980e54b4106954bdab8c2db05ee5b16ac02d050be15cd619da1fa9808d8d5d6ad2e2a4afeb6cc9290741aa
-MISC ChangeLog 34927 SHA256 352feea67ea2b6125a7013fd103f18af8d778e8e80385bd6c3cad032fc629bc4 SHA512 f038f80afe213856af1523a0f6f1259d87e107d25deba6126075f3c4fbc5bc8bda7e8961596f2407660135415de992101dbaf77d78a889a0406d052fc011a92a WHIRLPOOL ad77292816e0d74a121e69364a80379b448cad0162440edd3ebe8a3db433fbe8e4e0742ec9d983874d8e1dc3e6c849fa5c2d3be649204fa8c3cdd14e452e7941
+MISC ChangeLog 35131 SHA256 2fb52aa842eba679dc045bc21d673e28007fe68475c1b667dcaf6bc1894f29bf SHA512 9b7356e73d055c757e8e61edc33328a9042a58a6778d71b4eed1535e9f9f9263f73296a6a5022bb8a6671f3709a4de2870875551071255dd4330cb80d4b35ce0 WHIRLPOOL fdc2dc6b4b38c815a6e0e093a86a204c1c35f746ed19e72ce842d6ef38560a061f8010456f5d9b861d7972eb1e24b7ade599b56943707193177b2ce770734904
 MISC metadata.xml 645 SHA256 247a1437483f3ea8d7df3f99c065953686d0026f33120a3763fc46670278260f SHA512 a5f543871ff2cc3e56b1d703703338feed369933a6d183489e258b5e60b6b7246379a926d11e0697e3380a6bef2289beea48ac208691b16ea6a09306e44043aa WHIRLPOOL c2d5faa8a1d05dca37490fadb7932ec520948c8e0c9962778f05f4f2127b7bf86f31915be2cbbceffbc01f04769480bf15dae985c7575cc4667fe3afe3d97e7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkuvMACgkQCaWpQKGI+9RM2wCcDFDLifw3aiShBt9xzKSqTedm
-vI0AnRHO4O4QeFlBkqPLA1xO9cHEyVMb
-=9Mic
+iEYEAREIAAYFAlK5trwACgkQCaWpQKGI+9SxSACghFHHhJw0NEKl8eVgw63ftxeB
+9PgAn0a5H9d1cl+p4DQzzBO8R7Tq8qXk
+=Sdpw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
index c55688ca9f2f..7dfa96df1455 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.8.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.1 2013/12/24 16:30:51 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -26,14 +26,13 @@ RDEPEND="
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
 	>=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
@@ -63,13 +62,17 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
+		--enable-doc \
 		--enable-ssh-agent \
 		--enable-gpg-agent
 }
 
 src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
 }
 
 pkg_postinst() {
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild
deleted file mode 100644
index a2bfcc7608c4..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.3.ebuild
+++ /dev/null
@@ -1,81 +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.3.ebuild,v 1.2 2013/05/10 19:50:49 eva 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:=
-	>=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() {
-	gnome2_src_configure \
-		$(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
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-pkg_postinst() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}