add support for USE=vanilla

Package-Manager: portage-2.1.1_rc1-r4

2 files changed, 38 insertions, 28 deletions

diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 356aff04f481..b8cdd196f892 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
@@ -263,10 +266,10 @@ EBUILD bash-3.1_p16.ebuild 4566 RMD160 860abfc418e2a48acc10f1457138fc2f7f22d065
 MD5 c55c94a7e6554872b40e0f390c797246 bash-3.1_p16.ebuild 4566
 RMD160 860abfc418e2a48acc10f1457138fc2f7f22d065 bash-3.1_p16.ebuild 4566
 SHA256 bd47cb1bcf18a950588e9f0c20039d02e5aa3afcabec541c8ad7b9de451ef833 bash-3.1_p16.ebuild 4566
-EBUILD bash-3.1_p17.ebuild 4662 RMD160 14127447748bbcb23055de72723a65432d48467c SHA1 842a4d7071ae6fd0ec7e1edddf824a11ce042d37 SHA256 025d0d4cb6ae2d2fd9403d44914461e6e80128bf7fb100d3c92cfd3bc8c22974
-MD5 5a6e27af417eb1d06447550ef9204f1e bash-3.1_p17.ebuild 4662
-RMD160 14127447748bbcb23055de72723a65432d48467c bash-3.1_p17.ebuild 4662
-SHA256 025d0d4cb6ae2d2fd9403d44914461e6e80128bf7fb100d3c92cfd3bc8c22974 bash-3.1_p17.ebuild 4662
+EBUILD bash-3.1_p17.ebuild 4611 RMD160 272aafce744f2928d14450e7a58d6f8df05f812f SHA1 1b1acfc5fd66daa19ff0db6948c339cc728ad756 SHA256 219430b4a5dd077656bfe5f28bd811a3c5dc3fbb5c6a1a52b2eaf1edcc430ea3
+MD5 08e91e225b85dcc45decac4ff24c4457 bash-3.1_p17.ebuild 4611
+RMD160 272aafce744f2928d14450e7a58d6f8df05f812f bash-3.1_p17.ebuild 4611
+SHA256 219430b4a5dd077656bfe5f28bd811a3c5dc3fbb5c6a1a52b2eaf1edcc430ea3 bash-3.1_p17.ebuild 4611
 MISC ChangeLog 20448 RMD160 b32866c9442bf475dfdb370cb079618c3d48a252 SHA1 a93998c678b7811f3b2f72bdf851d162dc010fc9 SHA256 8882b8563f24bcb80f337a67aac805cefa30da20b700935f6898da8200ae6503
 MD5 5c3ef3733d8c947ce2954ebd59bcd933 ChangeLog 20448
 RMD160 b32866c9442bf475dfdb370cb079618c3d48a252 ChangeLog 20448
@@ -296,3 +299,10 @@ SHA256 1a25ed9d1fa648442a32e3bc60706b427718809325cf030c5acc5ea51aecc443 files/di
 MD5 341b816c5acf74ac16bf443d156e9719 files/digest-bash-3.1_p17 3931
 RMD160 607c556f7fd1528c64beb33828d95a31e22077ab files/digest-bash-3.1_p17 3931
 SHA256 04f2452aacb4b2e69a683d9ee5b2a9a04f3c9d0ef9b5bb0f28ec88b48db25bf6 files/digest-bash-3.1_p17 3931
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE/fzXamhnQswr0vIRAiFwAKCVZVotU2ie55iBCUrPmTtlArCzCwCeNYP4
+wsHZz+YuzBx5x0FKGndMu44=
+=rsav
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.1_p17.ebuild b/app-shells/bash/bash-3.1_p17.ebuild
index e874c380b239..052a8f018253 100644
--- a/app-shells/bash/bash-3.1_p17.ebuild
+++ b/app-shells/bash/bash-3.1_p17.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/app-shells/bash/bash-3.1_p17.ebuild,v 1.5 2006/08/02 18:22:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.1_p17.ebuild,v 1.6 2006/09/05 22:40:15 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="afs nls bashlogger"
+IUSE="afs bashlogger nls vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -55,28 +55,28 @@ src_unpack() {
 	done
 	cd ../..
 
-	# Fall back to /etc/inputrc
-	epatch "${FILESDIR}"/${PN}-3.0-etc-inputrc.patch
-	# Add more ulimit options (from Fedora)
-	epatch "${FILESDIR}"/${MY_P}-ulimit.patch
-	# Fix a memleak in read_builtin (from Fedora)
-	epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
-	# Don't barf on handled signals in scripts
-	epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
-	# Fix -/bin/bash login shell #118257
-	epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch
-	# Fix /dev/fd test with FEATURES=userpriv #131875
-	epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch
-#	# Fix generation of signals list when cross-compiling
-#	epatch "${FILESDIR}"/${PN}-3.0-cross-signals.patch
-	# Log bash commands to syslog #91327
-	if use bashlogger ; then
-		echo
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-		ebeep
-		epause
-		epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
+	if ! use vanilla ; then
+		# Fall back to /etc/inputrc
+		epatch "${FILESDIR}"/${PN}-3.0-etc-inputrc.patch
+		# Add more ulimit options (from Fedora)
+		epatch "${FILESDIR}"/${MY_P}-ulimit.patch
+		# Fix a memleak in read_builtin (from Fedora)
+		epatch "${FILESDIR}"/${PN}-3.0-read-memleak.patch
+		# Don't barf on handled signals in scripts
+		epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
+		# Fix -/bin/bash login shell #118257
+		epatch "${FILESDIR}"/bash-3.1-fix-dash-login-shell.patch
+		# Fix /dev/fd test with FEATURES=userpriv #131875
+		epatch "${FILESDIR}"/bash-3.1-dev-fd-test-as-user.patch
+		# Log bash commands to syslog #91327
+		if use bashlogger ; then
+			echo
+			ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+			ewarn "This will log ALL output you enter into the shell, you have been warned."
+			ebeep
+			epause
+			epatch "${FILESDIR}"/${PN}-3.1-bash-logger.patch
+		fi
 	fi
 
 	epatch "${FILESDIR}"/${PN}-3.0-configs.patch