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

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     1ecca12f62c722873c0c766fd4b0500c11b08f51
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 04:24:44 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 04:24:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1ecca12f

Drop support for mysql-cluster from the eclasses.

---
 eclass/mysql-autotools.eclass |   13 +++++--------
 eclass/mysql-v2.eclass        |   33 ++++++---------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index b336c5b..4b5b124 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -123,7 +123,7 @@ mysql-autotools_configure_common() {
 		myconf="${myconf} --with-debug=full"
 	else
 		myconf="${myconf} --without-debug"
-		if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then
+		if ( use cluster ); then
 			myconf="${myconf} --without-ndb-debug"
 		fi
 	fi
@@ -238,7 +238,7 @@ mysql-autotools_configure_51() {
 	done
 
 	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
+	if ( use cluster ) ; then
 		plugins_sta="${plugins_sta} ndbcluster partition"
 		plugins_dis="${plugins_dis//partition}"
 		myconf="${myconf} --with-ndb-binlog"
@@ -364,12 +364,9 @@ mysql-autotools_src_prepare() {
 	i="${S}"/storage/innodb_plugin/plug.in
 	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
 
-	# Additional checks, remove bundled zlib (Cluster needs this, for static
-	# memory management in zlib, leave available for Cluster)
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		rm -f "${S}/zlib/"*.[ch]
-		sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-	fi
+	# Additional checks, remove bundled zlib
+	rm -f "${S}/zlib/"*.[ch]
+	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 	rm -f "scripts/mysqlbug"
 
 	# Make charsets install in the right place

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 213735d..9f6f75e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -80,14 +80,6 @@ fi
 # mysql_upgrade.
 MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
 
-# Cluster is a special case...
-if [[ "${PN}" == "mysql-cluster" ]]; then
-	case $PV in
-		6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-	esac
-fi
-
-
 # @ECLASS-VARIABLE: MYSQL_VERSION_ID
 # @DESCRIPTION:
 # MYSQL_VERSION_ID will be:
@@ -134,21 +126,14 @@ if [ -z "${SERVER_URI}" ]; then
 		http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
 		"
-	# The cluster builds are on the mirrors
-	elif [[ ${PN} == "mysql-cluster" ]] ; then
-		if [[ "${PN}" == "mysql-cluster" ]] ; then
-			URI_DIR="MySQL-Cluster"
-			URI_FILE="mysql-cluster-gpl"
-		fi
+	else
+		URI_DIR="MySQL"
+		URI_FILE="mysql"
 		URI_A="${URI_FILE}-${MY_PV}.tar.gz"
 		MIRROR_PV=$(get_version_component_range 1-2 ${PV})
 		# Recently upstream switched to an archive site, and not on mirrors
 		SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
 					mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
-	# The (old) enterprise source is on the primary site only
-	elif [ "${PN}" == "mysql" ]; then
-		SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
-	fi
 fi
 
 # Define correct SRC_URIs
@@ -183,9 +168,7 @@ esac
 IUSE="${IUSE} latin1"
 
 IUSE="${IUSE} extraengine"
-if [[ ${PN} != "mysql-cluster" ]] ; then
-	IUSE="${IUSE} cluster"
-fi
+IUSE="${IUSE} cluster"
 
 IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} berkdb"
@@ -224,7 +207,7 @@ DEPEND="
 && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
 
 # Having different flavours at the same time is not a good idea
-for i in "mysql" "mysql-cluster" "mariadb" ; do
+for i in "mysql" "mariadb" ; do
 	[[ ${i} == ${PN} ]] ||
 	DEPEND="${DEPEND} !dev-db/${i}"
 done
@@ -401,14 +384,10 @@ mysql-v2_pkg_setup() {
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
-	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
+	if use cluster; then
 		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
 		ewarn "5.1 series should NOT be put into production. In the near"
 		ewarn "future, it will be disabled from building."
-		ewarn ""
-		ewarn "If you need NDB support, you should instead move to the new"
-		ewarn "mysql-cluster package that represents that upstream NDB"
-		ewarn "development."
 	fi
 }