Drop USE=bootstrap #256439.

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

8 files changed, 78 insertions, 101 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index f8977922d229..9f04a8c80a72 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/db
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.271 2008/09/20 14:52:39 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.272 2009/02/07 08:06:45 vapier Exp $
+
+  07 Feb 2009; Mike Frysinger <vapier@gentoo.org> db-4.6.21_p1.ebuild,
+  db-4.6.21_p3.ebuild, db-4.6.21_p3-r1.ebuild, db-4.7.25.ebuild,
+  db-4.7.25_p1.ebuild, db-4.7.25_p1-r1.ebuild:
+  Drop USE=bootstrap #256439.
 
   20 Sep 2008; Brent Baude <ranger@gentoo.org> db-3.2.9_p2.ebuild,
   db-4.2.52_p5-r1.ebuild, db-4.3.29_p1-r1.ebuild, db-4.5.20_p2-r1.ebuild:
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index f4a336621c28..2b86c407eb34 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -67,18 +67,18 @@ EBUILD db-4.4.20_p4-r1.ebuild 4972 RMD160 1e6351eb4a3f818b332a2a6dda56fb35c2cd2c
 EBUILD db-4.4.20_p4.ebuild 3683 RMD160 fb33c73182e555de6fd419a3c0d04f948d53685d SHA1 ad56ab59f80816cdc50538db331af5056da99327 SHA256 5f4c9808f5776fc08011250de1054f97ab209d52c84af5bab721a9992c855989
 EBUILD db-4.5.20_p2-r1.ebuild 5370 RMD160 e226e827e53f3d4e06c922e25ae3264b167dc52d SHA1 59697ee0d54030e6663aaa8cf392e2204fbf35af SHA256 1fbf12aed9e0295521c75a3c589b67c4ba978ae8c576f5c0553915d15ab868fe
 EBUILD db-4.5.20_p2.ebuild 3937 RMD160 d7857fc73ba5e3e46f3d2e056863112e6b0b01b2 SHA1 9037c83cc03dffce5857ff923dd8ef39178d877b SHA256 9740c42be6b0589191da27209ae1817816e05b5dc5fab2727397c1090ea66411
-EBUILD db-4.6.21_p1.ebuild 3938 RMD160 73adabeb81be1df6cdefbd92838c31980d473f1a SHA1 41ca803b0c7fac5d156f9ad2ff594ccd20458b52 SHA256 6dfb6e2516531b3716df28a5da2955a89d142f5126b059b171a8dba036d402b2
-EBUILD db-4.6.21_p3-r1.ebuild 5099 RMD160 eda590e5fa78caefd25dcaff0c478491d42829f2 SHA1 7eec5e8958f94ae97a10ea0d5604790dfb866a45 SHA256 fe775c57c53d6f36f2e6e9543d6e40d03610ab8d571f5f1689a12d4d65ba7cda
-EBUILD db-4.6.21_p3.ebuild 3948 RMD160 16bc15d03ec7dfbc6ec74afcdd4fd33863d93a78 SHA1 c54aeca496c02ae5e37eb7ed068f8db15fc09ddf SHA256 7d93f4471fff67da3ee6c2d15be5705a63e92c752edfbbd503435e9504f65e90
-EBUILD db-4.7.25.ebuild 3933 RMD160 98c4ddf234c7a274d7ae655008f2f010fda3bedc SHA1 1b0438c3811c64b66ac9a9711523fbe925e66027 SHA256 32ee208e2ab19cc48c04d732d2a7694803e9a15f84faa90374329600698e5669
-EBUILD db-4.7.25_p1-r1.ebuild 5087 RMD160 858967ca1e191998c7dcd42722b350d66aef80c4 SHA1 5df59ac4528d46959449b0398da501267737f021 SHA256 551bd1de5ca81e7ccb401bc46bd8f3d8f87f3263c9c14117382c1e8a117807e5
-EBUILD db-4.7.25_p1.ebuild 3936 RMD160 a61846bc739c71452b7e72489c639ffbe7aa9591 SHA1 a1723f9759a2d6030f4c2e0fad5bf97677db1aaf SHA256 2ee7ea6bce661792a46b92c2943688101a3b5c9c3c3f8b348eeede1c08d3228c
-MISC ChangeLog 42004 RMD160 370338a3f1ad872c151bc2f15feb7f16f15a5ce8 SHA1 1f646e060f022834cd5195a5f5279d38af864779 SHA256 d7b70e0422752af9d679342886fda1428d54eed074cef0e1e76668d8647269d1
+EBUILD db-4.6.21_p1.ebuild 3865 RMD160 cf43c8761273969be7137c62bd0a530de3f49d86 SHA1 a50375d0f13f653406f5f04e2d3d0a159d2faf3e SHA256 5831455d34eb64fee7feca50a12592adb0f85a45eaba364224a696efdec485a4
+EBUILD db-4.6.21_p3-r1.ebuild 4652 RMD160 55b89a2096b53cb7d7d664bb6c2f24ec5acf636c SHA1 92d83c636c260ceb3c589b80aa49f5202e78784f SHA256 3d18e051f467fb8e8860c30a61b413a33510f185033b898c3599dee9f0866e4e
+EBUILD db-4.6.21_p3.ebuild 3876 RMD160 d9583cc83e1f1c32a7b421d948b99d9e78514539 SHA1 4c1f05cc1afc8de0b63370488603f701347fa94a SHA256 323d68072435c2f9e158725a6ae128d84d8f51ead170828a828f1de1082b17ae
+EBUILD db-4.7.25.ebuild 3861 RMD160 7dff31a437024b8d81bfde56ebf24d44bdec0b5b SHA1 2f471035b7c3ef9f66572a480ba395c9e927414f SHA256 0c9fba500440214969271d9b131b45ade103c4379724e0d777496808ea181c50
+EBUILD db-4.7.25_p1-r1.ebuild 4640 RMD160 a90e5c07d7145b265b1de6cdeffb53628c3c7c68 SHA1 6d3d3796fda30bd8f9358b265eae4d485bf08349 SHA256 90ad64fa62bb4e778867dd7bf20cb9364aae8acd7f0866396e6a3c44dbbb7b8a
+EBUILD db-4.7.25_p1.ebuild 3864 RMD160 60143c58b4a98b0e02390231deb76f2e03a33d45 SHA1 e73bca0d2c95b1eeb904e1509a891a9eb3905a8f SHA256 0b8e2b4726da4561a774dce86ea9ee331e8b08956c1a7a08877d712625d96bd6
+MISC ChangeLog 42218 RMD160 4be79fe282f8cc8df11112d65b6d75b44a1ce700 SHA1 990945f31b23f5ea5671924e337069bb71f3ba31 SHA256 43b8b4b1dba10cad9378ba3e3dbd8dedcf38e9fd3231b88a98023cd5b6aa6260
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkEYkQACgkQ67wieSYcaxfQYwCdHzygCoaUr2onxMr2QQnd31tm
-18UAniuHQjfZ/Gwr2/AYdLeERi7OXlik
-=Mf+w
+iEYEARECAAYFAkmNQSgACgkQn/5bYzqsSmGceQCfez64rXWQQSuY9K3tJi+5usJo
+uzkAn3gixyb3kIR9hi5pLDNtA3DMJv5R
+=BlfH
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/db/db-4.6.21_p1.ebuild b/sys-libs/db/db-4.6.21_p1.ebuild
index a256587d0621..75b2aa342577 100644
--- a/sys-libs/db/db-4.6.21_p1.ebuild
+++ b/sys-libs/db/db-4.6.21_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.6.21_p1.ebuild,v 1.2 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p1.ebuild,v 1.3 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.6"
 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 )
@@ -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)" \
@@ -107,7 +105,7 @@ src_compile() {
 		--without-uniquename \
 		--enable-rpc \
 		--host="${CHOST}" \
-		${myconf}  "${javaconf}" || die "configure failed"
+		${myconf} "${javaconf}" || die "configure failed"
 
 	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
diff --git a/sys-libs/db/db-4.6.21_p3-r1.ebuild b/sys-libs/db/db-4.6.21_p3-r1.ebuild
index 58ad18d50870..a716de222b72 100644
--- a/sys-libs/db/db-4.6.21_p3-r1.ebuild
+++ b/sys-libs/db/db-4.6.21_p3-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.6.21_p3-r1.ebuild,v 1.3 2008/09/09 05:38:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p3-r1.ebuild,v 1.4 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.6"
 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
@@ -59,27 +54,24 @@ 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
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.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
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.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() {
@@ -93,9 +85,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.6.21_p3.ebuild b/sys-libs/db/db-4.6.21_p3.ebuild
index e8398faff5fa..28824ad803a8 100644
--- a/sys-libs/db/db-4.6.21_p3.ebuild
+++ b/sys-libs/db/db-4.6.21_p3.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.6.21_p3.ebuild,v 1.1 2008/08/16 05:32:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p3.ebuild,v 1.2 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.6"
 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 )
@@ -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)" \
diff --git a/sys-libs/db/db-4.7.25.ebuild b/sys-libs/db/db-4.7.25.ebuild
index 3eb96409b4cd..15963d7ef77d 100644
--- a/sys-libs/db/db-4.7.25.ebuild
+++ b/sys-libs/db/db-4.7.25.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.7.25.ebuild,v 1.2 2008/08/16 05:23:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25.ebuild,v 1.3 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.7"
 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.5 )
@@ -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)" \
diff --git a/sys-libs/db/db-4.7.25_p1-r1.ebuild b/sys-libs/db/db-4.7.25_p1-r1.ebuild
index 8d66541ed3ca..066c0716bc9d 100644
--- a/sys-libs/db/db-4.7.25_p1-r1.ebuild
+++ b/sys-libs/db/db-4.7.25_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.7.25_p1-r1.ebuild,v 1.4 2008/09/09 05:38:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p1-r1.ebuild,v 1.5 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.7"
 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.5 )
@@ -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}"-4.6-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.6-jni-check-prefix-first.patch
@@ -59,27 +54,24 @@ 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
-		cd "${S}"/../dist
-		rm -f aclocal/libtool.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
+	cd "${S}"/../dist
+	rm -f aclocal/libtool.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() {
@@ -93,9 +85,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.7.25_p1.ebuild b/sys-libs/db/db-4.7.25_p1.ebuild
index 7ac44cf14a7b..5888b7407bf7 100644
--- a/sys-libs/db/db-4.7.25_p1.ebuild
+++ b/sys-libs/db/db-4.7.25_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.7.25_p1.ebuild,v 1.1 2008/08/16 05:33:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.7.25_p1.ebuild,v 1.2 2009/02/07 08:06:45 vapier Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -27,7 +27,7 @@ done
 LICENSE="OracleDB"
 SLOT="4.7"
 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.5 )
@@ -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)" \