gentoo resync : 16.01.2020

9 files changed, 4 insertions, 202 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 5ce3d0997ba3..6b24f8a553c0 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-burn/Manifest b/media-plugins/vdr-burn/Manifest
index 96c411739d54..be811dd5aebf 100644
--- a/media-plugins/vdr-burn/Manifest
+++ b/media-plugins/vdr-burn/Manifest
@@ -10,5 +10,5 @@ AUX vdr-burn-0.3.0_setdefaults.patch 1904 BLAKE2B 382d146c2d642f0c97f259983f2436
 DIST vdr-burn-0.2.2.tgz 253570 BLAKE2B ac31f5d056e5fc92a43f12d506b7d91fc2063cd32f4dc591dd3c71003a98d1dd117c1869c954ac32ff85efea56429473f11429738d4d475f52c46bab1788c05a SHA512 06e490ff238f35122c2bcb7b2d98500a183409c8e855748609fa43dab661cd4ef5bf492cd17ccf5c7b9b26373cb994b3e35dd20edafccfa8bf186318c8fcc346
 DIST vdr-burn-0.3.0.tgz 469211 BLAKE2B e4448f40a058e6e51834966c8a8e6f407f8a2badaa1a5517a761a65d0087ef910445f8f35225c65335ac8407c1948fb7f35ed25c0fcf098addcfccfc9bf2b8df SHA512 a2ffe264c4fb33807bcc37f69e969a61c6af5de320a4564595f1520593dddb90f62d380ab1266ca07f7f2cda8b10b45f3cff545e185dbe1b204e813d2f06ccda
 EBUILD vdr-burn-0.2.2-r1.ebuild 2951 BLAKE2B 62e3b33b145b9b5b6bd42002a7c98382f20de42b8ac5aef9adf79c49e6a70515d06effcbdf06d1470e5cefe09bdfc21365e938965224eccecb5eb7450456cee9 SHA512 ca0c9322166a8b335cd6e4d72cfb2568c3dbd23a805d17ee7f0a5746739659b26cdc0080e39ea9b07f5263e90794ad0a031ad92b1a23a86ca911c88e932a8403
-EBUILD vdr-burn-0.3.0.ebuild 2609 BLAKE2B 274d95cc616c0f98835a565dbf94e9c7b37d0e45fdb6ed2325dc76ad4485a5b1a0d8022b061a5014f21e1ebf77d72c7e5173d213edd3be8629803d4d52e82f44 SHA512 846b2f1669010068662c685c9ceaeb7d73b4e2bf5ac6bb745ebb8a85dcc8f9fc5f52762e5b697e9f40b9d32e5a3c89740e3251b6286f2658377843ec07a17d7a
+EBUILD vdr-burn-0.3.0.ebuild 2621 BLAKE2B 60d3a3d5817364fdefefa48277605de54a5dfeb0a5a0f390973a7f2a4892f5090b13c984e8b679fa23409aed7fe6f63011752b096c9c5a22da031f53becdafb0 SHA512 cbfb9df6a94d56f4458e126a75a7f002eb11d90023583dcbc771d9e0d0ee5bae2b804588130d398f61ec19a76c048a725327196fd631af204dc1db53e7ff6602
 MISC metadata.xml 400 BLAKE2B 0683406aa4dc53b7f5eb0f98f0d93ac693776fcbdad8082b651f47e2a67b15b740918c26a62bb20648124573352b3d1ad1b04e381b40e981099b6579bfda5d02 SHA512 8f042c060eb2358756e19aa592dadfb351b26f9db2f4cb8c4538f0d60a84794b74d2ef1d4bf982e1bf035f4d33fac48df71db72a8a33adcaf39d89d1beb77e05
diff --git a/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
index dc8e31f4c6a3..b8537cd98449 100644
--- a/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
+++ b/media-plugins/vdr-burn/vdr-burn-0.3.0.ebuild
@@ -42,8 +42,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}_setdefaults.patch \
 		"${FILESDIR}"/${P}_dmh-archive.patch
 
-	use dvdarchive && sed -i Makefile \
+	if use dvdarchive; then
+		sed -i Makefile \
 		-e "s:#ENABLE_DMH_ARCHIVE:ENABLE_DMH_ARCHIVE:" || die
+	fi
 
 	sed -i Makefile \
 		-e 's:^ISODIR=.*$:ISODIR=/var/vdr/video/dvd-images:' || die
diff --git a/media-plugins/vdr-console/Manifest b/media-plugins/vdr-console/Manifest
deleted file mode 100644
index 9cfc1cf3bad8..000000000000
--- a/media-plugins/vdr-console/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdr-console-0.6.0-uint64.diff 1140 BLAKE2B ad9a38737e989c9b3f7b4a25921d9726cb4ffd5985fcbb4da9d096aa8bbfc5d8fb1a4604dc8fbd90d0cb45e62d51ba50d3ec1618c42b103775b27491ae1d3728 SHA512 e47e7290d03d1b95b69966945ce7d98b6ab1674ed639130d26d7187eb6ae89b3a6cecd0b82136302d96d1b876017c4301022cb4c29c6e5733bff84a1676ba44c
-AUX vdr-console-0.6.0-vdr-1.3.18.diff 1784 BLAKE2B 6d86f0125b9fba3db060d9b56bf0ad5e2056fc176bafd95566be432512e6c39bcc50df9e6c077e5863a557e04619d48c2cea3234c277907c7466b790da44be04 SHA512 8aa6a54af1716da0813c64bc51feb31dda26f6d9b2d7245fb0b5c3adae01007ccf3dd9ff7ed4cf004cfe95bcf1f952595c16321d773a52eb889b59ae4f13ec4e
-AUX vdr-console-0.6.0-vdr-1.6.x-compilefix.diff 2096 BLAKE2B 53104b0074fc510b3774e9d152a8350b6dfc40677ccc630bcd8749231816a497451e0366bcb07207bfe7704b29f1c9486ddbdccd5d03694afa7f952cdc527680 SHA512 9eac8aae3e63758d7963afb03881929ce45f21135679bebecbd42ab334931e91a25ca1e45ba0e98b2e6dd079c3f6f4ab9306eed185cc93e550c42fba7b9428ec
-DIST vdr-console-0.6.0.tgz 47133 BLAKE2B 2ed87ab6f9a5f63d959aa3a6c2fbc637fe69ddce1200c381a8a439db8efa63dc896ad4e41a8b5c79164e6176a28a5b387cf1c83460f856abd9407f99039bb4be SHA512 40d9819c68f4c17e62489f201ddc08514c7df898c9f99e20d733bba0e16c15f88613de51ddf27e7b9e440fba5f8186ba143936d4fdd26536c812d365a0a7e7d1
-EBUILD vdr-console-0.6.0.ebuild 774 BLAKE2B 14c434dbd3bdbd5fd6aaace69c2455e9876849e59df5cefae30c769cf54d83299a529f42fd6371ee301a714171beaa34e013c58743bf8f707416f3968cb9f8a9 SHA512 71cde63c979c203caf7a2d81e2c42f60110c7f776cd0d3b29b7ec4874af3baaceba2dce1c99bfbbfcbb0cd4430f6f400da954c6fff8e7eb7b7d7eb15018cba46
-MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
deleted file mode 100644
index 922fce25cb64..000000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-uint64.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru console-0.6.0-orig/menu.c console-0.6.0/menu.c
---- console-0.6.0-orig/menu.c	2006-12-03 15:28:31.522732562 +0100
-+++ console-0.6.0/menu.c	2006-12-03 15:29:04.026492765 +0100
-@@ -1193,7 +1193,7 @@
- 
-     switch (BASICKEY(Key)) {
- 
--    case kKbd:{     uint64 buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
-+    case kKbd:{     uint64_t buf = cKbdRemote::MapFuncToCode(KEYKBD(Key));
-                     WriteToConsole(buf);
- 
-                     // On every key press, we show the cursor immediately
-@@ -1425,7 +1425,7 @@
- 
- 
- 
--void cMenuConsole::WriteToConsole(const uint64& code) {
-+void cMenuConsole::WriteToConsole(const uint64_t& code) {
- 
-   unsigned char* data = (unsigned char*)(void*)&code;
- 
-diff -ru console-0.6.0-orig/menu.h console-0.6.0/menu.h
---- console-0.6.0-orig/menu.h	2006-12-03 15:28:31.526733517 +0100
-+++ console-0.6.0/menu.h	2006-12-03 15:28:44.925932704 +0100
-@@ -102,7 +102,7 @@
- private:
-   void CaptureKeyboard();
-   void ReleaseKeyboard();
--  void WriteToConsole(const uint64& code);
-+  void WriteToConsole(const uint64_t& code);
-   bool TerminateConsole();
- 
-   void AddSubMenu(cOsdObject* pSubMenu);
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff
deleted file mode 100644
index 9f0af3489aaf..000000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.3.18.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nru console-0.6.0-original/menu.c console-0.6.0/menu.c
---- console-0.6.0-original/menu.c	2004-09-12 00:10:57.000000000 +0200
-+++ console-0.6.0/menu.c	2005-01-15 11:59:07.735539136 +0100
-@@ -1210,14 +1210,14 @@
-     }
-     case kNone:
-                     // Handle blinking elements
--                    if (time_ms() >= _nextBlinkTime) {
-+                    if ((int)cTimeMs::Now() >= _nextBlinkTime) {
- 
--                      _nextBlinkTime = time_ms() + config.BlinkRate * 100;
-+                      _nextBlinkTime = cTimeMs::Now() + config.BlinkRate * 100;
-                       _blink = !_blink;
-                     }
- 
-                     // Handle keyboard releaseing
--                    if (time_ms() >= _timeReleaseCapture) {
-+                    if ((int)cTimeMs::Now() >= _timeReleaseCapture) {
-                       _timeReleaseCapture = INT_MAX;
- 
-                       // Time elapsed -> repost ESC...
-@@ -1243,10 +1243,10 @@
-                       _pConsole->getScreen().BellSeen();
- 
-                       if (config.BellTimeout) {
--                        _toRing = time_ms() + config.BellTimeout * 1000;
-+                        _toRing = cTimeMs::Now() + config.BellTimeout * 1000;
-                         state = osUser1;
-                       }
--                    } else if (_toRing && time_ms() > _toRing) {
-+                    } else if (_toRing && (int)cTimeMs::Now() > _toRing) {
-                       _toRing = 0;
-                       state = osUser1;
-                     }
-@@ -1441,7 +1441,7 @@
-           // esc detected. Ask for exit
-           if (data[i] == ESC) {
- 
--            _timeReleaseCapture = time_ms() + 1000;
-+            _timeReleaseCapture = cTimeMs::Now() + 1000;
-             _inputState = 1;
- 
-           } else
diff --git a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff b/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff
deleted file mode 100644
index 35aac3e0e263..000000000000
--- a/media-plugins/vdr-console/files/vdr-console-0.6.0-vdr-1.6.x-compilefix.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-console/trunk/debian/patches/94_console-1.6.0.dpatch?op=file&rev=0&sc=0
-
-by Tobias Grimm <tg@e-tobi.net>
---- vdr-plugin-console-0.6.0.orig/menu.c
-+++ vdr-plugin-console-0.6.0/menu.c
-@@ -24,7 +24,7 @@
- 
- 
- 
--#include "fontsmallfix.c"
-+//#include "fontsmallfix.c"
- #include "symbols/bell.xpm"
- #include "symbols/keyboard.xpm"
- 
-@@ -59,31 +59,11 @@
-     if (backColor != clrConsoleTransparent)
-       bitmap.DrawRectangle(x, y, x + w - 1, y + h - 1, backColor);
- 
--    const cFont::tCharData* CharData = font.CharData(ch);
-+    char text[2];
-+    text[1] = 0;
-+    text[0] = ch;
- 
--    // Center the char within its cell
--    x += (w - (int)CharData->width) / 2;
--    if (w > (int)CharData->width)
--      w = (int)CharData->width;
--
--    for (int row = 0; row < h; ++row) {
--
--      cFont::tPixelData PixelData = CharData->lines[row];
--//@@TEST
--      PixelData >>= 1;
--      for (int col = w; col-- > 0;) {
--
--        if (PixelData & 1) {
--          bitmap.SetIndex(x + col, y + row, fg);
--
--          // Try to fix flickering
--//          if (*bitmap.Data(x + col, y + row - 1) != fg)
--//            bitmap.SetIndex(x + col, y + row + 1, fg);
--        }
--
--        PixelData >>= 1;
--      }
--    }
-+    bitmap.DrawText(x, y, text, foreColor, backColor, &font);
- 
-   } else {
- 
-@@ -794,22 +774,22 @@
-     // Small
-     _pFont = cFont::GetFont(fontSml);
-     _charW = _pFont->Width('A');
--    _charH = _pFont->Height('A');
-+    _charH = _pFont->Height("A");
- 
-   } else if (_selectedFont == 2) {
- 
-     // Extra small
-     // The space between the chars can shrink, so more chars can go to the screen.
--    _pFont = new cFont(consFontSmallFix);
--    _charW = _pFont->Width('A') - 1;
--    _charH = _pFont->Height('A') - 1;
-+    _pFont = cFont::GetFont(fontOsd);
-+    _charW = _pFont->Width('A');
-+    _charH = _pFont->Height("A");
- 
-   } else {
- 
-     // Normal
-     _pFont = cFont::GetFont(fontFix);
-     _charW = _pFont->Width('A');
--    _charH = _pFont->Height('A');
-+    _charH = _pFont->Height("A");
-   }
- 
-   _charsW = (_pixelW / _charW);
-
diff --git a/media-plugins/vdr-console/metadata.xml b/media-plugins/vdr-console/metadata.xml
deleted file mode 100644
index 984a01fab265..000000000000
--- a/media-plugins/vdr-console/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>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild b/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
deleted file mode 100644
index dccf56c0c6f2..000000000000
--- a/media-plugins/vdr-console/vdr-console-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="vdr Plugin: Shows linux console on vdr's output device"
-HOMEPAGE="http://ricomp.de/vdr/"
-SRC_URI="http://ricomp.de/vdr/${P}.tgz"
-
-LICENSE="GPL-2"
-IUSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-vdr-1.3.18.diff
-	"${FILESDIR}"/${P}-uint64.diff )
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	vdr_remove_i18n_include console.c menu.c terminalemulation.c virtualconsole.c virtualconsoles.c
-	sed  -i console.c -e "s:RegisterI18n://RegisterI18n:"
-
-	ewarn "plugin will not support the new fonthandling"
-	epatch "${FILESDIR}/${P}-vdr-1.6.x-compilefix.diff"
-}