[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-keyring: gnome-keyring-3.12.2.ebuild gnome-keyring-3.10.1.ebuild gnome-keyring-3.12.0.ebuild gnome-keyring-3.12.2-r1.ebuild ChangeLog

[Alexandre Rostovtsev (tetromino)]

tetromino    14/06/23 04:06:56

  Modified:             gnome-keyring-3.12.2.ebuild
                        gnome-keyring-3.10.1.ebuild
                        gnome-keyring-3.12.0.ebuild ChangeLog
  Added:                gnome-keyring-3.12.2-r1.ebuild
  Log:
  Apply cap_ipc_lock only if USE=caps, and never install gnome-keyring-daemon as suid root since that breaks dbus activation (bug #513870, thanks to Francesco Turco). Remove ancient libgnome-keyring pdepend, shouldn't be needed now (bug #502434, thanks to Yaroslav Isakov).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.3                  gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild?r1=1.2&r2=1.3

Index: gnome-keyring-3.12.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-keyring-3.12.2.ebuild	7 Jun 2014 19:06:58 -0000	1.2
+++ gnome-keyring-3.12.2.ebuild	23 Jun 2014 04:06:56 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.2.ebuild,v 1.2 2014/06/07 19:06:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.3 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -34,7 +34,6 @@
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 pkg_setup() {
 	python-any-r1_pkg_setup



1.13                 gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild?r1=1.12&r2=1.13

Index: gnome-keyring-3.10.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-keyring-3.10.1.ebuild	21 Apr 2014 10:29:14 -0000	1.12
+++ gnome-keyring-3.10.1.ebuild	23 Jun 2014 04:06:56 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.1.ebuild,v 1.12 2014/04/21 10:29:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.13 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -32,7 +32,6 @@
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 src_prepare() {
 	# Disable stupid CFLAGS



1.2                  gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild?r1=1.1&r2=1.2

Index: gnome-keyring-3.12.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-keyring-3.12.0.ebuild	27 Apr 2014 16:53:02 -0000	1.1
+++ gnome-keyring-3.12.0.ebuild	23 Jun 2014 04:06:56 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.0.ebuild,v 1.1 2014/04/27 16:53:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v 1.2 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -34,7 +34,6 @@
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 pkg_setup() {
 	python-any-r1_pkg_setup



1.254                gnome-base/gnome-keyring/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.254&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.254&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.253&r2=1.254

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- ChangeLog	7 Jun 2014 19:06:58 -0000	1.253
+++ ChangeLog	23 Jun 2014 04:06:56 -0000	1.254
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.253 2014/06/07 19:06:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.254 2014/06/23 04:06:56 tetromino Exp $
+
+*gnome-keyring-3.12.2-r1 (23 Jun 2014)
+
+  23 Jun 2014; Alexandre Rostovtsev <tetromino@g.o>
+  gnome-keyring-3.10.1.ebuild, gnome-keyring-3.12.0.ebuild,
+  gnome-keyring-3.12.2.ebuild, +gnome-keyring-3.12.2-r1.ebuild:
+  Apply cap_ipc_lock only if USE=caps, and never install gnome-keyring-daemon
+  as suid root since that breaks dbus activation (bug #513870, thanks to
+  Francesco Turco). Remove ancient libgnome-keyring pdepend, shouldn't be
+  needed now (bug #502434, thanks to Yaroslav Isakov).
 
   07 Jun 2014; Alexandre Rostovtsev <tetromino@g.o>
   gnome-keyring-3.12.2.ebuild, metadata.xml:



1.1                  gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: gnome-keyring-3.12.2-r1.ebuild
===================================================================
# Copyright 1999-2014 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.12.2-r1.ebuild,v 1.1 2014/06/23 04:06:56 tetromino Exp $

EAPI="5"
GCONF_DEBUG="yes" # Not gnome macro but similar
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python2_7 )

inherit fcaps gnome2 pam python-any-r1 versionator virtualx

DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"

LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps debug pam selinux +ssh-agent"
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"

RDEPEND="
	>=app-crypt/gcr-3.5.3:=[gtk]
	>=dev-libs/glib-2.38:2
	app-misc/ca-certificates
	>=dev-libs/libgcrypt-1.2.2:0=
	>=sys-apps/dbus-1.1.1
	caps? ( sys-libs/libcap-ng )
	pam? ( virtual/pam )
"
DEPEND="${RDEPEND}
	${PYTHON_DEPS}
	app-text/docbook-xml-dtd:4.3
	dev-libs/libxslt
	>=dev-util/intltool-0.35
	sys-devel/gettext
	virtual/pkgconfig
"

pkg_setup() {
	python-any-r1_pkg_setup
}

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 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
		-i "${S}"/pkcs11/gkm/test-timer.c || die
	# For some reason all pam tests make the testsuite retun 77
	# which is considered an error but the test framework,
	# but all tests are successful, upstream bug #731030
	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die

	gnome2_src_prepare
}

src_configure() {
	gnome2_src_configure \
		$(use_with caps libcap-ng) \
		$(use_enable pam) \
		$(use_with pam pam-dir $(getpam_mod_dir)) \
		$(use_enable selinux) \
		$(use_enable ssh-agent) \
		--enable-doc \
		--enable-gpg-agent
}

src_test() {
	 # FIXME: this should be handled at eclass level
	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die

	 unset DBUS_SESSION_BUS_ADDRESS
	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
}

pkg_postinst() {
	# cap_ipc_lock only needed if building --with-libcap-ng
	# Never install as suid root, this breaks dbus activation, see bug #513870
	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
	gnome2_pkg_postinst
}