Convert all all FEATURES=userpriv tests to be UID -eq 0 to make Paludis et al happy.

Package-Manager: portage-2.1.5.2

14 files changed, 56 insertions, 48 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4eb739434ecb..636726a552f1 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.450 2008/05/29 05:51:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.451 2008/05/29 19:36:57 robbat2 Exp $
+
+  29 May 2008; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.26-r2.ebuild,
+  mysql-5.0.32.ebuild, mysql-5.0.34.ebuild, mysql-5.0.38.ebuild,
+  mysql-5.0.40.ebuild, mysql-5.0.42.ebuild, mysql-5.0.44.ebuild,
+  mysql-5.0.44-r1.ebuild, mysql-5.0.44-r2.ebuild, mysql-5.0.54.ebuild,
+  mysql-5.0.56.ebuild, mysql-5.0.60.ebuild:
+  Convert all all FEATURES=userpriv tests to be UID -eq 0 to make Paludis et
+  al happy.
 
 *mysql-5.0.60 (29 May 2008)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index dd8e6b475c66..84170c02a243 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -30,17 +30,17 @@ EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20b
 EBUILD mysql-4.0.27-r1.ebuild 1035 RMD160 6c3d710119acd6423f36434eb1265ea29af9582c SHA1 06e0833f06029e6cf1dc91d4faac30442e896c98 SHA256 dc73877d6d542253e588b34f92d380f150cf8f32d3ec4b67ce621b99193bcb58
 EBUILD mysql-4.1.22-r1.ebuild 1267 RMD160 53937bcb2a3092b55287c97230295fb7ddfaa544 SHA1 e1a7eb1e18a5ff878626ad75cc5777883d4b7a08 SHA256 56e4ef73cfb22659dcedbfe4c8834a8b5e0423fd19eb75d9733c9abcf99b9e85
 EBUILD mysql-4.1.23_alpha20070101-r61.ebuild 1246 RMD160 566541ebed2adc432c52bb08862d3f55fbacc829 SHA1 dd37c6184046bd50f7443ad0084298020f0f1a39 SHA256 e1910f0563d9b5fc649a9ac4054341d3b64d68c2fc272955e2ca9877deae3651
-EBUILD mysql-5.0.26-r2.ebuild 1960 RMD160 a4675984fc4c94b6e13e6a4e74b0d5164a465fc6 SHA1 22f28238f3b075c0e1959b12e7708898bd17e224 SHA256 2ff948d65d301aa566efe661f84398e5c8484f45efa2e0687ee06237b02be639
-EBUILD mysql-5.0.32.ebuild 2035 RMD160 034ca18af4539c6cc6440a6ac79a49d0ab429cdc SHA1 a868a0a5190f0c00a6d8a91e79b4cd09732fcc21 SHA256 5aae1d10c426a63f6860727527c58d925ad2846d2d351f5847f9a0822f1cafd2
-EBUILD mysql-5.0.34.ebuild 2053 RMD160 b6e4417d4645dfafceab4219247e6b4ecebadcfe SHA1 02c9448936243084fea0019c2376d27b7a4ec3fe SHA256 2359fda98097cdc84e2254601b6cc8bdbb2650149a8bdc6a563d373cfac58a55
-EBUILD mysql-5.0.38.ebuild 2656 RMD160 8548f300152b9a2e0ffc4c46e8f36e4b5f20fb56 SHA1 5e04c11755e5bfb65f40f475210c115dafb0d1d1 SHA256 ea5e1605c027e807b2f8e8579f44c31c63bd7775592eb4ac93af7b04821089bb
-EBUILD mysql-5.0.40.ebuild 2573 RMD160 01bc621255151df61e88519f6541a8f258a6a84e SHA1 7c4bb6280e90e8f181eab7aebebf0123c85f4282 SHA256 8164f5b785acbec66c10fe80b35f78565e0b5c0cbfb222902cdc9f2dd646f8c1
-EBUILD mysql-5.0.42.ebuild 2655 RMD160 c5316c19c9143f7f4918cab521a538825ff0648a SHA1 8aac12dce95d126921deda853c315eac58645cf9 SHA256 76210b9f7692c65e6598497ee85112e8af37cf302c9c835cbd672671d9fc295e
-EBUILD mysql-5.0.44-r1.ebuild 1946 RMD160 44899303db2a778ee786d22eaf4d6d8a53e717ca SHA1 ebbab0d92e52aed0b532b6cfbc69fe13488b46d1 SHA256 3b18eba72ac5f5990797f71fe3469245b440aa35b757409fda0482f73c800d51
-EBUILD mysql-5.0.44-r2.ebuild 2136 RMD160 08988870156ad6df2519b4444613876a67b16741 SHA1 1a44f23f48516ce6294e815acad3f2bf0947e72c SHA256 1df35a73a02951630fb31ab0ab88d20abc4284e473718e1e5adb196c304a4630
-EBUILD mysql-5.0.44.ebuild 2421 RMD160 818b644ac5d77a7b103263f4c4763edd11dbbd06 SHA1 523b445bf93c05313d702d7ebfe6e5c9deab55f1 SHA256 43f1119475c02fa856a6b038c9c7318cce5adce8ed4514485b98088db7fa423a
-EBUILD mysql-5.0.54.ebuild 2234 RMD160 21f1250f7898539c647da3c2c891fd783e028f42 SHA1 102973bff40df2682c8aa2c08d04967b77151273 SHA256 05408eff3c300abcea774727f926b75205f233986250edb350178ff30da16f9f
-EBUILD mysql-5.0.56.ebuild 3271 RMD160 7b9984700de0c8decded65b810d18adcf206ff81 SHA1 1a58b1099f6dddfd05c772c224d5ff7174ec606e SHA256 85aa87df23f96430a61f4526c7dc0a5a6f02c65b5839185ddbe0e1b1bcaf075f
-EBUILD mysql-5.0.60.ebuild 3271 RMD160 4d06ba35c46e56edc9c3ee9d117c0cb202cfbc88 SHA1 ec90463c94c15bbe571ffa9dcda920274541bb5f SHA256 976ce8cd46aa6692d44b19bff5f651c24904d8a9ce47afb30fada62ee9b93d93
-MISC ChangeLog 86890 RMD160 1f176c9245cb32287eef6ebd27f131e93530705b SHA1 53a30c211e8cb28039cf9ea92a9287238ff72cb9 SHA256 64157308ba100269b22b3d647fdd0ee4af023b5684e7dee9748d0a50005886e7
+EBUILD mysql-5.0.26-r2.ebuild 1947 RMD160 6f9df46e1ff2c45e4640152cc94b4b84ad91df1e SHA1 6c741dd1c051353b7b75414288522fb20ce138b2 SHA256 0e836ce15dc61300a44157b89d3080df1945c7c994fa993bcb54a0ea47da43db
+EBUILD mysql-5.0.32.ebuild 2022 RMD160 19799c15deba2f0eecea3d8646be6987e588c304 SHA1 f4b925ce5db15ddea112d4431d4b3a4a662860d9 SHA256 9a40dd6741e6b586609fe6c486a62e4ae45149ad16490561f5ae67c0e77cba68
+EBUILD mysql-5.0.34.ebuild 2040 RMD160 ccfd897b1715e71d967ab24e64b896cd33cb7d4e SHA1 ec30e3c4e47ce436f285dc32fe23d2165ebb7d61 SHA256 3f1d75d47278638719f0504c92b95a46050c6c62f84df1794e51b6bbb6fa951f
+EBUILD mysql-5.0.38.ebuild 2643 RMD160 9bb6ba8175c4341730250c70641606e7cb65f893 SHA1 9c108b58dc80df0d0d57548dae5ffee713ee2718 SHA256 0b08fb77af9d64773d839e93155c4d1fe9e81b606c444ebb5d02c9a38f752ed5
+EBUILD mysql-5.0.40.ebuild 2561 RMD160 8082e2d134d11ee5a1a52af92b4ba8ba1bdbf0b0 SHA1 129e1489d5f77caec7f29b9bd07b316786ea6012 SHA256 daa86e9dbaef1fcc8d5897cfd19e04a53d9f8f0f0aa8b76c6a8c75b0c3175f04
+EBUILD mysql-5.0.42.ebuild 2643 RMD160 e2f05026d69b43fbd7dec1b039577707f6f331f8 SHA1 e4f31a09a90693e2ccc10f3afdd12434fa47d08c SHA256 97bb7df911c5d4eaf31b38e984986513020884b46bf4716429f9c8103db372db
+EBUILD mysql-5.0.44-r1.ebuild 1933 RMD160 6ec64a81217ccd660a8c8c79ed828feb9beef9a0 SHA1 69add487f72de9a118be50a884f0a60c49606b7c SHA256 345d1f301641ec5d7b96a1b7687baaa6817ca378e4a73234c7269be6bfa77a1c
+EBUILD mysql-5.0.44-r2.ebuild 2124 RMD160 56a7628537341a6fb4835c51e341eae76d23a42f SHA1 25b1b8d3cc4e8473622c687474a97f2e0d9dfd2a SHA256 f30ce8b901a21163ead69ff6f78c044d9548ecf456eb032776bcfd0bd01f678d
+EBUILD mysql-5.0.44.ebuild 2408 RMD160 8dae8ad755696f61cddebefd7120d08cd97238d7 SHA1 ebde9919f0a160587862e59c8346242f7d774eda SHA256 047f53fd8b02154e68e7ac4f2e79c9b09c9501116df07b6926b6dcd289b72c56
+EBUILD mysql-5.0.54.ebuild 2224 RMD160 aa5ea015a3742d212f110f09c4ccadc3b7a775b8 SHA1 151c6bb62f72ff261bae00e48c8d5d1d46d03e73 SHA256 96d475d003e49aa8f09330e566ec27b35dfaff8d37c97d5f932da699802092e3
+EBUILD mysql-5.0.56.ebuild 3257 RMD160 a931ff0f2fc841c878f612d78740ea0b6c4a19ac SHA1 b0075e5b76e0ffe8b10ee8d3727dba5ec8bd7ab5 SHA256 ed23a12a92f35a6cb2be7542b0e089277ef888890771e7cef6ef4aac2933f175
+EBUILD mysql-5.0.60.ebuild 3289 RMD160 d8c5764cff391c70c42649467b787307bef9e517 SHA1 6a9162dcb88b1434f753530d1595223565f3d831 SHA256 2099baf5b98993016aea54ecb272287355f6091c6462ee884d190a46fd53ecef
+MISC ChangeLog 87302 RMD160 d5e01c4a6fe82459d78a97e2a9aefcffc256d329 SHA1 a3ad8b6a6bd3ae752caed2bcf37006bb8d7da38c SHA256 19b5b59678396af739e45f1617fbd7b04c12ca5a660dbf30b703e01a81258257
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
diff --git a/dev-db/mysql/mysql-5.0.26-r2.ebuild b/dev-db/mysql/mysql-5.0.26-r2.ebuild
index a55e9bcdbd44..ab19d0b5540d 100644
--- a/dev-db/mysql/mysql-5.0.26-r2.ebuild
+++ b/dev-db/mysql/mysql-5.0.26-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.26-r2.ebuild,v 1.2 2007/01/12 17:58:32 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.26-r2.ebuild,v 1.3 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070105"
 SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"
@@ -22,7 +22,7 @@ src_test() {
 		# mysqladmin start before dir creation
 		mkdir -p "${S}"/mysql-test/var{,/log}
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.32.ebuild b/dev-db/mysql/mysql-5.0.32.ebuild
index daef7ffeb2f2..e02ae8af4956 100644
--- a/dev-db/mysql/mysql-5.0.32.ebuild
+++ b/dev-db/mysql/mysql-5.0.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.32.ebuild,v 1.3 2007/01/12 17:58:32 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.32.ebuild,v 1.4 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070108"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -22,7 +22,7 @@ src_test() {
 		# mysqladmin start before dir creation
 		mkdir -p "${S}"/mysql-test/var{,/log}
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.34.ebuild b/dev-db/mysql/mysql-5.0.34.ebuild
index 29ae784d4c1a..b5780e76b1a7 100644
--- a/dev-db/mysql/mysql-5.0.34.ebuild
+++ b/dev-db/mysql/mysql-5.0.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34.ebuild,v 1.3 2007/03/06 16:11:48 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.34.ebuild,v 1.4 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070217"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -22,7 +22,7 @@ src_test() {
 		# mysqladmin start before dir creation
 		mkdir -p "${S}"/mysql-test/var{,/log}
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.38.ebuild b/dev-db/mysql/mysql-5.0.38.ebuild
index bac1f569f6c6..9fc96c148d93 100644
--- a/dev-db/mysql/mysql-5.0.38.ebuild
+++ b/dev-db/mysql/mysql-5.0.38.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.38.ebuild,v 1.12 2007/06/24 21:20:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.38.ebuild,v 1.13 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070415"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -26,7 +26,7 @@ src_test() {
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.40.ebuild b/dev-db/mysql/mysql-5.0.40.ebuild
index f2ed48f48528..d5d184135549 100644
--- a/dev-db/mysql/mysql-5.0.40.ebuild
+++ b/dev-db/mysql/mysql-5.0.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.40.ebuild,v 1.9 2007/06/24 21:20:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.40.ebuild,v 1.10 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070415"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -29,7 +29,7 @@ src_test() {
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.42.ebuild b/dev-db/mysql/mysql-5.0.42.ebuild
index 3fc099d0c400..a67895be44ee 100644
--- a/dev-db/mysql/mysql-5.0.42.ebuild
+++ b/dev-db/mysql/mysql-5.0.42.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.42.ebuild,v 1.9 2007/06/24 21:20:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.42.ebuild,v 1.10 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070415"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -29,7 +29,7 @@ src_test() {
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			mysql_disable_test	"im_daemon_life_cycle"	"fails as root"
 			mysql_disable_test	"im_life_cycle"			"fails as root"
 			mysql_disable_test	"im_options_set"		"fails as root"
diff --git a/dev-db/mysql/mysql-5.0.44-r1.ebuild b/dev-db/mysql/mysql-5.0.44-r1.ebuild
index 5227d0a843bb..64233f6a9719 100644
--- a/dev-db/mysql/mysql-5.0.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.0.44-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44-r1.ebuild,v 1.7 2007/12/11 09:43:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44-r1.ebuild,v 1.8 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070710"
 
@@ -15,7 +15,7 @@ EPATCH_EXCLUDE=''
 src_test() {
 	make check || die "make check failed"
 	if ! use "minimal" ; then
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
 		fi
 		cd "${S}"
diff --git a/dev-db/mysql/mysql-5.0.44-r2.ebuild b/dev-db/mysql/mysql-5.0.44-r2.ebuild
index 56ceecd94b6d..7b83a856f2db 100644
--- a/dev-db/mysql/mysql-5.0.44-r2.ebuild
+++ b/dev-db/mysql/mysql-5.0.44-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44-r2.ebuild,v 1.9 2007/12/11 09:43:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44-r2.ebuild,v 1.10 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20071115"
 
@@ -15,7 +15,7 @@ EPATCH_EXCLUDE=''
 src_test() {
 	make check || die "make check failed"
 	if ! use "minimal" ; then
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
 		fi
 		cd "${S}"
diff --git a/dev-db/mysql/mysql-5.0.44.ebuild b/dev-db/mysql/mysql-5.0.44.ebuild
index 4a9b53692114..f97456e2af57 100644
--- a/dev-db/mysql/mysql-5.0.44.ebuild
+++ b/dev-db/mysql/mysql-5.0.44.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44.ebuild,v 1.5 2007/08/25 22:35:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.44.ebuild,v 1.6 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20070710"
 SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"
@@ -29,7 +29,7 @@ src_test() {
 		# Ensure that parallel runs don't die
 		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
 
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			# As of 5.0.38, these work with the sandbox
 			# but they break if you are root
 			for t in \
diff --git a/dev-db/mysql/mysql-5.0.54.ebuild b/dev-db/mysql/mysql-5.0.54.ebuild
index de3a4c153b63..c7ae5c7d3877 100644
--- a/dev-db/mysql/mysql-5.0.54.ebuild
+++ b/dev-db/mysql/mysql-5.0.54.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.10 2008/01/28 07:06:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.11 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20080124"
 SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
@@ -16,7 +16,7 @@ EPATCH_EXCLUDE=''
 src_test() {
 	make check || die "make check failed"
 	if ! use "minimal" ; then
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
 		fi
 		cd "${S}"
diff --git a/dev-db/mysql/mysql-5.0.56.ebuild b/dev-db/mysql/mysql-5.0.56.ebuild
index d7d30dac5525..a9617b051d5a 100644
--- a/dev-db/mysql/mysql-5.0.56.ebuild
+++ b/dev-db/mysql/mysql-5.0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.56.ebuild,v 1.2 2008/03/10 02:58:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.56.ebuild,v 1.3 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20080310"
 SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
@@ -20,7 +20,7 @@ EPATCH_EXCLUDE=''
 src_test() {
 	make check || die "make check failed"
 	if ! use "minimal" ; then
-		if ! hasq "userpriv" ${FEATURES} ; then
+		if [[ $UID -eq 0 ]]; then
 			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
 		fi
 		cd "${S}"
diff --git a/dev-db/mysql/mysql-5.0.60.ebuild b/dev-db/mysql/mysql-5.0.60.ebuild
index 6ba044e9f753..cec829f4d307 100644
--- a/dev-db/mysql/mysql-5.0.60.ebuild
+++ b/dev-db/mysql/mysql-5.0.60.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.60.ebuild,v 1.1 2008/05/29 05:51:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.60.ebuild,v 1.2 2008/05/29 19:36:57 robbat2 Exp $
 
 MY_EXTRAS_VER="20080529"
 SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz"
@@ -20,8 +20,8 @@ EPATCH_EXCLUDE=''
 src_test() {
 	make check || die "make check failed"
 	if ! use "minimal" ; then
-		if ! hasq "userpriv" ${FEATURES} ; then
-			die "Testing with FEATURES=-userpriv is no longer supported by upstream"
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
 		fi
 		cd "${S}"
 		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"