Small cleanups.

(Portage version: 2.1.6.13/cvs/Linux i686)

7 files changed, 32 insertions, 25 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 86cd690e4303..cd50b976c9cc 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.132 2009/07/01 09:51:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.133 2009/07/01 10:42:27 zzam Exp $
+
+  01 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.7-r10.ebuild,
+  vdr-1.4.7-r11.ebuild, vdr-1.4.7-r12.ebuild, vdr-1.6.0_p2.ebuild,
+  vdr-1.6.0_p2-r2.ebuild, vdr-1.6.0_p2-r3.ebuild:
+  Small cleanups.
 
   01 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-1.6.0_p2.ebuild,
   vdr-1.6.0_p2-r2.ebuild, vdr-1.6.0_p2-r3.ebuild:
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index a1c3fc397407..c8712a07ff21 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.9 2009/01/12 13:23:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.10 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -201,8 +201,8 @@ src_unpack() {
 	if ! use vanilla; then
 
 		cd "${S}"
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${fname}"
 
 		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
 		add_cap CAP_SHUTDOWN_SVDRP
diff --git a/media-video/vdr/vdr-1.4.7-r11.ebuild b/media-video/vdr/vdr-1.4.7-r11.ebuild
index 1835c0b84d08..7fa4bae80d81 100644
--- a/media-video/vdr/vdr-1.4.7-r11.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.3 2009/01/12 13:23:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r11.ebuild,v 1.4 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -201,8 +201,8 @@ src_unpack() {
 	if ! use vanilla; then
 
 		cd "${S}"
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${fname}"
 
 		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
 		add_cap CAP_SHUTDOWN_SVDRP
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
index 02d0c7d91aef..3f2ac4708085 100644
--- a/media-video/vdr/vdr-1.4.7-r12.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.4 2009/01/12 13:23:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r12.ebuild,v 1.5 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -201,8 +201,8 @@ src_unpack() {
 	if ! use vanilla; then
 
 		cd "${S}"
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${fname}"
 
 		if use shutdown_rewrite; then
 			epatch "${EXT_DIR}/vdr-1.4.7-ext44_shutdown-rewrite.diff"
diff --git a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
index 56ed80f6484d..975947ded5f8 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r2.ebuild,v 1.4 2009/07/01 09:51:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r2.ebuild,v 1.5 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -172,9 +172,6 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
-	sed -e "s:dvdread:dvdnav:g" -i "${EXT_DIR}/${PN}"-1.6.0-2_extensions.diff
-
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
 	epatch "${DISTDIR}/${MY_P}-2.diff"
@@ -226,8 +223,12 @@ src_unpack() {
 
 		cd "${S}"
 		# Now apply extensions patch
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+
+		# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
+		sed -e "s:dvdread:dvdnav:g" -i "${fname}"
+
+		epatch "${fname}"
 
 		# Fix typo in Make.config.template
 		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
diff --git a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
index ea5a11dc07c6..d8b423c6c05d 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r3.ebuild,v 1.2 2009/07/01 09:51:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r3.ebuild,v 1.3 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -172,9 +172,6 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${S}"
-	# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
-	sed -e "s:dvdread:dvdnav:g" -i "${EXT_DIR}/${PN}"-1.6.0-2_extensions.diff
-
 	#applying maintainace-patches
 	epatch "${DISTDIR}/${MY_P}-1.diff"
 	epatch "${DISTDIR}/${MY_P}-2.diff"
@@ -226,8 +223,12 @@ src_unpack() {
 
 		cd "${S}"
 		# Now apply extensions patch
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+
+		# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
+		sed -e "s:dvdread:dvdnav:g" -i "${fname}"
+
+		epatch "${fname}"
 
 		# Fix typo in Make.config.template
 		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
diff --git a/media-video/vdr/vdr-1.6.0_p2.ebuild b/media-video/vdr/vdr-1.6.0_p2.ebuild
index 4ef360bd80d1..c5faebead3b1 100644
--- a/media-video/vdr/vdr-1.6.0_p2.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.6 2009/07/01 09:51:41 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2.ebuild,v 1.7 2009/07/01 10:42:27 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -215,8 +215,8 @@ src_unpack() {
 
 		cd "${S}"
 		# Now apply extensions patch
-		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-		epatch "${EXT_DIR}/${fname}"
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${fname}"
 
 		# Fix typo in Make.config.template
 		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template