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
