Version bump for gnome-3.6. Drop useless doc USE flag. Update homepage. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 64 insertions, 273 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index b37b239cc642..ac6a7392751c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,16 @@
 # 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.225 2012/10/24 07:11:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.226 2012/12/17 04:45:41 tetromino Exp $
+
+*gnome-keyring-3.6.2 (17 Dec 2012)
+
+  17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-keyring-2.32.1.ebuild, gnome-keyring-2.32.1-r1.ebuild,
+  -gnome-keyring-3.2.2.ebuild, -files/gnome-keyring-3.2.2-gold-glib-2.32.patch,
+  -gnome-keyring-3.4.1.ebuild, gnome-keyring-3.4.1-r1.ebuild,
+  +gnome-keyring-3.6.2.ebuild:
+  Version bump for gnome-3.6. Drop useless doc USE flag. Update homepage. Drop
+  old.
 
 *gnome-keyring-3.4.1-r1 (24 Oct 2012)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index cca451f09ece..108229c95fe8 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -3,27 +3,24 @@ 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
-AUX gnome-keyring-3.2.2-gold-glib-2.32.patch 1418 SHA256 523a2332dcc1db82f2897bf370c4c82b0e4ef3725ce06799b39554fe5ebe1587 SHA512 67eb80d999258162b871e34f235a1873850d64cbd5e6fdac604b3b402947b01842b40b5a8e9d0e7c893f3671c4a9e53084399ce8bfc06b25517fd6d3cce1b124 WHIRLPOOL 9b5fc1afe242f5612df534d70b3ca441dcc75f6ad01aae5e8dfb1a72800ad2392fad585f6f5ffecb1493bcda91068730e9db7865e221672104d338d0adb4291c
 AUX gnome-keyring-3.4.1-gpg-cache-method-1.patch 3222 SHA256 ad95945e404078059222d63decef8528a6e42a61aa01246463cfb272219420cc SHA512 44eefeb144d63ac9b66de13f58a87eb0713e91f73af758e2e7968a9d1f14af3d8137f5fce4abf51aea6eaef96f29219c349fbc8072725aa433ae7a9111756f9f WHIRLPOOL 159c94cef08b8e3d0d230f858e88c3fe75b40b3ff03cd18af3c4f0a771dbde424701abc7bb6610de6dd56127b7bc2b0715cef3d582c7206030739df04ee3a07b
 AUX gnome-keyring-3.4.1-gpg-cache-method-2.patch 1009 SHA256 832f4d27df3f8850ccc0e034e12d62e847e7c10deadd77b1e3761a90c6b1bd9b SHA512 610c7051e84bb343083932309758317ad120380041f4a57e6e7e2646677c20126395f0a2cc7f70c842be0175bd851d0253adfb6911c93a9dc0a6a6b86791371e WHIRLPOOL 5f4b413b1fc5bf9b3f0b7c4653876d00eab05f5d7f5d472272d3faaed17a8d2a0ed518b9e77f4b933a2fa69f7e905fcd911674ad36ffb3570ccc4aa2b44cc882
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
-DIST gnome-keyring-3.2.2.tar.xz 1579860 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3 SHA512 61ca66046183d3c4b9eb3209ffc51653cc6be209b9cff716c815e1ba5d8fdf7b187005a1f13e0b73662a28a5b51569fe96f9037887a01f4d5080d1fac581d806 WHIRLPOOL a90507204089587813f262aa3c4507ed701d335d55bbd7dffea954d31bb398f6b08212360cfdb5df2aab29deb4f26cf512edd830b0059c79f8abc9e4362f293c
 DIST gnome-keyring-3.4.1.tar.xz 1107820 SHA256 9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249 SHA512 3a27a62d1f074fcf4f95de2cbce9ab017aecf63be3f48f9371945b4b0a10a7e1dabe3fe4dc557e9aff8e67e9000769ab895d9c96bcd8187423a418f0dabaeddb WHIRLPOOL 8901777f34f05522a7f805b0369de8ed7366baf3aec9bfc1e5ca651f1b25e0b8e5f21eb5c2a469d7904a11f386b259713b4e40e442ae9c71c3d0559774a0a061
-EBUILD gnome-keyring-2.32.1-r1.ebuild 2053 SHA256 5dceeb6c7638158375148d1af8c99942a0f02b31349faea830173cacd781d06d SHA512 3c494f0c02be112195eb45febd32f7fd4736711f743402b37bf246f4be6cae064bfbf77a736dc3b343224d9315a31660ac843eedda0d1cc6b026f91e7c5ffd83 WHIRLPOOL 798361310b5b89342da1208ad506422a96446d1b23aea9a7bfc809cba81537923dd5f5fd8312c031eea6860c6aeaa069f669fbfe8cb790b6832b78da78ac9286
-EBUILD gnome-keyring-2.32.1.ebuild 1918 SHA256 65a75016c17492e81cde13d11fe1771608453abe98013311bb02bd8dbaa46748 SHA512 686dd6cba0e0f6d8f15b777ef7f0e6ae5550ddc5e48e6bec23ece9cc7be9fa53fa62ce28ba949442034efe7de9f87daf45e998ca320771a434a7c581df888c3c WHIRLPOOL 772385502159a906a24d671d260c83d14630b21166fa6cec9339840f45039aa1e227d8819e4d47337eca87589e814486dd018d212f449d75ab8950e225397dd9
-EBUILD gnome-keyring-3.2.2.ebuild 3429 SHA256 83455566bfe5f38e0f02c63d14db3bf5b5f7e553f4f56fd0894282fff376f4ea SHA512 4b4a126384183b0a4e227f20f75899ce401fed9d0990ed0d3d27c4cfa259e924c08368fe9d9d4e6c5749b5eec861b3c58a0c4bf9433dcc34679c5c6a99302196 WHIRLPOOL 2aeb296ee944ee1e5fa7e3598a3669103d8baf10f35d97577efa844f95db7005734ebeecc240a39f2d64b636722e7874f536d940e7dbc80387b40cb377c4bc89
-EBUILD gnome-keyring-3.4.1-r1.ebuild 3070 SHA256 f155b7b08463711719ec5691ac042a751096c7b66d3cc6268edd79e412421af0 SHA512 117c049a64cf2fb17496a96301a7995c466fdbea19fe86f899957f8447d29e69c1b41c32b2be54f7723867ae4af4f9156a80432531763c613784cbadf8fe6570 WHIRLPOOL 58107a194bd2d93b91daeb48aa6fb1c3421d00bc65c3c644b7e20ffec8f8204146cb548d25d4a7a1da63591a04602103fa52503768501a6e334347e493615869
-EBUILD gnome-keyring-3.4.1.ebuild 2943 SHA256 90b7b868a841050cafcb387afaef882cf401b192a7174da394334521fd9f9610 SHA512 5b97dd9f0931bfee1988de7a1b820cd996945a3fb400a47d162aa90e334810dcb18d15c92d4b507451bc95a791632c65a28be23b79743623d6b0960de117f98d WHIRLPOOL c65ca7870f9fba13fc0fc3f5c0d22f460130225e1eea46c341213818a69a5cc0fe56ac7658e1a1af3301072975e12eefa64068dc437e4723ec76b35243ae08d7
-MISC ChangeLog 32809 SHA256 c4ca666bbcd720df9c537ebde5281bcb21ba9b0bb366cdaba691f8c022122263 SHA512 a8b5457d7f0ae623b9e1451f616897b4d5965c65c77b1912b92d3280f0adf1acdb36c929f66e695e0687220b4601639b4de85a00f009adf24d99bdd4d8e09623 WHIRLPOOL 77bef14ea0f55f86ab7b9a2ad1aa43be089fe756b4120ebf986d3e1a2308dfd06169a0ad8166c304e2dd1e9a8f6b2d93467c9aa966138bbb3a19d8e3ebc56c41
+DIST gnome-keyring-3.6.2.tar.xz 1139836 SHA256 ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6 SHA512 d469e7cf5721aa3fd22bcf87799f303d01135698af7919f9bb9421ae043729bc8924d6e245b1e7c16d501897c259df35e9e015e79ae4d4c17af473a48dc337c5 WHIRLPOOL 0b24551a964d68e9f6dab211d409e80c49808640cd613a9d8b0cc47edfe288ac167dbc71e3164a81cbad64a1a3f1376f84ecbd023a3443b442da13770969d2ec
+EBUILD gnome-keyring-2.32.1-r1.ebuild 2050 SHA256 3a06de08fda7f013e5f2ec5dd2bcd2d3e44f98fb1036404bc0862caf1094f39a SHA512 3dc6362f2687a3989879937abd67d43e925b46c0822b41fe0b530d8feecd41f39c15c00ee6b8bc12576c789c980fa5ca585ad93731b35ca1d1c537439e330f53 WHIRLPOOL dfe94dff29550f966515b202d7392f5340604da3ed7fa1d4e9b8dac76746c62fd9330064896435f7a800c6b0ab213f2fee4ebc1d42c41d67e36eb36df6e08065
+EBUILD gnome-keyring-3.4.1-r1.ebuild 3090 SHA256 cb2d6893371372d2bd92d6cbf7ebc756fdb6dcb5090be76b23e0553b374f90d0 SHA512 db5faf60fffe2a240d1577e020fbe5c20facdfd303d963fcac27ce473675cf783bf7f0c10777c276eac18d6f0bdd565694fbabe99cca0e1a897e9feedff4abe3 WHIRLPOOL 005849277063ace79250f9076bf275b62fb3484f78adadaea6e777b382561870251ae7aa60fec99861c9f5c2458329f58ffa933cca2139e6b0ab10816e562a08
+EBUILD gnome-keyring-3.6.2.ebuild 3664 SHA256 f18bddaef0122b98becd8a1c082e9c1956abcaa56413ff3bc3b9349118324b65 SHA512 7e52f8560bd32f9fbe63ff9c8b12f5af352d08749333b905c0d9e9b1acecc3641776938995e3eab12ddb2b0a73d0a940566cc5cf2591c0e70b7a8fb94c0e6736 WHIRLPOOL 36c6d50045c9c9c2c6134136f0fb82a66ce3fe8cc05022c46189879fc84f498b32c6430f73baa13fe13c5c97ac704f1865cbe3ebf722a912eaa8a33d276e2620
+MISC ChangeLog 33228 SHA256 c0045c3cf42607160238fea7d2830ce5225c3eda1c865fe61559eacab4c7bc53 SHA512 589e5322bce1714102a4c7317ca9039e772e0af3df9c2c826c512548b1748998ae5ef77106a0b61431354bc5e5c40353e1500d827a590faeb023f7ce900a1dd7 WHIRLPOOL be9c9fd5f1e0394ed7141833d240612e058839c05d3300e918373da21c86487e24020504c0eaebf5707d4e2562e21441b1009dd8ccc002cf94147e0857b28e3f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQh5S4AAoJEJ0WA1zPCt1hATsH/0kBup20pxRwb5BLanCI9snY
-XWEoARKvDsV87FX2c46jQDaX5HwjFh50kpZ+owRkkOd/u3hN86JingOU66Z8unUu
-5y+rmiQQdLwHxI4YfLfh3jfp8ch1CCI2jBDmxiBv25iOACSBMhTJMLXXozfMHyAA
-FF8GcmiQJ/V4izQe2HZT5/c2GiYMe4mSBJcSOt/2aiZmZ87btx9sYWbI4Rj9X3ME
-UaZuO+HEn/nCwGrApzvaOjNh3n+ETutwGFS7vOuKIihw8GMfOYEwBFEDc3x2D8f9
-YX8SuB8otEaS2DtV4STs2vpmrhO0DvngXIVvNFy6ZdbSX4Hk2zpSfoM/F5RZo5I=
-=c7/k
+iQEcBAEBCAAGBQJQzqN2AAoJEJ0WA1zPCt1hqy0IAIEAtB8mw5BukcYuBIScNQpo
+LlpIWZivHMd+c3wAFZVgDlQeJ5XKzEi2lizphbgYl0jv19p43PJmmeSUlvrz9NC/
++OhJzi4BIP4bebNAzTnoFUCeMDd5DSEq8WhCPoboUqlgJLs0DTwev7r9WbK9UVvh
+Dx67x6Rgj809Y8DOhghtymquw1NhXPVWVCddhfOV93yn7fyvXIFp73FFQvXk7GdN
+XvmNRcgu/nxg2eLsplJhdA6mRAZUKL6KIymN6Hdnc0dmbsdAwxKx606iY3twUBEg
+Lb+Zp2PE50IEJ+Pjq7Hi1V8x075cVJT+Jh3Q2srMJDNQLnFj5ZjpGagm14E/kuw=
+=+L5l
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch
deleted file mode 100644
index 34c954d03a14..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-3.2.2-gold-glib-2.32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- configure.ac    |    8 ++++----
- gcr/Makefile.am |    1 +
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 70be49e..0fe24a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,8 +69,8 @@ AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
- PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
--AC_SUBST(GLIB_CFLAGS)
--AC_SUBST(GLIB_LIBS)
-+AC_SUBST(GMODULE_CFLAGS)
-+AC_SUBST(GMODULE_LIBS)
- 
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
- AC_SUBST(GTHREAD_CFLAGS)
-@@ -88,8 +88,8 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS"
--DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS"
-+DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS $GMODULE_CFLAGS"
-+DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS $GMODULE_LIBS"
- 
- GETTEXT_PACKAGE=gnome-keyring
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
-diff --git a/gcr/Makefile.am b/gcr/Makefile.am
-index 0e40215..1f75aa3 100644
---- a/gcr/Makefile.am
-+++ b/gcr/Makefile.am
-@@ -148,6 +148,7 @@ libgcr_@GCR_MAJOR@_la_LIBADD = \
- 	$(top_builddir)/gck/libgck-@GCK_MAJOR@.la \
- 	$(GOBJECT_LIBS) \
- 	$(GLIB_LIBS) \
-+	$(GMODULE_LIBS) \
- 	$(LIBGCRYPT_LIBS) \
- 	$(GTK_LIBS) \
- 	$(P11_KIT_LIBS)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
index 94097183738b..1647f89fc3e1 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.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-2.32.1-r1.ebuild,v 1.9 2012/10/24 07:11:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild,v 1.10 2012/12/17 04:45:41 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="debug doc pam test"
+IUSE="debug pam test"
 # USE=valgrind is probably not a good idea for the tree
 
 RDEPEND=">=dev-libs/glib-2.25:2
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
deleted file mode 100644
index 42cba927036a..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild
+++ /dev/null
@@ -1,74 +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-2.32.1.ebuild,v 1.16 2012/10/24 07:11:50 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="debug pam test"
-# USE=valgrind is probably not a good idea for the tree
-
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.20:2
-	gnome-base/gconf:2
-	>=sys-apps/dbus-1.0
-	pam? ( virtual/pam )
-	>=dev-libs/libgcrypt-1.2.2
-	>=dev-libs/libtasn1-1"
-#	valgrind? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="gnome-base/libgnome-keyring"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
-# revisit then.
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${EPREFIX}/usr/share/ca-certificates/
-		--enable-acl-prompts
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--with-gtk=2.0"
-#		$(use_enable valgrind)
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
deleted file mode 100644
index dbda83fe8c69..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild
+++ /dev/null
@@ -1,120 +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.2.ebuild,v 1.10 2012/10/24 07:11:50 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils 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 pam test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~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}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-
-# FIXME: tests are flaky and write to /tmp (instead of TMPDIR)
-RESTRICT="test"
-
-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"
-
-	# gold plus glib-2.32 underlinking fix
-	epatch "${FILESDIR}"/${P}-gold-glib-2.32.patch
-
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-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.4.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.4.1-r1.ebuild
index c493ebe601b6..7f333abbd481 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.4.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.4.1-r1.ebuild
@@ -1,15 +1,15 @@
 # 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.4.1-r1.ebuild,v 1.1 2012/10/24 07:11:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.4.1-r1.ebuild,v 1.2 2012/12/17 04:45:41 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 pam versionator virtualx
+inherit eutils gnome2 pam versionator virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
index 6118758803b3..5a8fe307299a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
@@ -1,46 +1,65 @@
 # 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.4.1.ebuild,v 1.2 2012/10/24 07:11:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild,v 1.1 2012/12/17 04:45:41 tetromino Exp $
 
-EAPI="4"
-GCONF_DEBUG="no"
+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://www.gnome.org/"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="GPL-2 LGPL-2"
+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 ~x86-linux ~sparc-solaris ~x86-solaris"
 
-RDEPEND=">=app-crypt/gcr-3.3.4
-	>=dev-libs/glib-2.28:2
+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
+	>=dev-libs/libgcrypt-1.2.2:=
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
+	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)
 
-# FIXME: tests are very flaky and write to /tmp (instead of TMPDIR)
-RESTRICT="test"
+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
+}
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
+src_configure() {
 	G2CONF="${G2CONF}
-		$(use_enable debug)
 		$(use_with caps libcap-ng)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
@@ -49,6 +68,7 @@ pkg_setup() {
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
+	gnome2_src_configure
 }
 
 src_test() {
@@ -57,7 +77,7 @@ src_test() {
 }
 
 pkg_postinst() {
-	use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
+	use caps && fcaps 0:0 755 cap_ipc_lock "${EROOT}"/usr/bin/gnome-keyring-daemon
 
 	gnome2_pkg_postinst
 }