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 BD8CE1392EF for ; Tue, 11 Mar 2014 23:12:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 120DBE09B5; Tue, 11 Mar 2014 23:12:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3025E09B5 for ; Tue, 11 Mar 2014 23:12:43 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D15A133FC47 for ; Tue, 11 Mar 2014 23:12:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1DE7B183B3 for ; Tue, 11 Mar 2014 23:12:39 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1394577862.9c8d5154a08df092d22bf919a9da9c167086b454.grknight.pub@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: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 9c8d5154a08df092d22bf919a9da9c167086b454 X-VCS-Branch: master Date: Tue, 11 Mar 2014 23:12:39 +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: a6c358ad-9336-40ce-b38b-a35cf2ab0f7a X-Archives-Hash: 9619cebb4a1bfe3fe7371a4bb956bf62 commit: 9c8d5154a08df092d22bf919a9da9c167086b454 Author: Brian Evans lavabit com> AuthorDate: Tue Mar 11 01:09:11 2014 +0000 Commit: Brian Evans lavabit com> CommitDate: Tue Mar 11 22:44:22 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9c8d5154 [eclass] Dep cleanup to prevent issues with autotools builds --- eclass/mysql-v2.eclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 060c15b..1957ec8 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -243,13 +243,14 @@ REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) stati # Be warned, *DEPEND are version-dependant # These are used for both runtime and compiletime DEPEND=" - ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) + ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 - >=sys-libs/zlib-1.2.3[static-libs?] - !dev-db/mariadb-native-client[mysqlcompat] + >=sys-libs/zlib-1.2.3 " +# TODO: add this as a dep if it is moved from the overlay +# !dev-db/mariadb-native-client[mysqlcompat] # dev-db/mysql-5.6.12+ only works with dev-libs/libedit if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.6.12" ; then @@ -285,14 +286,13 @@ for i in "mysql" "mariadb" "mariadb-galera" "percona-server" "mysql-cluster" ; d DEPEND="${DEPEND} !dev-db/${i}" done -if mysql_version_is_at_least "5.5" ; then - DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] )" - DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" -fi - if mysql_version_is_at_least "5.5.7" ; then - DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" - DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" + DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc[static-libs?] ) + tcmalloc? ( dev-util/google-perftools ) + >=sys-libs/zlib-1.2.3[static-libs?] + ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) + systemtap? ( >=dev-util/systemtap-1.3 ) + kernel_linux? ( dev-libs/libaio )" fi if [[ ${PN} == "mysql-cluster" ]] ; then