From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40D73138334 for ; Mon, 20 Aug 2018 00:38:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25AE2E0876; Mon, 20 Aug 2018 00:38:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F24E1E0876 for ; Mon, 20 Aug 2018 00:38:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B11193412C3 for ; Mon, 20 Aug 2018 00:38:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93788398 for ; Mon, 20 Aug 2018 00:38:25 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1534725499.4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/percona-server/percona-server-5.6.41.84.1.ebuild X-VCS-Directories: dev-db/percona-server/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff X-VCS-Branch: master Date: Mon, 20 Aug 2018 00:38:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e68ec571-bc35-4c03-ae17-2f645ca8c1f4 X-Archives-Hash: 861e9c0824cc705c1f74e82e44179f6f commit: 4976f3ee0aae2a6c7eac7bc08f90bc153b0edcff Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Aug 20 00:37:24 2018 +0000 Commit: Thomas Deutschmann gentoo 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() {