Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/grilo/files/, media-libs/grilo/
Date: Tue, 28 Jan 2020 09:39:21
Message-Id: 1580204063.d5253b238417b3c0215307a66587eb3f678c9cfc.leio@gentoo
1 commit: d5253b238417b3c0215307a66587eb3f678c9cfc
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 28 09:29:00 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 28 09:34:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5253b23
7
8 media-libs/grilo: remove old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 media-libs/grilo/Manifest | 1 -
14 .../grilo/files/grilo-0.3.9-totem-pl-parser.patch | 36 ----------
15 media-libs/grilo/grilo-0.3.9.ebuild | 81 ----------------------
16 3 files changed, 118 deletions(-)
17
18 diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
19 index b7594e94c48..79d93997816 100644
20 --- a/media-libs/grilo/Manifest
21 +++ b/media-libs/grilo/Manifest
22 @@ -1,2 +1 @@
23 DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
24 -DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
25
26 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
27 deleted file mode 100644
28 index 66d844f7912..00000000000
29 --- a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
30 +++ /dev/null
31 @@ -1,36 +0,0 @@
32 -From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
33 -From: Bastien Nocera <hadess@××××××.net>
34 -Date: Tue, 12 Nov 2019 19:44:04 +0100
35 -Subject: [PATCH] pls: Support totem-pl-parser 3.26.4
36 -
37 ----
38 - libs/pls/grl-pls.c | 6 +++++-
39 - 1 file changed, 5 insertions(+), 1 deletion(-)
40 -
41 -diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
42 -index 62c578b..f6121cc 100644
43 ---- a/libs/pls/grl-pls.c
44 -+++ b/libs/pls/grl-pls.c
45 -@@ -47,6 +47,10 @@
46 - #include <totem-pl-parser.h>
47 - #include <totem-pl-parser-mini.h>
48 -
49 -+#ifndef TOTEM_PL_IS_PARSER(x)
50 -+#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x)
51 -+#endif /* TOTEM_PL_IS_PARSER */
52 -+
53 - /* --------- Constants -------- */
54 -
55 - #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist"
56 -@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser,
57 - GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)",
58 - __FUNCTION__, parser, uri, metadata, user_data);
59 -
60 -- g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
61 -+ g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
62 - g_return_if_fail (uri);
63 - g_return_if_fail (metadata);
64 - g_return_if_fail (user_data);
65 ---
66 -2.22.2
67 -
68
69 diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
70 deleted file mode 100644
71 index c7a226b799b..00000000000
72 --- a/media-libs/grilo/grilo-0.3.9.ebuild
73 +++ /dev/null
74 @@ -1,81 +0,0 @@
75 -# Copyright 1999-2020 Gentoo Authors
76 -# Distributed under the terms of the GNU General Public License v2
77 -
78 -EAPI=7
79 -PYTHON_COMPAT=( python{2_7,3_6,3_7} )
80 -VALA_USE_DEPEND="vapigen"
81 -
82 -inherit gnome.org meson python-any-r1 vala xdg
83 -
84 -DESCRIPTION="A framework for easy media discovery and browsing"
85 -HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
86 -
87 -LICENSE="LGPL-2.1+"
88 -SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
89 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
90 -
91 -IUSE="gtk gtk-doc +introspection +network +playlist test vala"
92 -REQUIRED_USE="vala? ( introspection )"
93 -RESTRICT="!test? ( test )"
94 -
95 -# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
96 -RDEPEND="
97 - >=dev-libs/glib-2.44:2
98 - dev-libs/libxml2:2
99 - network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
100 - playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
101 - introspection? ( >=dev-libs/gobject-introspection-1.54:= )
102 -
103 - gtk? (
104 - net-libs/liboauth
105 - >=x11-libs/gtk+-3.14:3 )
106 -"
107 -DEPEND="${RDEPEND}"
108 -BDEPEND="
109 - dev-util/glib-utils
110 - >=sys-devel/gettext-0.19.8
111 - virtual/pkgconfig
112 - gtk-doc? (
113 - >=dev-util/gtk-doc-1.10
114 - app-text/docbook-xml-dtd:4.3 )
115 - ${PYTHON_DEPS}
116 - test? ( sys-apps/dbus )
117 - vala? ( $(vala_depend) )
118 -"
119 -
120 -PATCHES=(
121 - # Will be fixed in 0.3.11
122 - # https://gitlab.gnome.org/GNOME/grilo/commit/60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
123 - "${FILESDIR}"/${PN}-0.3.9-totem-pl-parser.patch
124 -)
125 -
126 -src_prepare() {
127 - sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
128 - sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
129 - sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
130 -
131 - # Drop explicit unversioned vapigen check
132 - sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
133 -
134 - # Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
135 - sed -i -e "/subdir('examples')/d" meson.build || die
136 -
137 - xdg_src_prepare
138 - use vala && vala_src_prepare
139 -}
140 -
141 -src_configure() {
142 - local emesonargs=(
143 - $(meson_use network enable-grl-net)
144 - $(meson_use playlist enable-grl-pls)
145 - $(meson_use gtk-doc enable-gtk-doc)
146 - $(meson_use introspection enable-introspection)
147 - $(meson_use gtk enable-test-ui)
148 - $(meson_use vala enable-vala)
149 - )
150 - meson_src_configure
151 -}
152 -
153 -src_test() {
154 - dbus-run-session meson test -C "${BUILD_DIR}" || die
155 -}