gentoo resync : 15.12.2019

4 files changed, 72 insertions, 3 deletions

diff --git a/media-plugins/vdr-ttxtsubs/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index 6b7e04870c57..5241a2fcbf2c 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,3 +1,5 @@
+AUX vdr-ttxtsubs-0.3.0_teletext-chars.patch 2983 BLAKE2B b18aa4f8a00ef102345531ba3fa02d2dc44ef1a5f38d93f74ba307b56828bc9861283fd8aa70777dc14c3bfb37688bfccee9ee4cc4259b2e2b7c45d21394ed7f SHA512 120ee81b47323792c94868a0e4b2bc3af26af9280854bc54a643777181ba6653920e6edb89558ee21eb94ee9983dbc929bd9a4d23ab8d5d7da0d1d644ca62408
 DIST vdr-ttxtsubs-0.3.0.tar.gz 58956 BLAKE2B 681b517c25793bc5a7cc9bde4efdfc5d61cb69ba9524348eaf1c9df1b896650634b489be4a2705d040b7cbdff7648f270d74b63493739544040ebc2051cadb7b SHA512 60edbbc152e4c168dbc91f67f2105f9e9536f108ba0210a8834d950659a0923bc7bc23f44dcfa484135d5d9a6f89abb4e90f0ad39db826ad41c8f1192446bc56
-EBUILD vdr-ttxtsubs-0.3.0.ebuild 515 BLAKE2B 4044c81452e833b093fe424940b07e0be49acd03a13d45a3c5d3db5b36dbc25493278f4b0ace5ee6597fdc83f0aa43afc9c56a0de104524db069d68d1c3b5af2 SHA512 d1253fd71199f9416726fbc9e6f684d2336fe27318ac00bd7d9d61f6fe886699747c2b22f2652f5510324778d4bb5a701dd32f6b3d146ec46a33aa482ffce004
+EBUILD vdr-ttxtsubs-0.3.0-r1.ebuild 599 BLAKE2B 7ea9a615e4f945f2f1023f08c2752ad33070b99477a5712f89204bb265f13acb157c916692a602c057d2ddf0c21f2a15bf17a698aba562e81c4a304a72dc0543 SHA512 77dcef542e0b0d9455187a1e53e73e3a4698ef31fdea241b41de083d1974bb7784b431955de04565767d3cf3cc85eefb5001b6117e084f6827f653647846d240
+EBUILD vdr-ttxtsubs-0.3.0.ebuild 512 BLAKE2B ef801893a8d25084b077a04f2fa7b31c622e5bcf02e6a420420930162c638df1d96dfab92e8ef697fa736974937bc99fd1b4e61adbd5f7a742a4fbdd2598fd4b SHA512 3d0b1b4cf7b3a8f2d73ced3a78e0c8d8428c1a546432ae3588a4cf47f8fac88b0f764da73b6af026558a7a09c7c7167f88850c449143fcfc2d9195169f3288f6
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch
new file mode 100644
index 000000000000..11faef9853cd
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/files/vdr-ttxtsubs-0.3.0_teletext-chars.patch
@@ -0,0 +1,41 @@
+will fix the wrong encode
+wrt bug 642528
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (13 Nov 2019)
+
+diff -Naur ttxtsubs-0.3.0.orig/teletext-chars.h ttxtsubs-0.3.0/teletext-chars.h
+--- ttxtsubs-0.3.0.orig/teletext-chars.h	2019-11-13 17:37:33.000000000 +0100
++++ ttxtsubs-0.3.0/teletext-chars.h	2019-11-13 17:39:02.000000000 +0100
+@@ -68,19 +68,19 @@
+  */
+ 
+ uint8_t laG0_nat_opts[13][14] = {
+-{0, '#', 'u', 'c', 't', 'z', 'ý', 'í', 'r', 'é', 'á', 'e', 'ú', 's'}, // 0 - Czech/Slovak
+-{0, '£', '$', '@', '-', '½', '-', '|', '#', '-', '¼', '#', '¾', '÷'}, // 1 - English
+-{0, '#', 'õ', 'S', 'Ä', 'Ö', 'Z', 'Ü', 'Õ', 's', 'ä', 'ö', 'z', 'ü'}, // 2 - Estonian
+-{0, 'é', 'ï', 'à', 'ë', 'ê', 'ù', 'î', '#', 'è', 'â', 'ô', 'û', 'ç'}, // 3 - French
+-{0, '#', '$', '§', 'Ä', 'Ö', 'Ü', '^', '_', 'º', 'ä', 'ö', 'ü', 'ß'}, // 4 - German
+-{0, '£', '$', 'é', 'º', 'ç', '-', '|', '#', 'ù', 'à', 'ò', 'è', 'ì'}, // 5 - Italian
+-{0, '#', '$', 'S', 'e', 'e', 'Z', 'c', 'u', 's', 'a', 'u', 'z', 'i'}, // 6 - Lettish/Lithuanian
+-{0, '#', 'n', 'a', 'Z', 'S', 'L', 'c', 'ó', 'e', 'z', 's', 'l', 'z'}, // 7 - Polish
+-{0, 'ç', '$', 'i', 'á', 'é', 'í', 'ó', 'ú', '¿', 'ü', 'ñ', 'è', 'à'}, // 8 - Portuguese/Spanish
+-{0, '#', '¤', 'T', 'Â', 'S', 'A', 'Î', 'i', 't', 'â', 's', 'a', 'î'}, // 9 - Rumanian
+-{0, '#', 'Ë', 'C', 'C', 'Z', 'D', 'S', 'ë', 'c', 'c', 'z', 'd', 's'}, // 10 - Serbian/Croation/Slovenian
+-{0, '#', '¤', 'É', 'Ä', 'Ö', 'Å', 'Ü', '_', 'é', 'ä', 'ö', 'å', 'ü'}, // 11 - Swedish/Finnish/Hungarian
+-{0, 'T', 'g', 'I', 'S', 'Ö', 'Ç', 'Ü', 'G', 'i', 's', 'ö', 'ç', 'ü'}  // 12 - Turkish
++{0, '#',  'u',  'c',  't',  'z',  0xfd, 0xed, 'r',  0xe9, 0xe1, 'e',  0xfa, 's' }, // 0 - Czech/Slovak
++{0, 0xa3, '$',  '@',  '-',  0xbd, '-',  '|',  '#',  '-',  0xbc, '#',  0xbe, 0xf7}, // 1 - English
++{0, '#',  0xf5, 'S',  0xc4, 0xd6, 'Z',  0xdc, 0xd5, 's',  0xe4, 0xf6, 'z',  0xfc}, // 2 - Estonian
++{0, 0xe9, 0xef, 0xe0, 0xeb, 0xea, 0xf9, 0xee, '#',  0xe8, 0xe2, 0xf4, 0xfb, 0xe7}, // 3 - French
++{0, '#',  '$',  0xa7, 0xc4, 0xd6, 0xdc, '^',  '_',  0xba, 0xe4, 0xf6, 0xfc, 0xdf}, // 4 - German
++{0, 0xa3, '$',  0xe9, 0xba, 0xe7, '-',  '|',  '#',  0xf9, 0xe0, 0xf2, 0xe8, 0xec}, // 5 - Italian
++{0, '#',  '$',  'S',  'e',  'e',  'Z',  'c',  'u',  's',  'a',  'u',  'z',  'i' }, // 6 - Lettish/Lithuanian
++{0, '#',  'n',  'a',  'Z',  'S',  'L',  'c',  0xf3, 'e',  'z',  's',  'l',  'z' }, // 7 - Polish
++{0, 0xe7, '$',  'i',  0xe1, 0xe9, 0xed, 0xf3, 0xfa, 0xbf, 0xfc, 0xf1, 0xe8, 0xe0}, // 8 - Portuguese/Spanish
++{0, '#',  0xa4, 'T',  0xc2, 'S',  'A',  0xce, 'i',  't',  0xe2, 's',  'a',  0xee}, // 9 - Rumanian
++{0, '#',  0xcb, 'C',  'C',  'Z',  'D',  'S',  0xeb, 'c',  'c',  'z',  'd',  's' }, // 10 - Serbian/Croation/Slovenian
++{0, '#',  0xa4, 0xc9, 0xc4, 0xd6, 0xc5, 0xdc, '_',  0xe9, 0xe4, 0xf6, 0xe5, 0xfc}, // 11 - Swedish/Finnish/Hungarian
++{0, 'T',  'g',  'I',  'S',  0xd6, 0xc7, 0xdc, 'G',  'i',  's',  0xf6, 0xe7, 0xfc}  // 12 - Turkish
+ };
+ 
+ uint16_t laG0_nat_opts16[13][14] = {
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..1f196dbb1d85
--- /dev/null
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+VERSION="1281" # every bump, new version!
+
+DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext based subtitles"
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-ttxtsubs"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="media-video/vdr[ttxtsubs]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	eapply "${FILESDIR}/${P}_teletext-chars.patch"
+}
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
index 78c093d6260f..68a2183616c5 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2