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 1RxWSw-0003qC-SL 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 CE4AAE0B37; 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 77946E0B37 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 84E311B4034 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 1CBCEE5400 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: <1329279782.dfdcaacc4ec8eaa6e02b55307f86d7be442691cd.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: dfdcaacc4ec8eaa6e02b55307f86d7be442691cd 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: cbeaeb4f-4ba7-434b-98b3-d694e950f116 X-Archives-Hash: 40a445076cdda6eac04b4621b5152203 commit: dfdcaacc4ec8eaa6e02b55307f86d7be442691cd Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Wed Feb 15 04:23:02 2012 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Wed Feb 15 04:23:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3Ddfdcaacc Drop support for mysql-community from the eclasses. --- eclass/mysql-autotools.eclass | 12 +++++------- eclass/mysql-v2.eclass | 33 ++++----------------------------- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclas= s index 4bfaec9..b336c5b 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -172,13 +172,11 @@ mysql-autotools_configure_51() { # user's data is not accessible. use max-idx-128 && die "Bug #336027: upstream has a corruption issue wi= th max-idx-128 presently" #use max-idx-128 && myconf=3D"${myconf} --with-max-indexes=3D128" - if [ "${MYSQL_COMMUNITY_FEATURES}" =3D=3D "1" ]; then - myconf=3D"${myconf} $(use_enable community community-features)" - if use community; then - myconf=3D"${myconf} $(use_enable profiling)" - else - myconf=3D"${myconf} --disable-profiling" - fi + myconf=3D"${myconf} $(use_enable community community-features)" + if use community; then + myconf=3D"${myconf} $(use_enable profiling)" + else + myconf=3D"${myconf} --disable-profiling" fi =20 # Scan for all available plugins diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 52ed606..213735d 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -110,23 +110,6 @@ MYSQL_VERSION_ID=3D${MYSQL_VERSION_ID##"0"} # This eclass should only be used with at least mysql-5.1.50 mysql_version_is_at_least "5.1.50" || die "This eclass should only be us= ed with >=3Dmysql-5.1.50" =20 -# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES -# @DESCRIPTION: -# Specifiy if community features are available. Possible values are 1 (y= es) -# and 0 (no). -# Community features are available in mysql-community -# AND in the re-merged mysql-5.0.82 and newer -if [ "${PN}" =3D=3D "mysql-community" -o "${PN}" =3D=3D "mariadb" ]; the= n - MYSQL_COMMUNITY_FEATURES=3D1 -elif [ "${MYSQL_PV_MAJOR}" =3D=3D "5.1" ]; then - MYSQL_COMMUNITY_FEATURES=3D1 -elif mysql_version_is_at_least "5.4.0"; then - MYSQL_COMMUNITY_FEATURES=3D1 -else - MYSQL_COMMUNITY_FEATURES=3D0 -fi - - # @ECLASS-VARIABLE: XTRADB_VER # @DEFAULT_UNSET # @DESCRIPTION: @@ -151,14 +134,11 @@ 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 community and cluster builds are on the mirrors - elif [[ "${MYSQL_COMMUNITY_FEATURES}" =3D=3D "1" || ${PN} =3D=3D "mysql= -cluster" ]] ; then + # 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" - else - URI_DIR=3D"MySQL" - URI_FILE=3D"mysql" fi URI_A=3D"${URI_FILE}-${MY_PV}.tar.gz" MIRROR_PV=3D$(get_version_component_range 1-2 ${PV}) @@ -188,9 +168,6 @@ if [[ "${PN}" =3D=3D "mariadb" ]]; then HOMEPAGE=3D"http://mariadb.org/" DESCRIPTION=3D"MariaDB is a MySQL fork with 3rd-party patches and addit= ional storage engines merged." fi -if [[ "${PN}" =3D=3D "mysql-community" ]]; then - DESCRIPTION=3D"${DESCRIPTION} (obsolete, move to dev-db/mysql)" -fi LICENSE=3D"GPL-2" SLOT=3D"0" =20 @@ -212,9 +189,7 @@ fi =20 IUSE=3D"${IUSE} max-idx-128" IUSE=3D"${IUSE} berkdb" - -[[ ${MYSQL_COMMUNITY_FEATURES} =3D=3D 1 ]] \ -&& IUSE=3D"${IUSE} +community profiling" +IUSE=3D"${IUSE} +community profiling" =20 [[ ${PN} =3D=3D "mariadb" ]] \ && IUSE=3D"${IUSE} libevent" @@ -249,7 +224,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-community" "mysql-cluster" "mariadb" ; do +for i in "mysql" "mysql-cluster" "mariadb" ; do [[ ${i} =3D=3D ${PN} ]] || DEPEND=3D"${DEPEND} !dev-db/${i}" done