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

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

7 files changed, 52 insertions, 258 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/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
 }