| 1 |
robbat2 09/02/28 10:51:57 |
| 2 |
|
| 3 |
Modified: mysql.eclass |
| 4 |
Log: |
| 5 |
BitKeeper is long dead. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.109 eclass/mysql.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.109&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.109&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.108&r2=1.109 |
| 13 |
|
| 14 |
Index: mysql.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v |
| 17 |
retrieving revision 1.108 |
| 18 |
retrieving revision 1.109 |
| 19 |
diff -p -w -b -B -u -u -r1.108 -r1.109 |
| 20 |
--- mysql.eclass 28 Feb 2009 10:50:24 -0000 1.108 |
| 21 |
+++ mysql.eclass 28 Feb 2009 10:51:57 -0000 1.109 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 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.108 2009/02/28 10:50:24 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.109 2009/02/28 10:51:57 robbat2 Exp $ |
| 27 |
|
| 28 |
# Author: Francesco Riosa (Retired) <vivo@g.o> |
| 29 |
# Maintainer: MySQL Team <mysql-bugs@g.o> |
| 30 |
@@ -23,14 +23,6 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; t |
| 31 |
inherit git |
| 32 |
fi |
| 33 |
|
| 34 |
-if [[ ${PR#r} -lt 60 ]] ; then |
| 35 |
- IS_BITKEEPER=0 |
| 36 |
-elif [[ ${PR#r} -lt 90 ]] ; then |
| 37 |
- IS_BITKEEPER=60 |
| 38 |
-else |
| 39 |
- IS_BITKEEPER=90 |
| 40 |
-fi |
| 41 |
- |
| 42 |
# MYSQL_VERSION_ID will be: |
| 43 |
# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99] |
| 44 |
# This is an important part, because many of the choices the MySQL ebuild will do |
| 45 |
@@ -76,10 +68,6 @@ mysql_version_is_at_least "5.1" \ |
| 46 |
mysql_version_is_at_least "5.1.12" \ |
| 47 |
&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" |
| 48 |
|
| 49 |
-# BitKeeper dependency, compile-time only |
| 50 |
-[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client" |
| 51 |
- |
| 52 |
- |
| 53 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 54 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" |
| 55 |
|
| 56 |
@@ -138,69 +126,6 @@ EXPORT_FUNCTIONS pkg_setup src_unpack sr |
| 57 |
# HELPER FUNCTIONS: |
| 58 |
# |
| 59 |
|
| 60 |
-bitkeeper_fetch() { |
| 61 |
- local reposuf |
| 62 |
- if [[ -z "${1}" ]] ; then |
| 63 |
- local tpv |
| 64 |
- tpv=( ${PV//[-._]/ } ) |
| 65 |
- reposuf="mysql-${tpv[0]}.${tpv[1]}" |
| 66 |
- else |
| 67 |
- reposuf="${1}" |
| 68 |
- fi |
| 69 |
- einfo "Using '${reposuf}' repository." |
| 70 |
- local repo_uri="bk://mysql.bkbits.net/${reposuf}" |
| 71 |
- ## -- ebk_store_dir: bitkeeper sources store directory |
| 72 |
- local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src" |
| 73 |
- ## -- ebk_fetch_cmd: bitkeeper fetch command |
| 74 |
- # always fetch the latest revision, use -r<revision> if a specified revision is wanted |
| 75 |
- # hint: does not work |
| 76 |
- local ebk_fetch_cmd="sfioball" |
| 77 |
- ## -- ebk_update_cmd: bitkeeper update command |
| 78 |
- local ebk_update_cmd="update" |
| 79 |
- |
| 80 |
- # addread "/etc/bitkeeper" |
| 81 |
- addwrite "${ebk_store_dir}" |
| 82 |
- |
| 83 |
- if [[ ! -d "${ebk_store_dir}" ]] ; then |
| 84 |
- debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..." |
| 85 |
- mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir}" |
| 86 |
- fi |
| 87 |
- |
| 88 |
- pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}" |
| 89 |
- |
| 90 |
- local wc_path=${reposuf} |
| 91 |
- |
| 92 |
- if [[ ! -d "${wc_path}" ]] ; then |
| 93 |
- local options="-r+" |
| 94 |
- |
| 95 |
- # first checkout |
| 96 |
- einfo "bitkeeper checkout start -->" |
| 97 |
- einfo " repository: ${repo_uri}" |
| 98 |
- |
| 99 |
- ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \ |
| 100 |
- || die "BK: couldn't fetch from ${repo_uri}" |
| 101 |
- else |
| 102 |
- if [[ ! -d "${wc_path}/BK" ]] ; then |
| 103 |
- popd |
| 104 |
- die "Looks like ${wc_path} is not a bitkeeper path" |
| 105 |
- fi |
| 106 |
- |
| 107 |
- # update working copy |
| 108 |
- einfo "bitkeeper update start -->" |
| 109 |
- einfo " repository: ${repo_uri}" |
| 110 |
- |
| 111 |
- ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \ |
| 112 |
- || die "BK: couldn't update from ${repo_uri} to ${wc_path}" |
| 113 |
- fi |
| 114 |
- |
| 115 |
- einfo " working copy: ${wc_path}" |
| 116 |
- cd "${wc_path}" |
| 117 |
- rsync -rlpgo --exclude="BK/" . "${S}" || die "BK: couldn't export to ${S}" |
| 118 |
- |
| 119 |
- echo |
| 120 |
- popd |
| 121 |
-} |
| 122 |
- |
| 123 |
mysql_disable_test() { |
| 124 |
local testname="${1}" ; shift |
| 125 |
local reason="${@}" |
| 126 |
@@ -529,22 +454,9 @@ mysql_src_unpack() { |
| 127 |
unpack ${A} |
| 128 |
# Grab the patches |
| 129 |
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack |
| 130 |
- # Bitkeeper checkout support |
| 131 |
- if [[ ${IS_BITKEEPER} -eq 90 ]] ; then |
| 132 |
- if mysql_check_version_range "5.1 to 5.1.99" ; then |
| 133 |
- bitkeeper_fetch "mysql-5.1-ndb" |
| 134 |
- elif mysql_check_version_range "5.2 to 5.2.99" ; then |
| 135 |
- bitkeeper_fetch "mysql-5.2-falcon" |
| 136 |
- else |
| 137 |
- bitkeeper_fetch |
| 138 |
- fi |
| 139 |
- cd "${S}" |
| 140 |
- einfo "Running upstream autorun over BK sources ..." |
| 141 |
- BUILD/autorun.sh |
| 142 |
- else |
| 143 |
+ |
| 144 |
mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" |
| 145 |
cd "${S}" |
| 146 |
- fi |
| 147 |
|
| 148 |
# Apply the patches for this MySQL version |
| 149 |
EPATCH_SUFFIX="patch" |
Archives