From 9562b30dab57c6de96ad70cb97d5b99ff7e72ac4 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Mon, 17 Dec 2012 04:46:11 +0000
Subject: Version bump for gnome-3.6, now with optional vala bindings. Update
 license. Drop useless doc USE flag. Switch to global introspection flag. Drop
 old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61
---
 gnome-base/libgnome-keyring/ChangeLog              | 10 +++-
 gnome-base/libgnome-keyring/Manifest               | 38 +++++++--------
 .../libgnome-keyring-2.32.0.ebuild                 | 12 ++---
 .../libgnome-keyring/libgnome-keyring-3.2.2.ebuild | 50 --------------------
 .../libgnome-keyring/libgnome-keyring-3.4.1.ebuild | 10 ++--
 .../libgnome-keyring/libgnome-keyring-3.6.0.ebuild | 54 ++++++++++++++++++++++
 gnome-base/libgnome-keyring/metadata.xml           |  3 +-
 7 files changed, 94 insertions(+), 83 deletions(-)
 delete mode 100644 gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
 create mode 100644 gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index 8baf32822672..a9e79fa76f47 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.36 2012/05/13 18:15:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.37 2012/12/17 04:46:05 tetromino Exp $
+
+*libgnome-keyring-3.6.0 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libgnome-keyring-2.32.0.ebuild, -libgnome-keyring-3.2.2.ebuild,
+  libgnome-keyring-3.4.1.ebuild, +libgnome-keyring-3.6.0.ebuild, metadata.xml:
+  Version bump for gnome-3.6, now with optional vala bindings. Update license.
+  Drop useless doc USE flag. Switch to global introspection flag. Drop old.
 
 *libgnome-keyring-3.4.1 (13 May 2012)
 
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 6493998f0e3b..be73bac16dc7 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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
-DIST libgnome-keyring-3.4.1.tar.xz 417752 RMD160 0eda1e112435aeb05940ad6721c274cd7a58ddf5 SHA1 a8e41617de8413219adf9e728e88869ab5145476 SHA256 e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8
-EBUILD libgnome-keyring-2.32.0.ebuild 1658 RMD160 4f17b53bcd9ee39258ff84495f9613097e645bf5 SHA1 2c7effcbd3c1a8dad9703fc069154e87af204055 SHA256 4dfb7354f6d5e8d5ee8a1a4e76b5d528e01fafe809e31408f91218c38c58fc11
-EBUILD libgnome-keyring-3.2.2.ebuild 1364 RMD160 9c123bfe946835f0a0f2e3dc5a734d32de102187 SHA1 e0c64eb5c04436907c9718b6bac48bf479191014 SHA256 0dfd711f4cb5fd9fb1679779b427360d55fea479dc3f88ff6796a61a66ce233e
-EBUILD libgnome-keyring-3.4.1.ebuild 1327 RMD160 da504afc00b4506536d011636f778a4e51526e69 SHA1 1dca96121b1190319baa8c1ad2fd2b9830c604e7 SHA256 cec92cdbf62fe6f36b7c3ea6fe5cc6e0ac3b27cb1632df4b678ea13ceff1272e
-MISC ChangeLog 6090 RMD160 0c7098352e1c24dd3c7f47180431e67a1b7d8faf SHA1 70a83597f170e5a3ea30f2475474191b19ba6fa9 SHA256 0a170b75946e4289da9482aa30a9d405b595513ae5f456bdea2a1678369f0643
-MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
+AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a82ff3cb6afa76a62bbba19312c417372b28eba89 SHA512 299ebf991a136483917a7739b3289e02c476e161991d13df7931fb7c2a8e742c1d8dc95540be919b4211a155303c29de00c80618f456fee2c05bf943751fa258 WHIRLPOOL c485ff391aa8d9d99e8f8431fb935d5eeca634e420c4b5c14ad4f36f742d7edf9ac61bc76a702c989d58f49b8b54ae7f58a6ec504eeb69be24bc76db3887cd29
+AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0 SHA512 6c842e018253841b5ea2138f19fae6a8cecafddb9b697f4ad8cdc287774d4db292f686e58ab0be47e66da72914a3205a3676819553ca5eda3708fee8a6b734ab WHIRLPOOL 3f7c92558aed3b013d7e8756c18be6e81756634dec7f9e4dde1b63e359e23929ed2f4177db259f352b97f2749e1f609fe69f32a194c3fe659678510a3d96b0ea
+AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
+DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
+DIST libgnome-keyring-3.4.1.tar.xz 417752 SHA256 e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8 SHA512 a6fd998fcc310390e8523a4c67818e0db28bc14799457475f00d2327ab72dac1b0ff8500e84de5f498e67c10f95ed38bf5f661454169651afc6860d6cb7a8c44 WHIRLPOOL e999052493cd1fd8f695a75d761436568b4050a88eade2c42f7306ab4c7aa4667dd963806ffab73f809cae767d578bd24dd2f946cbac8b0b9ca89b69453824b4
+DIST libgnome-keyring-3.6.0.tar.xz 423376 SHA256 6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830 SHA512 23913270972423abfe3eef785d553f4460f2a9930b464509897b22120fd5d376c67945d0a92d49cfd03aea514985511acbbfc46e776b9bfd2cd2cace49d0fbee WHIRLPOOL 589b05557efed6ae6e9916d8903e986d5fd1acfc1ddf348adaf7e6db6086ea627ee07e7bfba4ec46acb3ecffb38d67605828a9d62a19be5d2c6292e2084476f9
+EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
+EBUILD libgnome-keyring-3.4.1.ebuild 1337 SHA256 40b5f5bbac3568d33b1bfffa30ea50b0103069c436b5176ccc7f78ea0a08abb6 SHA512 9cf73397ef0efe1b124e1fed9c7bc738301a1d51a422381f91425c647066f21332abaa4ecfbf717f388a735037269dd4ca120505c4795d5baacba65650c20393 WHIRLPOOL 688f3a2e560ab75ecaf2309b2b4a8ac94ab2e2e2894932562a703730ae82147f0cb0cc35392564e4c30193f47e8e417e273f643581b42028e8cab987fa35a4bd
+EBUILD libgnome-keyring-3.6.0.ebuild 1496 SHA256 68cfaa92b0ba2567ac29d2e15673319536d3e2248f611ce046c0edc0dfa0deec SHA512 e7201a56410733f6686b3a04b877f95c2dcd4686b7abcef3ff5ea53fdc50b52f13232fd6fffd6498c3954a631a7931dec728c8ead49f57ef1a4e2bad0b6cd9cd WHIRLPOOL 6c89e98f9e4344ee17b45be0286bccda252572fea9b1a52aaa5a0ef43c3758b600e2ed380c9be31b6cee211547743bdde7a0de8223e56ad5706fd7f99b23ad4e
+MISC ChangeLog 6489 SHA256 19c437638aff3d9f9bb48c8c9b8f829d8f7535d5446c0f16ca77328e6619d98f SHA512 3ac0289087b0b5f9776b460a49b4a28fa594252414f7ee2607044a95069fa1750ea7757844b764fa24ac0e5da16aac4699d3f84d57e08d9ab53c95f44fc15a14 WHIRLPOOL e5c7349f72b73374d189927f48bfc6663f14239ea415c6f8669eeda2032081934c24d36235061fcff0220a404f72709a056839a5637e98e3e3822d48645c546d
+MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPr/pgAAoJEJ0WA1zPCt1hAykIAIX7Xf4E7Now5Dmp+UzsE6Fp
-Dr3i+tcAfla8CJ1pkVcGOepBCjTlWfnRR3r2b1MRp6ZQqZ0EfDpDgY2nRqvDAPQ1
-Wj9dfZOWd0pwHrvhxFzJ459FM266al5FWUyupTU3//fo/+36DfcddDgLygvUlr6B
-XAmFjk+06gT6t8hi5RX2FAqXdHnmyV3sgd4v+yEXwHIJO06++YPzbCcGTEUBs+83
-DNB9e83lxQyM3rPi4nC0khkDdEcCNmC3kYuInrQkqwOboEcY6w0Vp2FX1KE5/1NO
-zvh1+bmJRYGdv+TrBqC8/Fmrb12avxZ2riCoT0xc9u2ozyYiS87C7oDoqOsj+QM=
-=NZ5i
+iQEcBAEBCAAGBQJQzqOPAAoJEJ0WA1zPCt1h+U0H/A9LgbN5DS07VeYrRJUdMdGJ
+/EiLd44jaAdJTe8mzXU6hKUHPq07LhXCLd0LqzqzyYpRKueLu2xeFcb/ghdgDytn
+FFFOFZrsbmcAg7S0T9lkP1yI3GW0sqbKfOUQzcyXrhh9SQj5+7pcyHyCCK1NcxDP
+9TCuxeIAQA4Bs8vaVt0ME+RKWU51X50mkjuU0YBP2Gyyjke13BWGqYT5PaIF26fo
+EprGMFTuHTuVpRbpCN+vqgHVdm1E4uy5iKS2vTQdK8+QsO+L+HdUQw54KygBXnJ8
+GFTTvwljCVCj66Lgl4rQigVmMN4IEogMmZOZ8u7XsL+m09R+LWtIFdp0tB0MDPU=
+=81RK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
index 9b7cf5d0ea0b..99350bd31168 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.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/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.16 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.17 2012/12/17 04:46:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,19 +11,19 @@ inherit gnome2 eutils autotools
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc test"
+IUSE="debug test"
 
 RDEPEND=">=sys-apps/dbus-1.0
 	>=gnome-base/gnome-keyring-2.29[test?]
 	!<gnome-base/gnome-keyring-2.29"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
deleted file mode 100644
index 9d016f4d8da0..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.2.ebuild
+++ /dev/null
@@ -1,50 +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/libgnome-keyring/libgnome-keyring-3.2.2.ebuild,v 1.5 2012/05/09 16:10:23 aballier Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc test"
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=gnome-base/gnome-keyring-3.1.92[test?]"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests full)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS
-	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-
-	# FIXME: Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.ac configure || die "sed 2 failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
index f8ee7df2f6a4..ae1bcca0ac9f 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.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/libgnome-keyring/libgnome-keyring-3.4.1.ebuild,v 1.1 2012/05/13 18:15:54 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.4.1.ebuild,v 1.2 2012/12/17 04:46:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,19 +11,19 @@ inherit gnome2 python
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug doc +introspection test"
+IUSE="debug +introspection test"
 
 RDEPEND=">=sys-apps/dbus-1.0
 	>=gnome-base/gnome-keyring-3.1.92
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
 	test? ( =dev-lang/python-2* )"
 
 pkg_setup() {
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild
new file mode 100644
index 000000000000..cb296d598732
--- /dev/null
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.6.0.ebuild,v 1.1 2012/12/17 04:46:05 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python vala
+
+DESCRIPTION="Compatibility library for accessing secrets"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=sys-apps/dbus-1.0
+	>=gnome-base/gnome-keyring-3.1.92
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( =dev-lang/python-2* )
+	vala? ( $(vala_depend) )"
+
+pkg_setup() {
+	if use test; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	G2CONF="${G2CONF} $(use_enable vala)"
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# FIXME: Remove silly CFLAGS
+	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
+		-i configure.ac configure || die "sed failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch emake check || die "tests failed"
+}
diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml
index 3147d749554f..c83b6723d9e4 100644
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ b/gnome-base/libgnome-keyring/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad