Merge branch 'edge' into next

4 files changed, 4 insertions, 72 deletions

diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index fb4953bd616a..d656ecb56d7e 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,7 +1,5 @@
-DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
 DIST totem-pl-parser-3.26.5.tar.xz 1318700 BLAKE2B 18cea2edff1206ed9c77ac07fb018da0c9bc5550599b45e363d745166f4828adba6a2f77b763602af011c0a12e9f1f9765402fbafbe097fb69890ec7a9520825 SHA512 ce110d92f60da328272a8135a57ba60785ea4bca1fde3703a734969e7ba5b382ef19dc3b8930a5641d8f8effabf627f7e9b2727ee94e69e6144e0f085079e14d
-EBUILD totem-pl-parser-3.26.3.ebuild 1930 BLAKE2B 840f460efe1d98b7778751a6eb5692ffbb2609089dd74269e1a8f578a7dff0e5402ab8d2690c22c6a6dfc1ceb3863c9038bd244b6f26f0ebb560754410389dd7 SHA512 adaaba47806b4d525f8920684dfc7baec49eb8ffb11e1d7aa745f761b3cdc6ec28187d0315079494e22fd80b606d4141e1b09b852ab3c0f724b3358c32053592
-EBUILD totem-pl-parser-3.26.4.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
-EBUILD totem-pl-parser-3.26.5.ebuild 1933 BLAKE2B 72745ad96c7f8e072d28a81041d1fbbb1d7cb67421dfe387e69286548fc45e2042220a2dad4a18234fe5e12157abb19d508564a94f5dcf7f0617fd79df832463 SHA512 7aa9b7d27de83942e49452e7f6ff83edb28c64d8bc2ad83e7386b93b3f8efc19e6452397e14f7820d600420703057038dd32f02590b7e65e465c3afb401ea433
+EBUILD totem-pl-parser-3.26.4.ebuild 1930 BLAKE2B 5f16ca9d7d8ce0424eaf066f5dd811b8692a59cac9545d5774176e457f639e6d4db658b83ddfc3a01f6d662f1be575c5304560ab2d2fe3b003b41783ecad3f8d SHA512 3f9b54bcdeaf5e148a2f26cd549173de682c260239389301ec4a1736dffc2d52ed8d93e7b79ad452839443ee7d4e9390b5cc8247add116372887873e03a7800b
+EBUILD totem-pl-parser-3.26.5.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
deleted file mode 100644
index ee9851afbf07..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org meson xdg
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0/18"
-IUSE="archive crypt gtk-doc +introspection +quvi test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	quvi? ( >=media-libs/libquvi-0.9.1:0= )
-	archive? ( >=app-arch/libarchive-3:0= )
-	dev-libs/libxml2:2
-	crypt? ( dev-libs/libgcrypt:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		gnome-base/gvfs[http]
-		sys-apps/dbus )
-"
-
-src_prepare() {
-	# Disable tests requiring network access, bug #346127
-	# 3rd test fails on upgrade, not once installed
-	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
-	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
-	#	-i plparse/tests/parser.c || die "sed failed"
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# uninstalled-tests is abused to switch from loading live FS helper
-	# to in-build-tree helper, check on upgrades this is not having other
-	# consequences, bug #630242
-	local emesonargs=(
-		-Denable-quvi=$(usex quvi yes no)
-		-Denable-libarchive=$(usex archive yes no)
-		-Denable-libgcrypt=$(usex crypt yes no)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
index 5d2ffd44e4aa..ce4cfe8754cf 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
index 353b21ee7b05..5d2ffd44e4aa 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2