| 1 |
commit: de8b563fc1c80a130f34f76faa0bc8837b2d158b |
| 2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
| 3 |
AuthorDate: Mon Apr 28 18:10:06 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Mon Apr 28 18:10:06 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=de8b563f |
| 7 |
|
| 8 |
[eclass] clean up dep for MariaDB 10 |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com> |
| 11 |
|
| 12 |
--- |
| 13 |
eclass/mysql-multilib.eclass | 1 - |
| 14 |
eclass/mysql-v2.eclass | 3 +-- |
| 15 |
2 files changed, 1 insertion(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 18 |
index 1815e75..28df036 100644 |
| 19 |
--- a/eclass/mysql-multilib.eclass |
| 20 |
+++ b/eclass/mysql-multilib.eclass |
| 21 |
@@ -240,7 +240,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 22 |
fi |
| 23 |
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy:0= )" |
| 24 |
if mysql_version_is_at_least "10.0.9" ; then |
| 25 |
- use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=[static-libs]" || \ |
| 26 |
DEPEND="${DEPEND} >=dev-libs/libpcre-8.35:3=" |
| 27 |
fi |
| 28 |
fi |
| 29 |
|
| 30 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 31 |
index 1830130..15faf6c 100644 |
| 32 |
--- a/eclass/mysql-v2.eclass |
| 33 |
+++ b/eclass/mysql-v2.eclass |
| 34 |
@@ -274,8 +274,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 35 |
fi |
| 36 |
mysql_version_is_at_least "10.0.7" && DEPEND="${DEPEND} oqgraph? ( dev-libs/judy )" |
| 37 |
if mysql_version_is_at_least "10.0.9" ; then |
| 38 |
- use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs]" || \ |
| 39 |
- DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" |
| 40 |
+ DEPEND="${DEPEND} >=dev-libs/libpcre-8.35" |
| 41 |
fi |
| 42 |
fi |
Archives