commit: de8b563fc1c80a130f34f76faa0bc8837b2d158b Author: Brian Evans <grknight <AT> tuffmail <DOT> com> AuthorDate: Mon Apr 28 18:10:06 2014 +0000 Commit: Brian Evans <grknight <AT> lavabit <DOT> com> CommitDate: Mon Apr 28 18:10:06 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b563f
[eclass] clean up dep for MariaDB 10 Signed-off-by: Brian Evans <grknight <AT> tuffmail.com> --- eclass/mysql-multilib.eclass | 1 - eclass/mysql-v2.eclass | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 1815e75..28df036 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -240,7 +240,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \ DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" fi fi diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 1830130..15faf6c 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -274,8 +274,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" if mysql_version_is_at_least "10.0.9" ; then - use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ - DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" fi fi