gentoo resync : 24.12.2018

3 files changed, 3 insertions, 137 deletions

diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
index 9094ed22a3a7..9204bd03c292 100644
--- a/media-plugins/grilo-plugins/Manifest
+++ b/media-plugins/grilo-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST grilo-plugins-0.2.17.tar.xz 1036308 BLAKE2B c83de5b251c030c71164310f6240652ffc86efa46a057bc750ee242c7cc2ff91a9c28ec6a847783cf7fd2df068cba0dad6f10521db82c7080a466c63aacb4c03 SHA512 f556ae6e72c82ce74cc8902f7b4ae27f51060c3b06230989b36ce4498f93894c723809c1f08fc8edfabd892fc303eb0523f21ea72649f644c7eb421b62773140
-DIST grilo-plugins-0.3.5.tar.xz 1881080 BLAKE2B 06f06fe47cf6fb374d3d398e113a2d851c46e390011f2ef8c04a9b658bd04eea5f0c17ad4e89f7cd922ac0a24efe94f30db65697d4b71fab512eaf71c8ef936c SHA512 3420b18d5d938559b75ae41199a6a79dfa5a8a43d2b29631f7cb03c28df569627be610a4087514240c3413e476fa76def3ee7a1b065b5104679b788b633a5b0e
 DIST grilo-plugins-0.3.7.tar.xz 1892848 BLAKE2B 9894a01dc555f20c3119208e2ee875898c918f8d81e36571a777f7f1776c284d5fa5b4ac9126a352dc812b0f5ba9c15e0e81a2381ef9cb636afb66e272a77cec SHA512 9e69835b3b8f6e2974d799480e2c8c55a084d2089ead6b37112a8c3c79b6bd2142b8fd66952493b7118e09eb5070789408b59bd28784bd9f6bf5ea5a7bc5695d
 EBUILD grilo-plugins-0.2.17.ebuild 2435 BLAKE2B 3b10e88bc22e510adb5ef7b841304ff550ddc1ecd4b0977c8e09d618207a8ce3d41a4a527f3c7e6c36d3b0ba5dd962f33be9e982fd34b3ebc60e22a24b68d6e1 SHA512 28fff3c2ba9ccc801502d42f10ff125abb66250bc474d3748fe8ed6ec48484afcbf8e887428ec079eeec6be89fe1f45e58e1781ecf1ec00624a0e6d494c5ded8
-EBUILD grilo-plugins-0.3.5.ebuild 3580 BLAKE2B 27363429fde86523e15091f2ec933b1c5765b491e7879a33cdac6a836b2f927756dfe97eab91de3631ab37698f0f72e4d83bc7da821a89b731d098294e9a6833 SHA512 1b2014a8299a22faa0705c8432a0959f944829e8f058a178a0dad9d27985fd17eba538d2bb56ad3c98fbd8945ac0af8bb3555b7ddb2adf68e1df549f458e13fc
-EBUILD grilo-plugins-0.3.7.ebuild 3582 BLAKE2B e9c71e0c0a0a18df6d2cf48b2814498435e81aa991cd6bd398551080f6b2c0a6c341fe10fa5d99e16c9b7baef3ff3e9ef76df7ebbe71eb74d9848d581b2e70a4 SHA512 7a75b92ea6bb38a73122ddcc5146d0678d9834f63b19933f08a2dd484e803400025cb2a54d875156117813ebb2e9dec9c6d7ab9d0749b7c3bb276fa02017c2b5
+EBUILD grilo-plugins-0.3.7.ebuild 3577 BLAKE2B 23aa0ba03a43a60f310f12f7973a4093797083e0a02c37de67d64376f34310f5a28e5958e1fa12246f89591b1d144ba15c8ac53d3318135f98beb7675ca968af SHA512 8898c1fd574c7d030d98512db1560f09743c7ea7da6a7387a1dc8926a90798dab6c1e09d2108a6f26d94e3efb824d99210791b1580d28adb71786a7ce1c52e02
 MISC metadata.xml 1136 BLAKE2B 0efdd69b0def1abeb70d76229addd8cc17db0d8bf314696eb8abfe3e938a8f60ab68b47b0be7aad81d99ddcf0e597cec76e1717ff32e5c0529a8b4bbf8b92c08 SHA512 d308b981dd17f7c78462d0e90892169e2f15affbeb99d909aa35a46e0c1728f6fc3530e0fd936424150781411b469041a47fe62bbf438aa68c0140755830799d
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
deleted file mode 100644
index 934007421c91..000000000000
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-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 dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
-
-# Bump gom requirement to avoid segfaults
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=media-libs/grilo-0.3.1:${SLOT}=[network,playlist]
-	media-libs/libmediaart:2.0
-	>=dev-libs/gom-0.3.2
-
-	dev-libs/gmime:3.0
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-db/sqlite:3
-
-	chromaprint? ( media-plugins/gst-plugins-chromaprint:1.0 )
-	daap? ( >=net-libs/libdmapsharing-2.9.12:3.0 )
-	dvd? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	flickr? ( net-libs/liboauth )
-	freebox? ( net-dns/avahi )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
-	lua? (
-		>=dev-lang/lua-5.3
-		app-arch/libarchive
-		dev-libs/libxml2:2
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	subtitles? ( net-libs/libsoup:2.4 )
-	thetvdb? (
-		app-arch/libarchive
-		dev-libs/libxml2 )
-	tracker? ( >=app-misc/tracker-0.10.5:= )
-	youtube? (
-		>=dev-libs/libgdata-0.9.1:=
-		>=dev-libs/totem-pl-parser-3.4.1 )
-	upnp-av? (
-		net-libs/libsoup:2.4
-		net-libs/dleyna-connector-dbus
-		net-misc/dleyna-server )
-	vimeo? (
-		>=dev-libs/totem-pl-parser-3.4.1 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	>=dev-util/gdbus-codegen-2.44
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	lua? ( dev-util/gperf )
-	upnp-av? ( test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') ) )
-"
-
-python_check_deps() {
-	use upnp-av && use test && has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use upnp-av && use test && python-any-r1_pkg_setup
-}
-
-src_prepare () {
-	gnome2_src_prepare
-	sed -e "s:GETTEXT_PACKAGE=grilo-plugins$:GETTEXT_PACKAGE=grilo-plugins-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-}
-
-# FIXME: some unittests required python-dbusmock
-src_configure() {
-	# --enable-debug only changes CFLAGS, useless for us
-	# Plugins
-	# shoutcast seems to be broken
-	gnome2_src_configure \
-		--disable-static \
-		--disable-debug \
-		--disable-uninstalled \
-		--enable-bookmarks \
-		--enable-filesystem \
-		--enable-gravatar \
-		--enable-jamendo \
-		--enable-local-metadata \
-		--enable-magnatune \
-		--enable-metadata-store \
-		--enable-podcasts \
-		--enable-raitv \
-		--disable-shoutcast \
-		--enable-tmdb \
-		$(use_enable chromaprint) \
-		$(use_enable daap dmap) \
-		$(use_enable dvd optical-media) \
-		$(use_enable flickr) \
-		$(use_enable freebox) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable lua lua-factory) \
-		$(use_enable subtitles opensubtitles) \
-		$(use_enable thetvdb) \
-		$(use_enable tracker) \
-		$(use_enable upnp-av dleyna) \
-		$(use_enable vimeo) \
-		$(use_enable youtube)
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		doins help/examples/*.c
-	fi
-
-	gnome2_src_install \
-		DOC_MODULE_VERSION=${SLOT%/*} \
-		HELP_ID="grilo-plugins-${SLOT%/*}" \
-		HELP_MEDIA=""
-
-	# The above doesn't work and collides with 0.2 slot
-	mv "${ED}"/usr/share/help/C/examples/example-tmdb{,-0.3}.c || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/legal{,-0.3}.xml || die
-	mv "${ED}"/usr/share/help/C/grilo-plugins/grilo-plugins{,-0.3}.xml || die
-}
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
index bdfe54ab8370..1a950a708cc4 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,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 dvd examples chromaprint flickr freebox gnome-online-accounts lua subtitles test thetvdb tracker upnp-av vimeo +youtube"
 
 # Bump gom requirement to avoid segfaults