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 920891381F3 for ; Mon, 17 Dec 2012 08:15:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 570F521C025; Mon, 17 Dec 2012 08:14:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 810EA21C025 for ; Mon, 17 Dec 2012 08:14:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 673AE33DB72 for ; Mon, 17 Dec 2012 08:14:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 044F0E5442 for ; Mon, 17 Dec 2012 08:14:45 +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: <1355731774.cba0885cc3d870a060c8bd5237e7378ef2e3d875.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.6.2.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: cba0885cc3d870a060c8bd5237e7378ef2e3d875 X-VCS-Branch: master Date: Mon, 17 Dec 2012 08:14:45 +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: f663284e-b17b-4a6e-9978-df1484be0484 X-Archives-Hash: c6e745e4074c049be6d52b5071af494c commit: cba0885cc3d870a060c8bd5237e7378ef2e3d875 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 17 08:09:34 2012 +0000 Commit: Gilles Dartiguelongue gentoo 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_SECURITY enabled (e.g. EXT4_FS_SECURITY)" - ewarn "where 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 }