[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/

[Thomas Deutschmann]

commit:     4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 20 00:37:24 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 00:38:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4976f3ee

dev-db/percona-server: only check FEATURES on non-binary merge

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 .../percona-server-5.6.41.84.1.ebuild              | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild
index 746ff1dba26..a46ac7790a7 100644
--- a/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.41.84.1.ebuild
@@ -209,24 +209,24 @@ pkg_setup() {
 			eerror "Please use gcc-config to switch to gcc-4.7 or later version."
 			die "Unsupported GCC version"
 		fi
-	fi
 
-	if has test ${FEATURES} && \
-		use server && ! has userpriv ${FEATURES} ; then
-			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
-			die "FEATURES=test with FEATURES=-userpriv is not supported"
-	fi
+		if has test ${FEATURES} && \
+			use server && ! has userpriv ${FEATURES} ; then
+				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+				die "FEATURES=test with FEATURES=-userpriv is not supported"
+		fi
 
-	if has test ${FEATURES} && ! use test ; then
-		eerror "FEATURES=test requires USE=test."
-		die "FEATURES=test set but not USE=test"
+		if has test ${FEATURES} && ! use test ; then
+			eerror "FEATURES=test requires USE=test."
+			die "FEATURES=test set but not USE=test"
+		fi
+
+		use test && python-any-r1_pkg_setup
 	fi
 
 	# This should come after all of the die statements
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
-
-	use test && python-any-r1_pkg_setup
 }
 
 src_unpack() {