From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9C823138CD0 for ; Sun, 10 May 2015 17:20:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8F40E0827; Sun, 10 May 2015 17:20:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1BBAE0822 for ; Sun, 10 May 2015 17:20:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7148340FBA for ; Sun, 10 May 2015 17:20:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E0B09E8 for ; Sun, 10 May 2015 17:20:32 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1431272387.b6415eba78f12772f466d1bd9245d5c57bf999a5.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: b6415eba78f12772f466d1bd9245d5c57bf999a5 X-VCS-Branch: master Date: Sun, 10 May 2015 17:20:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3094ed99-e8dc-46aa-8d9b-c04435d2c5ec X-Archives-Hash: 260cfa13a757a8d1ba5aac6a0d5f3167 commit: b6415eba78f12772f466d1bd9245d5c57bf999a5 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun May 10 15:00:30 2015 +0000 Commit: Gilles Dartiguelongue gentoo 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 }