From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 314521386F7 for ; Mon, 28 Jan 2013 02:13:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E138D21C041; Mon, 28 Jan 2013 02:13:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D66C21C012 for ; Mon, 28 Jan 2013 02:13:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DCDD33DB18 for ; Mon, 28 Jan 2013 02:13:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BC996E4073 for ; Mon, 28 Jan 2013 02:13:21 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1358825618.ba1ebcdfb6593bd6d60ef713e5476254688edf44.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: ba1ebcdfb6593bd6d60ef713e5476254688edf44 X-VCS-Branch: master Date: Mon, 28 Jan 2013 02:13:21 +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: ed14ecdf-5176-4ff6-9bad-1dbb77af01dd X-Archives-Hash: ee7fe483d8d5ef444a869df3fdd91826 commit: ba1ebcdfb6593bd6d60ef713e5476254688edf44 Author: Brian Evans lavabit com> AuthorDate: Tue Jan 22 03:31:35 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Jan 22 03:33:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ba1ebcdf Move USE conflicts to REQUIRED_USE and fix bug 441700 --- eclass/mysql-v2.eclass | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 221ed61..faa482b 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -192,6 +192,8 @@ if mysql_version_is_at_least "5.5"; then IUSE="${IUSE} jemalloc tcmalloc" fi +REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" + mysql_version_is_at_least "5.5.7" \ && IUSE="${IUSE} systemtap" @@ -228,6 +230,11 @@ done && mysql_version_is_at_least "5.2.5" \ && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" +# Bug 441700 MariaDB >=5.3 include custom mytop +[[ "${PN}" == "mariadb" ]] \ +&& mysql_version_is_at_least "5.3" \ +&& DEPEND="${DEPEND} !dev-db/mytop" + mysql_version_is_at_least "5.5.7" \ && DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \ && DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" @@ -306,6 +313,7 @@ if pbxt_available; then IUSE="${IUSE} pbxt" PBXT_NEWSTYLE=1 + REQUIRED_USE="${REQUIRED_USE} pbxt? ( !embedded ) " fi if xtradb_patch_available; then @@ -318,6 +326,7 @@ if xtradb_patch_available; then XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" IUSE="${IUSE} xtradb" + REQUIRED_USE="${REQUIRED_USE} xtradb? ( !embedded ) " fi # @@ -367,33 +376,12 @@ mysql-v2_pkg_setup() { fi # Check for USE flag problems in pkg_setup - if use static && use ssl ; then - M="MySQL does not support being built statically with SSL support enabled!" - eerror "${M}" - die "${M}" - fi - if ! mysql_version_is_at_least "5.2" \ && use debug ; then # Also in package.use.mask die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51" fi - if ( use cluster || use extraengine || use embedded ) \ - && use minimal ; then - M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!" - eerror "${M}" - die "${M}" - fi - - if xtradb_patch_available \ - && use xtradb \ - && use embedded ; then - M="USE flags 'xtradb' and 'embedded' conflict and cause build failures" - eerror "${M}" - die "${M}" - 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"