| 1 |
commit: 98109af658fc7a5947da6ffcdd2b74c938ceff0a |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 01:07:11 2013 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 01:07:11 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=98109af6 |
| 7 |
|
| 8 |
[eclass] Update eclasses to support percona-server and do some more cleanup. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-cmake.eclass | 7 ++++++- |
| 12 |
eclass/mysql-v2.eclass | 19 +++++++++++++++++-- |
| 13 |
2 files changed, 23 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass |
| 16 |
index c00ceb2..c4a91ba 100644 |
| 17 |
--- a/eclass/mysql-cmake.eclass |
| 18 |
+++ b/eclass/mysql-cmake.eclass |
| 19 |
@@ -179,7 +179,7 @@ configure_cmake_standard() { |
| 20 |
mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) ) |
| 21 |
fi |
| 22 |
|
| 23 |
- if [ "${PN}" == "mariadb" ]; then |
| 24 |
+ if [[ ${PN} == "mariadb" ]]; then |
| 25 |
mycmakeargs+=( |
| 26 |
$(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE) |
| 27 |
$(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE) |
| 28 |
@@ -189,7 +189,12 @@ configure_cmake_standard() { |
| 29 |
if ! use pam ; then |
| 30 |
mycmakeargs+=( -DAUTH_PAM_DISABLED=1 ) |
| 31 |
fi |
| 32 |
+ fi |
| 33 |
|
| 34 |
+ if [[ ${PN} == "percona-server" ]]; then |
| 35 |
+ mycmakeargs+=( |
| 36 |
+ $(cmake-utils_use_with pam) |
| 37 |
+ ) |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
|
| 42 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 43 |
index cca2360..81cd9f2 100644 |
| 44 |
--- a/eclass/mysql-v2.eclass |
| 45 |
+++ b/eclass/mysql-v2.eclass |
| 46 |
@@ -116,7 +116,7 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with |
| 47 |
if [[ -z ${SERVER_URI} ]]; then |
| 48 |
[[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" |
| 49 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then |
| 50 |
- MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})" |
| 51 |
+ MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV}) |
| 52 |
MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" |
| 53 |
SERVER_URI=" |
| 54 |
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz |
| 55 |
@@ -129,6 +129,13 @@ if [[ -z ${SERVER_URI} ]]; then |
| 56 |
if [[ ${PN} == "mariadb-galera" ]]; then |
| 57 |
MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}" |
| 58 |
fi |
| 59 |
+ elif [[ ${PN} == "percona-server" ]]; then |
| 60 |
+ PERCONA_PN="Percona-Server" |
| 61 |
+ MIRROR_PV=$(get_version_component_range 1-2 ${PV}) |
| 62 |
+ MY_PV=$(get_version_component_range 1-3 ${PV}) |
| 63 |
+ MY_PATCH=$(get_version_component_range 4 ${PV}) |
| 64 |
+ SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/LATEST/source/${PERCONA_PN}-${MY_PV}-rel30.${MY_PATCH}.tar.gz" |
| 65 |
+# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz |
| 66 |
else |
| 67 |
URI_DIR="MySQL" |
| 68 |
URI_FILE="mysql" |
| 69 |
@@ -162,6 +169,10 @@ if [[ ${PN} == "mariadb-galera" ]]; then |
| 70 |
HOMEPAGE="http://mariadb.org/" |
| 71 |
DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" |
| 72 |
fi |
| 73 |
+if [[ ${PN} == "percona-server" ]]; then |
| 74 |
+ HOMEPAGE="http://www.percona.com/software/percona-server" |
| 75 |
+ DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team" |
| 76 |
+fi |
| 77 |
LICENSE="GPL-2" |
| 78 |
SLOT="0" |
| 79 |
|
| 80 |
@@ -198,6 +209,10 @@ if mysql_version_is_at_least "5.5.7"; then |
| 81 |
IUSE="${IUSE} systemtap" |
| 82 |
fi |
| 83 |
|
| 84 |
+if [[ ${PN} == "percona-server" ]]; then |
| 85 |
+ mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam" |
| 86 |
+fi |
| 87 |
+ |
| 88 |
REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" |
| 89 |
|
| 90 |
# |
| 91 |
@@ -234,7 +249,7 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 92 |
fi |
| 93 |
|
| 94 |
# Having different flavours at the same time is not a good idea |
| 95 |
-for i in "mysql" "mariadb" "mariadb-galera" ; do |
| 96 |
+for i in "mysql" "mariadb" "mariadb-galera" "percona-server"; do |
| 97 |
[[ ${i} == ${PN} ]] || |
| 98 |
DEPEND="${DEPEND} !dev-db/${i}" |
| 99 |
done |
Archives