Fix bug 278962

(Portage version: 2.2_rc33/cvs/Linux i686)

14 files changed, 37 insertions, 29 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 1e1811e2692f..48121a629cbe 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,14 @@
 # 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.286 2009/07/05 19:52:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.287 2009/07/30 11:01:33 pauldv Exp $
+
+  29 Jul 2009; Paul de Vrieze <pauldv@gentoo.org> db-3.2.9-r11.ebuild,
+  db-3.2.9_p2.ebuild, 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, db-4.6.21_p4.ebuild:
+  Fix bug #278962 and don't use the FEATURES variable in the ebuild when
+  checking for the test feature.
 
   05 Jul 2009; Mike Frysinger <vapier@gentoo.org> db-4.7.25_p4.ebuild:
   Add --with-mutex option for arm systems as suggested by thomasq #273906.
diff --git a/sys-libs/db/db-3.2.9-r11.ebuild b/sys-libs/db/db-3.2.9-r11.ebuild
index 8b354c95af08..fa22023f76e6 100644
--- a/sys-libs/db/db-3.2.9-r11.ebuild
+++ b/sys-libs/db/db-3.2.9-r11.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-3.2.9-r11.ebuild,v 1.17 2008/02/13 12:48:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r11.ebuild,v 1.18 2009/07/30 11:01:33 pauldv Exp $
 
 inherit gnuconfig libtool eutils db
 
@@ -157,7 +157,7 @@ pkg_postrm () {
 }
 
 src_test() {
-	if has test $FEATURES; then
+	if use test; then
 		eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series"
 	fi
 }
diff --git a/sys-libs/db/db-3.2.9_p2.ebuild b/sys-libs/db/db-3.2.9_p2.ebuild
index 5f24bf094587..86ef37045318 100644
--- a/sys-libs/db/db-3.2.9_p2.ebuild
+++ b/sys-libs/db/db-3.2.9_p2.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-3.2.9_p2.ebuild,v 1.10 2008/10/26 12:27:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9_p2.ebuild,v 1.11 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db
 
@@ -177,7 +177,7 @@ pkg_postrm () {
 }
 
 src_test() {
-	if has test $FEATURES; then
+	if use test; then
 		eerror "We'd love to be able to test, but the testsuite is broken in the 3.2.9 series"
 	fi
 }
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 0929025281d6..c4e280bed688 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-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.16 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p4-r2.ebuild,v 1.17 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils gnuconfig db java-pkg-opt-2
 
@@ -78,7 +78,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES; then
+	if use tcl && use test; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
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 0319742721fc..a379ffe0eaf7 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-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.9 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5-r1.ebuild,v 1.10 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -104,7 +104,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES; then
+	if use tcl && use test; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.2.52_p5.ebuild b/sys-libs/db/db-4.2.52_p5.ebuild
index 20806a7d93d6..4db03631929f 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-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.3 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.2.52_p5.ebuild,v 1.4 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db java-pkg-opt-2
 
@@ -76,7 +76,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES; then
+	if use tcl && use test; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.3.29-r2.ebuild b/sys-libs/db/db-4.3.29-r2.ebuild
index f34e6bfa0264..63e7190a936f 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-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.20 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29-r2.ebuild,v 1.21 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils gnuconfig db flag-o-matic java-pkg-opt-2
 
@@ -80,7 +80,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
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 7be6df32f230..7129163ca15e 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-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.11 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1-r1.ebuild,v 1.12 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -105,7 +105,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.3.29_p1.ebuild b/sys-libs/db/db-4.3.29_p1.ebuild
index a180296b16a8..da57892055f5 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-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.3 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.3.29_p1.ebuild,v 1.4 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -77,7 +77,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
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 833f145828bd..d3f61b328d68 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-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.3 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4-r1.ebuild,v 1.4 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -97,7 +97,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.4.20_p4.ebuild b/sys-libs/db/db-4.4.20_p4.ebuild
index 9b27a335a4b4..a7830883771d 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-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.7 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.4.20_p4.ebuild,v 1.8 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -75,7 +75,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
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 60a4369943d0..1b5f0f963255 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.11 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.12 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -109,7 +109,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index 5a2a0d49a168..fabfceeb219d 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.27 2009/03/14 12:54:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.28 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -81,7 +81,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index cba827b4bf11..cb2c24110272 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.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.6.21_p4.ebuild,v 1.7 2009/06/01 12:01:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.8 2009/07/30 11:01:33 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -102,7 +102,7 @@ src_compile() {
 	[[ -n ${CBUILD} ]] && myconf="${myconf} --build=${CBUILD}"
 
 	# the entire testsuite needs the TCL functionality
-	if use tcl && has test $FEATURES ; then
+	if use tcl && use test ; then
 		myconf="${myconf} --enable-test"
 	else
 		myconf="${myconf} --disable-test"