gentoo resync : 25.04.2020

3 files changed, 2 insertions, 68 deletions

diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index f2bf8e07e7f0..fedd43ce15ef 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,8 +1,6 @@
 AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20f262cbc486d57f6a1669da225386f92ac452ab0120e5095b097543430814827e74af5f9b2a7fdbdb8811f66c6b5be27d45e5 SHA512 4be4f2904ce35f29806432c04cd6c0c23783da1ebd66fb3f091c10a04749f93ceb4d49cdf6963c1f13343dd901a97446b57d39861d7251318feb03625644c59f
-DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
-EBUILD appstream-glib-0.7.15.ebuild 1639 BLAKE2B f1be59355da2351b95886e1dae32d7b552c25ce6b7f8ca09c32f015a88c8663882d98dba95f0a66551960273882669ffc80a4862e781a0259d1f906c86148057 SHA512 0ef5497cb325d16280f9b51321579f60a66794b9aec108fd3c93ec3fb7ed33c0c88a601dc3a033eb6a6d0a4a3d10e043f21a1b6f1caffd4270b7c59ea9d88b45
-EBUILD appstream-glib-0.7.16.ebuild 1702 BLAKE2B 2f3684543e76eb2c96134fe7f4e4ddbbf6dd34b968c0572e8b4aac5c31ab682301edcc56e420aa08f1dc67df350502f91a6b1a73cb22e489849fde0929c410e0 SHA512 3a7d8fd3e5e0ff48cf6d3012ee83e14c791dad7b04e08d35af79942e7dd67131106fdd7c39d219cb0a361594fc373cd51618d8e630579ee6a006b827f8c7547d
+EBUILD appstream-glib-0.7.16.ebuild 1701 BLAKE2B 7fea4d96b083a99439e2fe5e98e6f76d80ec4a9dd2233c82d12344119388364725c614dc89451e1d763162498db82226badf603c88529bddc52ea62a4cd6417f SHA512 ccfff59f9b7f034d63eda0ee1ed099b5073f6aac2a11d0d3485b38bcadf55cba34e025d72151817c4d88ebbc7cba06dc88f66ee7e924b4705dd35577bcf20d95
 EBUILD appstream-glib-0.7.17.ebuild 1647 BLAKE2B 20a250abf1dcfd2ba376b2b3bef172a655a3b9598baf154e67901a832b097170f7ea65c9d1f1d797784da05667c6f3f4e1cfd9c8ad0153f9522144629dc24369 SHA512 d4eac6ef8d2897666571e44e3c0642ca1ef09cdb5ac80eabce25363de1262efaa5914dcf7d28f328619b107fd3a01fe2b2bffb53e0208f2a78cd0c5cee0fceed
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
deleted file mode 100644
index 49ef2b9f8873..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.45.8:2
-	sys-apps/util-linux
-	app-arch/libarchive
-	>=net-libs/libsoup-2.51.92:2.4
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? ( x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2 )
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-# ${PN} superseeds appdata-tools
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index 683b5a49bc0d..b237b2c02bac 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="