gentoo resync : 02.02.2022

5 files changed, 3 insertions, 198 deletions

diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 5fe688d07070..f5d5cb9ab676 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,7 +1,3 @@
-AUX 0.3.13-meson-goa.patch 2376 BLAKE2B 35a35af7aebf3c7f735affdcb2775a556eef8aafbde8aada3e8ea83fa67db9d0a0f992115eb4d54dd69736ae813b0cdef8d25b2991f4cb1361f0d451fe1f43a6 SHA512 ee3959e0c7eabc7f7fbdd6ddbd0c10242ffb9ebe427915115430f10bec821fc5b66dc8315a75337e69875ea060ec3a8c10ef6979534a1e47b408ebbf4785e6bd
-AUX 0.3.13-meson-tracker3-test.patch 966 BLAKE2B 85daac660794ae43c592a7a344d82dff0bc008b2f32a5a66e724a867ead059bb4c9f2f6a9c4c9a3fbf6ace8b7f2b12abd353b2ace08e1c5d2e712837721c36e8 SHA512 da7677753209a8da8d75cb258bd88e003fd2ea647bd1c2bfde4e63bcc48b7d0df3600b5d9e0192461f49b20bb56c605613c088e85b8b4e955b34457d231f8a00
-DIST grilo-plugins-0.3.13.tar.xz 1835320 BLAKE2B 3c39c652700eba0d6c557dbfa700a4f8f1b52ecadb757d7c36b5a3023f096fcb7587f4b054f75eb12ffee61b423abbca73d7847d902450d23b5527024f260058 SHA512 7edccc7366623c3dab56f7c95156327db08efdf038563c9be3e423c517a1117003ef516a069f9a2e877f6a610dad6783d3087d111b039ce7bdc6657124cf8e25
 DIST grilo-plugins-0.3.14.tar.xz 1836512 BLAKE2B 28d633a1565c1bc8329a6a69d4f2d8db5e5887cdce5e56fd4167ab31f293a2c203583b9c2a916977a9642c6acc15933d37e50026e9929587f0f35af688c6a9c4 SHA512 941d9524cfb33e33315ac7575051521d9117ef517b169cca90660dee788252eaf1e6f8171ccc7beede5564d63149e065faf08c3244e17f7c1c193bfb7d2af1f8
-EBUILD grilo-plugins-0.3.13.ebuild 3237 BLAKE2B a7bed1b246cfc05fffe85dbe445994e0404d69eefca75e9c0084dadbe8e0cac884042434c228c6076276407f2b461ce2afa6b0345b106dfccd2cd1a1c8c92f79 SHA512 1fb6c2be771643d8f339e505c7e12050cf827f7278d10083ca1bc052fcc5696428c2dad74eda3c16622f256d2d921cca83055b62ba04767076cca0f0fea00e2e
-EBUILD grilo-plugins-0.3.14.ebuild 3141 BLAKE2B fb792524792a3914ef9532bf8fe2667394d0f9661f0bd5d5d1252fee649673a67a918eb213f2b16cce4489a7f26b1611b070ab3e1a4aa5da8ad609945e4ce3c1 SHA512 6f6d3abbb75c920005de345c5fdbc597aa1a2013f9e8698fc9c48833aead538c3194b88bccaa3c6b09530919bc685ee6269ca5699976f4429d1ad2390986724f
+EBUILD grilo-plugins-0.3.14.ebuild 3138 BLAKE2B 1b370e91a55564012f6671e6e77a78da04bba500cebdea1ff2ff62e770458709989f60e1d7f94c4456d6e20f43285d022184781fbe51b877c583d6da40ce0998 SHA512 b362fcb4be536a75a880f14793f3b14934d14cde76c9f861aaea9024e9687c40a2ca74d71b6c15c275c1a729c97ba49ef92ff7d9d7d6e0cfc9096a73d0abb7e9
 MISC metadata.xml 921 BLAKE2B 6d399a219e95fd3cd2bd3549256bd4c66caec4ad78feba1b89fa4a6018d8a0b32c7e02c59c69b3c7d3aaa0eb7df6c0be1cc41052d53eafc664dda240367fa9c3 SHA512 a2360f8a8690346c2aa971d91776fb143671e4a1d69300519325943579522e98cc6f12654e5d8fa8df6008d56b7bd82b81ab41d95f7c650f439a91d8f3a705c9
diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
deleted file mode 100644
index 8122e57db3fd..000000000000
--- a/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/109
-
-From 27585cd5bcfba9e75d8ca9bc86dc0b7b3e5a2e59 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 16 Feb 2019 14:44:44 +0200
-Subject: [PATCH] build: Support controlling gnome-online-accounts dep
-
-On Gentoo, some users prefer to disable gnome-online-accounts since it
-brings in the large WebKitGTK dependency.
----
- meson.build       | 4 ++--
- meson_options.txt | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 74a5d2a9..5f8c7cd4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -13,7 +13,7 @@ project('grilo-plugins', 'c',
-             'warning_level=1'
-         ],
-         license: 'LGPL 2.1',
--        meson_version: '>= 0.44.0')
-+        meson_version: '>= 0.47.0')
- 
- plugin_version = meson.project_version()
- version_array = plugin_version.split('.')
-@@ -52,7 +52,7 @@ avahi_glib_dep = dependency('avahi-glib', required: false)
- avahi_gobject_dep = dependency('avahi-gobject', required: false)
- gio_dep = dependency('gio-2.0', required: false)
- gio_unix_dep = dependency('gio-unix-2.0', required: false)
--goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false)
-+goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: get_option('goa'))
- gom_dep = dependency('gom-1.0', version: '>= 0.4', required: false)
- grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false,
-                            fallback: ['grilo', 'libgrlnet_dep'])
-diff --git a/meson_options.txt b/meson_options.txt
-index f5132228..1e0ea090 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -21,4 +21,5 @@ option('enable-tmdb', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'a
- option('enable-tracker', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker plugin (DEPRECATED)')
- option('enable-tracker3', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker3 plugin')
- option('enable-youtube', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable YouTube plugin')
-+option('goa', type: 'feature', value: 'auto', description: 'Enable gnome-online-accounts usage')
- option('help', type: 'combo', choices: [ 'yes', 'no' ], value: 'yes', description: 'Build examples developers')
--- 
-2.26.3
-
diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
deleted file mode 100644
index 0812d7936b6d..000000000000
--- a/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/110
-
-From 62229a03614add0d3cb6e1087f241407f952de12 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 14 Apr 2021 22:08:13 -0400
-Subject: [PATCH] build: Only run tracker3 test when enabled
-
-Previously -Denable-tracker3=no would not build the tracker3 plugin but
-if the dependency was found on the system the unit test would still be
-enabled (and would fail).
----
- tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index 97e196db..7ba2236b 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -39,6 +39,6 @@ if local_metadata_enabled and lua_factory_enabled
-     subdir('local-metadata')
- endif
- 
--if tracker3_dep.found() and tracker3_testutils_dep.found()
-+if get_option('enable-tracker3') != 'no' and tracker3_dep.found() and tracker3_testutils_dep.found()
-     subdir('tracker3')
- endif
--- 
-2.26.3
-
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
deleted file mode 100644
index 65c4e305388f..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LUA_COMPAT=( lua5-3 )
-inherit gnome.org lua-single meson xdg
-
-DESCRIPTION="A collection of plugins for the Grilo framework"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.13)
-# json-glib used by tmdb and lua; tmdb currently non-optional
-# TODO: validate upnp-av dleyna deps
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=media-libs/grilo-0.3.13:${SLOT}=[playlist]
-	freebox? ( net-dns/avahi[dbus] )
-	>=dev-libs/gom-0.4
-	chromaprint? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-chromaprint:1.0
-	)
-	dev-libs/json-glib
-	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
-	media-libs/libmediaart:2.0
-	net-libs/libsoup:2.4
-	dev-libs/libxml2:2
-	flickr? (
-		net-libs/liboauth
-		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-	)
-	dev-db/sqlite:3
-	>=dev-libs/totem-pl-parser-3.4.1
-	tracker? ( app-misc/tracker:3= )
-	upnp-av? (
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server
-	)
-	lua? (
-		${LUA_DEPS}
-		app-arch/libarchive
-		dev-libs/libxml2:2
-		gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-	)
-	thetvdb? ( app-arch/libarchive )
-	youtube? ( >=dev-libs/libgdata-0.9.1:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
-	virtual/pkgconfig
-	lua? ( dev-util/gperf )
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.3.13-meson-goa.patch
-	"${FILESDIR}"/0.3.13-meson-tracker3-test.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
-	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
-	sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
-
-	# libdmapsharing-4 is not packaged
-	sed -i -e "s:libdmapsharing4_dep.found():false:" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable-bookmarks=yes
-		-Denable-chromaprint=$(usex chromaprint yes no)
-		-Denable-dleyna=$(usex upnp-av yes no)
-		-Denable-dmap=$(usex daap yes no)
-		-Denable-filesystem=yes
-		-Denable-flickr=$(usex flickr yes no)
-		-Denable-freebox=$(usex freebox yes no)
-		-Denable-gravatar=yes
-		-Denable-local-metadata=yes
-		-Denable-lua-factory=$(usex lua yes no)
-		-Denable-magnatune=yes
-		-Denable-metadata-store=yes
-		-Denable-opensubtitles=yes
-		-Denable-optical-media=yes
-		-Denable-podcasts=yes
-		-Denable-raitv=yes
-		-Denable-shoutcast=yes
-		-Denable-thetvdb=$(usex thetvdb yes no)
-		-Denable-tmdb=yes
-		-Denable-tracker=no
-		-Denable-tracker3=$(usex tracker yes no)
-		-Denable-youtube=$(usex youtube yes no)
-		$(meson_feature gnome-online-accounts goa)
-		-Dhelp=no
-	)
-	meson_src_configure
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
index 9ad084371036..226ee065aaa4 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"