gentoo resync 08.09.2018

5 files changed, 7 insertions, 59 deletions

diff --git a/media-plugins/vdr-pin/Manifest b/media-plugins/vdr-pin/Manifest
index a25293222dd3..da8fdd4a99be 100644
--- a/media-plugins/vdr-pin/Manifest
+++ b/media-plugins/vdr-pin/Manifest
@@ -1,8 +1,4 @@
 AUX reccmds.pin.conf 192 BLAKE2B fe3527abde1c2a06c330899c15f201559adef5d5824b12884d310f660f78d7ecd7cc8989a7818c411e6938113c4f63e409fff9b791a624036ee86966157925cc SHA512 86f30889fc1574a2de58c152b988640bedfc7337a3e702b86669ae3d4871fe4666b8f237ee3ca3ea86a26f4dcb27bc4633348bd3b4005dc04ec6014a285d7381
-AUX reccmds.pin.conf-0.0.16 204 BLAKE2B 6051ae720b0343cca300f64897faa098b145b32f9c8425677ab5d07b28c33e16d33a2502f4498352b7d4933f2d8961c24bfe69294ef158172166ce8cf1b4251d SHA512 22c53e51697edacd69d1afa18595020e8985524bd44a34ceff51e2aeb3d02d3d3957eca183e27282ee9cbda354ebec9279d67d6d03ea57aa10f4aed33566376d
-AUX vdr-pin-0.1.9.diff 445 BLAKE2B 018751c6f1ac46bbaab693a9f1d7a48b3544ea0dda5fd8aefd9d15d237e0d0d8bddc0980ab551c19b87d84cbbd40db4716875ee03735f28e4a0b5de32f69da6e SHA512 fe70be0fff7f1cc83447bab36c8bbc0ef30d9f50fa8c093d297ffcb3471b1a433052ce5265448aa1b06cb8e68f0fc2eaa47bc4985715c431e86ba28f9d99e814
 DIST vdr-pin-0.1.14.tgz 48771 BLAKE2B 70458adbb55aa7ed989fed9592b68da94033edb09f8cd28c106964151c8bb8999936d6a7a83c6d29ba9e2723b35f0a24f98c166e956f79eaa6643545a84867ac SHA512 0eb2f6f7587ec6e3d5731e48b5b37687900d8698f698c745ccacf2e41fc59c71277e020c195db77342ca997331fbf0c629bd178db734e45098844529b9e5430a
-DIST vdr-pin-0.1.9.tgz 42006 BLAKE2B bd5b85e093e017d60fd815857082e3686ee14518600b0a3c8a4ad8005642fd1ca67bbf355eead9463f2088e23e9e5486153a5e1a2dec40016bb71a54de18a24c SHA512 b48e205a2da7d07e819b4a063ced2e251417d0135d5229016da56f4ab21a69d317055543637d689f3cd7a0942418bf127220942286bd74d434a9b08b91d9f4ae
-EBUILD vdr-pin-0.1.14.ebuild 922 BLAKE2B d2f47f080914309783b28b33e0fea4e43653dcf7ab3e6ec35f9470d068b08759f5d72be02af00bb74c0b29ac26fb748af9ec87b54f28d34b2d909ca3b57f37d4 SHA512 bee39bf2c427ddfbd71b76b11203aa220cac1c15563acd69162f057d23db42c7d19091ee88fbc874d3f3f76253ee13e794fa2a1fd8b4c995b3642e2aac72495a
-EBUILD vdr-pin-0.1.9.ebuild 638 BLAKE2B 956440991d66107b2e8ed046888c5798636a6ce996218189937c37944ae0ed0148c6c999d783df652b396c7f4838c43cf06375d08b0da8d1a3fabb52531ac458 SHA512 e92abd3587c2c1b53d84986428b38c7821d833c33c8dbd3058ee281d07d4f99ba1e993e97f82d2d65cd57c76d8bbefced2750e960792eb2b6c1b5b3885f71fd0
+EBUILD vdr-pin-0.1.14.ebuild 1042 BLAKE2B ea3b0f707a55d1d6840e9aa46e44c1e26651952ae85a7073ad5ad2c7b8a52fc2d7a82266054b25a175f2db2d4281074f3caac8fec615dda615a9ce168af0abb5 SHA512 0bc20a5fc1bb0eed068579e148af705e58887829fc265da729f75c4c3757b36bece6616a6bfece4e9ca966428808d7d4c11fea6d7f0cde18bc4efa4e42b5bf5a
 MISC metadata.xml 381 BLAKE2B dba7a4b90f29c4762a36271d825469aff04458087c2be0e1e466c3d0c5fadc0f5b34fba5dfef25ab4e1039e46390852956262a55df9f8795ea092797943d5cd8 SHA512 f0beb8a3122d672f7fdef6698c77e5922379222d9cfdd0def6a11e9e1a9314b6d3a9b5d6e7bc2831eab8eefcf3377df56f454dfcfb8435a78e6353d96b8704a6
diff --git a/media-plugins/vdr-pin/files/reccmds.pin.conf-0.0.16 b/media-plugins/vdr-pin/files/reccmds.pin.conf-0.0.16
deleted file mode 100644
index e47da47e7de0..000000000000
--- a/media-plugins/vdr-pin/files/reccmds.pin.conf-0.0.16
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# creats protected records, only visibly with the right pin
-# 
-FSK Schutz hinzufügen: /usr/share/vdr/pin/bin/fskprotect.sh protect
-FSK Schutz entfernen:  /usr/share/vdr/pin/bin/fskprotect.sh unprotect
diff --git a/media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff b/media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff
deleted file mode 100644
index 54e0b6cb16db..000000000000
--- a/media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur pin-0.1.9.orig/Makefile pin-0.1.9/Makefile
---- pin-0.1.9.orig/Makefile	2010-12-02 17:01:55.000000000 +0100
-+++ pin-0.1.9/Makefile	2010-12-02 17:02:50.000000000 +0100
-@@ -104,8 +104,7 @@
- plugin: libvdr-$(PLUGIN).so
- 
- fskcheck: $(CMDOBJS)
--	$(CXX) $(CXXFLAGS) $(CMDOBJS) -o $@
--	@cp $@ $(FSKCHKDIR)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(CMDOBJS) -o $@
- 
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
diff --git a/media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild b/media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild
index 43e89dac7ec7..a18203267304 100644
--- a/media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild
+++ b/media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -23,6 +23,11 @@ src_prepare() {
 	vdr-plugin-2_src_prepare
 
 	sed -i "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += -I\$(VDRDIR)/include:" Makefile
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
+			-i pin.c
+	fi
 }
 
 src_install() {
diff --git a/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild b/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild
deleted file mode 100644
index 489801c1a2b3..000000000000
--- a/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild
+++ /dev/null
@@ -1,35 +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: pin PlugIn"
-HOMEPAGE="http://www.jwendel.de"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0[pinplugin]"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	epatch "${FILESDIR}/${P}.diff"
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dobin fskcheck
-
-	into /usr/share/vdr/pin
-	dobin "${S}"/scripts/*.sh
-
-	insinto /etc/vdr/reccmds
-	newins "${FILESDIR}"/reccmds.pin.conf-0.0.16 reccmds.pin.conf
-}