gentoo resync : 22.12.2021

3 files changed, 2 insertions, 81 deletions

diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 0f7fdabb0740..4a629e6374f9 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,6 +1,4 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
-DIST AppStream-0.14.5.tar.xz 2344820 BLAKE2B 714f7004db7579fb293c68e8574f0ebb8cea230e090edbaf459e6e2e0833656d7dd6372bd55c39c5e0b665117015c768990ac8b182a51219823c9cf90360263d SHA512 3f2fff8ee98a5689534802136b9fc8368422ce73c72458924b49beeb5b01170dadf25308bee692cfbc0b0a6cd4b3ee3047e46668a1b76a16b23faec4bf8ae78c
 DIST AppStream-0.14.6.tar.xz 2403088 BLAKE2B 1eb85601c1782fc47ff21983517f301dc9493fb60347cfe8072c277cc4415e80bf6c11a93db80b6d7fe1eeda7ff1fa414fd10ce7ef0d7379b415326407d805b8 SHA512 810aa7427df50793f4bed27cc3cb5b72c156f0c582f241e06131aa8eabe82d59c8ac0bcc37a22877f7a19ac4640a9a831f8b567ce3e2d26a41ce999515affdb0
-EBUILD appstream-0.14.5.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
-EBUILD appstream-0.14.6.ebuild 1791 BLAKE2B 0ea428d3df6a13465aa4fbe3b6d9b0f40b856549f3d1934c548e7611397dbc2a76023ffe180cc600bb6972da351b24d3f1654f78d7dc651c1e1c14bc63c44992 SHA512 91197c450782f4bb70f52e38195c68f7793d2bf14dae858449b3afacc8e1b57f4e1e141b78aba3a5c62d8a469b3a6d555f6bfbe162e8dd6ac7c2d29b09bc6328
+EBUILD appstream-0.14.6.ebuild 1788 BLAKE2B 6caa408ff4ce96c547fddae9396d6e92d9721febf16d73c32052a93bbfe47add052c4b49185d8616eee1aa79ad3f69a9cac2caa5c6f4ff807063746f3db4ddb6 SHA512 b615ef8dc0d8ea2f87cff9c7b98c3c14eb2dd08369f69ff0119e735a40344fac6b370dcddcf78dc6e74f7433b7c0c81d5868d544cb1450affd846c8e694a377c
 MISC metadata.xml 400 BLAKE2B c9855a1e3650a66c8b42fb9055d6de0aa0575ed86bb1e8695d112f2e7cdfbd5f55d6805dfeb0ed19c3354ee3cda8208fd8a4adf4e8313e791493fa1730fb32d9 SHA512 9723ac7481f748429bddde7579b81c7db2dfad2ecd5150c1c4023843c5ef47e02ce41ff43508437ae60ba427a072d09e8d46a6e6b82fc946ea3af71dd71c52f2
diff --git a/dev-libs/appstream/appstream-0.14.5.ebuild b/dev-libs/appstream/appstream-0.14.5.ebuild
deleted file mode 100644
index a67f828fd48f..000000000000
--- a/dev-libs/appstream/appstream-0.14.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
-	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-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 doc +introspection qt5 test"
-RESTRICT="test" # bug 691962
-
-RDEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.58:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer:=
-	net-misc/curl
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-DEPEND="${RDEPEND}
-	test? ( qt5? ( dev-qt/qttest:5 ) )
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	doc? ( app-text/docbook-xml-dtd:4.5 )
-	test? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
-)
-
-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
-		-Dcompose=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dinstall-docs=$(usex doc true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/appstream/appstream-0.14.6.ebuild b/dev-libs/appstream/appstream-0.14.6.ebuild
index 0354ce9412b7..a67f828fd48f 100644
--- a/dev-libs/appstream/appstream-0.14.6.ebuild
+++ b/dev-libs/appstream/appstream-0.14.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
 	S="${WORKDIR}/AppStream-${PV}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"