summaryrefslogtreecommitdiff
path: root/gnome-base/libgnome-keyring
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-30 17:27:54 +0100
commitf70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
treee907cb121b30e3c1df1710719c0ddf4029597a47 /gnome-base/libgnome-keyring
parentdb063b515939ab15261136b24e4bc44386335c0c (diff)
gentoo resync : 30.09.2020
Diffstat (limited to 'gnome-base/libgnome-keyring')
-rw-r--r--gnome-base/libgnome-keyring/Manifest2
-rw-r--r--gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild35
2 files changed, 9 insertions, 28 deletions
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index c011cafd07d1..7f154c174b89 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,4 @@
AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 2101 BLAKE2B 5563cbb91d8cf702bad279a341f79c2010eafa735b9920b4a32d03e0cea592810f7943fe43def1ed5d1cfd16cf90fa4e5c42d5ddcb89d0271da1598d64d9844f SHA512 9dd20635f7864861c5180cff31bbc6b318dd9279abb75fb70a41972870a655a0f8756774948d9984bfb35a8cf9e46f5a7d8b21eda2fc9d52469de6f9ab727aa3
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1600 BLAKE2B 1c01c314f1988c048787930d03ec216a4e22334ffc713d99315ebc5950155e1aa2de93362f53c6cab8cfad2fde53888d100105e407dbb8166daf663c7ad451e1 SHA512 4145bcbc2982433bc2507989f4709ea4bee2467674cf20d14bd3420527436190e9028d0b229d272daf08a313518b765f42dd99f9659f5c2cf8037c68b7ea2cec
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 30c0398c00e8..7a5b74562aac 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -1,25 +1,24 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI="6"
GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2 python-any-r1 vala multilib-minimal
+inherit gnome2 vala multilib-minimal
DESCRIPTION="Compatibility library for accessing secrets"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
SLOT="0"
-IUSE="debug +introspection test vala"
-RESTRICT="!test? ( test )"
+IUSE="debug +introspection vala"
REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+# tests need python2
+RESTRICT="test"
+
RDEPEND="
>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
>=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}]
@@ -32,25 +31,11 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
- test? ( ${PYTHON_DEPS} $(python_gen_any_dep '
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]') )
vala? ( $(vala_depend) )
"
-python_check_deps() {
- if use test; then
- has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" &&
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
- fi
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
src_prepare() {
- epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch
+ eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch
use vala && vala_src_prepare
gnome2_src_prepare
@@ -62,6 +47,7 @@ src_prepare() {
multilib_src_configure() {
ECONF_SOURCE="${S}" gnome2_src_configure \
+ $(usex debug --enable-debug=yes ' ') \
$(multilib_native_use_enable vala)
if multilib_is_native_abi; then
@@ -72,8 +58,3 @@ multilib_src_configure() {
multilib_src_install() {
gnome2_src_install
}
-
-multilib_src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- dbus-launch emake check || die "tests failed"
-}