gentoo resync : 18.11.2018

5 files changed, 53 insertions, 37 deletions

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index b2d1e5184bba..a36af2349b3d 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,8 +1,8 @@
-AUX appstream-0.11.5-fix-meson-po.patch 501 BLAKE2B 40d5f00cd7e883ddbd580ba7acfef6c956003a8a50f618b1f7e4810338af1ec41d6595828987132d175c2c07721ce60ba368033919a49ede9c659089fefd50eb SHA512 d4b4fb770ad84a6bf365e998eb749939a3aa4553aad9730f6d99d5072de37eb6594ad2ac00ee17706621483afe58f44c9f9f90aa9f666d0e2f6379f40ad78e71
+AUX appstream-0.12.2-gcc-7.3.patch 630 BLAKE2B 5ca478b25aa712a5450d405ca34aaf0c07887dacf7fbe3301c694eaa69303871120e0ba4269d4b1c2499db8e2c20a3700359d3c7868c5f1d9c568dda75ffeb05 SHA512 83bdeb2d8f92a510c1530cf65df0baae9ce4b70be0a1f880b99d02ce0a8212fecc193de07167ab8d7a30061c8a3fd84b2ba492a60cdf8f96a77b2cdd742d2382
 DIST AppStream-0.12.2.tar.xz 1938868 BLAKE2B 968853e9d5f87ca2c1f894a6ffe5439f7fce611459243cd96d3859a15e225243585a1a43e90d8eca8271b91e1237d94eb4615b5c3c0543d9a37646b5fbd7d2fe SHA512 d5c95309d4fddb961f4a5b9ac460840e34d4bae0e256bd0be09ceeab0d45a3ac5254c9e9c183a1e6cb3983ce0a9d6d0e519908f612a5b135ed578ec26556e53d
+DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9
 DIST appstream-0.10.6.tar.gz 1821879 BLAKE2B 49e0476ef41c37d2e9bb12a7c046fcbb2cd8fcb1f521321dce4cda15e504a966cf59a1cbf56fc7359a82f677c54906ba041ad37eeb7f639ad69691e8d2ccd24c SHA512 9f8b4ddc39d580c62b166df0d9a2c5e4caac1b433d25a4e9118b7c73ceea5c7b1ff78f02d682a68cdfeb8da29e806a4838cfc11637fca2982f436af333605256
-DIST appstream-0.11.5.tar.gz 1856204 BLAKE2B 9f1e423e71e40b569cae0fb259bf5a0203a0abcba64f877c951c941f1dfdbc8005509ca46040586b8937cc168ad9315978dd2a3763592de1686c9648eac6c928 SHA512 308f65df2d03f09a5fdfe1d5b61ed37ddfd73a6f7cd861f685463c45ba17a2a937ba34216b4d5f533cb5f9f56c65ff9b261e03d07aaab74bec3f89e5bfb57d7b
 EBUILD appstream-0.10.6-r1.ebuild 1490 BLAKE2B cf0ea93f614715937e74088b70502574a644c641f8853bd359eea753f0376c8ba1f846990f95e927865e5f1c6479e450fcf4f3b292b1ec0b13743acfbfd2ad5d SHA512 b4f43642d9648bc9956ae4212e3d5b7fc7bb5f5c86293b5c9fd1196acf6fb37e5a2553ff3ae789f50ab9cd75c94a92cf46957a4d19e9d3aecc43036628abb0f3
-EBUILD appstream-0.11.5.ebuild 1376 BLAKE2B a4505ffee8274eeeff1d78a79ba1e2bf47588dda71a2dfb5993985ab4d689380fe94d473b5cb4f43a018228e0a59f1ae72d294190e4e89e9df52512ac121c449 SHA512 de2b3c1a9ea20715572b94dcd78b23a0c7e9a41545d9c1898a33d50a263c5b82b7b2b99a9d0cc2e61e02598b6b8885df48d9ab5f4c88c58e0f9548fea60ea62a
-EBUILD appstream-0.12.2.ebuild 1456 BLAKE2B a7aaed498184987107ca5436235ca9401dc573f3fc937d16743f2bea1b8e21a2c237711f5d0ac8b06c64a338a28060b5e5a15b2fdf3204fdee8e8312f1097291 SHA512 bd50cab254590ceffe6bb7b47663b9f9534cf049c82a219dfa4aa501b3a71c54c024fd8f69ec56463ec9fa7bb8b06ee33f1eb5b49029a846aabf7d0089fb4106
+EBUILD appstream-0.12.2.ebuild 1502 BLAKE2B ce7c0ba0602029ae4a243d38bff98f67942479fed417af55cbad840d69cbfb2c5f806ffb05d10205f70abaaa8292b32e05eaa63a4e7b26fe99e9a917393fbc30 SHA512 0149dad2ade3d6d70efba1f8ad9a4b39fcb3e76d5779568dbb26b42eb04b0e8b95cd27bbcd5f5bbc41dbca4813cc43bdcafe8b0ea6eaddbeb391d92281165e41
+EBUILD appstream-0.12.3.ebuild 1456 BLAKE2B a7aaed498184987107ca5436235ca9401dc573f3fc937d16743f2bea1b8e21a2c237711f5d0ac8b06c64a338a28060b5e5a15b2fdf3204fdee8e8312f1097291 SHA512 bd50cab254590ceffe6bb7b47663b9f9534cf049c82a219dfa4aa501b3a71c54c024fd8f69ec56463ec9fa7bb8b06ee33f1eb5b49029a846aabf7d0089fb4106
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.2.ebuild b/dev-libs/appstream/appstream-0.12.2.ebuild
index f2aa30c08f78..ff514c29496c 100644
--- a/dev-libs/appstream/appstream-0.12.2.ebuild
+++ b/dev-libs/appstream/appstream-0.12.2.ebuild
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-gcc-7.3.patch" )
+
 src_prepare() {
 	default
 	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
diff --git a/dev-libs/appstream/appstream-0.11.5.ebuild b/dev-libs/appstream/appstream-0.12.3.ebuild
index bf4e52ace68b..f2aa30c08f78 100644
--- a/dev-libs/appstream/appstream-0.11.5.ebuild
+++ b/dev-libs/appstream/appstream-0.12.3.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
@@ -9,12 +9,10 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ximion/${PN}"
 else
-	inherit eapi7-ver
-	MY_PV="$(ver_rs 0- '_')"
-	MY_P="APPSTREAM_${MY_PV}"
-	SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+	MY_PN="AppStream"
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_P}"
+	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
@@ -23,39 +21,45 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
 LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
-IUSE="apt doc qt5 test"
+IUSE="apt +introspection qt5 test"
 
 RDEPEND="
 	dev-libs/glib:2
-	dev-libs/gobject-introspection
 	dev-libs/libxml2:2
 	dev-libs/libyaml
 	dev-libs/snowball-stemmer
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
 	qt5? ( dev-qt/qtcore:5 )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.5
+	dev-libs/appstream-glib
 	dev-util/itstool
 	>=dev-util/meson-0.42.0
-	sys-devel/gettext
-	test? (
-		qt5? ( dev-qt/qttest:5 )
+	>=sys-devel/gettext-0.19.8
+	qt5? (
+		dev-qt/linguist-tools:5
+		test? ( dev-qt/qttest:5 )
 	)
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-meson-po.patch" )
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+}
 
 src_configure() {
 	xdg_environment_reset
 
 	local emesonargs=(
-		-Denable-docs=false
-		-Denable-maintainer=false
-		-Denable-stemming=true
-		-Denable-vapi=false
-		-Denable-apt-support=$(usex apt true false)
-		-Denable-apidocs=$(usex doc true false)
-		-Denable-qt=$(usex qt5 true false)
+		-Dapidocs=false
+		-Ddocs=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
 	)
 
 	meson_src_configure
diff --git a/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch b/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
deleted file mode 100644
index 2a37662e8f34..000000000000
--- a/dev-libs/appstream/files/appstream-0.11.5-fix-meson-po.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/640916
-Thanks-to: David Haller <gentoo@dhaller.de>
-
---- a/po/meson.build	2017-09-04 18:09:52.000000000 +0200
-+++ b/po/meson.build	2018-05-15 12:24:42.000000000 +0200
-@@ -21,7 +21,7 @@
-         'find ' + meson.current_source_dir() +
-         ' -type f' +
-         ' -iname "*.po"' +
--        ' -printf \'%f\\n\'' +
-+        ' -printf \'%f\n\'' +
-         ' | grep -oP \'.*(?=[.])\' | sort' +
-         ' > ' + join_paths(meson.current_source_dir(), 'LINGUAS')
-     ]
diff --git a/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
new file mode 100644
index 000000000000..3eb8b0db877d
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-0.12.2-gcc-7.3.patch
@@ -0,0 +1,24 @@
+From 9252de815e4443d1b617211f38685afe7c0f6b0e Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias@tenstral.net>
+Date: Sat, 20 Oct 2018 20:20:09 +0200
+Subject: [PATCH] Explicitly include string.h in as-tag.c
+
+This apparently is necessary to fix an FTBFS issue with older GCC
+releases. Resolves #207
+---
+ src/as-tag.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/as-tag.c b/src/as-tag.c
+index 6afba621..91076e69 100644
+--- a/src/as-tag.c
++++ b/src/as-tag.c
+@@ -32,6 +32,8 @@
+ 
+ #include "as-tag.h"
+ 
++#include <string.h>
++
+ #ifdef __clang__
+ #pragma clang diagnostic ignored "-Wmissing-field-initializers"
+ #endif