clean up; moved to EAPI=2, fixed bug #339250

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 22 insertions, 70 deletions

diff --git a/media-plugins/vdr-pin/ChangeLog b/media-plugins/vdr-pin/ChangeLog
index bb5f54f8405c..d2d52a2ab3dd 100644
--- a/media-plugins/vdr-pin/ChangeLog
+++ b/media-plugins/vdr-pin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-pin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pin/ChangeLog,v 1.8 2007/12/02 18:36:11 hd_brummy Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pin/ChangeLog,v 1.9 2010/12/02 16:14:05 hd_brummy Exp $
+
+  02 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-pin-0.0.20.ebuild, vdr-pin-0.1.9.ebuild, files/vdr-pin-0.1.9.diff:
+  clean up; moved to EAPI=2, fixed bug #339250
 
 *vdr-pin-0.1.9 (02 Dec 2007)
 
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
index d7579805cca4..54e0b6cb16db 100644
--- a/media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff
+++ b/media-plugins/vdr-pin/files/vdr-pin-0.1.9.diff
@@ -1,11 +1,13 @@
 diff -Naur pin-0.1.9.orig/Makefile pin-0.1.9/Makefile
---- pin-0.1.9.orig/Makefile	2007-12-02 19:22:47.000000000 +0100
-+++ pin-0.1.9/Makefile	2007-12-02 19:23:10.000000000 +0100
-@@ -106,7 +106,6 @@
+--- 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 $@
+-	$(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.0.20.ebuild b/media-plugins/vdr-pin/vdr-pin-0.0.20.ebuild
deleted file mode 100644
index 687cb26b4b60..000000000000
--- a/media-plugins/vdr-pin/vdr-pin-0.0.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pin/vdr-pin-0.0.20.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder 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.3.45-r1"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		elog "Patched vdr found"
-	else
-		echo
-		eerror "Patched VDR needed"
-		echo
-		elog "reemerge VDR with USE=\"child-protection\" or USE=\"bigpatch\"" && \
-		die "unpack failed, patched VDR needed"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	dobin ${S}/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
-}
diff --git a/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild b/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild
index 7cb178be8249..0192673457ae 100644
--- a/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild
+++ b/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild,v 1.2 2007/12/03 07:20:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pin/vdr-pin-0.1.9.ebuild,v 1.3 2010/12/02 16:14:05 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -13,26 +15,12 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
 
-DEPEND=">=media-video/vdr-1.3.45-r1"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		elog "Patched vdr found"
-	else
-		echo
-		eerror "Patched VDR needed"
-		echo
-		elog "reemerge VDR with USE=\"child-protection\" or USE=\"bigpatch\""
-		elog "or in newer VDR versiones use USE=\"pinplugin\"" && die "unpack failed, patched VDR needed"
-	fi
-}
+DEPEND=">=media-video/vdr-1.6.0[pinplugin]"
 
-src_unpack() {
-    vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
-	epatch ${FILESDIR}/${P}.diff
+	epatch "${FILESDIR}/${P}.diff"
 }
 
 src_install() {
@@ -41,8 +29,8 @@ src_install() {
 	dobin fskcheck
 
 	into /usr/share/vdr/pin
-	dobin ${S}/scripts/*.sh
+	dobin "${S}"/scripts/*.sh
 
 	insinto /etc/vdr/reccmds
-	newins ${FILESDIR}/reccmds.pin.conf-0.0.16 reccmds.pin.conf
+	newins "${FILESDIR}"/reccmds.pin.conf-0.0.16 reccmds.pin.conf
 }