commit: d4a5a64c22419a4de99889183b3ce596008e1fe8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Oct 9 21:08:28 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Oct 9 21:14:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4a5a64c
media-plugins/vdr-vodcatcher: Remove last-rited pkg Closes: https://bugs.gentoo.org/665128 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-plugins/vdr-vodcatcher/Manifest | 1 - media-plugins/vdr-vodcatcher/files/rc-addon.sh | 14 ------ .../files/vdr-vodcatcher-0.2.2_gcc-4.7.patch | 15 ------- .../vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff | 50 ---------------------- media-plugins/vdr-vodcatcher/metadata.xml | 8 ---- .../vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild | 49 --------------------- profiles/package.mask | 7 --- 7 files changed, 144 deletions(-) diff --git a/media-plugins/vdr-vodcatcher/Manifest b/media-plugins/vdr-vodcatcher/Manifest deleted file mode 100644 index 66eaaad43a6..00000000000 --- a/media-plugins/vdr-vodcatcher/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vdr-vodcatcher-0.2.2.tar.gz 126612 BLAKE2B 61ece27cfda40cebfbe18261015665bf8c2053f38969d1ae9c2dd66b88479bf8de5efb0ed01ac61d2b777e8fc91148deb5c5234d72e615eb44075f6db7e0bd3e SHA512 05a8188888caed5bd656d0ff65b718debdc889e82373b6e00aed4b2ffb942f822f8b6cbff4811d5f4c9b271e1ff8d8ec5874d34081b5ef3c8fc95ac215ce2a22 diff --git a/media-plugins/vdr-vodcatcher/files/rc-addon.sh b/media-plugins/vdr-vodcatcher/files/rc-addon.sh deleted file mode 100644 index bf38de315f6..00000000000 --- a/media-plugins/vdr-vodcatcher/files/rc-addon.sh +++ /dev/null @@ -1,14 +0,0 @@ -# -# rc-addon-script for plugin vodcatcher -# -# Joerg Bornkessel <[email protected]> - -VODCATCHER_CACHE_DIR=var/cache/vdr-plugin-vodcatcher - -# depends on QA, create paths in /var/cache on the fly at runtime as needed -init_cache_dir() { - if [ ! -d "${VODCATCHER_CACHE_DIR}" ]; then - mkdir -p ${VODCATCHER_CACHE_DIR} - chown vdr:vdr ${VODCATCHER_CACHE_DIR} - fi -} 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 deleted file mode 100644 index 8472764a863..00000000000 --- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch +++ /dev/null @@ -1,15 +0,0 @@ -compilefix for gcc-4.7 -https://bugs.gentoo.org/show_bug.cgi?id=514128 -Signed-of-by: Joerg Bornkessel <[email protected]> 22/Jun/2014 - -diff -Naur vodcatcher-0.2.2.orig/src/LocalFileCache.cc vodcatcher-0.2.2/src/LocalFileCache.cc ---- vodcatcher-0.2.2.orig/src/LocalFileCache.cc 2014-06-22 00:34:55.448489644 +0200 -+++ vodcatcher-0.2.2/src/LocalFileCache.cc 2014-06-22 00:36:11.090546002 +0200 -@@ -24,6 +24,7 @@ - #include "LocalFileCache.h" - #include "SdbmHashCalculator.h" - #include <values.h> -+#include <unistd.h> - - using namespace std; - 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 deleted file mode 100644 index 0f79116cb34..00000000000 --- a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur vodcatcher-0.2.2.orig/Makefile vodcatcher-0.2.2/Makefile ---- vodcatcher-0.2.2.orig/Makefile 2010-09-22 21:51:06.000000000 +0200 -+++ vodcatcher-0.2.2/Makefile 2010-09-22 21:53:11.000000000 +0200 -@@ -50,8 +50,7 @@ - ### Includes and Defines (add further entries here): - - INCLUDES += -I. -I$(VDRDIR)/include -I$(DVBDIR)/include --INCLUDES += `curl-config --cflags` --INCLUDES += -I./tinyxml -+INCLUDES += $(shell curl-config --cflags) - - DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - DEFINES += -DCXXTEST_ABORT_TEST_ON_FAIL -@@ -66,7 +65,8 @@ - endif - - # libcurl, libxml, libxml++ --LIBS += `curl-config --libs` -+LIBS += -lcurl -+LIBS += -ltinyxml - - ### The source files (add further files here): - -diff -Naur vodcatcher-0.2.2.orig/sources.mk vodcatcher-0.2.2/sources.mk ---- vodcatcher-0.2.2.orig/sources.mk 2010-09-22 21:51:06.000000000 +0200 -+++ vodcatcher-0.2.2/sources.mk 2010-09-22 21:53:22.000000000 +0200 -@@ -34,11 +34,6 @@ - src/StreamType.cc \ - src/SynchedDownloadPool.cc \ - src/ThreadsafeDownloadPool.cc \ -- tinyxml/tinystr.cpp \ -- tinyxml/tinyxml.cpp \ -- tinyxml/tinyxmlerror.cpp \ -- tinyxml/tinyxmlparser.cpp \ -- - - SRCS_TESTONLY = \ - src/DownloadCacheMock.cc \ -diff -Naur vodcatcher-0.2.2.orig/src/RssFeedParser.cc vodcatcher-0.2.2/src/RssFeedParser.cc ---- vodcatcher-0.2.2.orig/src/RssFeedParser.cc 2010-09-22 21:51:06.000000000 +0200 -+++ vodcatcher-0.2.2/src/RssFeedParser.cc 2010-09-22 21:53:44.000000000 +0200 -@@ -22,7 +22,7 @@ - #include "HtmlToText.h" - #include "Feed.h" - #include "IDownloadCache.h" --#include "tinyxml.h" -+#include <tinyxml.h> - #include "Item.h" - - using namespace std; diff --git a/media-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml deleted file mode 100644 index 27f419c289c..00000000000 --- a/media-plugins/vdr-vodcatcher/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> -<email>[email protected]</email> -<name>Gentoo VDR Project</name> -</maintainer> -</pkgmetadata> diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild deleted file mode 100644 index c62a37bdc41..00000000000 --- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit vdr-plugin-2 - -DESCRIPTION="VDR plugin: Downloads rss-feeds and passes video enclosures to the mplayer plugin" -HOMEPAGE="https://projects.vdr-developer.org/projects/plg-vodcatcher"; -SRC_URI="mirror://vdr-developerorg/154/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-misc/curl - >=dev-libs/tinyxml-2.6.1[stl] - media-video/vdr" -RDEPEND="${DEPEND} - || ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )" - -PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" - "${FILESDIR}/${P}_gcc-4.7.patch" ) - -src_prepare() { - vdr-plugin-2_src_prepare - - sed -e "s:ConfigDirectory():ConfigDirectory( \"vodcatcher\" ):" -i src/VodcatcherPlugin.cc -} - -src_install() { - vdr-plugin-2_src_install - - insinto /etc/vdr/plugins/vodcatcher/ - doins examples/vodcatchersources.conf -} - -pkg_postinst() { - vdr-plugin-2_pkg_postinst - - echo - elog "! IMPORTEND" - elog "In order to allow the MPlayer plug-in to play back the streams passed in by the" - elog "Vodcatcher, you must add the following entry to the mplayersources.conf file:" - echo - elog "/tmp;Vodcatcher;0" - echo -} diff --git a/profiles/package.mask b/profiles/package.mask index b258074184d..6e04fae56da 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -164,13 +164,6 @@ media-plugins/vdr-prefermenu # masked for removal on End Sep 2018 media-plugins/vdr-text2skin -# Joerg Bornkessel <[email protected]> (02/Sep/2018) -# quit old -# unmanged on upstream since ~ 10 years -# bug 665128 -# masked for removal on End Sep 2018 -media-plugins/vdr-vodcatcher - # Matthias Maier <[email protected]> (1 Sep 2018) # Mask 0.7.0 and 1.0.1 for the time being until a compatible LLVM version # made it into the tree, bug #665192
