Bump to 3.0.2, from gnome overlay for GNOME 3

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

4 files changed, 214 insertions, 1 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index eb69a50b679c..80096da715cc 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.206 2011/07/11 11:42:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.207 2011/08/14 15:13:25 nirbheek Exp $
+
+*gnome-keyring-3.0.3-r300 (14 Aug 2011)
+*gnome-keyring-3.0.3-r200 (14 Aug 2011)
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-keyring-3.0.2-automagic-libcap.patch,
+  +gnome-keyring-3.0.3-r200.ebuild, +gnome-keyring-3.0.3-r300.ebuild:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
 *gnome-keyring-2.32.1-r1 (11 Jul 2011)
 
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
new file mode 100644
index 000000000000..2947af310827
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-3.0.2-automagic-libcap.patch
@@ -0,0 +1,57 @@
+From b75b9d5aa7f6207eca190b9d8e08059872c99365 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 20 May 2011 17:53:43 -0400
+Subject: [PATCH] Fix automagic libcap dependency (GNOME bug #649936)
+
+Backport of the patch by Saleem Abdulrasool <compnerd@compnerd.org>
+to gnome-keyring-3.0.x
+
+Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
+---
+ configure.in |   29 +++++++++++++++++++++--------
+ 1 files changed, 21 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index b2d07a7..88f7e66 100644
+--- a/configure.in
++++ b/configure.in
+@@ -445,16 +445,29 @@ fi
+ # libcap2
+ #
+
+-AC_CHECK_LIB([cap], [cap_get_proc], have_libcap="yes", have_libcap="no")
+-
+-if test $have_libcap = yes; then
+-   AC_DEFINE(HAVE_LIBCAP, 1, [Have libcap2 package, libcap library])
+-   DAEMON_LIBS="$DAEMON_LIBS -lcap"
+-else
+-   AC_MSG_WARN([libcap2 (or development headers) is not installed])
++AC_ARG_WITH([libcap],
++            [AC_HELP_STRING([--without-libcap],
++                            [build without libcap2 (disables Linux capabilities support)])],,
++            [with_libcap=auto])
++
++if test x"$with_libcap" != x"no" ; then
++    AC_CHECK_LIB([cap], [cap_get_proc],
++                 [
++                   with_libcap="yes"
++                   AC_DEFINE([HAVE_LIBCAP], [1], [Have libcap2 package, libcap library])
++                   DAEMON_LIBS="$DAEMON_LIBS -lcap"
++                 ],
++                 [
++                   if test x"$with_libcap" = x"yes" ; then
++                     AC_MSG_ERROR([libcap2 support requested, but package not found])
++                   else
++                     AC_MSG_WARN([libcap2 (or development headers) is not installed])
++                   fi
++                   with_libcap="no"
++                 ])
+ fi
+
+-libcap_status=$have_libcap
++libcap_status=$with_libcap
+
+ # --------------------------------------------------------------------
+ # Debug mode
+--
+1.7.5.rc3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
new file mode 100644
index 000000000000..b0cbc48eb204
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 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.0.3-r200.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+
+# 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
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1
+	caps? ( sys-libs/libcap )
+	pam? ( virtual/pam )
+"
+#	valgrind? ( dev-util/valgrind )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND="gnome-base/libgnome-keyring"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_with caps libcap)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--with-gtk=2.0"
+#		$(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"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
+	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_test() {
+	# FIXME: /gkm/transaction/ tests fail
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
new file mode 100644
index 000000000000..64041bd6c45c
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 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.0.3-r300.ebuild,v 1.1 2011/08/14 15:13:25 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+
+# USE=valgrind is probably not a good idea for the tree
+#
+# XXX: ARGH: libgcr is slotted, but libgck is not.
+# Hence, gtk2/3 versions are not parallel installable.
+RDEPEND=">=dev-libs/glib-2.25:2
+	>=x11-libs/gtk+-2.90.0:3
+	gnome-base/gconf:2
+	>=sys-apps/dbus-1.0
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1
+	caps? ( sys-libs/libcap )
+	pam? ( virtual/pam )
+"
+#	valgrind? ( dev-util/valgrind )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND="gnome-base/libgnome-keyring"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_with caps libcap)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--with-gtk=3.0"
+#		$(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"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
+	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_test() {
+	# FIXME: /gkm/transaction/ tests fail
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}