[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-09-27 22:32 Alexandre Rostovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-27 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6ed2703241eceb07db33435fd99e61f0320b6fdf
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 22:27:42 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 22:27:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6ed27032

gnome-base/gnome-keyring: 3.5.92 → 3.6.0

---
 ...ng-3.5.92.ebuild => gnome-keyring-3.6.0.ebuild} |    2 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.5.92.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild
similarity index 99%
rename from gnome-base/gnome-keyring/gnome-keyring-3.5.92.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild
index 8ca068f..8ef9a46 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.5.92.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps debug doc pam selinux"
 if [[ ${PV} = 9999 ]]; then

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 8ca068f..8ef9a46 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps debug doc pam selinux"
 if [[ ${PV} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2018-01-12 12:46 Dennis Lamm
  0 siblings, 0 replies; 28+ messages in thread
From: Dennis Lamm @ 2018-01-12 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     fc71cf20afa52751b88e0c127c5fce404e0173a7
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 12:46:19 2018 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 12:46:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fc71cf20

gnome-base/gnome-keyring: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../gnome-keyring/gnome-keyring-3.20.0.ebuild      | 85 ----------------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |  3 +-
 2 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
deleted file mode 100644
index ecbd8d62..00000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-
-	>=app-crypt/gnupg-2.0.28
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/pinentry[gnome-keyring]
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || 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
-}
-
-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
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 11e9a6c2..f4983042 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2016-03-26 22:54 Ole Reifschneider
  0 siblings, 0 replies; 28+ messages in thread
From: Ole Reifschneider @ 2016-03-26 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     16c71e35ff5a2c6ff4404c599d0c07d7d9a1cc5a
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 21:20:10 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 21:20:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=16c71e35

gnome-base/gnome-keyring: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...ing-9999.ebuild => gnome-keyring-3.20.0.ebuild} | 37 ++++++++++++----------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 26 ++++++++++-----
 2 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
similarity index 66%
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
index efe0831..ecbd8d6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,32 +8,31 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 
 inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 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 test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-fi
+IUSE="+caps pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
-RDEPEND="
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+COMMON_DEPEND="
 	>=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 )
+
+	>=app-crypt/gnupg-2.0.28
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/pinentry[gnome-keyring]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
+	>=app-eselect/eselect-pinentry-0.5
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
@@ -43,11 +42,11 @@ DEPEND="${RDEPEND}
 "
 
 pkg_setup() {
-	python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	# Disable stupid CFLAGS
+	# Disable stupid CFLAGS with debug enabled
 	sed -e 's/CFLAGS="$CFLAGS -g"//' \
 		-e 's/CFLAGS="$CFLAGS -O0"//' \
 		-i configure.ac configure || die
@@ -62,8 +61,7 @@ src_configure() {
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
 		$(use_enable ssh-agent) \
-		--enable-doc \
-		--enable-gpg-agent
+		--enable-doc
 }
 
 src_test() {
@@ -79,4 +77,9 @@ pkg_postinst() {
 	# 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
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index efe0831..11e9a6c 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,16 +24,22 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
-RDEPEND="
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+COMMON_DEPEND="
 	>=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 )
+
+	>=app-crypt/gnupg-2.0.28
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/pinentry[gnome-keyring]
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
+	>=app-eselect/eselect-pinentry-0.5
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
 	>=dev-util/intltool-0.35
@@ -43,11 +49,11 @@ DEPEND="${RDEPEND}
 "
 
 pkg_setup() {
-	python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	# Disable stupid CFLAGS
+	# Disable stupid CFLAGS with debug enabled
 	sed -e 's/CFLAGS="$CFLAGS -g"//' \
 		-e 's/CFLAGS="$CFLAGS -O0"//' \
 		-i configure.ac configure || die
@@ -62,8 +68,7 @@ src_configure() {
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
 		$(use_enable ssh-agent) \
-		--enable-doc \
-		--enable-gpg-agent
+		--enable-doc
 }
 
 src_test() {
@@ -79,4 +84,9 @@ pkg_postinst() {
 	# 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
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2015-05-10 17:20 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-10 17:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b6415eba78f12772f466d1bd9245d5c57bf999a5
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 15:00:30 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 15:39:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b6415eba

gnome-base/gnome-keyring: 3.14.0 → 3.16.0

 ...ing-9999.ebuild => gnome-keyring-3.16.0.ebuild} | 28 ++++------------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 19 ++++-----------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
similarity index 64%
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
index c3e87ff..85ff627 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,21 +8,14 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
 
 inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 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"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	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"
-fi
+IUSE="+caps debug pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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]
@@ -34,16 +27,16 @@ RDEPEND="
 	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
+	test? ( ${PYTHON_DEPS} )
 "
 
 pkg_setup() {
-	python-any-r1_pkg_setup
+	use test && python-any-r1_pkg_setup
 }
 
 src_prepare() {
@@ -52,17 +45,6 @@ src_prepare() {
 		-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
 }
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index c3e87ff..ce59d93 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,11 +17,11 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+caps debug pam selinux +ssh-agent"
+IUSE="+caps debug pam selinux +ssh-agent test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
 RDEPEND="
@@ -34,12 +34,12 @@ RDEPEND="
 	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
+	test? ( ${PYTHON_DEPS} )
 "
 
 pkg_setup() {
@@ -52,17 +52,6 @@ src_prepare() {
 		-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
 }
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2014-12-22 23:11 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-22 23:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1fa95cea8b56e3cc0d84d8720776590579d9b60f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 22 23:05:39 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 22 23:05:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1fa95cea

gnome-base/gnome-keyring: moved to gentoo-x86

---
 .../gnome-keyring/gnome-keyring-3.14.0.ebuild      | 86 ----------------------
 1 file changed, 86 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.14.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.14.0.ebuild
deleted file mode 100644
index 4520b19..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.14.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2014-10-26 15:46 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-26 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     07c24fc32ba7defb8f61009f17d2b359ff03dd45
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 26 15:46:07 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 15:46:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=07c24fc3

gnome-base/gnome-keyring: sync metadata.xml

---
 gnome-base/gnome-keyring/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
index 133e5a2..e771efd 100644
--- a/gnome-base/gnome-keyring/metadata.xml
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -11,4 +11,8 @@
     standard way for applications to manage certificates and keys on
     smart cards or secure storage.
   </longdescription>
+  <use>
+    <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys.
+      Recommended unless you are using ECDSA or Ed25519 keys.</flag>
+  </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2014-04-16 22:27 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-16 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     c05ea9572513d73a3e654d07ac9892fd6fefc7ef
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 16 21:52:45 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 16 22:25:59 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c05ea957

gnome-base/gnome-keyring: 3.10.1 → 3.12.0

Unittests now require python. Seems like a common trait for package that
got migrated to GLIB_TESTS macro ?
Something weird is going on with PAM unittests.

---
 ...ing-9999.ebuild => gnome-keyring-3.12.0.ebuild} | 35 ++++++++++++++--------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |  6 ++--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
similarity index 58%
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
index e612bd7..260260c 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
 GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
 
-inherit fcaps gnome2 pam versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit fcaps gnome2 pam python-any-r1 versionator virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
@@ -17,22 +15,19 @@ HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps debug pam selinux"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	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"
-fi
+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.32.0:2
+	>=dev-libs/glib-2.38:2
 	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
+	>=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
@@ -41,12 +36,28 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
+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
+	# FIXME: this is only for overlay, report upstream, make a patch !!!
+	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index e612bd7..38aa85d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -25,9 +25,9 @@ fi
 
 RDEPEND="
 	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/glib-2.38:2
 	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
+	>=dev-libs/libgcrypt-1.2.2:0=
 	>=sys-apps/dbus-1.1.1
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2014-02-12 20:58 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2014-02-12 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     b13a28693d8320696926071ddd22242a38050d06
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:21:50 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:27:10 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b13a2869

gnome-base/gnome-keyring: moved to gentoo-x86

---
 .../gnome-keyring/gnome-keyring-3.10.1.ebuild      | 81 ----------------------
 gnome-base/gnome-keyring/metadata.xml              |  9 +++
 2 files changed, 9 insertions(+), 81 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
deleted file mode 100644
index bd71cad..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit fcaps gnome2 pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-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 ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.32.0:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-
-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
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		--enable-doc \
-		--enable-ssh-agent \
-		--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() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}

diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
index 6e0e2ec..133e5a2 100644
--- a/gnome-base/gnome-keyring/metadata.xml
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
+  <longdescription lang="en">
+    GNOME Keyring is a collection of components in GNOME that store
+    secrets, passwords, keys, certificates and make them available to
+    applications. It is integrated with the user's login, so that
+    their secret storage can be unlocked when the user logins into their
+    session. It is based around a standard called PKCS#11, which is a
+    standard way for applications to manage certificates and keys on
+    smart cards or secure storage.
+  </longdescription>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2013-12-11 23:44 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-11 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     0762cb6f00d9f5c4c580781866cc5697ae54f48d
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 11 23:22:51 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 23:43:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0762cb6f

gnome-base/gnome-keyring: 3.10.0 → 3.10.1

---
 .../{gnome-keyring-3.10.0.ebuild => gnome-keyring-3.10.1.ebuild}    | 6 +++---
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild                  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
similarity index 95%
rename from gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
index 38dc4f6..bd71cad 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
@@ -26,14 +26,13 @@ RDEPEND="
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
 	>=dev-util/intltool-0.35
 	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)
 
 src_prepare() {
 	# Disable stupid CFLAGS
@@ -63,6 +62,7 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
+		--enable-doc \
 		--enable-ssh-agent \
 		--enable-gpg-agent
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 7b76c05..e612bd7 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -33,14 +33,13 @@ RDEPEND="
 	pam? ( virtual/pam )
 "
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
 	>=dev-util/intltool-0.35
 	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)
 
 src_prepare() {
 	# Disable stupid CFLAGS
@@ -57,6 +56,7 @@ src_configure() {
 		$(use_enable pam) \
 		$(use_with pam pam-dir $(getpam_mod_dir)) \
 		$(use_enable selinux) \
+		--enable-doc \
 		--enable-ssh-agent \
 		--enable-gpg-agent
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2013-10-13 22:22 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2013-10-13 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     98c96376aaec25a6e5abec6e38822609818b2003
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 21:41:39 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 21:50:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=98c96376

gnome-base/gnome-keyring: 3.8.2 → 3.10.0

---
 .../gnome-keyring/gnome-keyring-3.10.0.ebuild      | 81 ++++++++++++++++++++++
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild | 80 +++++----------------
 2 files changed, 99 insertions(+), 62 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild
new file mode 100644
index 0000000..38dc4f6
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.10.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+
+inherit fcaps gnome2 pam versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+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 ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.32.0:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	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)
+
+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
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		--enable-ssh-agent \
+		--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() {
+	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index e1b153d..7b76c05 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 pam versionator virtualx
+inherit fcaps gnome2 pam versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -20,16 +20,15 @@ IUSE="+caps debug pam selinux"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+	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"
 fi
 
 RDEPEND="
-	>=app-crypt/gcr-3.5.3:=
+	>=app-crypt/gcr-3.5.3:=[gtk]
 	>=dev-libs/glib-2.32.0:2
-	>=x11-libs/gtk+-3.0:3
 	app-misc/ca-certificates
 	>=dev-libs/libgcrypt-1.2.2:=
-	>=sys-apps/dbus-1.0
+	>=sys-apps/dbus-1.1.1
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )
 "
@@ -53,67 +52,24 @@ src_prepare() {
 }
 
 src_configure() {
-	G2CONF="${G2CONF}
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable selinux)
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		--enable-ssh-agent
-		--enable-gpg-agent"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		--enable-ssh-agent \
+		--enable-gpg-agent
 }
 
 src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
+	 # 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() {
-	use caps && fcaps 0:0 755 cap_ipc_lock "${EROOT}"/usr/bin/gnome-keyring-daemon
-
+	fcaps cap_ipc_lock 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 capability 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
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-12-17  8:14 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-17  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     cba0885cc3d870a060c8bd5237e7378ef2e3d875
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 17 08:09:34 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 17 08:09:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cba0885c

gnome-base/gnome-keyring: moved to gx86

And sync live ebuild with gx86 changes.

---
 .../gnome-keyring/gnome-keyring-3.6.2.ebuild       |  133 --------------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   15 +--
 2 files changed, 7 insertions(+), 141 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
deleted file mode 100644
index e2c3d58..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 pam versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug doc pam selinux"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-fi
-
-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
-	>=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
-"
-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)
-
-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
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable selinux)
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		--enable-ssh-agent
-		--enable-gpg-agent"
-	gnome2_src_configure
-}
-
-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 capability 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-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 8ecc200..e1b153d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
 GNOME2_LA_PUNT="yes"
 
@@ -12,11 +12,11 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://live.gnome.org/GnomeKeyring"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="+caps debug doc pam selinux"
+IUSE="+caps debug pam selinux"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -24,18 +24,18 @@ else
 fi
 
 RDEPEND="
-	>=app-crypt/gcr-3.5.3
+	>=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
+	sys-devel/gettext
 	virtual/pkgconfig
 "
 PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
@@ -53,7 +53,6 @@ src_prepare() {
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		$(use_with caps libcap-ng)
 		$(use_enable pam)
@@ -72,7 +71,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
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-11-25 15:46 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-25 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     1a33f38b66d94a52951c613b5ab7c343b1fd722a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 15:46:26 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 15:46:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a33f38b

gnome-base/gnome-keyring: 3.6.1 → 3.6.2

---
 ...ing-3.6.1.ebuild => gnome-keyring-3.6.2.ebuild} |   38 +++++++++++++++----
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   25 +++++++++----
 gnome-base/gnome-keyring/metadata.xml              |    5 +++
 3 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
similarity index 74%
rename from gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
index 7a6944f..e2c3d58 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.6.2.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-GCONF_DEBUG="no"
+GCONF_DEBUG="yes" # Not gnome macro but similar
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 pam versionator virtualx
@@ -23,30 +23,51 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
-RDEPEND=">=app-crypt/gcr-3.5.3
+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
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )"
+	pam? ( virtual/pam )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
+	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
 
-pkg_setup() {
+	# 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
+}
+
+src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
-		$(use_enable debug)
 		$(use_with caps libcap-ng)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
@@ -55,6 +76,7 @@ pkg_setup() {
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
+	gnome2_src_configure
 }
 
 src_test() {

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 7a6944f..8ecc200 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="4"
-GCONF_DEBUG="no"
+GCONF_DEBUG="yes" # Not gnome macro but similar
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 pam versionator virtualx
@@ -23,30 +23,38 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
-RDEPEND=">=app-crypt/gcr-3.5.3
+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
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )"
+	pam? ( virtual/pam )
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
+	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
 
-pkg_setup() {
+	gnome2_src_prepare
+}
+
+src_configure() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
-		$(use_enable debug)
 		$(use_with caps libcap-ng)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
@@ -55,6 +63,7 @@ pkg_setup() {
 		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
+	gnome2_src_configure
 }
 
 src_test() {

diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-10-24  8:10 Alexandre Rostovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Rostovtsev @ 2012-10-24  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     e4bfe2abe765aed59425dda1d22aba6dfd79c1be
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 07:46:32 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 07:46:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e4bfe2ab

gnome-base/gnome-keyring: 3.6.0 → 3.6.1 + sync with gx86

USE=doc did absolutely nothing, so drop it.

---
 ...ing-3.6.0.ebuild => gnome-keyring-3.6.1.ebuild} |    7 +++----
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild
similarity index 95%
rename from gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild
index 8ef9a46..7a6944f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.6.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+HOMEPAGE="https://live.gnome.org/GnomeKeyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -33,13 +33,12 @@ RDEPEND=">=app-crypt/gcr-3.5.3
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	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"

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 8ef9a46..7a6944f 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+HOMEPAGE="https://live.gnome.org/GnomeKeyring"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -33,13 +33,12 @@ RDEPEND=">=app-crypt/gcr-3.5.3
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-09-22 15:54 Nirbheek Chauhan
  0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan @ 2012-09-22 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7925bffc4b74995e1fd0df4f1c519cd1501e1188
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 04:55:54 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7925bffc

gnome-base/gnome-keyring: 3.5.91 → 3.5.92

---
 ...g-3.5.91.ebuild => gnome-keyring-3.5.92.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.5.91.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.5.92.ebuild
similarity index 100%
rename from gnome-base/gnome-keyring/gnome-keyring-3.5.91.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.5.92.ebuild


^ permalink raw reply	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-09-05 15:48 Nirbheek Chauhan
  0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     1a86619aa2ef5d3be5b2ff989c63d419b8cd58a0
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 01:53:01 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a86619a

Add gnome-base/gnome-keyring-3.5.90

---
 ...ing-9999.ebuild => gnome-keyring-3.5.91.ebuild} |    7 +++----
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.5.91.ebuild
similarity index 97%
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.5.91.ebuild
index 3febbdc..32d203a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.5.91.ebuild
@@ -23,15 +23,14 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
-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
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
+	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/gtk-doc-am-1.9

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 3febbdc..32d203a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -23,15 +23,14 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
-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
 	>=sys-apps/dbus-1.0
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
+	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/gtk-doc-am-1.9


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-05-14  6:38 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2012-05-14  6:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1105ad7ba9e395c2b5f066de554dc6d86a3cfaec
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 06:30:03 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon May 14 06:30:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1105ad7b

gnome-base/gnome-keyring: moved to gx86; sync 9999 with gx86

---
 .../gnome-keyring/gnome-keyring-3.4.1.ebuild       |  113 --------------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    4 +-
 2 files changed, 2 insertions(+), 115 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
deleted file mode 100644
index a54e3fe..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
+++ /dev/null
@@ -1,113 +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.4 2011/11/18 04:41:30 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 pam versionator virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam selinux"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
-fi
-
-RDEPEND=">=app-crypt/gcr-3.3.4
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3.0:3
-	app-misc/ca-certificates
-	>=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/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.9
-
-# FIXME: tests are very flaky and write to /tmp (instead of TMPDIR)
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_with caps libcap-ng)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		$(use_enable selinux)
-		--with-root-certs=${EPREFIX}/etc/ssl/certs/
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
-		--enable-ssh-agent
-		--enable-gpg-agent"
-}
-
-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 capability 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-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index a54e3fe..3febbdc 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.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-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ IUSE="+caps debug doc pam selinux"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 fi
 
 RDEPEND=">=app-crypt/gcr-3.3.4



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-04-20  7:29 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2012-04-20  7:29 UTC (permalink / raw
  To: gentoo-commits

commit:     576df74c9e38be69a685b2092521850f485348b1
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 07:27:53 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr 20 07:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=576df74c

gnome-base/gnome-keyring: 3.3.92 → 3.4.1

---
 ...ng-3.3.92.ebuild => gnome-keyring-3.4.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
similarity index 100%
rename from gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild



^ permalink raw reply	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-03-26  8:20 Nirbheek Chauhan
  0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan @ 2012-03-26  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     3ffc23fa3db561a5c585185e2a19dec6eac71d34
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 05:34:12 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ffc23fa

gnome-base/gnome-keyring: 3.3.5 → 3.3.92

---
 ...ng-3.3.5.ebuild => gnome-keyring-3.3.92.ebuild} |   10 +++++++++-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
similarity index 91%
rename from gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
index d24922d..722708d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
@@ -7,6 +7,9 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 pam versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -14,7 +17,11 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="+caps debug doc pam selinux"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+fi
 
 RDEPEND=">=app-crypt/gcr-3.3.4
 	>=dev-libs/glib-2.28:2
@@ -47,6 +54,7 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		$(use_enable selinux)
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 6653828..722708d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2011/01/02 21:32:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam virtualx
+inherit gnome2 pam versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -54,6 +54,7 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		$(use_enable selinux)
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
 }



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2012-02-27  2:24 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2012-02-27  2:24 UTC (permalink / raw
  To: gentoo-commits

commit:     73ae60138d95721997cf1ff81125a7fc362e5c2a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 01:54:37 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Feb 27 01:54:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=73ae6013

gnome-base/gnome-keyring: add 3.3.5

---
 ...ring-9999.ebuild => gnome-keyring-3.3.5.ebuild} |   61 +++++++------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   50 +++++++---------
 2 files changed, 44 insertions(+), 67 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
similarity index 58%
copy from gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
index 6bcb769..d24922d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
@@ -1,40 +1,30 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/01/02 21:32:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
+inherit gnome2 pam versionator 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"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
+IUSE="+caps debug doc pam selinux"
+KEYWORDS="~amd64 ~mips ~sh ~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.90.0:3
-	>=app-crypt/p11-kit-0.6
+RDEPEND=">=app-crypt/gcr-3.3.4
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
 	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}
 	sys-devel/gettext
 	>=dev-util/gtk-doc-am-1.9
@@ -45,34 +35,25 @@ PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 
+# FIXME: tests are very 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))
+		$(use_enable selinux)
 		--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"
-
-	gnome2_src_prepare
+		--enable-gpg-agent"
 }
 
 src_test() {
-	# FIXME: /gkm/transaction/ tests fail
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
+	Xemake check
 }
 
 pkg_postinst() {
@@ -88,6 +69,7 @@ pkg_postinst() {
 # @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
@@ -103,15 +85,18 @@ fcaps() {
 
 	#set the capability
 	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
+	#check if the capability got set correctly
 	setcap -v "$capset=ep" "$path" &> /dev/null
 	res=$?
 
 	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
+		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}

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 6bcb769..6653828 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/01/02 21:32:23 mr_bones_ Exp $
 
@@ -16,25 +16,22 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-IUSE="+caps debug doc pam test"
+IUSE="+caps debug doc pam selinux"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
 fi
 
-# 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
+RDEPEND=">=app-crypt/gcr-3.3.4
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
 	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}
 	sys-devel/gettext
 	>=dev-util/gtk-doc-am-1.9
@@ -45,34 +42,25 @@ PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 
+# FIXME: tests are very 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))
+		$(use_enable selinux)
 		--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"
-
-	gnome2_src_prepare
+		--enable-gpg-agent"
 }
 
 src_test() {
-	# FIXME: /gkm/transaction/ tests fail
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
+	Xemake check
 }
 
 pkg_postinst() {
@@ -88,6 +76,7 @@ pkg_postinst() {
 # @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
@@ -103,15 +92,18 @@ fcaps() {
 
 	#set the capability
 	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
+	#check if the capability got set correctly
 	setcap -v "$capset=ep" "$path" &> /dev/null
 	res=$?
 
 	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
-		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
-		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
-		ewarn "${path}"
+		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}



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-10-21  4:01 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2011-10-21  4:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ccc621f8191c20b3fd4f47ac648a95b43cbd2880
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 21 03:57:19 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 21 03:57:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ccc621f8

gnome-base/gnome-keyring: pull in new libgnome-keyring

Make sure to pull in >=libgnome-keyring-3.1.92 due to changes in
gnome-keyring's dbus protocol. Older versions of libgnome-keyring are
incompatible. Thanks to fra79Wii for reporting a failure with an earlier
version of libgnome-keyring on IRC.

---
 .../gnome-keyring/gnome-keyring-3.2.1.ebuild       |    2 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
index 9be61bb..6bcb769 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 9be61bb..6bcb769 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
-PDEPEND="gnome-base/libgnome-keyring"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-10-18  7:37 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     46ff0a839db55a607dc730face20b02b92c1ae1c
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 23:50:22 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 23:50:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=46ff0a83

gnome-base/gnome-keyring: 3.2.0-r1 → 3.2.1

Bump, fixes debug output.

---
 ...-3.2.0-r1.ebuild => gnome-keyring-3.2.1.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
similarity index 100%
rename from gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild



^ permalink raw reply	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-10-06  5:22 Priit Laes
  0 siblings, 0 replies; 28+ messages in thread
From: Priit Laes @ 2011-10-06  5:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1f78cc62f4ddda3890c6f78a248b5de6195b3edf
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Oct  6 05:14:32 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Oct  6 05:17:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1f78cc62

gnome-base/gnome-keyring: fixed typo in Flameeyes' nick

---
 .../gnome-keyring/gnome-keyring-3.2.0-r1.ebuild    |    2 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
index f0f0572..9be61bb 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
@@ -81,7 +81,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 }
 
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
+# 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

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index f0f0572..9be61bb 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -81,7 +81,7 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 }
 
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
+# 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



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-10-05 21:41 Alexandre Restovtsev
  0 siblings, 0 replies; 28+ messages in thread
From: Alexandre Restovtsev @ 2011-10-05 21:41 UTC (permalink / raw
  To: gentoo-commits

commit:     fecbc8f9ef9e3f8adcdd64d5fbd7f0d2cfbb47b0
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct  5 21:29:59 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct  5 21:34:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fecbc8f9

gnome-base/gnome-keyring: fcaps in pkg_postinst

Add the GSoC 2010 fcaps() function and call it in pkg_postinst to set the
cap_ipc_lock capability on /usr/bin/gnome-keyring-daemon, as upstream
intended.

Thanks to Marien Zwart for the patch.

---
 .../gnome-keyring/gnome-keyring-3.2.0-r1.ebuild    |  120 ++++++++++++++++++++
 .../gnome-keyring/gnome-keyring-3.2.0.ebuild       |   76 ------------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   44 +++++++
 3 files changed, 164 insertions(+), 76 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
new file mode 100644
index 0000000..f0f0572
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.0-r1.ebuild
@@ -0,0 +1,120 @@
+# 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-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib pam virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+fi
+
+# 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}
+	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-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"
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	# FIXME: /gkm/transaction/ tests fail
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}
+
+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 flameyeys
+# @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.
+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 missed kernel support."
+		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
+		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
+		ewarn "${path}"
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
deleted file mode 100644
index ca7f9ef..0000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib pam virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="+caps debug doc pam test"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-fi
-
-# 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}
-	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-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"
-
-	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-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index ca7f9ef..f0f0572 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -74,3 +74,47 @@ src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }
+
+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 flameyeys
+# @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.
+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 missed kernel support."
+		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
+		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
+		ewarn "${path}"
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-05-28  3:40 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-28  3:40 UTC (permalink / raw
  To: gentoo-commits

commit:     40869388dab15c795472d0610a526daa61aded85
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu May 26 18:05:09 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 28 03:20:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=40869388

gnome-base/gnome-keyring: 3.0.2 → 3.0.3

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

---
 ...r200.ebuild => gnome-keyring-3.0.3-r200.ebuild} |    2 +-
 ...r300.ebuild => gnome-keyring-3.0.3-r300.ebuild} |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
similarity index 97%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
index bc6d16d..4365aa0 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r200.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r200.ebuild
@@ -67,7 +67,7 @@ src_prepare() {
 		-i gcr/Makefile.* || die "sed failed"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
-	epatch "${FILESDIR}"/${P}-automagic-libcap.patch
+	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
 	eautoreconf
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
similarity index 97%
rename from gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
index 257766f..025f941 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.2-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.3-r300.ebuild
@@ -69,7 +69,7 @@ src_prepare() {
 		-i gcr/Makefile.* || die "sed failed"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=649936
-	epatch "${FILESDIR}"/${P}-automagic-libcap.patch
+	epatch "${FILESDIR}"/${PN}-3.0.2-automagic-libcap.patch
 	eautoreconf
 	gnome2_src_prepare
 }



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-04-11 22:25 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-11 22:25 UTC (permalink / raw
  To: gentoo-commits

commit:     00c396fad87d2e66749ffb6ee73cce0ea8174b9b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 22:24:11 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 22:24:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=00c396fa

gnome-base/gnome-keyring: fix buggy sed expression, bug #363075

---
 .../gnome-keyring/gnome-keyring-3.0.0-r300.ebuild  |    2 +-
 .../gnome-keyring/gnome-keyring-3.0.0.ebuild       |    2 +-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
index ee1d720..5b56195 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
@@ -74,7 +74,7 @@ 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 = .*/SUBDIRS =/' \
+	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
 		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
 
 	gnome2_src_prepare

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
index dae8cd3..012522e 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
@@ -72,7 +72,7 @@ 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 = .*/SUBDIRS =/' \
+	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
 		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
 
 	gnome2_src_prepare

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index ee1d720..5b56195 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -74,7 +74,7 @@ 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 = .*/SUBDIRS =/' \
+	sed -e '/^SUBDIRS = /,+1 c\SUBDIRS =\' \
 		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
 
 	gnome2_src_prepare



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-04-10 18:04 Gilles Dartiguelongue
  0 siblings, 0 replies; 28+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-10 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     7e110b9ed4633c50a86f9fa64b807116b140afb9
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 17:45:18 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:04:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7e110b9e

gnome-base/gnome-keyring: QAed

	* Handle debug manually as it is not the same as
	  GNOME_DEBUG_CHECK
	* Remove CFLAGS changing code in configure.ac
	* Disable gcr testsuite due to weird opensc interaction

---
 .../gnome-keyring/gnome-keyring-3.0.0-r300.ebuild  |   24 ++++++++---------
 .../gnome-keyring/gnome-keyring-3.0.0.ebuild       |   23 ++++++++---------
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   27 +++++++++----------
 3 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
index f537f42..ee1d720 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
 
 EAPI="3"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib pam virtualx
@@ -29,7 +29,7 @@ fi
 # 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
+	gnome-base/gconf:2
 	>=sys-apps/dbus-1.0
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1
@@ -40,7 +40,6 @@ RDEPEND=">=dev-libs/glib-2.25:2
 #	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 )"
@@ -48,22 +47,15 @@ PDEPEND="gnome-base/libgnome-keyring"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
-# revisit then.
-# UPDATE: gcr tests fail with:
-# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
-RESTRICT="test"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	# XXX: Automagic libcap support
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${ROOT}/etc/ssl/certs/
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
 		--enable-ssh-agent
 		--enable-gpg-agent
 		--with-gtk=3.0"
@@ -72,13 +64,19 @@ pkg_setup() {
 
 src_prepare() {
 	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -g -O0: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"
 
+	# 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 = .*/SUBDIRS =/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
index abd488c..dae8cd3 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
 
 EAPI="3"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib pam virtualx
@@ -27,7 +27,7 @@ fi
 
 RDEPEND=">=dev-libs/glib-2.25:2
 	>=x11-libs/gtk+-2.20:2
-	gnome-base/gconf
+	gnome-base/gconf:2
 	>=sys-apps/dbus-1.0
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1
@@ -45,22 +45,15 @@ PDEPEND="gnome-base/libgnome-keyring"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
-# revisit then.
-# UPDATE: tests use system-installed libraries, fail with:
-# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
-RESTRICT="test"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	# XXX: Automagic libcap support
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${ROOT}/etc/ssl/certs/
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
 		--enable-ssh-agent
 		--enable-gpg-agent
 		--with-gtk=2.0"
@@ -69,13 +62,19 @@ pkg_setup() {
 
 src_prepare() {
 	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -g -O0: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"
 
+	# 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 = .*/SUBDIRS =/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 72deafc..ee1d720 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
 
 EAPI="3"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib pam virtualx
@@ -29,7 +29,7 @@ fi
 # 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
+	gnome-base/gconf:2
 	>=sys-apps/dbus-1.0
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1
@@ -47,22 +47,15 @@ PDEPEND="gnome-base/libgnome-keyring"
 # eautoreconf needs:
 #	>=dev-util/gtk-doc-am-1.9
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
-# revisit then.
-# UPDATE: tests use system-installed libraries, fail with:
-# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
-RESTRICT="test"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	# XXX: Automagic libcap support
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable test tests)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${ROOT}/etc/ssl/certs/
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
 		--enable-ssh-agent
 		--enable-gpg-agent
 		--with-gtk=3.0"
@@ -70,15 +63,21 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -g -O0: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"
+
+	# 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 = .*/SUBDIRS =/' \
+		-i gcr/Makefile.am gcr/Makefile.in || die "sed 3 failed"
+
+	gnome2_src_prepare
 }
 
 src_test() {



^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-04-05  0:57 Nirbheek Chauhan
  0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05  0:57 UTC (permalink / raw
  To: gentoo-commits

commit:     2170bfe5bede5027905f6da94f6c183e616d2d06
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  4 14:34:12 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 15:47:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2170bfe5

gnome-base/gnome-keyring: 2.91.93 → 3.0.0

---
 ...r300.ebuild => gnome-keyring-3.0.0-r300.ebuild} |    0
 ...g-2.91.93.ebuild => gnome-keyring-3.0.0.ebuild} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.93-r300.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild
similarity index 100%
rename from gnome-base/gnome-keyring/gnome-keyring-2.91.93-r300.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.0-r300.ebuild

diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.93.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild
similarity index 100%
rename from gnome-base/gnome-keyring/gnome-keyring-2.91.93.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.0.0.ebuild



^ permalink raw reply	[flat|nested] 28+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
@ 2011-02-15 23:45 Nirbheek Chauhan
  0 siblings, 0 replies; 28+ messages in thread
From: Nirbheek Chauhan @ 2011-02-15 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2b189906490b3ea22539a53ba65572a07e7613a3
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 23:19:36 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 23:42:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2b189906

gnome-base/gnome-keyring: Add GTK+-3 version

* Slotting is problematic because libgcr is slotted, but libgck is not
* However, libgck doesn't link to gtk+3, so binary distros are happy
  - WE ARE SCREWED
* Maybe we can chicken out of slotting this if nothing much links to libgcr

---
 ...1.4.ebuild => gnome-keyring-2.91.4-r300.ebuild} |   10 +++++++---
 .../gnome-keyring/gnome-keyring-2.91.4.ebuild      |    2 ++
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |   10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
similarity index 84%
copy from gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
index ab6a9db..be0a4d9 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.4-r300.ebuild
@@ -22,9 +22,11 @@ else
 fi
 
 # 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.20:2
+	>=x11-libs/gtk+-2.90.0:3
 	gnome-base/gconf
 	>=sys-apps/dbus-1.0
 	>=dev-libs/libgcrypt-1.2.2
@@ -47,6 +49,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 # tests fail in several ways, they should be fixed in the next cycle (bug #340283),
 # revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
 RESTRICT="test"
 
 pkg_setup() {
@@ -60,7 +64,7 @@ pkg_setup() {
 		--enable-acl-prompts
 		--enable-ssh-agent
 		--enable-gpg-agent
-		--with-gtk=2.0"
+		--with-gtk=3.0"
 #		$(use_enable valgrind)
 }
 

diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
index ab6a9db..dc29a2a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.91.4.ebuild
@@ -47,6 +47,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 # tests fail in several ways, they should be fixed in the next cycle (bug #340283),
 # revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
 RESTRICT="test"
 
 pkg_setup() {

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index ab6a9db..be0a4d9 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -22,9 +22,11 @@ else
 fi
 
 # 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.20:2
+	>=x11-libs/gtk+-2.90.0:3
 	gnome-base/gconf
 	>=sys-apps/dbus-1.0
 	>=dev-libs/libgcrypt-1.2.2
@@ -47,6 +49,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
 
 # tests fail in several ways, they should be fixed in the next cycle (bug #340283),
 # revisit then.
+# UPDATE: tests use system-installed libraries, fail with:
+# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged 
 RESTRICT="test"
 
 pkg_setup() {
@@ -60,7 +64,7 @@ pkg_setup() {
 		--enable-acl-prompts
 		--enable-ssh-agent
 		--enable-gpg-agent
-		--with-gtk=2.0"
+		--with-gtk=3.0"
 #		$(use_enable valgrind)
 }
 



^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2018-01-12 12:46 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-27 22:32 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ Alexandre Rostovtsev
  -- strict thread matches above, loose matches on Subject: below --
2018-01-12 12:46 Dennis Lamm
2016-03-26 22:54 Ole Reifschneider
2015-05-10 17:20 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2014-10-26 15:46 Gilles Dartiguelongue
2014-04-16 22:27 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2013-12-11 23:44 Gilles Dartiguelongue
2013-10-13 22:22 Gilles Dartiguelongue
2012-12-17  8:14 Gilles Dartiguelongue
2012-11-25 15:46 Gilles Dartiguelongue
2012-10-24  8:10 Alexandre Rostovtsev
2012-09-22 15:54 Nirbheek Chauhan
2012-09-05 15:48 Nirbheek Chauhan
2012-05-14  6:38 Alexandre Restovtsev
2012-04-20  7:29 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2012-02-27  2:24 Alexandre Restovtsev
2011-10-21  4:01 Alexandre Restovtsev
2011-10-18  7:37 Alexandre Restovtsev
2011-10-06  5:22 Priit Laes
2011-10-05 21:41 Alexandre Restovtsev
2011-05-28  3:40 Gilles Dartiguelongue
2011-04-11 22:25 Gilles Dartiguelongue
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-02-15 23:45 Nirbheek Chauhan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox