gentoo resync : 15.01.2020

4 files changed, 56 insertions, 15 deletions

diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 21a46ccec1ba..3bff1c6b9480 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +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.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.7.15.ebuild 1637 BLAKE2B 49a20321fb54b0ace4458e0d4a3b257a317b559d2520d5bc584d4d4fb37e2b5c39cd3d2463ffce7f70324a76eae29b59508b8a6a96ac3b9fa30df26b42a82a92 SHA512 664365e7c5d4e4f37d0accbfa3faac3faa65a4a027ce85cd351b60b155563b4eddd3d40f1764a4000ce4ded3500b41dfe5922d2a803dd4dfa4a19b4a9909ea20
-EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
+DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
+EBUILD appstream-glib-0.7.15.ebuild 1636 BLAKE2B 5b0eea6311cd40bb66068198302ca52229483a68b65fd3c8ec2b04d9a73f8a7b25d93c0fdb2a7bdeec5870634f1e332b09b400683725884bcc40e076cdea8ff1 SHA512 8b37bae9b37cb27c9ac430fbbfa0b29c5de9511997c4c33d97225e864a204bf4bef74f062126c3c8c1ef8ddf5faafe80898e6691c5d276206d93ddb073014501
+EBUILD appstream-glib-0.7.16.ebuild 1709 BLAKE2B c8085d06fc9044599952d1abfb28c0d1ddb898c1fe48b3500ffa34d2362a1a9c81690424b0754b83d591b84aa01f3b17a2d61364154467f6f864f9d21ecd2d31 SHA512 0154d92b3840d49cc9b0343dd74f3c0cf4367b9868fc80b02f5264023eccf72664c1511a86b8518a2b4f5fa0a47513ae64ae16483946ccedbba9e60e7786a94f
 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
index 0a4e30e25446..093bf90960b6 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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="
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
index 92e711c76a42..ec8fc78191ff 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,8 @@ 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="doc +introspection stemmer"
+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
@@ -21,10 +21,9 @@ RDEPEND="
 	>=net-libs/libsoup-2.51.92:2.4
 	>=dev-libs/json-glib-1.1.2
 	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-	app-arch/gcab
 
-	x11-libs/gtk+:3
-	>=media-libs/freetype-2.4:2
+	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 )
@@ -38,27 +37,31 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
-	doc? (
+	gtk-doc? (
 		>=dev-util/gtk-doc-1.9
 		app-text/docbook-xml-dtd:4.3
 	)
-	>=sys-devel/gettext-0.19.7
+	>=sys-devel/gettext-0.19.8
 "
 # ${PN} superseeds appdata-tools
 RDEPEND="${RDEPEND}
 	!<dev-util/appdata-tools-0.1.8-r1
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-tests-run-in-2020.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddep11=true
 		-Dbuilder=true
 		-Drpm=false
 		-Dalpm=false
-		-Dfonts=true
+		$(meson_use fonts)
 		$(meson_use stemmer)
 		-Dman=true
-		$(meson_use doc gtk-doc)
+		$(meson_use gtk-doc)
 		$(meson_use introspection)
 	)
 	meson_src_configure
diff --git a/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch b/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
new file mode 100644
index 000000000000..40ffe3edb6d1
--- /dev/null
+++ b/dev-libs/appstream-glib/files/0.7.16-fix-tests-run-in-2020.patch
@@ -0,0 +1,37 @@
+From 953c8e529d7291e60a95e580967ed79ce2c9ccf0 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 6 Jan 2020 11:04:56 +0000
+Subject: [PATCH] trivial: Fix CI by moving 'future' back a bit
+
+2020 seemed like such a long time in the future all those years ago...
+---
+ data/tests/broken.appdata.xml       | 2 +-
+ libappstream-glib/as-app-validate.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/tests/broken.appdata.xml b/data/tests/broken.appdata.xml
+index f7a5386e..cf80f5b4 100644
+--- a/data/tests/broken.appdata.xml
++++ b/data/tests/broken.appdata.xml
+@@ -40,7 +40,7 @@
+         <p>This is a duplicate release on the same day!</p>
+       </description>
+     </release>
+-    <release date="2020-01-01" version="0.6.2">
++    <release date="2050-01-01" version="0.6.2">
+       <description>
+         <p>This is a release in the future!</p>
+       </description>
+diff --git a/libappstream-glib/as-app-validate.c b/libappstream-glib/as-app-validate.c
+index c1103ace..f50e4e41 100644
+--- a/libappstream-glib/as-app-validate.c
++++ b/libappstream-glib/as-app-validate.c
+@@ -864,7 +864,7 @@ as_app_validate_release (AsApp *app,
+ 				     AS_PROBLEM_KIND_ATTRIBUTE_MISSING,
+ 				     "<release> has no timestamp");
+ 	}
+-	if (timestamp > 20120101 && timestamp < 20251231) {
++	if (timestamp > 20120101 && timestamp < 20351231) {
+ 		ai_app_validate_add (helper,
+ 				     AS_PROBLEM_KIND_ATTRIBUTE_INVALID,
+ 				     "<release> timestamp should be a UNIX time");