Version bump for Gnome 3.10, drop old

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

4 files changed, 23 insertions, 76 deletions

diff --git a/app-crypt/gcr/ChangeLog b/app-crypt/gcr/ChangeLog
index b507e03bb6f0..7813f036028a 100644
--- a/app-crypt/gcr/ChangeLog
+++ b/app-crypt/gcr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gcr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.22 2013/12/08 17:38:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/ChangeLog,v 1.23 2013/12/24 15:23:21 pacho Exp $
+
+*gcr-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gcr-3.10.1.ebuild,
+  -gcr-3.6.2.ebuild, -gcr-3.8.1.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gcr-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 4695be4a20c2..efe1238b626b 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX gcr-3.4.1-invalid-whitespace.patch 1752 SHA256 ec744e55714d7f700dd8179f3c365da9a9538e9866be4f0616ffd880ff3a8a02 SHA512 f4bf4e8643b5a7be9cbb2173ff6bd9ecde542e1bf6d65752104b1727fc315faba647cf1d867130d9e5193b3cdaad911fdc1b5935bc84949e5723d31abdc2da57 WHIRLPOOL 7b423338f123ffc89f34b2441098e745ab38dd59290a65e046be205ff0d5f3d8017cdb694959fe1077d3cd20768272d6fbcb28c4b3169d4f61cfcd15e4d3dc4e
+DIST gcr-3.10.1.tar.xz 1402524 SHA256 006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b SHA512 2c02465398a12d2cd7210a4a7478076e7706d01b80413598feb02c967179b86d77388321ba510112bf820f7600ea139fb126ba9cd7eed2236a055052cea811b2 WHIRLPOOL b6af579de0564b41861606f2f36156319b1e7f127baa2edb49aa6bde58a63a549cbbc842bb362ced3e01ff32dca9c1b5c998ea92b24805fe0bc34a0dca7a5306
 DIST gcr-3.4.1.tar.xz 1335160 SHA256 a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609 SHA512 bfd298b2fe52a97bcae6988b865dbe4f43ade209531cb5ddeebbd4a5f9ac3310f2bf9aebfc6101da63b2db427b8d4b822d3711693ab91a6227f632a7d9189874 WHIRLPOOL 01386f8b140f99861c9dc24b25dc675b862d851ef31cae94ac071d30701e5fc357fb7d763c23ba0d64578fb0f2ece36ec087302e356aafb3f9abe1b53a1f936a
-DIST gcr-3.6.2.tar.xz 1365124 SHA256 f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b SHA512 77ef1da381436db128cc2c784b989776f0975360c9c374989cfcb7c4aecd45eaaea9f0b6b82881e093165b3b67d18914582d2f233e856d4bb39f9d04e7f6fa15 WHIRLPOOL 1de2178d1367ba5c2837fe4e6a71a2f55253b4813b70984c39d93e4a38545fb17c315d6d9f545f83b842ae618dac1618245dae73f3298aa9210e9cbde5579cdb
-DIST gcr-3.8.1.tar.xz 1409596 SHA256 38f158d71ce8fb14dca74928053a3edf32751e142400d1429bec5fe0f4bbb8f0 SHA512 7a0b32f860fc11e89403fb464139979e814c6ddb733510586022004d4c2a5ba9a9779b8931a592a8859c354e9c80394b4f03c87b5f7cfc50b57957086adb14b0 WHIRLPOOL 4f6c7edf32330cd05a215cfcf81f2bcb9c8dedc14e707995c7e798e640caba2fbd44271324d7f16e159a4a172bcc2eef6966e1950eee82774c76a280120b1ddb
 DIST gcr-3.8.2.tar.xz 1393924 SHA256 a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1 SHA512 487e6de7f42f996f77099eb1ec660720c9583806c03c544fe05fc828d56dd60fdd12b2523d3cb3cfa1c67954b3722cb21169cbd8050d81bd15ab780ef66a5f9d WHIRLPOOL 52f09b87f9f62628bd5417fdb206a47ef00df10a58b576dddbf461c3ec81ae958bd2ec4bb85bde9786c16b7cc3c7140686a92f608f165ae18be6ef9b90c900b6
+EBUILD gcr-3.10.1.ebuild 1915 SHA256 882e1712d4875b2f8a1a9f823a363949826fb78580e1710e47b04cfd0061526c SHA512 b60964fe43129fa7375a73aea123529177e84a589b3b0371b2cb7f2e4d9d8fcd3d8eeefee3fb64a2c6d1ddeb7bdaa11a7e8381f16b8e0469f53ceab7df41ee39 WHIRLPOOL 252911d5abcee83c8d5ace34144f2acca8d7e64829fca638533d237d36ee544d41b6064d47aea95914f7ab8850322df4df44742957bb9bb417e59fc30ebb103a
 EBUILD gcr-3.4.1-r2.ebuild 1716 SHA256 f2feb0822c9a61403e0879e98ba461624f1f5046dfad3ae03bca1dabba8515d1 SHA512 2e171197431c3a8c0a38ca1c57ea1e7d49b6b600aa0d9f78c9557150b98dca84938f45c6fed24fb4a90f80ffd76aabe6a198692a75bb74fcc5a449705e1795dd WHIRLPOOL ff0c3c584719b6acd3385afa44dd30cd18c8b74d294eb9069fc60b60b318d88e4641d39a44061a64e4972789a390a9a5dcd53ea07d848bcb2e3ef7c8a76abb8a
-EBUILD gcr-3.6.2.ebuild 1684 SHA256 dc025beb060fee4ae30faf602b3f1d25971a3936ec89335fe5b257bd07ef9fd2 SHA512 46bab94b521433f65113da9cb574b000cb1b75d3e6cf724da7e047ae1c69bcb0be017683ee618bed8688e1cf583281100a08c71c3a964ef58a891f161229f612 WHIRLPOOL 96aa53f9d17015f00c3fb34d30f43c6f8d4d9f753e46471ff856a9cea037c050ef7982fb4c78b1cbf9930befef6885fe3346a34864dbc5a26706723d7a162679
-EBUILD gcr-3.8.1.ebuild 1731 SHA256 366444be1e097411eab43b627dd41d45973b05b26a0e8d56fe90ba5afa94b5ef SHA512 cfc5cbdc912bc98a99a4ed2566bb3a1acea4f80649492a37d916e7db2e609d292c17775d93fedda3540c017000173cbb6442faf67bf8121142019f1f73039765 WHIRLPOOL a2a11de971efa245d9385573febc267eba7e136c4748859f8380514b38c745909e0405fbbeb053375af031f72ce3ac36b9b4a8f7f2dee1c37198d1cfc02f93a7
 EBUILD gcr-3.8.2.ebuild 1729 SHA256 ccf1354789dfddb0b2824e7d3c2dce0b856e837e19d3b14a8c42d4a552e631ee SHA512 12e0c5ebac7c22b17977d09f35c834744fb671be34bc339b51235907fe9832b8422419f121957a8d54d2f482bb775fa9569168129b59020731aed78f0d78f8cd WHIRLPOOL c2bfc937d176f40cc8bff2aa168e50d72780605651bc5ce0f834f20d4ecdde14bdfc5ba7ed1700454945676d7b2c0b16fe206ece0a3331226e976d13379aebe9
-MISC ChangeLog 3105 SHA256 ee411719025930d8dff897b6356cb2375a3739e44ff0f1350bd8c65ccba4dac4 SHA512 1558f0482efd3aa55b9b2866dca28f586a9eb488fd7db4cd7395c16226b639025de4a13a72c4b98400970a8e35853f69cd50938fc74b6593040faa7f6b8bbe64 WHIRLPOOL 9a5256ee8a8e3088c00360bcd70f27d35656e8f5b837adc5682a0e6bc42b1a456ead1e0f15263b6c8363ee227d23c35923e78d382824075378021c52816a90c9
+MISC ChangeLog 3279 SHA256 e1a30767291eed85bcbcf64880d8720fcdb32aafbf68f655baed17f0f362e078 SHA512 8cd1a2f0ab4ae96faecfa2ab35e3296f580b0f35de1275aea9b6c639f6f27ddc199003cf573dd7f922fb897c7a66746f763a7d87956bf8d91b72470e0b77ddb8 WHIRLPOOL 4fd8cb41593d1de88149f4fa5c25acad01b17441fe439f5e74d242a466b630647ee3c1d979fcbe4dbdf61e64ddb0ed04921810e01312be1698b73acefc9d79c8
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkroAACgkQCaWpQKGI+9RJ9gCggMWe7WjAGK1sWBPEwx2ss1f2
-ljkAn2OB+hGE0kCKwCB5Gqd7x2Ce0sSJ
-=ttH/
+iEYEAREIAAYFAlK5puoACgkQCaWpQKGI+9QSbQCeOCJfpS9y2afJPKspyYaHzPri
+MSIAn3S1ioqzbIpZORvYMdafxqBgdimj
+=w8aJ
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gcr/gcr-3.8.1.ebuild b/app-crypt/gcr/gcr-3.10.1.ebuild
index 51f6786b8737..e4610d6a307e 100644
--- a/app-crypt/gcr/gcr-3.8.1.ebuild
+++ b/app-crypt/gcr/gcr-3.10.1.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.8.1.ebuild,v 1.1 2013/04/17 19:51:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.10.1.ebuild,v 1.1 2013/12/24 15:23:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.20"
+VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 virtualx
+inherit gnome2 vala virtualx
 
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
 HOMEPAGE="https://developer.gnome.org/gcr/"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug gtk +introspection"
+IUSE="debug gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
 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"
 
 COMMON_DEPEND="
 	>=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.6
+	>=app-crypt/p11-kit-0.19
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libgcrypt-1.2.2:=
 	>=dev-libs/libtasn1-1:=
@@ -36,6 +39,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
+	vala? ( $(vala_depend) )
 "
 # eautoreconf needs:
 #	dev-libs/gobject-introspection-common
@@ -46,6 +50,7 @@ src_prepare() {
 		-e 's/CFLAGS="$CFLAGS -O0"//' \
 		-i configure.ac configure || die
 
+	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 
@@ -54,6 +59,7 @@ src_configure() {
 	gnome2_src_configure \
 		$(use_with gtk) \
 		$(use_enable introspection) \
+		$(use_enable vala) \
 		$(usex debug --enable-debug=yes --enable-debug=default) \
 		--disable-update-icon-cache \
 		--disable-update-mime
diff --git a/app-crypt/gcr/gcr-3.6.2.ebuild b/app-crypt/gcr/gcr-3.6.2.ebuild
deleted file mode 100644
index 504e1d334f1c..000000000000
--- a/app-crypt/gcr/gcr-3.6.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gcr/gcr-3.6.2.ebuild,v 1.6 2013/02/25 08:49:57 zmedico Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-IUSE="debug +introspection"
-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"
-
-COMMON_DEPEND="
-	>=app-crypt/gnupg-2
-	>=app-crypt/p11-kit-0.6
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1.0
-	>=x11-libs/gtk+-3.0:3
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	dev-libs/gobject-introspection-common
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(usex debug --enable-debug=yes --enable-debug=default)
-		--disable-update-icon-cache
-		--disable-update-mime"
-
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}