From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RxWSx-0003qB-0i for garchives@archives.gentoo.org; Wed, 15 Feb 2012 04:27:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98788E0B36; Wed, 15 Feb 2012 04:27:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 50883E0B36 for ; Wed, 15 Feb 2012 04:27:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AA0B1B4035 for ; Wed, 15 Feb 2012 04:27:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 491D6E5404 for ; Wed, 15 Feb 2012 04:27:28 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1329279884.1ecca12f62c722873c0c766fd4b0500c11b08f51.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 1ecca12f62c722873c0c766fd4b0500c11b08f51 X-VCS-Branch: master Date: Wed, 15 Feb 2012 04:27:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 223ffbce-e1c2-406b-901d-1cf11c075a31 X-Archives-Hash: 795f8c1cdeee9eb3cd1a92d713029a26 commit: 1ecca12f62c722873c0c766fd4b0500c11b08f51 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Wed Feb 15 04:24:44 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Wed Feb 15 04:24:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D1ecca12f 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.eclas= s index b336c5b..4b5b124 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -123,7 +123,7 @@ mysql-autotools_configure_common() { myconf=3D"${myconf} --with-debug=3Dfull" else myconf=3D"${myconf} --without-debug" - if ( use cluster || [[ "${PN}" =3D=3D "mysql-cluster" ]] ); then + if ( use cluster ); then myconf=3D"${myconf} --without-ndb-debug" fi fi @@ -238,7 +238,7 @@ mysql-autotools_configure_51() { done =20 # like configuration=3Dmax-no-ndb - if ( use cluster || [[ "${PN}" =3D=3D "mysql-cluster" ]] ) ; then + if ( use cluster ) ; then plugins_sta=3D"${plugins_sta} ndbcluster partition" plugins_dis=3D"${plugins_dis//partition}" myconf=3D"${myconf} --with-ndb-binlog" @@ -364,12 +364,9 @@ mysql-autotools_src_prepare() { i=3D"${S}"/storage/innodb_plugin/plug.in [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" =20 - # Additional checks, remove bundled zlib (Cluster needs this, for stati= c - # memory management in zlib, leave available for Cluster) - if [[ "${PN}" !=3D "mysql-cluster" ]] ; then - rm -f "${S}/zlib/"*.[ch] - sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.i= n" - 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" =20 # 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=3D"$(get_version_component_range 1-2 ${PV})" =20 -# Cluster is a special case... -if [[ "${PN}" =3D=3D "mysql-cluster" ]]; then - case $PV in - 6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=3D5.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-x= 86/${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} =3D=3D "mysql-cluster" ]] ; then - if [[ "${PN}" =3D=3D "mysql-cluster" ]] ; then - URI_DIR=3D"MySQL-Cluster" - URI_FILE=3D"mysql-cluster-gpl" - fi + else + URI_DIR=3D"MySQL" + URI_FILE=3D"mysql" URI_A=3D"${URI_FILE}-${MY_PV}.tar.gz" MIRROR_PV=3D$(get_version_component_range 1-2 ${PV}) # Recently upstream switched to an archive site, and not on mirrors SERVER_URI=3D"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}" =3D=3D "mysql" ]; then - SERVER_URI=3D"ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" - fi fi =20 # Define correct SRC_URIs @@ -183,9 +168,7 @@ esac IUSE=3D"${IUSE} latin1" =20 IUSE=3D"${IUSE} extraengine" -if [[ ${PN} !=3D "mysql-cluster" ]] ; then - IUSE=3D"${IUSE} cluster" -fi +IUSE=3D"${IUSE} cluster" =20 IUSE=3D"${IUSE} max-idx-128" IUSE=3D"${IUSE} berkdb" @@ -224,7 +207,7 @@ DEPEND=3D" && DEPEND=3D"${DEPEND} libevent? ( >=3Ddev-libs/libevent-1.4 )" =20 # 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} =3D=3D ${PN} ]] || DEPEND=3D"${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' use= r" =20 - if [ "${PN}" !=3D "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 } =20