[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-xine/files/, media-plugins/vdr-xine/, profiles/

[Michał Górny]

commit:     4c25c181bcac4c7a133ecdf79626fcaa2f5efe4f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 21:07:15 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 21:14:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c25c181

media-plugins/vdr-xine: Remove last-rited pkg

Closes: https://bugs.gentoo.org/665132
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-plugins/vdr-xine/Manifest                    |  1 -
 media-plugins/vdr-xine/files/confd                 |  8 ---
 .../files/vdr-xine-0.9.4-build-system.patch        | 59 --------------------
 .../vdr-xine/files/vdr-xine-0.9.4-gentoo.diff      | 12 -----
 media-plugins/vdr-xine/metadata.xml                |  8 ---
 media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild    | 62 ----------------------
 profiles/package.mask                              |  9 ----
 7 files changed, 159 deletions(-)

diff --git a/media-plugins/vdr-xine/Manifest b/media-plugins/vdr-xine/Manifest
deleted file mode 100644
index 19d968e16a8..00000000000
--- a/media-plugins/vdr-xine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-xine-0.9.4.tgz 339879 BLAKE2B b160e5ad33890d777587e8e3a45e8a27b9ec6a65d7cb0468ca740ff85c63be767de615c55aab8cff038edf18a3e3d350ca032458b9c69c94550e5b0ff35248fc SHA512 0a7bbff21b5a35360aeb68ed62a0ada5fc107453cd63231da2a48d2cc7ea4b6a333cac86164f3e6edcdcda5e9bc73d0e7fd51f6b45c149477a3acb86ffad9ae4

diff --git a/media-plugins/vdr-xine/files/confd b/media-plugins/vdr-xine/files/confd
deleted file mode 100644
index d728819e004..00000000000
--- a/media-plugins/vdr-xine/files/confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/vdr.xine:
-
-# Global config file for vdr rc-scripts
-
-# -r:
-#   Enable xine to send keys to vdr-process
-
-_EXTRAOPTS="-r"

diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch b/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch
deleted file mode 100644
index 9ebaffb93c6..00000000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 537ad5fa86305cf55f37dd9c87a9ec3260668049 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@g.o>
-Date: Tue, 10 Jan 2012 13:58:40 +0100
-Subject: [PATCH] patch 1
-
----
- Makefile |   14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 674f4fb..e1fdba2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -25,9 +25,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
- 
- ### Make sure that necessary options are included:
- 
-@@ -37,7 +37,7 @@ TMPDIR = /tmp
- 
- -include $(VDRDIR)/Make.config
- 
--INCLUDES += `pkg-config --cflags libxine` 
-+INCLUDES += `pkg-config --cflags libxine`
- 
- # where to create fifos (xine expects them at /tmp/vdr-xine)
- VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-@@ -114,9 +114,9 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
- 
- ### Internationalization (I18N):
--
-+ifeq ($(ENABLE_I18N), yes)
- PODIR     = po
--LOCALEDIR = $(VDRDIR)/locale
-+LOCALEDIR = $(DESTDIR)$(VDRDIR)/locale
- I18Npo    = $(wildcard $(PODIR)/*.po)
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/$(PLUGIN).pot
-@@ -135,6 +135,8 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- 	@mkdir -p $(dir $@)
- 	cp $< $@
- 
-+endif
-+
- .PHONY: i18n
- i18n: $(I18Nmsgs) $(I18Npot)
- 
--- 
-1.7.3.4
-

diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff
deleted file mode 100644
index 581dba28737..00000000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru xine-0.9.0-orig/xineLib.c xine-0.9.0/xineLib.c
---- xine-0.9.0-orig/xineLib.c	2009-01-18 17:40:13.228935882 +0100
-+++ xine-0.9.0/xineLib.c	2009-01-18 17:41:28.815595331 +0100
-@@ -2118,7 +2118,7 @@
- 
-   bool cXineLib::readNoSignalStream(const int index, const string &suffix)
-   {
--    string noSignalFileName = m_plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+    string noSignalFileName = "/usr/share/vdr/xine";
- //    noSignalFileName += "/noSignal.pes";
-     noSignalFileName += "/noSignal" + suffix + ".mpg";
- 

diff --git a/media-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
deleted file mode 100644
index a1831e12ef3..00000000000
--- a/media-plugins/vdr-xine/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-needed -->
-	<use>
-		<flag name="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
-	</use>
-</pkgmetadata>

diff --git a/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild b/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild
deleted file mode 100644
index 95a73a5b3ee..00000000000
--- a/media-plugins/vdr-xine/vdr-xine-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="yaepg"
-
-COMMON_DEP=">=media-video/vdr-1.5.7
-	>=media-libs/xine-lib-1.1.8[vdr]"
-DEPEND="${COMMON_DEP}"
-RDEPEND="${COMMON_DEP}
-	>=media-video/mjpegtools-2.1.0
-	media-libs/netpbm"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-build-system.patch"
-
-	use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -e "s:pid == patPmtParser.PmtPid():patPmtParser.IsPmtPid(pid):" \
-			-i xineDevice.c
-	fi
-
-	# remove i18n crap
-	sed -e "s:^#include[[:space:]]*\"xineI18n.h\"::" -i xine.c
-
-	BUILD_PARAMS="VDR_XINE_FIFO_DIR=/var/vdr/xine"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin xineplayer || die
-
-	insinto /usr/share/vdr/xine
-	doins data/* || die
-
-	dodoc MANUAL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
-		ewarn "You have a leftover directory of vdr-xine."
-		ewarn "You can safely remove it with:"
-		ewarn "# rm -rf /etc/vdr/plugins/xine"
-	fi
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index bbf6ca8468e..b258074184d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -171,15 +171,6 @@ media-plugins/vdr-text2skin
 # masked for removal on End Sep 2018
 media-plugins/vdr-vodcatcher
 
-# Joerg Bornkessel <hd_brummy@g.o> (02/Sep/2018)
-# homepage dead
-# not addapted to latest xine
-# fails on compile
-# quit old
-# bug 665132
-# masked for removal on End Sep 2018
-media-plugins/vdr-xine
-
 # Matthias Maier <tamiko@g.o> (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