Archives
Archives
| From: | "Robin H. Johnson (robbat2)" <robbat2@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass |
| Date: | Tue, 02 Feb 2010 22:16:07 |
| Message-Id: | E1NcR2S-0007cg-PH@stork.gentoo.org |
| 1 | robbat2 10/02/02 22:16:04 |
| 2 | |
| 3 | Modified: mysql.eclass |
| 4 | Log: |
| 5 | Missed a commit to the eclass. |
| 6 | |
| 7 | Revision Changes Path |
| 8 | 1.132 eclass/mysql.eclass |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.132&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.132&content-type=text/plain |
| 12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.131&r2=1.132 |
| 13 | |
| 14 | Index: mysql.eclass |
| 15 | =================================================================== |
| 16 | RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
| 17 | retrieving revision 1.131 |
| 18 | retrieving revision 1.132 |
| 19 | diff -p -w -b -B -u -u -r1.131 -r1.132 |
| 20 | --- mysql.eclass 2 Feb 2010 03:01:31 -0000 1.131 |
| 21 | +++ mysql.eclass 2 Feb 2010 22:16:04 -0000 1.132 |
| 22 | @@ -1,6 +1,6 @@ |
| 23 | # Copyright 1999-2009 Gentoo Foundation |
| 24 | # Distributed under the terms of the GNU General Public License v2 |
| 25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.131 2010/02/02 03:01:31 robbat2 Exp $ |
| 26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.132 2010/02/02 22:16:04 robbat2 Exp $ |
| 27 | |
| 28 | # @ECLASS: mysql.eclass |
| 29 | # @MAINTAINER: |
| 30 | @@ -85,7 +85,11 @@ elif [ "${PV#5.0}" != "${PV}" ] && mysql |
| 31 | MYSQL_COMMUNITY_FEATURES=1 |
| 32 | elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then |
| 33 | MYSQL_COMMUNITY_FEATURES=1 |
| 34 | -elif [ "${PV#5.4}" != "${PV}" ] || [ "${PV#5.4}" != "${PV}" ]; then |
| 35 | +elif [ "${PV#5.4}" != "${PV}" ] ; then |
| 36 | + MYSQL_COMMUNITY_FEATURES=1 |
| 37 | +elif [ "${PV#5.5}" != "${PV}" ] ; then |
| 38 | + MYSQL_COMMUNITY_FEATURES=1 |
| 39 | +elif [ "${PV#6.0}" != "${PV}" ] ; then |
| 40 | MYSQL_COMMUNITY_FEATURES=1 |
| 41 | else |
| 42 | MYSQL_COMMUNITY_FEATURES=0 |
| 43 | @@ -136,12 +140,13 @@ PDEPEND="${PDEPEND} =virtual/mysql-$(get |
| 44 | |
| 45 | # Work out the default SERVER_URI correctly |
| 46 | if [ -z "${SERVER_URI}" ]; then |
| 47 | + [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" |
| 48 | # The community build is on the mirrors |
| 49 | if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then |
| 50 | - SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" |
| 51 | + SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${MY_PV}.tar.gz" |
| 52 | # The (old) enterprise source is on the primary site only |
| 53 | elif [ "${PN}" == "mysql" ]; then |
| 54 | - SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz" |
| 55 | + SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz" |
| 56 | fi |
| 57 | fi |