gentoo resync : 31.05.2021

4 files changed, 3 insertions, 82 deletions

diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 4bcb2428d25e..42fecbf7754e 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.3.12.tar.xz 234340 BLAKE2B dd9f2558dee73080d87a98209816ca79a13fee4934a9e456190616e11565095e3c08e64f3ccec30e3bb7a102a9e23c25ba32a95f963676516a354a785bd6bdd6 SHA512 c0badc4b3f96efa04e6f3b5f32b2322855d9a660f748ce68012d266a6f5936f850bd63e559c782ae02ee24ba282c3b3882c6b8fae99019b913d74ff927a31017
 DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
-EBUILD grilo-0.3.12.ebuild 2177 BLAKE2B 83c6a3c6ef688d089661f0c57b84f886746411dab7a5b4d1ccd6ef18686f83676b82228aee7a9eaae30292afec7d83b66bc5f67413432cf707306f5eda1368b3 SHA512 c6a49bd755af487c317d9177a914e029b3945f1cea6439cf40473219373a9e06bdc22afed9c03ff7362536e15f8e0698abe73c304e27adf4a8c4248882f2c94b
-EBUILD grilo-0.3.13.ebuild 2164 BLAKE2B a410bc714f34ad9b0c7eeaee99c71ee6d2caaa141e5a3ad6edd8ca4b0839d7c29dea01d42de8f64b2eb32250bac1321386871dfb855d8dfc55f7b94c36027578 SHA512 0be573f9c1e45900f0aeb58f98548a003d5a820f21a015c411e1ef121194f023a7f4a02768a54486b7ca7a41398cab74f463dda24d81f738d72e897d9b644df4
-MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
+EBUILD grilo-0.3.13.ebuild 2161 BLAKE2B 372b97addf0c555d9b70e727439a8cc5ba88e2ff5104b018baac33caab68429b0d2dd700309560f32db934f7e69e1a488d504629e936693372e100f3e1c8f8c0 SHA512 16bc78c6094e06f80c219b0b7c6252f34052de9e6984b28b4f110c93db58f78f5e17501b9cca5f476f93b8e90074ee5ad3e6ec3b103baa96d964ce8a08ec6963
+MISC metadata.xml 619 BLAKE2B 53795b955d3e86349c48e0856af7556c4b03bfce27a6b90d963aecb62860e80463639a9235dcf5efa853b11cbcf40f2800a648d4130cf227ad68c469967e6c8e SHA512 515a4711a98f422e49e6c7204b3d07b7c8828303109b3dbd7f4fdaabe9142f769edf515a98f6fdf9560fecb930510d7ca84b729d01d7877a800d20ccb004fe5d
diff --git a/media-libs/grilo/grilo-0.3.12.ebuild b/media-libs/grilo/grilo-0.3.12.ebuild
deleted file mode 100644
index 193083ae03d8..000000000000
--- a/media-libs/grilo/grilo-0.3.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +network +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/libxml2:2
-	network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
-	playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
-	gtk? (
-		net-libs/liboauth
-		>=x11-libs/gtk+-3.14:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	${PYTHON_DEPS}
-	test? ( sys-apps/dbus )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
-	sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
-	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
-	# Drop explicit unversioned vapigen check
-	sed -i -e "/find_program.*vapigen/d" meson.build || die
-
-	# Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
-	sed -i -e "/subdir('examples')/d" meson.build || die
-
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use network enable-grl-net)
-		$(meson_use playlist enable-grl-pls)
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk enable-test-ui)
-		$(meson_use vala enable-vala)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
index 954cedfd8939..19e4c81586de 100644
--- a/media-libs/grilo/grilo-0.3.13.ebuild
+++ b/media-libs/grilo/grilo-0.3.13.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index bbc62e48bcf9..c1193dfddabb 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="network">Enable network access for media discovery using
-			<pkg>net-libs/libsoup</pkg></flag>
 		<flag name="playlist">Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
 	</use>