diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-02-16 14:37:50 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-02-16 14:37:50 +0000 |
| commit | deec11960c21a13b3f99231794582944e4d981ac (patch) | |
| tree | 2b8df1e221ed35c3b37f99605fc45509276b2227 /eclass | |
| parent | Mask MySQL and MariaDB 5.5 series for security bug 537216 (diff) | |
| download | gentoo-2-deec11960c21a13b3f99231794582944e4d981ac.tar.gz gentoo-2-deec11960c21a13b3f99231794582944e4d981ac.tar.bz2 gentoo-2-deec11960c21a13b3f99231794582944e4d981ac.zip | |
Silence repoman warnings by providing slots on openssl and readline
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/mysql-v2.eclass | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 635f7c16d026..c6329905636c 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1535 2015/02/13 01:32:01 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1536 2015/02/16 14:37:50 grknight Exp $ + + 16 Feb 2015; Brian Evans <grknight@gentoo.org> mysql-v2.eclass: + Silence repoman warnings by providing slots on openssl and readline 13 Feb 2015; Mike Pagano <mpagano@gentoo.org> ChangeLog: Handle cpu optimization patch for different gcc versions diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index dafc0f8a5821..351335902ad1 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.35 2014/08/10 05:47:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.36 2015/02/16 14:37:50 grknight Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -266,7 +266,7 @@ 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 ) + ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 @@ -284,9 +284,9 @@ elif [[ ${PN} == "mysql-cluster" ]] && mysql_version_is_at_least "7.3"; then DEPEND="${DEPEND} dev-libs/libedit" else if mysql_version_is_at_least "5.5" ; then - DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1 )" + DEPEND="${DEPEND} !bindist? ( >=sys-libs/readline-4.1:0 )" else - DEPEND="${DEPEND} >=sys-libs/readline-4.1" + DEPEND="${DEPEND} >=sys-libs/readline-4.1:0" fi fi |