Do not try to unpack patchset when use-flag vanilla is set.

(Portage version: 2.1.1_pre1-r5)

6 files changed, 54 insertions, 36 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 8df86338f8cf..bb35c65cfb49 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.66 2006/06/28 09:08:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.67 2006/07/01 15:34:26 zzam Exp $
+
+  01 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.0.ebuild,
+  vdr-1.4.0-r1.ebuild, vdr-1.4.1.ebuild, vdr-1.4.1-r1.ebuild,
+  vdr-1.4.1-r2.ebuild:
+  Do not try to unpack patchset when use-flag vanilla is set.
 
   28 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.0-r1.ebuild:
   Marked stable on x86.
diff --git a/media-video/vdr/vdr-1.4.0-r1.ebuild b/media-video/vdr/vdr-1.4.0-r1.ebuild
index f5cd85c7c388..77ba28aaeb0e 100644
--- a/media-video/vdr/vdr-1.4.0-r1.ebuild
+++ b/media-video/vdr/vdr-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.0-r1.ebuild,v 1.2 2006/06/28 09:08:56 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.0-r1.ebuild,v 1.3 2006/07/01 15:34:26 zzam Exp $
 
 inherit eutils flag-o-matic
 
@@ -112,12 +112,15 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+
+	if ! use vanilla; then
+		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+			ewarn "Using local developer patchset."
+			PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+		else
+			unpack ${PATCHSET_NAME}.tar.bz2
+			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		fi
 	fi
 
 	cd ${S}
diff --git a/media-video/vdr/vdr-1.4.0.ebuild b/media-video/vdr/vdr-1.4.0.ebuild
index 415da85a6dd4..295feb9ae9c6 100644
--- a/media-video/vdr/vdr-1.4.0.ebuild
+++ b/media-video/vdr/vdr-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.0.ebuild,v 1.3 2006/05/04 14:43:22 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.0.ebuild,v 1.4 2006/07/01 15:34:26 zzam Exp $
 
 inherit eutils flag-o-matic
 
@@ -112,12 +112,15 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+
+	if ! use vanilla; then
+		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+			ewarn "Using local developer patchset."
+			PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+		else
+			unpack ${PATCHSET_NAME}.tar.bz2
+			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		fi
 	fi
 
 	cd ${S}
diff --git a/media-video/vdr/vdr-1.4.1-r1.ebuild b/media-video/vdr/vdr-1.4.1-r1.ebuild
index 02e93a309326..e942ad507302 100644
--- a/media-video/vdr/vdr-1.4.1-r1.ebuild
+++ b/media-video/vdr/vdr-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r1.ebuild,v 1.1 2006/06/17 14:55:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r1.ebuild,v 1.2 2006/07/01 15:34:26 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -120,12 +120,14 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	if ! use vanilla; then
+		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+			ewarn "Using local developer patchset."
+			PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+		else
+			unpack ${PATCHSET_NAME}.tar.bz2
+			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		fi
 	fi
 
 	cd ${S}
diff --git a/media-video/vdr/vdr-1.4.1-r2.ebuild b/media-video/vdr/vdr-1.4.1-r2.ebuild
index 4258ef75d4f9..2f23f90b112e 100644
--- a/media-video/vdr/vdr-1.4.1-r2.ebuild
+++ b/media-video/vdr/vdr-1.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r2.ebuild,v 1.1 2006/06/27 18:30:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1-r2.ebuild,v 1.2 2006/07/01 15:34:26 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -121,12 +121,14 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	if ! use vanilla; then
+		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+			ewarn "Using local developer patchset."
+			PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+		else
+			unpack ${PATCHSET_NAME}.tar.bz2
+			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		fi
 	fi
 
 	cd ${S}
diff --git a/media-video/vdr/vdr-1.4.1.ebuild b/media-video/vdr/vdr-1.4.1.ebuild
index f1c23847bacf..badcfcb48475 100644
--- a/media-video/vdr/vdr-1.4.1.ebuild
+++ b/media-video/vdr/vdr-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1.ebuild,v 1.1 2006/06/13 06:04:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.1.ebuild,v 1.2 2006/07/01 15:34:26 zzam Exp $
 
 inherit eutils flag-o-matic
 
@@ -121,12 +121,15 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${P}.tar.bz2
-	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
-		ewarn "Using local developer patchset."
-		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
-	else
-		unpack ${PATCHSET_NAME}.tar.bz2
-		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+
+	if ! use vanilla; then
+		if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+			ewarn "Using local developer patchset."
+			PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+		else
+			unpack ${PATCHSET_NAME}.tar.bz2
+			PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+		fi
 	fi
 
 	cd ${S}