diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2018-08-20 02:37:24 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2018-08-20 02:38:19 +0200 |
| commit | 4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff (patch) | |
| tree | c3c9ce2e7039ee37c374ea920fc2bff5b12adb59 | |
| parent | dev-go/go-tools: remove old versions (diff) | |
| download | gentoo-4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff.tar.gz gentoo-4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff.tar.bz2 gentoo-4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff.zip | |
dev-db/percona-server: only check FEATURES on non-binary merge
Package-Manager: Portage-2.3.47, Repoman-2.3.10
| -rw-r--r-- | dev-db/percona-server/percona-server-5.6.41.84.1.ebuild | 22 |
1 files 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 746ff1dba26f..a46ac7790a75 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() { |