gentoo resync : 15.01.2020

4 files changed, 62 insertions, 12 deletions

diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index d45a2e99c8d2..a279b4317599 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,5 +1,6 @@
-DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
+AUX grilo-0.3.9-totem-pl-parser.patch 1140 BLAKE2B 4b6b176e4fb072074299ca2bce71b663d981c382445c8e07ee31d763456f859846ae8ee9c4b04218766b1727235903e925b2e24414c91d0709cd977a855e855b SHA512 bd0af0e0c390bb610556cd165b1e7317f1cf683f1f2649e4d56f8359803aff7474749e19c8812feefb5c192d9554f4cb5de2857861c3df69d21903c565eab2df
+DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
 DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
-EBUILD grilo-0.3.7.ebuild 2053 BLAKE2B 13132593347bd779208414302a0268478867e98ac583673bcb71608f9c72c420e9dae73025bbb5e33994e6ef6c0c3d27c53bd2ed46802df80a10661c6255f23e SHA512 3ec448ba94ee9206379ca5f7676e14471a472ae761edd077ec306fb9aa48841ca4e342fb8c141b1056a6d964f5b3c9dcd5bd0ba0c1bdb968b634472ec2cf130f
-EBUILD grilo-0.3.9.ebuild 2191 BLAKE2B c332c97093dee6ddf9d3ffebc846293526101df4e53e6708a26b6c5c90066920bf1203c86b3d4410ae8a6e5f568f9f49f96f4faa66ae7e150814af28125ba34d SHA512 27c98791d18cad64deaa447a0cb75e73b97b4bdefb8d7c2e35b67305b8aa85786c05c2371d4e3f8009b16fdbc151ffcd111917c924b5da9ca34c2338e413dc20
+EBUILD grilo-0.3.11.ebuild 2186 BLAKE2B 5be765152b052397e7570d424bc0fd410404d068f66b8b641e3091b53c64fb6e269c08df4bc771c6a7b7248f51fdab8d87f22522fa4615ca9f453d3ea8592046 SHA512 d3ca3961ef602fa856060006ca206bd09df32e72330061979ad6e6f0ccea4d439b437103869781b27c57e20280c27d600a40689a86a82aa3f658150dd51434f2
+EBUILD grilo-0.3.9.ebuild 2364 BLAKE2B 5f77e800677fad0893565973173e6c7215b22f4b272f55f75414cb0e1d420718f698499655b5032c88856ba9309ad00da91a1cd0aa085cc0ce540c57e53c4621 SHA512 dd90a99e0e5e356edbc7c9b558fcd16e604bb67734e53caf90bbb370cff66aa3b418a53e55d4e560c8aa10f370b4bb64689bafde50935c5b0360bdb4d4797d5e
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
new file mode 100644
index 000000000000..66d844f79124
--- /dev/null
+++ b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
@@ -0,0 +1,36 @@
+From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 12 Nov 2019 19:44:04 +0100
+Subject: [PATCH] pls: Support totem-pl-parser 3.26.4
+
+---
+ libs/pls/grl-pls.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
+index 62c578b..f6121cc 100644
+--- a/libs/pls/grl-pls.c
++++ b/libs/pls/grl-pls.c
+@@ -47,6 +47,10 @@
+ #include <totem-pl-parser.h>
+ #include <totem-pl-parser-mini.h>
+ 
++#ifndef TOTEM_PL_IS_PARSER(x)
++#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x)
++#endif /* TOTEM_PL_IS_PARSER */
++
+ /* --------- Constants -------- */
+ 
+ #define GRL_DATA_PRIV_PLS_IS_PLAYLIST   "priv:pls:is_playlist"
+@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser,
+   GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)",
+       __FUNCTION__, parser, uri, metadata, user_data);
+ 
+-  g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
++  g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
+   g_return_if_fail (uri);
+   g_return_if_fail (metadata);
+   g_return_if_fail (user_data);
+-- 
+2.22.2
+
diff --git a/media-libs/grilo/grilo-0.3.7.ebuild b/media-libs/grilo/grilo-0.3.11.ebuild
index 9dd70438b908..1c79be334ffd 100644
--- a/media-libs/grilo/grilo-0.3.7.ebuild
+++ b/media-libs/grilo/grilo-0.3.11.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=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
@@ -12,10 +12,11 @@ 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 +network +playlist vala"
+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="
@@ -29,7 +30,8 @@ RDEPEND="
 		net-libs/liboauth
 		>=x11-libs/gtk+-3.14:3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
@@ -37,6 +39,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.10
 		app-text/docbook-xml-dtd:4.3 )
 	${PYTHON_DEPS}
+	test? ( sys-apps/dbus )
 	vala? ( $(vala_depend) )
 "
 
@@ -46,7 +49,7 @@ src_prepare() {
 	sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
 
 	# Drop explicit unversioned vapigen check
-	sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
+	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
@@ -66,3 +69,7 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
index 8cdfd059b112..c7a226b799b8 100644
--- a/media-libs/grilo/grilo-0.3.9.ebuild
+++ b/media-libs/grilo/grilo-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} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
@@ -43,6 +43,12 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	# Will be fixed in 0.3.11
+	# https://gitlab.gnome.org/GNOME/grilo/commit/60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
+	"${FILESDIR}"/${PN}-0.3.9-totem-pl-parser.patch
+)
+
 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