[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
commit: fc71cf20afa52751b88e0c127c5fce404e0173a7
Author: Dennis Lamm gentoo org>
AuthorDate: Fri Jan 12 12:46:19 2018 +
Commit: Dennis Lamm gentoo org>
CommitDate: Fri Jan 12 12:46:19 2018 +
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-.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..
--- 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-.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-.ebuild
index 11e9a6c2..f4983042 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-.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
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
commit: 16c71e35ff5a2c6ff4404c599d0c07d7d9a1cc5a
Author: Ole Reifschneider gentoo org>
AuthorDate: Sat Mar 26 21:20:10 2016 +
Commit: Ole Reifschneider gentoo org>
CommitDate: Sat Mar 26 21:20:10 2016 +
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-.ebuild => gnome-keyring-3.20.0.ebuild} | 37 --
gnome-base/gnome-keyring/gnome-keyring-.ebuild | 26 ++-
2 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
similarity index 66%
copy from gnome-base/gnome-keyring/gnome-keyring-.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
index efe0831..ecbd8d6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-.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} = ]]; 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} = ]]; 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-.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-.ebuild
index efe0831..11e9a6c 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-.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
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
commit: b6415eba78f12772f466d1bd9245d5c57bf999a5
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun May 10 15:00:30 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 10 15:39:47 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b6415eba
gnome-base/gnome-keyring: 3.14.0 → 3.16.0
...ing-.ebuild = gnome-keyring-3.16.0.ebuild} | 28 --
gnome-base/gnome-keyring/gnome-keyring-.ebuild | 19 ---
2 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/gnome-base/gnome-keyring/gnome-keyring-.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
similarity index 64%
copy from gnome-base/gnome-keyring/gnome-keyring-.ebuild
copy to gnome-base/gnome-keyring/gnome-keyring-3.16.0.ebuild
index c3e87ff..85ff627 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-.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} = ]]; 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} = ]]; 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-.ebuild
b/gnome-base/gnome-keyring/gnome-keyring-.ebuild
index c3e87ff..ce59d93 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-.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} = ]]; 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
-
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
commit: 1fa95cea8b56e3cc0d84d8720776590579d9b60f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Dec 22 23:05:39 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Dec 22 23:05:39 2014 +
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..000
--- 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
-}
[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
commit: 07c24fc32ba7defb8f61009f17d2b359ff03dd45 Author: Gilles Dartiguelongue eva AT gentoo DOT org AuthorDate: Sun Oct 26 15:46:07 2014 + Commit: Gilles Dartiguelongue eva AT gentoo DOT org CommitDate: Sun Oct 26 15:46:07 2014 + 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-agentUse GNOME Keyring to unlock SSH keys. + Recommended unless you are using ECDSA or Ed25519 keys./flag + /use /pkgmetadata
