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
}
