[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     b4e23e00dc25af07778b67472f32300f5801f814
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Sun Apr  6 11:47:22 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Sun Apr  6 11:47:22 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4e23e00

[eclass] Add libpcre-8.35 dep for mariadb 10

Signed-off-by: Brian Evans <grknight <AT> tuffmail.com>

---
 eclass/mysql-cmake.eclass    | 3 +--
 eclass/mysql-multilib.eclass | 9 ++++-----
 eclass/mysql-v2.eclass       | 9 ++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 96f89b8..81159ac 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -332,8 +332,7 @@ mysql-cmake_src_configure() {
                else
                        mycmakeargs+=( -DWITH_JEMALLOC=no )
                fi
-       # TODO: uncomment this when libpcre 8.35 is released to remove bundled 
library
-#              mysql_version_is_at_least "10.0.9" mycmakeargs+=( 
-DWITH_PCRE=system )
+               mysql_version_is_at_least "10.0.9" && mycmakeargs+=( 
-DWITH_PCRE=system )
        fi
 
        configure_cmake_locale

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 7814b2d..7eb14bf 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -239,11 +239,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] 
; then
                        "
        fi
        mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( 
dev-libs/judy:0= )"
-       # TODO: uncomment this when libpcre 8.35 is released to remove bundled 
library
-#      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
+       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
 
 # Having different flavours at the same time is not a good idea

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3a04875..67f9499 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -272,11 +272,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] 
; then
                        "
        fi
        mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( 
dev-libs/judy )"
-       # TODO: uncomment this when libpcre 8.35 is released to remove bundled 
library
-#      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"
-#      fi
+       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"
+       fi
 fi
 
 # Having different flavours at the same time is not a good idea