gentoo resync : 22.10.2018

6 files changed, 0 insertions, 284 deletions

diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
deleted file mode 100644
index d167fb289608..000000000000
--- a/media-plugins/vdr-text2skin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdr-1.7.27.diff 3814 BLAKE2B 3358015edbed3f18a875c7ae5d3996a7cc6c4a1610318f65642dcbf97786218812b7a586609020a79a8fed14f7d8c495a8cf3f2d8ea90c8b74d29a842241189c SHA512 58983f674bd7bbd53437b2dfc92acd3365d20843f85ff67b91cc2f9f177054634804c29849df4f30eb147c3b78c13272d70b5615ecd9203376b4afa4519a7b35
-AUX vdr-text2skin-1.3.2-Makefile.patch 1808 BLAKE2B 37bbf4fd814b89060e0356355e242dba632d2b358bad36b37515fe8ed4d10cd199c6168f48ba26d6bef9b2f9b6321fe2268f74d9ce370da58cbdad761017fd60 SHA512 e726ee9c2a9ff036cda68d44aca4ff11d0423674bfacd8f3e98c6c0bdc4006b9c4aa02deba6952976ff9d6ed0b971b2362bf3dbc8c13e8ffbe6971a294b869d8
-AUX vdr-text2skin-1.3.2_vdr-2.1.2.diff 612 BLAKE2B bc8c23582586a91d1eff32aa1d2ecaded1b1994e80df14555b8d080fb67e0a272b7057bc5ebccd38270886747ce0f76b182d5845dedfb4cfe9c1efa0afee335c SHA512 00f59897c4e31fa23e8da68935775fe738852679430bf476a33e41da309d9d1e6667b34197a91c84ee5f73f7b97a9e72845ac506ec79c154c428ef2c56bb5add
-DIST vdr-text2skin-1.3.2.tgz 94476 BLAKE2B 485e3694acb66d48e2da929f854ad685d18cb7ade326515390dedc365f979badb00b494d14bb4cd30eeff22101ea394ffc37f5de0484a4d33ebebcf71e1040ae SHA512 418339f7132ddf854f1c7fbaa3b11aac5eb7aba0f15d427bb946d4175b6540199ac079fd895f9cebdccb4797dcf96b0681cee4db93a5e4c817abae04a08bdea9
-EBUILD vdr-text2skin-1.3.2-r1.ebuild 1785 BLAKE2B ec00a13000e9e8c765c1b3ddd66e2009e0956a28fede2dd0c198aaa0fc39f64c340bddaeffc1ea6fb9e88d35c376ee0c8f8e0b84f999c898a98981d848f0f085 SHA512 20c981663ea4b099941fb0353d725f8790aa423afd0400e54fe170f9369952e7ed02f073475fa946436915b14992060edd486875b93742f5ec2e7d052feb2784
-MISC metadata.xml 327 BLAKE2B 2408386cc7d6f313607ef7ddc98162ed97ca2a1c8aa6d74334bad7d93e5d53d400214723f30dad151b644fd7724f36909f6da02c1afbe349598a46e99b515793 SHA512 f22d86655f20776f78793a582203a4588353dc9d808ea83bd9d466e23c12762f8ecc626930b05a873d00064dbd92c51c6d0bf94226ec9911fc6259dd282d0f8d
diff --git a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff b/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
deleted file mode 100644
index 9d3280cf5849..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/display.c text2skin-1.3.2/display.c
---- text2skin-1.3.2.orig/display.c	2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/display.c	2012-04-07 20:45:47.000000000 +0200
-@@ -1233,17 +1233,17 @@
- 
- 	case tRecordingPriority:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->priority
-+		       ? (cxType)mRecording->Priority()
- 		       : (cxType)false;
- 
- 	case tRecordingLifetime:
- 		return mRecording != NULL
--		       ? (cxType)mRecording->lifetime
-+		       ? (cxType)mRecording->Lifetime()
- 		       : (cxType)false;
- 
- 	case tRecordingDateTime:
- 		return mRecording != NULL
--		       ? (cxType)TimeType(mRecording->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mRecording->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tRecordingTitle:
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c	2012-04-07 20:45:11.000000000 +0200
-+++ text2skin-1.3.2/render.c	2012-04-07 20:48:29.000000000 +0200
-@@ -597,14 +597,14 @@
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x + m->position * Size.w / Total, Pos.y);
-+				txPoint pt(Pos.x + m->Position() * Size.w / Total, Pos.y);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(pt.x, Pos.y + Size.h / 3), 
--					              txSize(((m2 ? m2->position : Total) - m->position) 
-+					              txSize(((m2 ? m2->Position() : Total) - m->Position()) 
- 					              * Size.w / Total + 1, Size.h - Size.h * 2 / 3 + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, false, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, false, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-@@ -614,15 +614,15 @@
- 		if (Marks) {
- 			bool start = true;
- 			for (const cMark *m = Marks->First(); m; m = Marks->Next(m)) {
--				txPoint pt(Pos.x, Pos.y + m->position * Size.h / Total);
-+				txPoint pt(Pos.x, Pos.y + m->Position() * Size.h / Total);
- 				if (Selected && start) {
- 					const cMark *m2 = Marks->Next(m);
- 					DrawRectangle(txPoint(Pos.x + Size.w / 3, pt.y), 
- 					              txSize(Size.w - Size.w * 2 / 3 + 1,
--					              ((m2 ? m2->position : Total) - m->position)
-+					              ((m2 ? m2->Position() : Total) - m->Position())
- 					              * Size.h / Total + 1), Selected);
- 				}
--				DrawMark(pt, Size, start, m->position == Current, true, Mark, Cur);
-+				DrawMark(pt, Size, start, m->Position() == Current, true, Mark, Cur);
- 				start = !start;
- 			}
- 		}
-diff -Naur text2skin-1.3.2.orig/common.c text2skin-1.3.2/common.c
---- text2skin-1.3.2.orig/common.c	2012-04-07 20:54:59.000000000 +0200
-+++ text2skin-1.3.2/common.c	2012-04-07 20:56:00.000000000 +0200
-@@ -255,11 +255,11 @@
- 		int start = 1; // first frame
- 		bool isStart = true;
- 
--		for (cMark *m = marks.First(); m; m = marks.GetNext(m->position)) {
-+		for (cMark *m = marks.First(); m; m = marks.GetNext(m->Position())) {
- 			if (isStart)
--				start = m->position;
-+				start = m->Position();
- 			else
--				length += (double)(m->position - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
-+				length += (double)(m->Position() - start + 1 + diffIFrame) / (60 * FramesPerSecond); // [min]
- 
- 			isStart = !isStart;
- 		}
-diff -Naur text2skin-1.3.2.orig/status.c text2skin-1.3.2/status.c
---- text2skin-1.3.2.orig/status.c	2012-04-07 20:59:39.000000000 +0200
-+++ text2skin-1.3.2/status.c	2012-04-07 21:01:12.000000000 +0200
-@@ -314,7 +314,7 @@
- 
- 	case tReplayDateTime:
- 		return mReplay != NULL
--		       ? (cxType)TimeType(mReplay->start, Token.Attrib.Text)
-+		       ? (cxType)TimeType(mReplay->Start(), Token.Attrib.Text)
- 		       : (cxType)false;
- 
- 	case tReplayShortText:
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
deleted file mode 100644
index cce51d79febc..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile b/Makefile
-index daa54d7..1163a8d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -9,6 +9,7 @@ STRIP=strip
- # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
- IMAGELIB = imagemagick
- 
-+#
- 
- # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
- # -------------------------------------------------------------
-@@ -29,13 +30,18 @@ VERSION = $(shell grep 'const char \*cText2SkinPlugin::VERSION *=' $(PLUGIN).c |
- ### The C++ compiler and options:
- 
- CXX      ?= g++
--CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
-+ifdef DEBUG
-+CXXFLAGS ?= -Wall -Woverloaded-virtual
-+else
-+CXXFLAGS ?= -Wall -Woverloaded-virtual -O3
-+endif
-+CXXFLAGS += -fPIC
- 
- ### The directory environment:
- 
--VDRDIR = ../../..
--LIBDIR = ../../lib
--TMPDIR = /tmp
-+VDRDIR ?= ../../..
-+LIBDIR ?= ../../lib
-+TMPDIR ?= /tmp
- 
- ### Make sure that necessary options are included (VDR >= 1.7.13):
- 
-@@ -88,8 +94,7 @@ endif
- ifdef DEBUG
- 	CXXFLAGS += -g -fno-inline
- 	DEFINES += -DDEBUG
--else
--	CXXFLAGS += -O3
-+	STRIP=
- ifdef BENCH
- 	DEFINES += -DBENCH
- endif
-@@ -118,7 +123,7 @@ $(DEPFILE): Makefile
- -include $(DEPFILE)
- 
- ### Internationalization (I18N):
--
-+#
- PODIR     = po
- LOCALEDIR = $(VDRDIR)/locale
- I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
-@@ -134,6 +139,7 @@ $(I18Npot): $(wildcard *.c)
- $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
- 	@mkdir -p $(dir $@)
- 	msgfmt -c -o $@ $<
-+#
- 
- .PHONY: i18n
- i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
-@@ -143,7 +149,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
- 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
--ifndef DEBUG
-+ifdef STRIP
- 	$(STRIP) $(LIBDIR)/$@.$(APIVERSION)
- endif
- 
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
deleted file mode 100644
index 7a4873db751d..000000000000
--- a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2_vdr-2.1.2.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur text2skin-1.3.2.orig/render.c text2skin-1.3.2/render.c
---- text2skin-1.3.2.orig/render.c	2013-10-26 22:29:16.000000000 +0200
-+++ text2skin-1.3.2/render.c	2013-10-26 22:33:19.000000000 +0200
-@@ -813,7 +813,11 @@
- 	switch (Token.Type) {
- 	case tFreeDiskSpace: {
- 			int FreeMB;
-+#if APIVERSNUM > 20101
-+			cVideoDirectory::VideoDiskSpace(&FreeMB);
-+#else
- 			VideoDiskSpace(&FreeMB);
-+#endif
- 			Dprintf("FreeMB: %d, attrib type is %d\n", FreeMB,Token.Attrib.Type);
- 			return Token.Attrib.Type == aString && Token.Attrib.Text.length() > 0
- 			       ? (cxType)DurationType(FreeMB * 60 / MB_PER_MINUTE,
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
deleted file mode 100644
index bd64b5471f53..000000000000
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<use>
-		<flag name="contrib">Install user contributed scripts</flag>
-	</use>
-</pkgmetadata>
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
deleted file mode 100644
index 3ed16ca90fc3..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-VERSION="783" # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc graphicsmagick +imagemagick imlib"
-
-RDEPEND="
-	>=media-video/vdr-1.6.0
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
-	!imagemagick? (
-		imlib? (
-			media-libs/imlib2
-			>=media-video/vdr-1.6.0[-graphtft]
-		)
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-KEEP_I18NOBJECT="yes"
-
-src_prepare() {
-	local imagelib=
-
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
-
-	if ! has_version ">=media-video/vdr-1.7.13"; then
-		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
-	fi
-
-	if use imagemagick; then
-		if use graphicsmagick; then
-			imagelib="graphicsmagick"
-		else
-			imagelib="imagemagick"
-		fi
-	else
-		if use imlib; then
-			imagelib="imlib2"
-		else
-			imagelib="none"
-		fi
-	fi
-
-	sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
-
-	vdr-plugin-2_src_prepare
-
-	if has_version ">=media-video/vdr-1.7.27"; then
-		epatch "${FILESDIR}/vdr-1.7.27.diff"
-	fi
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	keepdir "/usr/share/vdr/${VDRPLUGIN}"
-
-	dodoc CONTRIBUTORS
-
-	if use doc; then
-		dodoc Docs/{Reference,Tutorial}.txt
-	fi
-
-	if use contrib; then
-		dodoc -r contrib/
-	fi
-}