gentoo resync : 24.12.2018

3 files changed, 3 insertions, 85 deletions

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index a4546381add5..510608446a2e 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,3 @@
 DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
-EBUILD libsecret-0.18.6-r1.ebuild 2664 BLAKE2B 15eef2a437a308ea343caaf3ad0fdfa9599dae26ba806a89f964d45798b3cd2f009296a6a16d5615f86fdab36a2470d80cf8a4a6089e21eec415de88b92905e0 SHA512 639f1d8c9cb595b6786c7a58dc19fe6afeab5f0e67992a461b12e2f2562d0fce841488fedc5ea20b86d0e9697573946fd61e0fd059449bddfd7a837ed5ec221b
-EBUILD libsecret-0.18.6.ebuild 2116 BLAKE2B 559cc152d3439cfd45ae971e4f182171fabe004c4feda040cc3c821cb44bd2f3250246789d87289e8094a6da0dff6c55f365b0f8c35aadb6f1401708fd458e3d SHA512 e8b8f4f8bc4593f0b6a04785be47b3872f8d2f15cf76559ae42422bab598620789b1acdb839eceb98f9f2059ea9d32094fd26b931de36e210b05a20ee1b642bf
+EBUILD libsecret-0.18.6-r1.ebuild 2660 BLAKE2B 4840e5cfcc512aeef800d324f77d9d083d690963042903c0bdd6513a146b565106057b9ab9969b5ea905118e36cd06c9d12d025865ef190ab15c94383cc81ab5 SHA512 160be3b6686b700fe5d69251f1560cf6f15ecb5ebd9f0a1298952501294e60938584fc8ab62c0f36da32db4809710827c59f41782f5d756b65ec25aaab4cd997
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
index d77cc19d970a..b982e64260f3 100644
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+crypt +introspection test vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
deleted file mode 100644
index e644126483f9..000000000000
--- a/app-crypt/libsecret/libsecret-0.18.6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt +introspection test vala"
-# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
-REQUIRED_USE="test? ( introspection )
-	vala? ( introspection )"
-
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-PDEPEND=">=gnome-base/gnome-keyring-3
-"
-# PDEPEND to avoid circular dep (bug #547456)
-# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
-# Add ksecrets to PDEPEND when it's added to portage
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
-		introspection? ( >=dev-libs/gjs-1.32 )
-	)
-	vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	Xemake check
-}