Fix patching logic for USE=bigpatch noepg, Bug #193550.

Package-Manager: portage-2.1.3.11

3 files changed, 44 insertions, 37 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 384523116915..926e111fb32a 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.88 2007/10/01 12:28:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.89 2007/10/01 13:05:25 zzam Exp $
+
+  01 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.6.ebuild:
+  Fix patching logic for USE=bigpatch noepg, Bug #193550.
 
   01 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.7-r5.ebuild:
   Code cleanup.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 0ce25a5ed629..e7f6caa7763e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -78,10 +78,10 @@ EBUILD vdr-1.4.5.ebuild 5316 RMD160 a34b9e94bea6016802b3bded0c7ffde2b7da4133 SHA
 MD5 a36cc1d155479bf037c329156ef490b5 vdr-1.4.5.ebuild 5316
 RMD160 a34b9e94bea6016802b3bded0c7ffde2b7da4133 vdr-1.4.5.ebuild 5316
 SHA256 acfdd9f3bb238f64f521939d87b41ed984245fb0a6049c30967d2333a675a7c3 vdr-1.4.5.ebuild 5316
-EBUILD vdr-1.4.6.ebuild 5425 RMD160 369a1e814403eaa328d5f51c0024c3d05e0bf1a8 SHA1 5205f72cb44f1fd1953ac41c71b9fb74677be02f SHA256 1cd4e946364987460e84496a4b186b1ccd6879621d6399bc54056f4fd893f755
-MD5 aead0aa6cd680ce6e5e88a0658028748 vdr-1.4.6.ebuild 5425
-RMD160 369a1e814403eaa328d5f51c0024c3d05e0bf1a8 vdr-1.4.6.ebuild 5425
-SHA256 1cd4e946364987460e84496a4b186b1ccd6879621d6399bc54056f4fd893f755 vdr-1.4.6.ebuild 5425
+EBUILD vdr-1.4.6.ebuild 5609 RMD160 1ff37804b45c5c45bc9254621c58868f71405d4a SHA1 a163a0ffb4dc82cbc9dd2bb8b771b9d20b86c518 SHA256 38644284c519f6e978b12637202f2ff09d2aba84e59cca0ae35573dcb0344309
+MD5 a4c274278aaf0deb25735c01303fce54 vdr-1.4.6.ebuild 5609
+RMD160 1ff37804b45c5c45bc9254621c58868f71405d4a vdr-1.4.6.ebuild 5609
+SHA256 38644284c519f6e978b12637202f2ff09d2aba84e59cca0ae35573dcb0344309 vdr-1.4.6.ebuild 5609
 EBUILD vdr-1.4.7-r4.ebuild 8714 RMD160 9e65e3366dea3740387405e792ad44b7a4de5183 SHA1 14403c3ddd4d88721734f855c47d375735e47162 SHA256 8fc0624d3fa9d0ef5d5ffa05b08bcfdff1547342d30c5e7ca28f013bf3d79b59
 MD5 3e4a7e0b76a3cd8a6dd5fed2ede550b3 vdr-1.4.7-r4.ebuild 8714
 RMD160 9e65e3366dea3740387405e792ad44b7a4de5183 vdr-1.4.7-r4.ebuild 8714
@@ -90,10 +90,10 @@ EBUILD vdr-1.4.7-r5.ebuild 8434 RMD160 de025f02abb66b04ec352c4ff0881a6d91c6b075
 MD5 3f6043e05606818e2cecead82893566c vdr-1.4.7-r5.ebuild 8434
 RMD160 de025f02abb66b04ec352c4ff0881a6d91c6b075 vdr-1.4.7-r5.ebuild 8434
 SHA256 9cb2453a4eddedb4c8ea4d0be2970182cda283e0b821b11445d881fbbb92395b vdr-1.4.7-r5.ebuild 8434
-MISC ChangeLog 14781 RMD160 af7faac7f3c0d951fa0da41c306fbfd767bc80df SHA1 6d081d86441c6b7f0021d2d00390e88bd8be995a SHA256 4adecbf18d94ce9f9dca7581cef4589fc8175e4aa48dc825fe39f03365d44ff5
-MD5 41652e527cfcda6901cb0fffb1e19533 ChangeLog 14781
-RMD160 af7faac7f3c0d951fa0da41c306fbfd767bc80df ChangeLog 14781
-SHA256 4adecbf18d94ce9f9dca7581cef4589fc8175e4aa48dc825fe39f03365d44ff5 ChangeLog 14781
+MISC ChangeLog 14911 RMD160 1d09e8a7acbc74ab528f334957aee66ad768eb57 SHA1 c83a58f778696b52bc2c55e462f5376ec8c46dc2 SHA256 1ea44bb2f734ebb045df0cbdb450fb632e05d6053289a9947332bcd105fdb08f
+MD5 9cd48b52415e433d65b2ff9f2de6ab72 ChangeLog 14911
+RMD160 1d09e8a7acbc74ab528f334957aee66ad768eb57 ChangeLog 14911
+SHA256 1ea44bb2f734ebb045df0cbdb450fb632e05d6053289a9947332bcd105fdb08f ChangeLog 14911
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -131,7 +131,7 @@ SHA256 403d97ec261a17d22f71a77e4ded1e941b35dcf36819b9c79a8f5b0c2d98b1c1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHAOgpt2vP6XvVdOcRAgFoAJ95C/3HL4azaViNaPZOAWQE/MfQsACg5Vgo
-+T+5+w/dyYQW9wAXjSSfOMw=
-=WHzh
+iD8DBQFHAPCct2vP6XvVdOcRAiE/AKDSecQjTdA1RWwSpuVKk6IsCaezzwCeNR+F
+zf+apegBj32i1ikdAOx8n14=
+=b2zt
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index 3040373adde0..eea1d7345047 100644
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ b/media-video/vdr/vdr-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.6 2007/09/11 19:06:48 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.7 2007/10/01 13:05:25 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -12,7 +12,7 @@ PATCHSET_V=1
 PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
 
 MY_P="${P%_p*}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/vdr/"
@@ -39,9 +39,9 @@ PDEPEND="setup-plugin? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
 # Relevant Pathes for vdr on gentoo
 DVB_DIR=/usr/include
 VDR_INCLUDE_DIR=/usr/include/vdr
-PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
+PLUGIN_LIB_DIR="/usr/$(get_libdir)/vdr/plugins"
 CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
+CAP_FILE="${S}/capabilities.sh"
 CAPS="# Capabilities of the vdr-executable for use by startscript etc."
 
 pkg_setup() {
@@ -49,9 +49,9 @@ pkg_setup() {
 }
 
 add_cap() {
-	while [ "$1" ]; do
-		CAPS="${CAPS}\n$1=1"
-		shift
+	local ARG
+	for ARG; do
+		CAPS="${CAPS}\n${ARG}=1"
 	done
 }
 
@@ -61,11 +61,15 @@ src_unpack() {
 		ewarn "Using local developer patchset."
 		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
 	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		unpack "${PATCHSET_NAME}".tar.bz2
+		PATCHSET_DIR="${WORKDIR}/${PATCHSET_NAME}"
+
+		# Fix logic bigpatch+noepg, Bug #193550
+		sed -i "${PATCHSET_DIR}"/apply_patchset.sh \
+			-e 's/use noepg/use noepg \&\& use !bigpatch/'
 	fi
 
-	cd ${S}
+	cd "${S}"
 
 	ebegin "Changing pathes for gentoo"
 	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
@@ -86,7 +90,7 @@ src_unpack() {
 	EOT
 	eend 0
 
-	source ${PATCHSET_DIR}/apply_patchset.sh
+	source "${PATCHSET_DIR}"/apply_patchset.sh
 	apply_vdr_patchset "${PATCHSET_DIR}"
 
 	if use !vanilla; then
@@ -118,7 +122,7 @@ src_unpack() {
 	fi
 
 	if [[ -n "${VDRSOURCE_DIR}" ]]; then
-		cp -r ${S} ${T}/source-tree
+		cp -r "${S}" "${T}"/source-tree
 	fi
 
 	if ! use vanilla; then
@@ -127,7 +131,7 @@ src_unpack() {
 			CAP_SHUTDOWN_SVDRP \
 			CAP_CHUID
 
-		echo -e ${CAPS} > ${CAP_FILE}
+		echo -e ${CAPS} > "${CAP_FILE}"
 	fi
 }
 
@@ -136,17 +140,17 @@ src_install() {
 	doexe vdr
 	doexe svdrpsend.pl
 
-	insinto ${VDR_INCLUDE_DIR}
+	insinto "${VDR_INCLUDE_DIR}"
 	doins *.h
 	doins Make.config
 
-	insinto ${VDR_INCLUDE_DIR}/libsi
+	insinto "${VDR_INCLUDE_DIR}"/libsi
 	doins libsi/*.h
 
-	keepdir ${CONF_DIR}/plugins
-	keepdir ${CONF_DIR}/themes
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
 
-	insinto ${CONF_DIR}
+	insinto "${CONF_DIR}"
 	doins *.conf channels.conf.*
 
 	keepdir "${PLUGIN_LIB_DIR}"
@@ -158,20 +162,20 @@ src_install() {
 	dodoc TODO-enAIO-rm CONTRIBUTORS
 
 	insinto /usr/share/vdr
-	doins ${CAP_FILE}
+	doins "${CAP_FILE}"
 
 	if [[ -n "${VDRSOURCE_DIR}" ]]; then
 		elog "Installing sources"
-		insinto ${VDRSOURCE_DIR}/${P}
-		doins -r ${T}/source-tree/*
-		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+		insinto "${VDRSOURCE_DIR}/${P}"
+		doins -r "${T}"/source-tree/*
+		keepdir "${VDRSOURCE_DIR}/${P}"/PLUGINS/lib
 	fi
 
 	if use setup-plugin; then
 		insinto /usr/share/vdr/setup
-		doins ${S}/menu.c
+		doins "${S}"/menu.c
 	fi
-	chown -R vdr:vdr ${D}/${CONF_DIR}
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
 pkg_postinst() {
@@ -202,7 +206,7 @@ pkg_postinst() {
 	local keysfound=0
 	local key
 	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
-	local remote_file=${ROOT}/etc/vdr/remote.conf
+	local remote_file="${ROOT}"/etc/vdr/remote.conf
 
 	if [[ -e ${remote_file} ]]; then
 		for key in ${warn_keys}; do