gentoo resync : 02.02.2022

3 files changed, 3 insertions, 82 deletions

diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 0c519056a5f1..fcb42b989b05 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,3 @@
-DIST grilo-0.3.13.tar.xz 236420 BLAKE2B 8f891507edce92bccbc12aa9ecce78e8bd0804e548deec9a3651a656a27e9e87156e8cd7e1959a662c23e16fe958ff09f95755f825116f785784271883579dfc SHA512 b229b9b7524c1be63ed8891a9438844ebb87013074b394330f25316feb015040b304cd98bf3c89dc3248e6898c587a5e51666776a5b4ba5026a80ee8ad3e6d01
 DIST grilo-0.3.14.tar.xz 236620 BLAKE2B 25c81fb9b4ebce456f24aea19518d0a9c3b98a216e50fe9cbe9fa8b7e089535b5d695fb915497e8f812a0fc964b1f2b591fb0c0e382771af88318d94dd659fe8 SHA512 128464e51040ea121b19640c708fa996743a18e047ab11d4c3047db7d24732eac6da65393c16f987e834cb301385ef0c349eb0fabd7d67b2d10a230c8f03492a
-EBUILD grilo-0.3.13.ebuild 2168 BLAKE2B 4aaa2f680c2a96ac26e929e8537b280fb535682a12632f7bdf969e645de2140941cbca3cfc669b6d479b15a6e062271f3473725ec82ea846397a41689d144d74 SHA512 ab6bcb97eafbc188f10efc234e809444322203d2f4a6645af430a119af597d55b02fbaa6cbf8b85bc01bd2b8a83f7d2f2454e65886523cc027e9a85140e78d70
-EBUILD grilo-0.3.14.ebuild 2172 BLAKE2B 60c1d6248ac93c8772f702ea5ce34cf8bb017242e10fe183af6ddd6b7ab9759e64fe30390d3302d4cd4b2dbc81028377dbdd6169b0540c1e5b5c8ac4cc1428d1 SHA512 624eac2fa5b6cf8a98226e6e6c93c8dd152f072dd5276ae019642edbc382debdb8d249e12b7536ec91ba743387b2cb2b00a496db8daf65d26cbac773b13127f5
+EBUILD grilo-0.3.14.ebuild 2169 BLAKE2B 3b93a248d911c19a83546185f10d75a1a0ca093c693bb99613834429080b8cea15bce40f843558ed579d7ec57ae17bad4a7c54c0da769a6765365828c10d51a1 SHA512 7452084985ed85209675d3d19ff1cf390e3f35a6f6634777af7cea9ade5ebe1fd82ff495020486af85d161a66269a9b4f779db79ced0ef1c3ca64fe44e4a3478
 MISC metadata.xml 620 BLAKE2B e4868ed8fa4d41404a3ef8681bcd864c8baa047bcc612e57e1225007caa97de0455ff78810e8a46d68bd30415ed03172738a4b941f46a99024becf58d089b4a2 SHA512 5198d7b6f3730971a2ef0da47963699376750f9a0d66ac0ba29170313e455e1d05b85e34419c889a8f35fff389e9c074a602db96cff82834493b39e35565650d
diff --git a/media-libs/grilo/grilo-0.3.13.ebuild b/media-libs/grilo/grilo-0.3.13.ebuild
deleted file mode 100644
index 8f94f4a5cd45..000000000000
--- a/media-libs/grilo/grilo-0.3.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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 ~riscv ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +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.58:2
-	dev-libs/libxml2:2
-	>=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=(
-		-Denable-grl-net=true # Fails to build
-		$(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.14.ebuild b/media-libs/grilo/grilo-0.3.14.ebuild
index d8c385b4b579..53e6714a22d0 100644
--- a/media-libs/grilo/grilo-0.3.14.ebuild
+++ b/media-libs/grilo/grilo-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
@@ -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 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk gtk-doc +introspection +playlist test vala"
 REQUIRED_USE="vala? ( introspection )"