gentoo resync : 15.01.2020

3 files changed, 3 insertions, 110 deletions

diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 0732ae991662..0f81a80650b5 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,6 +1,4 @@
 AUX 0.3.8-meson-goa.patch 2086 BLAKE2B 82bcd7de7d96caeed6f5448e36666acbb3870e4e8361c8890a73e031cb241261b98d8c97a3caf45187d2a7deebdf712a5447ccb29f96509a256eff8b5c257b6a SHA512 b5a6942092b32c91518e6142e7b0fbb46994eaa0f03eb83b0fbb561bf1ee27d435c1f0982cb036700fcff04bab27cf1080cb068bfdce44eeb6238f4f642c486d
-DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
 DIST grilo-plugins-0.3.9.tar.xz 1418148 BLAKE2B 438aac490f2e099c40f5df15d8b3958dc29c4344e4846a3ff452561f60bf041fe2975b6c67b634f5f54721fd69e53f86c5008eadb3a402cbc8b479e805ab8221 SHA512 4700b08cab53afe0899edf7859a2e18608f6ed2016a9139694e8f1eb628c5b7318b04fe1633406fd1685a8dd54d1632b886352eac3192d52a1c1a1ac55896479
-EBUILD grilo-plugins-0.3.8.ebuild 3016 BLAKE2B 9c70d247d60177a0bd297de80bac559300f6ce10c3bebf78c2ee74fbc36a928f34bdecf8617eb25ad0d474439e3d463186b821e0bd038b43b9d19348e9a48ea9 SHA512 78faf59534f49b61f251a69b457c225b52700ccc3f400e43dcfd974ca265491f5aaad0e4da91575bf3903007911ef0199976184a40d82627a1e372c3818344ca
-EBUILD grilo-plugins-0.3.9.ebuild 3027 BLAKE2B d051b27ae0b9a1a7e232ccd1494632b963af5e1f9c57e36f441f39f38d388275ab7713f33696a328bafd80769d54d041d1927f925c5d152535475792460059e8 SHA512 5a2d9eb4f2fe3ce9da9b4d5c11f99508b0974c8069f3a9bb7485d6132731affcbab5c2409d8c7d4a4220a2e41bc4d6285b0b1b20a3d33961e5ed62281adcb722
+EBUILD grilo-plugins-0.3.9.ebuild 3023 BLAKE2B fbeea375f6b4267966b6fd5eb8d181bf42b7487fbc8a025c2a87b10eda57bdeb35135a064e1993ed89c76c455b1dab43f7ff94581e9b0f30c1059e9752dad328 SHA512 9c1fa1f6a7d6fa47daf2c95829cac07ee0218fd45da547d4fc150a825a092e0141f2c201e575a458a9fc8bf3c6299f57303ed53f3a27cf9b51c826e41705a68c
 MISC metadata.xml 920 BLAKE2B c6119dc73ede7e500e3113f03677f81d65d4a2a524e84847f010e6c9215b96feed5fcaf400166471c25075742268cbe7639e23cd11447e0e795146b29dec797e SHA512 322b01e064c5656e9d9c7e2343d7feb76f35bd9ea6e5174ce3702747e5c4dd5de9ab60e9c91d72db171ad62a90f84eedcc03b3547ef7bc8e231090c7eaef9ac7
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
deleted file mode 100644
index 7f493b862a69..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_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.6:${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-0.10.5:= )
-	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}
-	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}"/${PV}-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.9.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
index 8fb20461ad68..10527d60d629 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit gnome.org meson xdg