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

Package-Manager: portage-2.1.1_pre1-r5

7 files changed, 82 insertions, 64 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/Manifest b/media-video/vdr/Manifest
index cd70f9c6fa13..98f40f06ad0e 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -144,30 +144,30 @@ EBUILD vdr-1.3.45.ebuild 5350 RMD160 20cef96e0638f21435b74377f4867f14a68851c4 SH
 MD5 605cb84da22cd175dbcc0b5dd14b9b93 vdr-1.3.45.ebuild 5350
 RMD160 20cef96e0638f21435b74377f4867f14a68851c4 vdr-1.3.45.ebuild 5350
 SHA256 a167c1d2043b977001e331d5ed83870f5429447be99aa940df9a50c311bb562f vdr-1.3.45.ebuild 5350
-EBUILD vdr-1.4.0-r1.ebuild 5943 RMD160 ad65c988578f113adf854d27e6599b44c6a396f3 SHA1 27338acef50d2fe5c4173f5fbda15f3b29ea1943 SHA256 bdbc982e1c86ea248966482e32f7c0bce3d07eccd2eabb72bb81321070d394f5
-MD5 959d4368cb7e4e9707846579160cd8b4 vdr-1.4.0-r1.ebuild 5943
-RMD160 ad65c988578f113adf854d27e6599b44c6a396f3 vdr-1.4.0-r1.ebuild 5943
-SHA256 bdbc982e1c86ea248966482e32f7c0bce3d07eccd2eabb72bb81321070d394f5 vdr-1.4.0-r1.ebuild 5943
-EBUILD vdr-1.4.0.ebuild 5941 RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 SHA1 ba6af8cca6e3e43a3a2d6ab83cb7f7a69ab42e4a SHA256 afa281ac718c9476e9d55850b7bb907dde3d1e4fc637fce52b59ffb2844f81db
-MD5 71ba04249f3f2b9d6eeecfd4f04ac3f8 vdr-1.4.0.ebuild 5941
-RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 vdr-1.4.0.ebuild 5941
-SHA256 afa281ac718c9476e9d55850b7bb907dde3d1e4fc637fce52b59ffb2844f81db vdr-1.4.0.ebuild 5941
-EBUILD vdr-1.4.1-r1.ebuild 6185 RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891 SHA1 17feabd5f76a4ff98fbddfe552d3e651c46f9334 SHA256 84723473f89c6dddaa407e9701ec70d356e90e67cbba0a750440e73e4cd9feb8
-MD5 8c5f1c6a5d4d90d7d3d77c2c069ca790 vdr-1.4.1-r1.ebuild 6185
-RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891 vdr-1.4.1-r1.ebuild 6185
-SHA256 84723473f89c6dddaa407e9701ec70d356e90e67cbba0a750440e73e4cd9feb8 vdr-1.4.1-r1.ebuild 6185
-EBUILD vdr-1.4.1-r2.ebuild 6211 RMD160 7322fe8b68bde4d91a673064a3a4c19de3ea7f0c SHA1 e0e2105238217d718ac4de08746b8e049969cb19 SHA256 181e23eddd44b19c1b4b351fdc15f780051730067422bef7cef48fedc31cbbaf
-MD5 a4067c7e126e4c262f378bfe7b5c0097 vdr-1.4.1-r2.ebuild 6211
-RMD160 7322fe8b68bde4d91a673064a3a4c19de3ea7f0c vdr-1.4.1-r2.ebuild 6211
-SHA256 181e23eddd44b19c1b4b351fdc15f780051730067422bef7cef48fedc31cbbaf vdr-1.4.1-r2.ebuild 6211
-EBUILD vdr-1.4.1.ebuild 6163 RMD160 418878997bb7883c9e4af559edfe6ce16a431900 SHA1 e5cbe454697de9e1dd7a89065830e7af00c1f83a SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229
-MD5 274915c640202c2bc78e2d961d4a3c63 vdr-1.4.1.ebuild 6163
-RMD160 418878997bb7883c9e4af559edfe6ce16a431900 vdr-1.4.1.ebuild 6163
-SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229 vdr-1.4.1.ebuild 6163
-MISC ChangeLog 10125 RMD160 ec91e02e613a041510bea32a593f7e913c2aad93 SHA1 9c213408e7a37e6b9313a08cbd23b4a8d5fdc48d SHA256 c82e6ab7488467a385b601bde17b639f5936203c21319d752ee62d8c30ac0462
-MD5 0247cf18783af0f9f6cddabc6564df43 ChangeLog 10125
-RMD160 ec91e02e613a041510bea32a593f7e913c2aad93 ChangeLog 10125
-SHA256 c82e6ab7488467a385b601bde17b639f5936203c21319d752ee62d8c30ac0462 ChangeLog 10125
+EBUILD vdr-1.4.0-r1.ebuild 5979 RMD160 fe936f94a7fc82204006a81e3678a32969c90299 SHA1 222e0b1ef5a1f8a5be1b18b984d2e6be02ad8cb9 SHA256 4ae5158bb732cc62781d03e438c30eeb764b44553944ffdee5f7b44985fa069f
+MD5 24a6ba694d143f22e46b925c24407d0e vdr-1.4.0-r1.ebuild 5979
+RMD160 fe936f94a7fc82204006a81e3678a32969c90299 vdr-1.4.0-r1.ebuild 5979
+SHA256 4ae5158bb732cc62781d03e438c30eeb764b44553944ffdee5f7b44985fa069f vdr-1.4.0-r1.ebuild 5979
+EBUILD vdr-1.4.0.ebuild 5977 RMD160 1e8ad2f49d5bf1efaa24a6568a61e634fb7b50c7 SHA1 bba9a5bfb42169e0b205c602a8e2419734e7b90a SHA256 cd1c564a28dab358c1f973779a1c66e858f546a1f67a55462725707dd3c1dd9d
+MD5 603fa8e0e0d4331bbf6608ce08d0b4e9 vdr-1.4.0.ebuild 5977
+RMD160 1e8ad2f49d5bf1efaa24a6568a61e634fb7b50c7 vdr-1.4.0.ebuild 5977
+SHA256 cd1c564a28dab358c1f973779a1c66e858f546a1f67a55462725707dd3c1dd9d vdr-1.4.0.ebuild 5977
+EBUILD vdr-1.4.1-r1.ebuild 6220 RMD160 91819f9f189385697e07bddc7f49c4fdda320bf2 SHA1 18238fdd336eb0cc738ff54bd0ec616b2a00be3f SHA256 b1ac6f64a854bcd434c62ee742ef4b19434609059201020f2b8541a861aa6363
+MD5 8a62f0e6846b0ba55ecf23754b20a6f3 vdr-1.4.1-r1.ebuild 6220
+RMD160 91819f9f189385697e07bddc7f49c4fdda320bf2 vdr-1.4.1-r1.ebuild 6220
+SHA256 b1ac6f64a854bcd434c62ee742ef4b19434609059201020f2b8541a861aa6363 vdr-1.4.1-r1.ebuild 6220
+EBUILD vdr-1.4.1-r2.ebuild 6246 RMD160 4cbc714e7040b6bee8d0c66c5a3246519d1a8604 SHA1 36a52780df67747f448a82def81e6cefb51f0ef8 SHA256 6f2d5e1591167afd93ce2d0fd9860d4088343d1928f14907cb850c53ae2167f6
+MD5 bc00bdfd26b2e9bf3cded9ab308da511 vdr-1.4.1-r2.ebuild 6246
+RMD160 4cbc714e7040b6bee8d0c66c5a3246519d1a8604 vdr-1.4.1-r2.ebuild 6246
+SHA256 6f2d5e1591167afd93ce2d0fd9860d4088343d1928f14907cb850c53ae2167f6 vdr-1.4.1-r2.ebuild 6246
+EBUILD vdr-1.4.1.ebuild 6199 RMD160 23f8a5d9833ac24d792ff377a1bb712104c04b18 SHA1 70225794cdb30d8b5e6908aeec3ac6dac95c0cbb SHA256 47ee85bcecbbdc8d0f22ff6cf3d328cf064b8693719e46f075121c593c551485
+MD5 f667c74b1286972e615e8a14f6d9d0b9 vdr-1.4.1.ebuild 6199
+RMD160 23f8a5d9833ac24d792ff377a1bb712104c04b18 vdr-1.4.1.ebuild 6199
+SHA256 47ee85bcecbbdc8d0f22ff6cf3d328cf064b8693719e46f075121c593c551485 vdr-1.4.1.ebuild 6199
+MISC ChangeLog 10344 RMD160 154acfaa3aba9d36e6d5ccf1a15cba2ab19de96f SHA1 f49c28d6eb5f74c5db55d53006b7202706256106 SHA256 939669e5cd3093bac48207487bfc889eee1b2561251caa1aa150c2dbc01eca0c
+MD5 2b3f0f92822ce4ee4dda68ac683a5975 ChangeLog 10344
+RMD160 154acfaa3aba9d36e6d5ccf1a15cba2ab19de96f ChangeLog 10344
+SHA256 939669e5cd3093bac48207487bfc889eee1b2561251caa1aa150c2dbc01eca0c ChangeLog 10344
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -233,9 +233,9 @@ MD5 8335ea9ab24557870e7bf7d8052c8edd files/digest-vdr-1.4.1-r2 518
 RMD160 aa1f10a484b1cc48e384c4bfac18dcdd709eaa21 files/digest-vdr-1.4.1-r2 518
 SHA256 9337e798e1894d69e0d649837c273a477e306a55e78a91bf642b4e5214b5ffd8 files/digest-vdr-1.4.1-r2 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEokczZfSl1Kp5KmoRAkB4AJ9AKJttotFNVhEwNmcOl841KZrNcwCfeXpK
-576TDWZCvvtVAQHIqYsy0UY=
-=/Y85
+iD8DBQFEppYPZfSl1Kp5KmoRAiQFAKCFo2SBPxFq64wwNdHJlZY1+Qn/WQCgjg2r
+7u9KeCq+knC//QPfZV/vQiA=
+=7kY9
 -----END PGP SIGNATURE-----
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}