1 |
commit: d4a5a64c22419a4de99889183b3ce596008e1fe8 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 9 21:08:28 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 9 21:14:04 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a5a64c |
7 |
|
8 |
media-plugins/vdr-vodcatcher: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/665128 |
11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
12 |
|
13 |
media-plugins/vdr-vodcatcher/Manifest | 1 - |
14 |
media-plugins/vdr-vodcatcher/files/rc-addon.sh | 14 ------ |
15 |
.../files/vdr-vodcatcher-0.2.2_gcc-4.7.patch | 15 ------- |
16 |
.../vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff | 50 ---------------------- |
17 |
media-plugins/vdr-vodcatcher/metadata.xml | 8 ---- |
18 |
.../vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild | 49 --------------------- |
19 |
profiles/package.mask | 7 --- |
20 |
7 files changed, 144 deletions(-) |
21 |
|
22 |
diff --git a/media-plugins/vdr-vodcatcher/Manifest b/media-plugins/vdr-vodcatcher/Manifest |
23 |
deleted file mode 100644 |
24 |
index 66eaaad43a6..00000000000 |
25 |
--- a/media-plugins/vdr-vodcatcher/Manifest |
26 |
+++ /dev/null |
27 |
@@ -1 +0,0 @@ |
28 |
-DIST vdr-vodcatcher-0.2.2.tar.gz 126612 BLAKE2B 61ece27cfda40cebfbe18261015665bf8c2053f38969d1ae9c2dd66b88479bf8de5efb0ed01ac61d2b777e8fc91148deb5c5234d72e615eb44075f6db7e0bd3e SHA512 05a8188888caed5bd656d0ff65b718debdc889e82373b6e00aed4b2ffb942f822f8b6cbff4811d5f4c9b271e1ff8d8ec5874d34081b5ef3c8fc95ac215ce2a22 |
29 |
|
30 |
diff --git a/media-plugins/vdr-vodcatcher/files/rc-addon.sh b/media-plugins/vdr-vodcatcher/files/rc-addon.sh |
31 |
deleted file mode 100644 |
32 |
index bf38de315f6..00000000000 |
33 |
--- a/media-plugins/vdr-vodcatcher/files/rc-addon.sh |
34 |
+++ /dev/null |
35 |
@@ -1,14 +0,0 @@ |
36 |
-# |
37 |
-# rc-addon-script for plugin vodcatcher |
38 |
-# |
39 |
-# Joerg Bornkessel <hd_brummy@g.o> |
40 |
- |
41 |
-VODCATCHER_CACHE_DIR=var/cache/vdr-plugin-vodcatcher |
42 |
- |
43 |
-# depends on QA, create paths in /var/cache on the fly at runtime as needed |
44 |
-init_cache_dir() { |
45 |
- if [ ! -d "${VODCATCHER_CACHE_DIR}" ]; then |
46 |
- mkdir -p ${VODCATCHER_CACHE_DIR} |
47 |
- chown vdr:vdr ${VODCATCHER_CACHE_DIR} |
48 |
- fi |
49 |
-} |
50 |
|
51 |
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch |
52 |
deleted file mode 100644 |
53 |
index 8472764a863..00000000000 |
54 |
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch |
55 |
+++ /dev/null |
56 |
@@ -1,15 +0,0 @@ |
57 |
-compilefix for gcc-4.7 |
58 |
-https://bugs.gentoo.org/show_bug.cgi?id=514128 |
59 |
-Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> 22/Jun/2014 |
60 |
- |
61 |
-diff -Naur vodcatcher-0.2.2.orig/src/LocalFileCache.cc vodcatcher-0.2.2/src/LocalFileCache.cc |
62 |
---- vodcatcher-0.2.2.orig/src/LocalFileCache.cc 2014-06-22 00:34:55.448489644 +0200 |
63 |
-+++ vodcatcher-0.2.2/src/LocalFileCache.cc 2014-06-22 00:36:11.090546002 +0200 |
64 |
-@@ -24,6 +24,7 @@ |
65 |
- #include "LocalFileCache.h" |
66 |
- #include "SdbmHashCalculator.h" |
67 |
- #include <values.h> |
68 |
-+#include <unistd.h> |
69 |
- |
70 |
- using namespace std; |
71 |
- |
72 |
|
73 |
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff |
74 |
deleted file mode 100644 |
75 |
index 0f79116cb34..00000000000 |
76 |
--- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff |
77 |
+++ /dev/null |
78 |
@@ -1,50 +0,0 @@ |
79 |
-diff -Naur vodcatcher-0.2.2.orig/Makefile vodcatcher-0.2.2/Makefile |
80 |
---- vodcatcher-0.2.2.orig/Makefile 2010-09-22 21:51:06.000000000 +0200 |
81 |
-+++ vodcatcher-0.2.2/Makefile 2010-09-22 21:53:11.000000000 +0200 |
82 |
-@@ -50,8 +50,7 @@ |
83 |
- ### Includes and Defines (add further entries here): |
84 |
- |
85 |
- INCLUDES += -I. -I$(VDRDIR)/include -I$(DVBDIR)/include |
86 |
--INCLUDES += `curl-config --cflags` |
87 |
--INCLUDES += -I./tinyxml |
88 |
-+INCLUDES += $(shell curl-config --cflags) |
89 |
- |
90 |
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' |
91 |
- DEFINES += -DCXXTEST_ABORT_TEST_ON_FAIL |
92 |
-@@ -66,7 +65,8 @@ |
93 |
- endif |
94 |
- |
95 |
- # libcurl, libxml, libxml++ |
96 |
--LIBS += `curl-config --libs` |
97 |
-+LIBS += -lcurl |
98 |
-+LIBS += -ltinyxml |
99 |
- |
100 |
- ### The source files (add further files here): |
101 |
- |
102 |
-diff -Naur vodcatcher-0.2.2.orig/sources.mk vodcatcher-0.2.2/sources.mk |
103 |
---- vodcatcher-0.2.2.orig/sources.mk 2010-09-22 21:51:06.000000000 +0200 |
104 |
-+++ vodcatcher-0.2.2/sources.mk 2010-09-22 21:53:22.000000000 +0200 |
105 |
-@@ -34,11 +34,6 @@ |
106 |
- src/StreamType.cc \ |
107 |
- src/SynchedDownloadPool.cc \ |
108 |
- src/ThreadsafeDownloadPool.cc \ |
109 |
-- tinyxml/tinystr.cpp \ |
110 |
-- tinyxml/tinyxml.cpp \ |
111 |
-- tinyxml/tinyxmlerror.cpp \ |
112 |
-- tinyxml/tinyxmlparser.cpp \ |
113 |
-- |
114 |
- |
115 |
- SRCS_TESTONLY = \ |
116 |
- src/DownloadCacheMock.cc \ |
117 |
-diff -Naur vodcatcher-0.2.2.orig/src/RssFeedParser.cc vodcatcher-0.2.2/src/RssFeedParser.cc |
118 |
---- vodcatcher-0.2.2.orig/src/RssFeedParser.cc 2010-09-22 21:51:06.000000000 +0200 |
119 |
-+++ vodcatcher-0.2.2/src/RssFeedParser.cc 2010-09-22 21:53:44.000000000 +0200 |
120 |
-@@ -22,7 +22,7 @@ |
121 |
- #include "HtmlToText.h" |
122 |
- #include "Feed.h" |
123 |
- #include "IDownloadCache.h" |
124 |
--#include "tinyxml.h" |
125 |
-+#include <tinyxml.h> |
126 |
- #include "Item.h" |
127 |
- |
128 |
- using namespace std; |
129 |
|
130 |
diff --git a/media-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml |
131 |
deleted file mode 100644 |
132 |
index 27f419c289c..00000000000 |
133 |
--- a/media-plugins/vdr-vodcatcher/metadata.xml |
134 |
+++ /dev/null |
135 |
@@ -1,8 +0,0 @@ |
136 |
-<?xml version="1.0" encoding="UTF-8"?> |
137 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
138 |
-<pkgmetadata> |
139 |
-<maintainer type="project"> |
140 |
-<email>vdr@g.o</email> |
141 |
-<name>Gentoo VDR Project</name> |
142 |
-</maintainer> |
143 |
-</pkgmetadata> |
144 |
|
145 |
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild |
146 |
deleted file mode 100644 |
147 |
index c62a37bdc41..00000000000 |
148 |
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild |
149 |
+++ /dev/null |
150 |
@@ -1,49 +0,0 @@ |
151 |
-# Copyright 1999-2018 Gentoo Foundation |
152 |
-# Distributed under the terms of the GNU General Public License v2 |
153 |
- |
154 |
-EAPI="5" |
155 |
- |
156 |
-inherit vdr-plugin-2 |
157 |
- |
158 |
-DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin" |
159 |
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-vodcatcher" |
160 |
-SRC_URI="mirror://vdr-developerorg/154/${P}.tar.gz" |
161 |
- |
162 |
-SLOT="0" |
163 |
-LICENSE="GPL-2" |
164 |
-KEYWORDS="~amd64 ~x86" |
165 |
-IUSE="" |
166 |
- |
167 |
-DEPEND="net-misc/curl |
168 |
- >=dev-libs/tinyxml-2.6.1[stl] |
169 |
- media-video/vdr" |
170 |
-RDEPEND="${DEPEND} |
171 |
- || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )" |
172 |
- |
173 |
-PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" |
174 |
- "${FILESDIR}/${P}_gcc-4.7.patch" ) |
175 |
- |
176 |
-src_prepare() { |
177 |
- vdr-plugin-2_src_prepare |
178 |
- |
179 |
- sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- vdr-plugin-2_src_install |
184 |
- |
185 |
- insinto /etc/vdr/plugins/vodcatcher/ |
186 |
- doins examples/vodcatchersources.conf |
187 |
-} |
188 |
- |
189 |
-pkg_postinst() { |
190 |
- vdr-plugin-2_pkg_postinst |
191 |
- |
192 |
- echo |
193 |
- elog "! IMPORTEND" |
194 |
- elog "In order to allow the MPlayer plug-in to play back the streams passed in by the" |
195 |
- elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:" |
196 |
- echo |
197 |
- elog "/tmp;Vodcatcher;0" |
198 |
- echo |
199 |
-} |
200 |
|
201 |
diff --git a/profiles/package.mask b/profiles/package.mask |
202 |
index b258074184d..6e04fae56da 100644 |
203 |
--- a/profiles/package.mask |
204 |
+++ b/profiles/package.mask |
205 |
@@ -164,13 +164,6 @@ media-plugins/vdr-prefermenu |
206 |
# masked for removal on End Sep 2018 |
207 |
media-plugins/vdr-text2skin |
208 |
|
209 |
-# Joerg Bornkessel <hd_brummy@g.o> (02/Sep/2018) |
210 |
-# quit old |
211 |
-# unmanged on upstream since ~ 10 years |
212 |
-# bug 665128 |
213 |
-# masked for removal on End Sep 2018 |
214 |
-media-plugins/vdr-vodcatcher |
215 |
- |
216 |
# Matthias Maier <tamiko@g.o> (1 Sep 2018) |
217 |
# Mask 0.7.0 and 1.0.1 for the time being until a compatible LLVM version |
218 |
# made it into the tree, bug #665192 |