gentoo resync : 25.12.2017

3 files changed, 3 insertions, 92 deletions

diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 80cb63a52cbf..1151259a81b3 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,7 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
-DIST libsignon-glib-1.13.tar.gz 51601 BLAKE2B e38d12a0cbb6b0df80c0da27620c06e0fb4301694782c64dd86bd5dbc0424ca40b917d5d6d4c4197a9f736bea199a7e029c8b48bc5b9bc997005b26311b560af SHA512 aaae6a37a113685eb36ddccd497e387617cf0900506638cbafbac282c4d63ade41f4c915ad6f04214c58af580b70d9062ecf3e1618b6f5fe07dad50c5dc125a6
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.13-r1.ebuild 1697 BLAKE2B b83182bdcf78e203dd7fd234191ad1b4bd5c6efc6299cbf380390180fd225de696a6c4562890f69cea208fec6fe6b8751e6e56bace94661680d8de038e1bf8df SHA512 c19bd7185b8aede936c4cf1b0fa6ff237538b7a3b9943670529defb637f116adda61bc7beee5b6acc750f420763afb5eb3d8836cf0c4adbc7b49931ba62b4fa2
-EBUILD libsignon-glib-1.14.ebuild 1754 BLAKE2B 397a0467ec10fa3f0a0cd330517848b6bf5feaeaeb5791b0ccdd1d07c2d051325437fc66eab2c53c64da6f617f43158a4f02bcaad8a09180cb629cdf4c215f0f SHA512 8e2dc163b9c68ad2ffd36f5763bb476dd3b43b71979bb601664e2c430416687515c09b01ec27171a09a93dc3dbb4483bb44c287bcae43147c31e04624f3fa907
+EBUILD libsignon-glib-1.14.ebuild 1752 BLAKE2B eb39bd4d5031d29377681babdaddb090639295fa080da51fb110b94adbd31f19a1ab60f35f482e27c64e84e16070dcd8df3ec047021bc47be466393d2da6d87a SHA512 d11952359f6aacffdbd5cb91db8f91eb788bbeb6719c0cf564191453a887bd088b0437c99166c1b33a696646c96854de146a90aa91d3f910a52f2f3b60aa492f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
deleted file mode 100644
index 7a39014192a5..000000000000
--- a/net-libs/libsignon-glib/libsignon-glib-1.13-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools python-r1 vcs-snapshot xdg-utils
-
-DESCRIPTION="GLib binding for the D-Bus API provided by signond"
-HOMEPAGE="https://01.org/gsso/"
-SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_1.13 -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="debug doc +introspection python test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
-
-RDEPEND="
-	dev-libs/glib:2
-	net-libs/signond
-	introspection? ( dev-libs/gobject-introspection:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	doc? ( dev-util/gtk-doc )
-"
-
-DOCS=( AUTHORS NEWS README )
-
-# needs more love
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		eapply "${FILESDIR}/${PN}-1.12-doc-disable.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	myconfigure() {
-		local myeconfargs=(
-			$(use_enable debug)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable python)
-			$(use_enable test tests)
-		)
-
-		econf "${myeconfargs[@]}"
-	}
-
-	if use python; then
-		python_copy_sources
-		python_foreach_impl run_in_build_dir myconfigure
-	else
-		myconfigure
-	fi
-}
-
-src_compile() {
-	# fails to compile with more than one thread
-	MAKEOPTS="${MAKEOPTS} -j1"
-	default
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	fi
-}
-
-src_install() {
-	default
-	if use python; then
-		python_foreach_impl run_in_build_dir default
-	fi
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index fe543c511282..4b1fc11e2067 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -10,9 +10,9 @@ DESCRIPTION="GLib binding for the D-Bus API provided by signond"
 HOMEPAGE="https://01.org/gsso/"
 SRC_URI="https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=VERSION_${PV} -> ${P}.tar.gz"
 
-SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+SLOT="0"
+KEYWORDS="amd64 x86"
 IUSE="debug doc +introspection python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} introspection )"