diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 05:20:49 -0700 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-04-24 05:45:37 -0700 |
| commit | bdf77c8f5d722bd41d4b28afb89c56041395d8c6 (patch) | |
| tree | 52769082a736810dabac8b017921f9d090508412 /eclass/mysql-v2.eclass | |
| parent | net-misc/curl-7.36.0-r1: revbump/merge (diff) | |
| download | gmt-bdf77c8f5d722bd41d4b28afb89c56041395d8c6.tar.gz gmt-bdf77c8f5d722bd41d4b28afb89c56041395d8c6.tar.bz2 gmt-bdf77c8f5d722bd41d4b28afb89c56041395d8c6.zip | |
eclass/mysql-{cmake-multilib,v2}.eclass: merge upstream deltas
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'eclass/mysql-v2.eclass')
| -rw-r--r-- | eclass/mysql-v2.eclass | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 57a5cf7..76c0644 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -159,10 +159,9 @@ if [[ -z ${SERVER_URI} ]]; then MY_PV=$(get_version_component_range 1-3 ${PV}) PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) PERCONA_RC=$(get_version_component_range 6 ${PV}) - mysql_version_is_at_least "5.5.34" && PERCONA_RC=${PERCONA_RC:-rel} - SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/${PERCONA_PN}-${MY_PV}-${PERCONA_RC:-rel}${PERCONA_RELEASE}.tar.gz" -# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz -# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/Percona-Server-5.6.13-rc60.5.tar.gz + SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" +# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-30.2.tar.gz +# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz else if [[ "${PN}" == "mysql-cluster" ]] ; then URI_DIR="MySQL-Cluster" @@ -291,13 +290,10 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then fi mysql_version_is_at_least "10.0.7" && \ DEPEND="${DEPEND} oqgraph? ( dev-libs/judy${_mysql_v2_multilib_usedep} )" - # 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?${_mysql_v2_multilib_usedep_nobrackets}]" || \ -# DEPEND="${DEPEND} >=dev-libs/libpcre-8.35${_mysql_v2_multilib_usedep}" -# fi + if mysql_version_is_at_least "10.0.9" ; then + use embedded && DEPEND="${DEPEND} >=dev-libs/libpcre-8.35[static-libs${_mysql_v2_multilib_usedep_nobrackets}]" || \ + DEPEND="${DEPEND} >=dev-libs/libpcre-8.35${_mysql_v2_multilib_usedep}" + fi fi # Having different flavours at the same time is not a good idea @@ -344,7 +340,7 @@ if [[ ${PN} == "mariadb-galera" ]] ; then # The wsrep API version must match between the ebuild and sys-cluster/galera. # This will be indicated by WSREP_REVISION in the ebuild and the first number # in the version of sys-cluster/galera - RDEPEND="${RDEPEND} + RDEPEND="${RDEPEND} =sys-cluster/galera-${WSREP_REVISION}* " fi |