gentoo resync : 18.08.2019

3 files changed, 75 insertions, 2 deletions

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index f05e8f2fd755..f71cbc88dad7 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,7 @@
 DIST AppStream-0.12.6.tar.xz 1953604 BLAKE2B 28b03a935b8c203f2ac2c52c1de8317cc899f2b81b00e83e2eb858dbd185a985ce608ba3f6b1c35f084b4ee91946a4870c89d6b0c0a4c6fd32a938558e3997f1 SHA512 c19cd89ba39aff5afa2ff6d5fca72581a8624463c33011b11036526db98392ff5aa6c0f599682e90fdee29b8732538cf96c20b66965016b96f60b3f899d722bb
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
+DIST AppStream-0.12.8.tar.xz 1992072 BLAKE2B ae1d6801119798f360b7eae36b0c46b0511a93ae00adb2437e7dda830d5293c622b04475664055bee392dc824f398d42c6a0a4000392f82fc8bdfc828fa0295e SHA512 4354ef1840d919102647feffc38687f508b14fe9c047c868448347d888aa821dd8a4d25787a2ffb55247f8e9e20e9e03ba330ad74ad61d476be0c414c04a7c30
 EBUILD appstream-0.12.6.ebuild 1577 BLAKE2B 068254a2aaf873f8376cfe229596319a462a636137c74a90109c36ef975fa6022fc63bdd7c1469981731cb1e3712740506acebb74756de81502c92127a1be3bb SHA512 1f1c5a1d307e42ddb273c4ad77cc887f913f2a74392ff25050a541403a424981baecd95e1a3c127877888ab9e910307e4a6070821a7892583e5a853620c421b4
-EBUILD appstream-0.12.7.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
+EBUILD appstream-0.12.7.ebuild 1593 BLAKE2B 970c6254d488a75ed7205c7c3564381d987ac6afbcc34aba8a8b6d70e8396832b9be5d4829a394b5c8ea4e88559cd1197cdc55c8904668867619991586c70b1d SHA512 0af12d23c034999c44a59d3cf89b8e25cb08e7bb7d085c4cc0c5c269008a494480cd055b8ffad9e7e83b48a1e69eaa88eb5ebee6fe14486195064e7247dcb7c2
+EBUILD appstream-0.12.8.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
index cbbde57065d8..1cacb6a7e53f 100644
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ b/dev-libs/appstream/appstream-0.12.7.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	MY_PN="AppStream"
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
diff --git a/dev-libs/appstream/appstream-0.12.8.ebuild b/dev-libs/appstream/appstream-0.12.8.ebuild
new file mode 100644
index 000000000000..cbbde57065d8
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.12.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	MY_PN="AppStream"
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt +introspection qt5 test"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=dev-util/meson-0.42.0
+	>=sys-devel/gettext-0.19.8
+	test? (
+		dev-qt/linguist-tools:5
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+DEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.54:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-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
+}