Drop remaining USE=bootstrap usage #256439.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

12 files changed, 160 insertions, 196 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 44be6d32357f..37b9daf85b25 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.275 2009/02/24 16:16:43 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.276 2009/03/14 12:54:49 vapier Exp $
+
+  14 Mar 2009; Mike Frysinger <vapier@gentoo.org> db-4.2.52_p4-r2.ebuild,
+  db-4.2.52_p5.ebuild, db-4.2.52_p5-r1.ebuild, db-4.3.29-r2.ebuild,
+  db-4.3.29_p1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.4.20_p4.ebuild,
+  db-4.4.20_p4-r1.ebuild, db-4.5.20_p2.ebuild, db-4.5.20_p2-r1.ebuild:
+  Drop remaining USE=bootstrap usage #256439.
 
   24 Feb 2009; Joshua Kinard <kumba@gentoo.org> db-4.6.21_p3-r1.ebuild:
   Add ~mips to KEYWORDS
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 7a265c2a4e40..11e65c023dc8 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f
 AUX db-3.2.9-fix-dep-link.patch 1005 RMD160 71f4c2255cc6afffc494341ecd6352a6c754c006 SHA1 437f0eb7c82c0a2b8e7c2cdadddbd889d2735a97 SHA256 57e6f13170db99ba7f2f43aa0c7606085d25094127c63a48b76333c1289f6382
 AUX db-3.2.9-gcc43.patch 441 RMD160 90de42fc7b06e1f92f389b17d1af88da44b36b4d SHA1 7c42a4cba6cbd3ae75c306a5ed9090162f719c49 SHA256 102ac694f32719deabbefdcfbecd96a255b8a6cdc312095fb537cf99ca6b9d77
@@ -54,21 +57,28 @@ DIST patch.4.7.25.1 2072 RMD160 89c58f5235f95e82e65bab447d1b9019bf26ed25 SHA1 3a
 EBUILD db-1.85-r3.ebuild 1380 RMD160 5f83a60a3e196d9988af40a0e1a5c1b4781f81ca SHA1 07998d65f70d2ff4703f7f87cb73f6b35f545b19 SHA256 2547f9e976def8144f3ce8ab21c396b6555bc98193bef3ab54656e2b829ab994
 EBUILD db-3.2.9-r11.ebuild 4425 RMD160 3da3794a23f356fcf6fbbccae274afb4001d16fc SHA1 d5fecadf49d8ad9ee8f9bff0f3cc9df6e37ffa0b SHA256 04cbaa35c5e27d25a483432b8c3b709c7a68f7a9c98d11b95efb70c5cdcdcc4a
 EBUILD db-3.2.9_p2.ebuild 4927 RMD160 57ca7aaa0fe43c1c82cc7a0497ffbf9e6af2214c SHA1 a5a988fabad3a1e4385dde22fc5598d4a374ec26 SHA256 6c5ed4f04dbc87456278308a6baee539f2a7846dfeba8960a681e2fddea7433d
-EBUILD db-4.2.52_p4-r2.ebuild 3486 RMD160 de46f7d210692588bbbed1acccb6e8aa5047bb5f SHA1 509c581644371e4735df1bfae0b57f056cb6fb6e SHA256 c29ae939d9740e0d43a57b178e2423a5bf72749a1bd1adc55c9ec901b43077c3
-EBUILD db-4.2.52_p5-r1.ebuild 5246 RMD160 03b72bb711e8300b0e81af1ef633fabfa9314d6b SHA1 25f41452d9cefea8cd3d341c144d008b40df9f6a SHA256 c743155057f428a6d5b1fdaa7c57743e138de4510baac6f16af0b826ee79123e
-EBUILD db-4.2.52_p5.ebuild 3601 RMD160 1ae0ed4f4aefef8787cdfad43ba2b9538e3db3cc SHA1 a0f18167ecb42beb306b611a5d8c313fbfbc067b SHA256 2eec1df5abc79855a961e9d866a25791ae0c05bcf8c08c0e8967fd90ac597751
-EBUILD db-4.3.29-r2.ebuild 3715 RMD160 e0533bcad7d7eb9b6b3834ebea4ba4082d4b86f3 SHA1 a9d4f84420e5f1f2666a86efce3b8098b0fd8f8a SHA256 784011081d9ddeaaa611e3bbf982350cd090f2aa02dafa2b829b9f2bc6a9f62b
-EBUILD db-4.3.29_p1-r1.ebuild 5206 RMD160 53ea43fdfa5b198bee09cc4ebd46d75e16c121e5 SHA1 47a6edfbd7802981bed2bc9f30b0c0fec4562d57 SHA256 415fdeffc4b524d67b81128acf6a4e52e7d8140fb6ba1fc4e2425a0d2e64ee55
-EBUILD db-4.3.29_p1.ebuild 3771 RMD160 d202d849ab74eb1ce91f7f0ceb30543d7ae85fd6 SHA1 f62118646085075302795bb72c95697306f5d808 SHA256 8336abd71322d428d55905de36afaa8f9c8dae3581bd17e765563402a6abdbd6
-EBUILD db-4.4.20_p4-r1.ebuild 4972 RMD160 1e6351eb4a3f818b332a2a6dda56fb35c2cd2cfc SHA1 b4dfd66e2adce21a5f4f0394d4ba02a6829ea86f SHA256 b0ea8e7948d4fc9d881e9595afb281e598062c824388b4ee580d26fa0e93aa28
-EBUILD db-4.4.20_p4.ebuild 3683 RMD160 fb33c73182e555de6fd419a3c0d04f948d53685d SHA1 ad56ab59f80816cdc50538db331af5056da99327 SHA256 5f4c9808f5776fc08011250de1054f97ab209d52c84af5bab721a9992c855989
-EBUILD db-4.5.20_p2-r1.ebuild 5372 RMD160 639ab102b917012c421497120caf7dd2813ced0e SHA1 68870d35aef3e818d5e52ac2162fea17c28fcef8 SHA256 a5343a45610782857d8baced213f2f26c8b8435f5dbe0def9ad32c18f9ffb7b5
-EBUILD db-4.5.20_p2.ebuild 3937 RMD160 17fde86a8a4f5d00f9d5f37584b831de1f67a07b SHA1 2b8f971269f61280016fc6cd5c24baaf85dd1e01 SHA256 dc72a81ca54577ccae65aa648c2a8e739aba337cae198c0d942ec432d9975bc1
+EBUILD db-4.2.52_p4-r2.ebuild 3416 RMD160 973a89b8890eec59050470636dc8e592d24992f7 SHA1 96980db648e38a70b8782cbbe70e651ad43f913a SHA256 12bfabc7eba2cba9abfee02f5b5206ef39a42bb99c426fedfb522f59188457f1
+EBUILD db-4.2.52_p5-r1.ebuild 4793 RMD160 6dc6e49d9c7b65cd891f9018defab8d8d739f216 SHA1 ae413e5e366b9ebb29acbf1ff0f7027bad710bda SHA256 07aa95bb91dbeb87afbc07b260dd2930c6b29b1181b8433339fa3e63df77ca0e
+EBUILD db-4.2.52_p5.ebuild 3529 RMD160 e4dea6b5a5271614c30a798249cf635eb927e993 SHA1 b32f46b8e9e5f993ccf7339e4c90d231e432cd85 SHA256 241b7312854b1c2933a55706095c6b7825210b96db18a1fb6c35e812236406c1
+EBUILD db-4.3.29-r2.ebuild 3642 RMD160 f93ed4f0acee467ab01d5ae6732248ed8f619ead SHA1 6da592093886836b162128039902a61c223b162a SHA256 bcf5e22d0e5880f7fac052adbc897b312059611001d4482369b4d6e4ffd23ab7
+EBUILD db-4.3.29_p1-r1.ebuild 4753 RMD160 0407f6740d478e4fbc4bc6487abc9183432a56eb SHA1 b74b7a4220a91d77d5481c245ff65ef9a4657f43 SHA256 2a5aa1655917b21c71d9de9e5719b1a2579acafadff095c17d0be3d4e2380a97
+EBUILD db-4.3.29_p1.ebuild 3699 RMD160 b0712d1cad3e15cc9897e7b110511e40a14f8aa9 SHA1 9ab38e0238902ecee6eae7b9f1eb5c06b715aa80 SHA256 a6f2bed2a66a6daea52d8e36f757b915a33a8b3dae6d10dea0908aa41cb73935
+EBUILD db-4.4.20_p4-r1.ebuild 4524 RMD160 c88fb1f72e20823f81b03864baec70e028d6030a SHA1 6b2fa311b0c41b5f6c3990f800210cfffe1d8d58 SHA256 33f3d243b149f061ca63ee44f3db2a89fafc27247f357cf71a601ceef713f2ef
+EBUILD db-4.4.20_p4.ebuild 3611 RMD160 f7d2f171f24a1c72bd448e25120f7b36cadbc294 SHA1 3b9729c2c34cb1f84c83e0238104bbf6532eb7d5 SHA256 723ecbb618c6970d65d6c0803e303541f9a8170d9a6ae4015481bf3a7044da78
+EBUILD db-4.5.20_p2-r1.ebuild 4919 RMD160 4d2638e9ec7cd0b8b9d897138495ef7f32b940d6 SHA1 6615d387c3b483c49943054a41be1565ca13951c SHA256 95e0fe2c550b8e94b87041440d51cc5de6a214b9a0a9b9af33313167f5865435
+EBUILD db-4.5.20_p2.ebuild 3866 RMD160 a67a4a5d1f136b3c865163a4698a1657d488a24e SHA1 1ae58a1f131fa1fef1db3abd38b0ae8bd3b23e27 SHA256 ddb3601e41436f3a914ce4e5566eed3ead320f56d250e96f9a538ce6338e312c
 EBUILD db-4.6.21_p1.ebuild 3866 RMD160 d44ba6cc4a2f9155ce0cd25d5832683bace06ffe SHA1 d12e83eb34ca772eea338442c90b47418e73a36c SHA256 235dce75518e269fad196e2cc5b6edb5cb04ac52ce65e40a1aa5353f84ba0809
 EBUILD db-4.6.21_p3-r1.ebuild 4658 RMD160 0db057102b4df427068f0364b3f428d6a0f4b4f7 SHA1 7e4fb4287494aecd46d36acf3ed52e16db6503f2 SHA256 68756a6efeb16e4f2c2e7e6423410f9268e95d551e75e0104b373852243dd816
 EBUILD db-4.6.21_p3.ebuild 3877 RMD160 941245184f71171d5c39c864abe163930c2c64e6 SHA1 64f45801522b7da58f2865439b2c984ef49f6bad SHA256 77067dfa96419100002b9b5704dbeeb5f7d3d95917f8d4bbaa36156aff0503d8
 EBUILD db-4.7.25.ebuild 3862 RMD160 06397eb94a8da2bce29fde580e725ce93a785924 SHA1 85e963df3a46754035cb5a26d81a5cb9adc13f55 SHA256 805fd8427aa21338c5bfd3e412fc535200459a1376e7bc66147c2201964d5716
 EBUILD db-4.7.25_p1-r1.ebuild 3973 RMD160 6e72ec9b9042d93e74e9e88b15d05baa4bb29842 SHA1 c5ea1388b4dff185ed9fb8ef72e97a5dbd9d4c0c SHA256 d592270c6b8ff7573a7193f65ce2b6918f26406f91408454599a77575222ee5b
 EBUILD db-4.7.25_p1.ebuild 3865 RMD160 3aa38102dbd67bba8f66927835731d109e3a005c SHA1 7f105483508c1023269c7f6b302b15bd5a2b4e7a SHA256 db977d1a2e90b930a2a73991b5946814a08195817cf079ba04d1da65bb15b347
-MISC ChangeLog 42695 RMD160 6f2467133ad1c7477f5f81c9d51fde716850eb52 SHA1 943c92610b1928a6001f50d9366d718aa5de7133 SHA256 bfcee44fc0dc89a4650c6c0f4b8507ed7993738e29627ced40597d14a89838b4
+MISC ChangeLog 43024 RMD160 74ff43597455f7923f84ff291e43bb202ea7fdba SHA1 9ab316996b10d7bb98924acced563e7b27627759 SHA256 8680751f89461f090910b8d1f4478cce4c467de9e1a1c9cfebe0c734969fcf8a
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm7qSQACgkQn/5bYzqsSmEb8ACfePZktmLoG1PH0RcqivY0qOQE
+2pEAn1h2Lg0pgx57AWow7ztWb2sTxY5m
+=y+va
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.2.52_p4-r2.ebuild b/sys-libs/db/db-4.2.52_p4-r2.ebuild
index f0448173f6b4..0929025281d6 100644
--- a/sys-libs/db/db-4.2.52_p4-r2.ebuild
+++ b/sys-libs/db/db-4.2.52_p4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.15 2008/03/10 01:35:13 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.16 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils gnuconfig db java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="DB"
 SLOT="4.2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )"
@@ -61,9 +61,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.2.52_p5-r1.ebuild b/sys-libs/db/db-4.2.52_p5-r1.ebuild
index 39f231dc8291..0319742721fc 100644
--- a/sys-libs/db/db-4.2.52_p5-r1.ebuild
+++ b/sys-libs/db/db-4.2.52_p5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.8 2008/10/26 12:27:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.9 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="DB"
 SLOT="4.2"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )"
@@ -42,12 +42,7 @@ src_unpack() {
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
 	epatch "${FILESDIR}"/"${PN}"-4.2.52_p2-TXN.patch
-	# This patch and sed statement only matter when USE=bootstrap is in effect
-	# because the build system is regenerated otherwise.
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-	sed -i \
-		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
-		"${S}"/../dist/configure
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
@@ -60,34 +55,31 @@ src_unpack() {
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
 		"${S}"/../dist/Makefile.in
 
-	# During bootstrap, libtool etc might not yet be available
-	if use !bootstrap; then
-		# START of 4.5+earlier specific
-		# Upstream sucks, they normally concat these
-		cd "${S}"/../dist/aclocal
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		cd "${S}"/../dist/aclocal_java
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		# END of 4.5+earlier specific
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.{m4,ac} aclocal.m4
-		sed -i \
-			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-			configure.ac
-		sed -i \
-			-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
-			aclocal/programs.m4
-		AT_M4DIR="aclocal aclocal_java" eautoreconf
-		# Upstream sucks - they do autoconf and THEN replace the version variables.
-		. ./RELEASE
-		sed -i \
-			-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-			-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-			-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-			-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-			-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-			-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
-	fi
+	# START of 4.5+earlier specific
+	# Upstream sucks, they normally concat these
+	cd "${S}"/../dist/aclocal
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	cd "${S}"/../dist/aclocal_java
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	# END of 4.5+earlier specific
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.{m4,ac} aclocal.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
+		aclocal/programs.m4
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
 }
 
 src_compile() {
@@ -95,9 +87,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.2.52_p5.ebuild b/sys-libs/db/db-4.2.52_p5.ebuild
index 12122f6dd022..20806a7d93d6 100644
--- a/sys-libs/db/db-4.2.52_p5.ebuild
+++ b/sys-libs/db/db-4.2.52_p5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.2 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.3 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="DB"
 SLOT="4.2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )"
@@ -59,9 +59,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
index dd4e5888152e..f34e6bfa0264 100644
--- a/sys-libs/db/db-4.3.29-r2.ebuild
+++ b/sys-libs/db/db-4.3.29-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.19 2008/02/29 18:43:03 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.20 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
 
@@ -28,7 +28,7 @@ done
 LICENSE="DB"
 SLOT="4.3"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -63,9 +63,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.3.29_p1-r1.ebuild b/sys-libs/db/db-4.3.29_p1-r1.ebuild
index a774a44d5bac..7be6df32f230 100644
--- a/sys-libs/db/db-4.3.29_p1-r1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.10 2008/10/26 12:27:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.11 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="DB"
 SLOT="4.3"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -42,12 +42,7 @@ src_unpack() {
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	# This patch and sed statement only matter when USE=bootstrap is in effect
-	# because the build system is regenerated otherwise.
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-	sed -i \
-		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
-		"${S}"/../dist/configure
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
@@ -61,34 +56,31 @@ src_unpack() {
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
 		"${S}"/../dist/Makefile.in
 
-	# During bootstrap, libtool etc might not yet be available
-	if use !bootstrap; then
-		# START of 4.5+earlier specific
-		# Upstream sucks, they normally concat these
-		cd "${S}"/../dist/aclocal
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		cd "${S}"/../dist/aclocal_java
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		# END of 4.5+earlier specific
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.{m4,ac} aclocal.m4
-		sed -i \
-			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-			configure.ac
-		sed -i \
-			-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
-			aclocal/programs.m4
-		AT_M4DIR="aclocal aclocal_java" eautoreconf
-		# Upstream sucks - they do autoconf and THEN replace the version variables.
-		. ./RELEASE
-		sed -i \
-			-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-			-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-			-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-			-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-			-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-			-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
-	fi
+	# START of 4.5+earlier specific
+	# Upstream sucks, they normally concat these
+	cd "${S}"/../dist/aclocal
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	cd "${S}"/../dist/aclocal_java
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	# END of 4.5+earlier specific
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.{m4,ac} aclocal.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, missing_sh/ bash, missing_sh/' \
+		aclocal/programs.m4
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
 }
 
 src_compile() {
@@ -96,9 +88,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.3.29_p1.ebuild b/sys-libs/db/db-4.3.29_p1.ebuild
index e43fcb72e16c..a180296b16a8 100644
--- a/sys-libs/db/db-4.3.29_p1.ebuild
+++ b/sys-libs/db/db-4.3.29_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1.ebuild,v 1.2 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1.ebuild,v 1.3 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="DB"
 SLOT="4.3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -60,9 +60,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.4.20_p4-r1.ebuild b/sys-libs/db/db-4.4.20_p4-r1.ebuild
index 6bd25673c6af..833f145828bd 100644
--- a/sys-libs/db/db-4.4.20_p4-r1.ebuild
+++ b/sys-libs/db/db-4.4.20_p4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.2 2008/08/16 22:46:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.3 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.4"
 KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -42,12 +42,7 @@ src_unpack() {
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	# This patch and sed statement only matter when USE=bootstrap is in effect
-	# because the build system is regenerated otherwise.
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-	sed -i \
-		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
-		"${S}"/../dist/configure
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
@@ -59,28 +54,25 @@ src_unpack() {
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
 		"${S}"/../dist/Makefile.in
 
-	# During bootstrap, libtool etc might not yet be available
-	if use !bootstrap; then
-		# START of 4.5+earlier specific
-		# Upstream sucks, they normally concat these
-		cd "${S}"/../dist/aclocal
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		cd "${S}"/../dist/aclocal_java
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		# END of 4.5+earlier specific
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.{m4,ac} aclocal.m4
-		AT_M4DIR="aclocal aclocal_java" eautoreconf
-		# Upstream sucks - they do autoconf and THEN replace the version variables.
-		. ./RELEASE
-		sed -i \
-			-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-			-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-			-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-			-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-			-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-			-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
-	fi
+	# START of 4.5+earlier specific
+	# Upstream sucks, they normally concat these
+	cd "${S}"/../dist/aclocal
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	cd "${S}"/../dist/aclocal_java
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	# END of 4.5+earlier specific
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.{m4,ac} aclocal.m4
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
 }
 
 src_compile() {
@@ -88,9 +80,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index 1043239bab36..9b27a335a4b4 100644
--- a/sys-libs/db/db-4.4.20_p4.ebuild
+++ b/sys-libs/db/db-4.4.20_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.6 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.7 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.4"
 KEYWORDS="~amd64 ~arm ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -58,9 +58,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index 33e9f623677f..60a4369943d0 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.10 2009/02/07 09:10:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.11 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.5"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -42,12 +42,7 @@ src_unpack() {
 	do
 		epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
 	done
-	# This patch and sed statement only matter when USE=bootstrap is in effect
-	# because the build system is regenerated otherwise.
 	epatch "${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
-	sed -i \
-		-e "s,\(ac_compiler\|\${MAKEFILE_CC}\|\${MAKEFILE_CXX}\|\$CC\)\( *--version\),\1 -dumpversion,g" \
-		"${S}"/../dist/configure
 
 	# use the includes from the prefix
 	epatch "${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
@@ -59,34 +54,31 @@ src_unpack() {
 		-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
 		"${S}"/../dist/Makefile.in
 
-	# During bootstrap, libtool etc might not yet be available
-	if use !bootstrap; then
-		# START of 4.5+earlier specific
-		# Upstream sucks, they normally concat these
-		cd "${S}"/../dist/aclocal
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		cd "${S}"/../dist/aclocal_java
-		for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
-		# END of 4.5+earlier specific
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.{m4,ac} aclocal.m4
-		sed -i \
-			-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
-			configure.ac
-		sed -i \
-			-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
-			aclocal/programs.m4
-		AT_M4DIR="aclocal aclocal_java" eautoreconf
-		# Upstream sucks - they do autoconf and THEN replace the version variables.
-		. ./RELEASE
-		sed -i \
-			-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
-			-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
-			-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
-			-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
-			-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
-			-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
-	fi
+	# START of 4.5+earlier specific
+	# Upstream sucks, they normally concat these
+	cd "${S}"/../dist/aclocal
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	cd "${S}"/../dist/aclocal_java
+	for i in *; do ln -s $i ${i%.ac}.m4 ; done ;
+	# END of 4.5+earlier specific
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.{m4,ac} aclocal.m4
+	sed -i \
+		-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
+		configure.ac
+	sed -i \
+		-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
+		aclocal/programs.m4
+	AT_M4DIR="aclocal aclocal_java" eautoreconf
+	# Upstream sucks - they do autoconf and THEN replace the version variables.
+	. ./RELEASE
+	sed -i \
+		-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \
+		-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \
+		-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \
+		-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \
+		-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \
+		-e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure
 }
 
 src_compile() {
@@ -100,9 +92,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index b5569117283a..5a2a0d49a168 100644
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.26 2009/02/07 09:10:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.27 2009/03/14 12:54:49 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.5"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="tcl java doc nocxx bootstrap"
+IUSE="tcl java doc nocxx"
 
 DEPEND="tcl? ( >=dev-lang/tcl-8.4 )
 	java? ( >=virtual/jdk-1.4 )
@@ -64,9 +64,7 @@ src_compile() {
 
 	use amd64 && myconf="${myconf} --with-mutex=x86/gcc-assembly"
 
-	use bootstrap \
-		&& myconf="${myconf} --disable-cxx" \
-		|| myconf="${myconf} $(use_enable !nocxx cxx)"
+	myconf="${myconf} $(use_enable !nocxx cxx)"
 
 	use tcl \
 		&& myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" \