gentoo resync : 31.05.2021

4 files changed, 2 insertions, 154 deletions

diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 88e7e6df1ed6..0bedb8d550f7 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,8 +1,5 @@
 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
-AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
-DIST grilo-plugins-0.3.11.tar.xz 1449408 BLAKE2B 8ed9bd49f779eadb486a13be3bbdee0df797ebffb7833eaf2632cbb6fac90b33e2f3c92223c7e6d268257aabd710e0b9fd6c8e9395bfae776990a64e7537b41a SHA512 eefeabf333568d06ce77ba865f2dc96592428ae41c459f51e2ea7f37914c2b3d52778e5548b7d49059f1e4b83c8c07e5a8798272c5ced0259de1900d9e3f6991
 DIST grilo-plugins-0.3.13.tar.xz 1835320 BLAKE2B 3c39c652700eba0d6c557dbfa700a4f8f1b52ecadb757d7c36b5a3023f096fcb7587f4b054f75eb12ffee61b423abbca73d7847d902450d23b5527024f260058 SHA512 7edccc7366623c3dab56f7c95156327db08efdf038563c9be3e423c517a1117003ef516a069f9a2e877f6a610dad6783d3087d111b039ce7bdc6657124cf8e25
-EBUILD grilo-plugins-0.3.11-r1.ebuild 2987 BLAKE2B 8b946ceb3ddee6fae619624915f970b9aeb8df81359b6e103c5f1fc3aa9b00da19df0381948538e3933cafd9ad2dafca9311a4b74dde7d3cec40738dffec327b SHA512 b2c546d0bfedc72cb92a4d1da144ba4696d34cee09e54233879e46c74dba742c92704496f8c173c01e8fb828718b500410db566aa97b587cdf81277fe33969fb
-EBUILD grilo-plugins-0.3.13.ebuild 3233 BLAKE2B be0ad3a6e75d5f2b61d23d0959566d1ddf47916cd10766e41a7341d874ae95b0bc202ca0a6d8c59201bd9b0f6bd75c31eb599c3c6b32a102d8d66af8a86bf157 SHA512 3525d03ec78ad6dbcc05226b0cccd6234de8bd34d7c854be9143f8823fb79fff41b03b7bfed910d303dd888d940f48c73d0933c006028696a77645e705363521
+EBUILD grilo-plugins-0.3.13.ebuild 3230 BLAKE2B d27fd29832d3cc03027a685e2b8a6702e320cf2c3e63a84b47d0f231eae2235e3781f5c1b2085f136aa8b33ab3f4b85e6eb18c755f5d6e46b8672c1b55864220 SHA512 340e54e4fe0dd4ee4acdf9d29230a51672d4be8e724ce1ae927be8292170b57e81a61f204afaa196cff6a13eb37dce8cbe752fd1c7f68e17019bccfa1eac89c5
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch
deleted file mode 100644
index fc3241085acb..000000000000
--- a/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ecee1d8099447b2639d9c38acc344428877d4799 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 dependency
-
----
- meson.build       | 4 ++--
- meson_options.txt | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 83a83a0..e79e84f 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.37.0')
-+        meson_version: '>= 0.47.0')
- 
- plugin_version = meson.project_version()
- version_array = plugin_version.split('.')
-@@ -51,7 +51,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.3.2', required: false)
- grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false)
- grilo_pls_dep = dependency('grilo-pls-0.3', version: '>= 0.3.0', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index 7d96a74..32b51d2 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -21,3 +21,4 @@ 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')
- option('enable-vimeo', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Vimeo 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')
--- 
-2.17.0
-
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.11-r1.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.11-r1.ebuild
deleted file mode 100644
index 6eb11b5c703e..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.11-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org 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 ~sparc x86"
-IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
-RESTRICT="!test? ( test )"
-
-# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.8)
-# 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.8:${SLOT}=[network(+),playlist]
-	freebox? (
-		net-dns/avahi[dbus] )
-	>=dev-libs/gom-0.3.2-r1
-	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 )
-	dev-db/sqlite:3
-	>=dev-libs/totem-pl-parser-3.4.1
-	tracker? (
-		>=app-misc/tracker-2.3.0:0= )
-	upnp-av? (
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server )
-	lua? (
-		>=dev-lang/lua-5.3
-		app-arch/libarchive
-		dev-libs/libxml2:2 )
-	thetvdb? (
-		app-arch/libarchive )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:= )
-
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-"
-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.8-meson-goa.patch # Support controlling g-o-a dep via 'goa' meson_options
-)
-
-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
-}
-
-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-jamendo=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=$(usex tracker yes no)
-		-Denable-vimeo=yes
-		-Denable-youtube=$(usex youtube yes no)
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-	)
-	meson_src_configure
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
index b1aa867de4f8..a4224bdc0875 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.13.ebuild
@@ -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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~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} )"