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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 36 insertions, 75 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/Manifest b/media-plugins/vdr-pin/Manifest
index 71e00bde9447..e6f8d94faea6 100644
--- a/media-plugins/vdr-pin/Manifest
+++ b/media-plugins/vdr-pin/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX reccmds.pin.conf-0.0.16 333 RMD160 1112645380794a66914034127da6224caa0b5cd6 SHA1 6b841c82e3840d7de6b724f254aeabec205a70be SHA256 c00fca27361711229c3b9efa410eb235d2a426fb1591c1fadbdf38cdf63412b6
-AUX vdr-pin-0.1.9.diff 367 RMD160 b73d32f8d94d52700c0331fc904eabed54459797 SHA1 8950c000a38542e24fd71479b14885f97410f0eb SHA256 57976afdc45a9baf3919296fce4671035ffea94ab89452062e911e3e0f3be32f
+AUX vdr-pin-0.1.9.diff 445 RMD160 d4f2c6bf859800c21fa411c744f1444263606bfc SHA1 4e11b154fdeb3e5dd1df949dfdaa7d34a5e3950d SHA256 f2bf2b7400dcfe24e9d843d6174dfeed26ba3edd01ec0bee6e50920649f7801f
 AUX vdr-pin.sh 213 RMD160 bafdb66176f1e05bcc1f0245b4cf051e67ca344a SHA1 054b4f4032c6fbb4836b4d2766fa8120a314a87c SHA256 a01e109be4556e6dfea92acde39edf1917de3e9985afdeb25c2f105d9aabe314
-DIST vdr-pin-0.0.20.tgz 32248 RMD160 0e8ebbd03bfb8de471902f62a315d0e1d71a6624 SHA1 b974e6af41fa95fc8f91cfa54daff9ad539f73b8 SHA256 1574523efe58c48fe0109675c37f6a8f38ffec82c2f50ad83903e69fda786bb4
 DIST vdr-pin-0.1.9.tgz 42006 RMD160 ed1c6cbf78c225d1392e00a7ae67e39385071f2d SHA1 db2d53847b78f7ffb86b5d4ce933d47797f5c928 SHA256 15410df9dcb1e3c0c0734c83b19d309278d72b2cfb56dc81967d5bc3b0dc777c
-EBUILD vdr-pin-0.0.20.ebuild 969 RMD160 5a8200c6b79250797c24daa82560e5ea56d82b5e SHA1 1060b4450943eaa1ac44c69421294c1558e178a2 SHA256 c190eea929f549f435540b729a00191a48028adea8a54f79ad4c5a51c088e073
-EBUILD vdr-pin-0.1.9.ebuild 1083 RMD160 469120c6e4e5d58a76f89c9cfee4617fa6f04025 SHA1 22a7b39a6973f3718e0f5b4b696b6ce32ff89f94 SHA256 02f105d0e532160a67d0c9dea25117511ba2d595fc54b9be6ba1c01f227d4ec7
-MISC ChangeLog 1583 RMD160 90ff8d8be4213077f7a766302d1a810431a656bf SHA1 1b367b5f2cdca3db50d6ec4159ef39be54816bd2 SHA256 06d6617bc1c9031aaf6763712ab0824a3f579499c0c4af5257cb004f19d54f8a
+EBUILD vdr-pin-0.1.9.ebuild 754 RMD160 5f848dbad315fa338685c9fac3e8bb4da4abc778 SHA1 7de5a56a0b5211c793877e83531cc6f743cddbf4 SHA256 1f12ac3fd4d1efc50c4865695a92e27ef705a748112f152e6e71e3f3505cd19d
+MISC ChangeLog 1760 RMD160 3bcfc7bc82e767648e5be6f99296e049694ab33f SHA1 1769a353faddafa4a88f7a70ec573e7fe5ee8ae9 SHA256 f76517e4ac66a1a933107ed8fa67c3d3b982869263194f5ad2a7dbffd956e4a0
 MISC metadata.xml 396 RMD160 1cf822c3e5a115ee230a31029caa09a2ccf8bea5 SHA1 1d0ce7e1a540eaaf0a7018e9ab33949f9751e749 SHA256 821155465b9cfe3cd945667c00260cc798a0dd7687005a19534d195a8f5ee77d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFM98Xpdn07HTTCgIoRAuFGAJoDWcBGnERRUYHz76IY6LDvyTd1xQCgjuF1
+Iffr04nc7nysDekclXCGTUY=
+=yV8+
+-----END PGP SIGNATURE-----
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
 }