From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 24 Jan 2007 02:36:48 +0000 (+0000)
Subject: make sure USE=vanilla actually works
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=efc9422aab78cc5c218256e2004e92446061c518;p=gentoo.git

make sure USE=vanilla actually works
Package-Manager: portage-2.1.2-r1
---

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index bf6b882c0ccb..b298366f8e25 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash-2.05b-empty-herestring.patch 836 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 SHA1 fc34260611e395caee16930e66ec13e7aae63796 SHA256 a05098a9bb85520efc5c6d108fdcf635e4a9b20369d42d9aa0803c6b1d145cae
 MD5 edf95b873162f4548435c379e4998b4e files/bash-2.05b-empty-herestring.patch 836
 RMD160 bdeef415bb8ef5294bfdb47a00beb3523f5e33c5 files/bash-2.05b-empty-herestring.patch 836
@@ -289,10 +292,10 @@ EBUILD bash-3.2_p5.ebuild 4349 RMD160 20855d757ae0aeadba9c78e161b7609fefb699bd S
 MD5 ae5f9524df0ce39ee9cf7a8375a83e8b bash-3.2_p5.ebuild 4349
 RMD160 20855d757ae0aeadba9c78e161b7609fefb699bd bash-3.2_p5.ebuild 4349
 SHA256 cf967008deb374cebd3251c7fcd6bd0e7e52b6db7286e160d2b685422a39d842 bash-3.2_p5.ebuild 4349
-EBUILD bash-3.2_p9-r1.ebuild 4357 RMD160 5a0cd9f6b0b83055e98c5cc1a3d76b6ccb1117e8 SHA1 aa2e4c78625b76c7853778c7f5809fd38d81da66 SHA256 048f1d41b0c3bc727ee98c0f877a9c661923531edbc288c255b92d82e8c59276
-MD5 cfe4da2e0fdd47c9b4bf02d09c922526 bash-3.2_p9-r1.ebuild 4357
-RMD160 5a0cd9f6b0b83055e98c5cc1a3d76b6ccb1117e8 bash-3.2_p9-r1.ebuild 4357
-SHA256 048f1d41b0c3bc727ee98c0f877a9c661923531edbc288c255b92d82e8c59276 bash-3.2_p9-r1.ebuild 4357
+EBUILD bash-3.2_p9-r1.ebuild 4350 RMD160 96312763942806d6109005f9553248b2240b5d5d SHA1 4e3879cba0be3f3f4cfd112d2efcb88466ecd3b7 SHA256 e4de2ac48feb27189e667aab29d4a5b6e7482cbff273c7a32d151f162df1bc5a
+MD5 43edcfde60933cf92ae5d687a709feb9 bash-3.2_p9-r1.ebuild 4350
+RMD160 96312763942806d6109005f9553248b2240b5d5d bash-3.2_p9-r1.ebuild 4350
+SHA256 e4de2ac48feb27189e667aab29d4a5b6e7482cbff273c7a32d151f162df1bc5a bash-3.2_p9-r1.ebuild 4350
 EBUILD bash-3.2_p9.ebuild 4349 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d SHA1 dd81e2115a3279efa37f45e0a89e298f952932ef SHA256 2f929739750214c01b34c4d936cdff7427db23e496e820a1de696233ba7489b3
 MD5 6a5b3c847e3c85dcd5599d35bb53ea33 bash-3.2_p9.ebuild 4349
 RMD160 6ae9a6429ac83712e557346bc03e9058b326183d bash-3.2_p9.ebuild 4349
@@ -332,3 +335,10 @@ SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/di
 MD5 ef1b3c02b997284cb562ba9e3eebf17c files/digest-bash-3.2_p9-r1 2074
 RMD160 3232387aa160a9ea2ee764e929fa58618674d590 files/digest-bash-3.2_p9-r1 2074
 SHA256 1fe387fc344fd77f445608d6e5d99d8547c8c2f0aba4150c6b54720ff7a0b7df files/digest-bash-3.2_p9-r1 2074
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFtsZk8bi6rjpTunYRAi72AJ9SBjkOawbL61BkNLOszgI857KTHQCeK6M1
+w/YTh+LNfkgIkeu1uVM5tdM=
+=wq31
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2_p9-r1.ebuild b/app-shells/bash/bash-3.2_p9-r1.ebuild
index 840394181270..737f99ba0eeb 100644
--- a/app-shells/bash/bash-3.2_p9-r1.ebuild
+++ b/app-shells/bash/bash-3.2_p9-r1.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/app-shells/bash/bash-3.2_p9-r1.ebuild,v 1.2 2007/01/18 18:35:43 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p9-r1.ebuild,v 1.3 2007/01/24 02:36:48 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -42,10 +42,6 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
-
-	# Fix process substitution on BSD.
-	epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
 
 	# Include official patches
 	local i
@@ -59,6 +55,11 @@ src_unpack() {
 	cd ../..
 
 	if ! use vanilla ; then
+		epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
+
+		# Fix process substitution on BSD.
+		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
+
 		epatch "${FILESDIR}"/${PN}-3.2-ulimit.patch
 		# Don't barf on handled signals in scripts
 		epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
@@ -126,7 +127,7 @@ src_install() {
 
 	doman doc/*.1
 	dodoc README NEWS AUTHORS CHANGES COMPAT Y2K doc/FAQ doc/INTRO
-	dosym bash.info.bz2 /usr/share/info/bashref.info.bz2
+	dosym bash.info /usr/share/info/bashref.info
 }
 
 pkg_preinst() {