diff options
| -rw-r--r-- | media-plugins/vdr-pin/Manifest | 1 | ||||
| -rw-r--r-- | media-plugins/vdr-pin/files/reccmds.pin.conf-0.0.16 | 5 | ||||
| -rw-r--r-- | media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff | 13 | ||||
| -rw-r--r-- | media-plugins/vdr-pin/vdr-pin-0.1.14.ebuild | 7 | ||||
| -rw-r--r-- | media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild | 35 |
5 files changed, 6 insertions, 55 deletions
diff --git a/media-plugins/vdr-pin/Manifest b/media-plugins/vdr-pin/Manifest index b6048f27a2c1..ffa289ec45fd 100644 --- a/media-plugins/vdr-pin/Manifest +++ b/media-plugins/vdr-pin/Manifest @@ -1,2 +1 @@ DIST vdr-pin-0.1.14.tgz 48771 BLAKE2B 70458adbb55aa7ed989fed9592b68da94033edb09f8cd28c106964151c8bb8999936d6a7a83c6d29ba9e2723b35f0a24f98c166e956f79eaa6643545a84867ac SHA512 0eb2f6f7587ec6e3d5731e48b5b37687900d8698f698c745ccacf2e41fc59c71277e020c195db77342ca997331fbf0c629bd178db734e45098844529b9e5430a -DIST vdr-pin-0.1.9.tgz 42006 BLAKE2B bd5b85e093e017d60fd815857082e3686ee14518600b0a3c8a4ad8005642fd1ca67bbf355eead9463f2088e23e9e5486153a5e1a2dec40016bb71a54de18a24c SHA512 b48e205a2da7d07e819b4a063ced2e251417d0135d5229016da56f4ab21a69d317055543637d689f3cd7a0942418bf127220942286bd74d434a9b08b91d9f4ae 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 -} |