From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LdMnX-0004GE-Na for garchives@archives.gentoo.org; Sat, 28 Feb 2009 10:52:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95ABDE03B1; Sat, 28 Feb 2009 10:51:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4EA12E03B1 for ; Sat, 28 Feb 2009 10:51:58 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id DC8AC647BD for ; Sat, 28 Feb 2009 10:51:57 +0000 (UTC) Received: from robbat2 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LdMnV-0003ni-IX for gentoo-commits@lists.gentoo.org; Sat, 28 Feb 2009 10:51:57 +0000 From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: mysql.eclass X-VCS-Directories: eclass X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: Sender: "Robin H. Johnson" Date: Sat, 28 Feb 2009 10:51:57 +0000 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: 10833068-9526-4877-b810-f9ce0dde8612 X-Archives-Hash: 206aa78cac3a6292b60ec7ce91ff2be7 robbat2 09/02/28 10:51:57 Modified: mysql.eclass Log: BitKeeper is long dead. Revision Changes Path 1.109 eclass/mysql.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.109&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?rev=3D1.109&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclas= s?r1=3D1.108&r2=3D1.109 Index: mysql.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v retrieving revision 1.108 retrieving revision 1.109 diff -p -w -b -B -u -u -r1.108 -r1.109 --- mysql.eclass 28 Feb 2009 10:50:24 -0000 1.108 +++ mysql.eclass 28 Feb 2009 10:51:57 -0000 1.109 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.108 2009/02/2= 8 10:50:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.109 2009/02/2= 8 10:51:57 robbat2 Exp $ =20 # Author: Francesco Riosa (Retired) # Maintainer: MySQL Team @@ -23,14 +23,6 @@ if [[ "${MY_EXTRAS_VER}" =3D=3D "live" ]]; t inherit git fi =20 -if [[ ${PR#r} -lt 60 ]] ; then - IS_BITKEEPER=3D0 -elif [[ ${PR#r} -lt 90 ]] ; then - IS_BITKEEPER=3D60 -else - IS_BITKEEPER=3D90 -fi - # MYSQL_VERSION_ID will be: # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, a= ll [0..99] # This is an important part, because many of the choices the MySQL ebuil= d will do @@ -76,10 +68,6 @@ mysql_version_is_at_least "5.1" \ mysql_version_is_at_least "5.1.12" \ && DEPEND=3D"${DEPEND} >=3Ddev-util/cmake-2.4.3" =20 -# BitKeeper dependency, compile-time only -[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND=3D"${DEPEND} dev-util/bk_client" - - # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND=3D"perl? ( >=3Ddev-perl/DBD-mysql-2.9004 )" =20 @@ -138,69 +126,6 @@ EXPORT_FUNCTIONS pkg_setup src_unpack sr # HELPER FUNCTIONS: # =20 -bitkeeper_fetch() { - local reposuf - if [[ -z "${1}" ]] ; then - local tpv - tpv=3D( ${PV//[-._]/ } ) - reposuf=3D"mysql-${tpv[0]}.${tpv[1]}" - else - reposuf=3D"${1}" - fi - einfo "Using '${reposuf}' repository." - local repo_uri=3D"bk://mysql.bkbits.net/${reposuf}" - ## -- ebk_store_dir: bitkeeper sources store directory - local ebk_store_dir=3D"${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src" - ## -- ebk_fetch_cmd: bitkeeper fetch command - # always fetch the latest revision, use -r if a specified rev= ision is wanted - # hint: does not work - local ebk_fetch_cmd=3D"sfioball" - ## -- ebk_update_cmd: bitkeeper update command - local ebk_update_cmd=3D"update" - - # addread "/etc/bitkeeper" - addwrite "${ebk_store_dir}" - - if [[ ! -d "${ebk_store_dir}" ]] ; then - debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directo= ry ..." - mkdir -p "${ebk_store_dir}" || die "BK: couldn't mkdir ${ebk_store_dir= }" - fi - - pushd "${ebk_store_dir}" || die "BK: couldn't chdir to ${ebk_store_dir}= " - - local wc_path=3D${reposuf} - - if [[ ! -d "${wc_path}" ]] ; then - local options=3D"-r+" - - # first checkout - einfo "bitkeeper checkout start -->" - einfo " repository: ${repo_uri}" - - ${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \ - || die "BK: couldn't fetch from ${repo_uri}" - else - if [[ ! -d "${wc_path}/BK" ]] ; then - popd - die "Looks like ${wc_path} is not a bitkeeper path" - fi - - # update working copy - einfo "bitkeeper update start -->" - einfo " repository: ${repo_uri}" - - ${ebk_update_cmd} "${repo_uri}" "${wc_path}" \ - || die "BK: couldn't update from ${repo_uri} to ${wc_path}" - fi - - einfo " working copy: ${wc_path}" - cd "${wc_path}" - rsync -rlpgo --exclude=3D"BK/" . "${S}" || die "BK: couldn't export to = ${S}" - - echo - popd -} - mysql_disable_test() { local testname=3D"${1}" ; shift local reason=3D"${@}" @@ -529,22 +454,9 @@ mysql_src_unpack() { unpack ${A} # Grab the patches [[ "${MY_EXTRAS_VER}" =3D=3D "live" ]] && S=3D"${WORKDIR}/mysql-extras"= git_src_unpack - # Bitkeeper checkout support - if [[ ${IS_BITKEEPER} -eq 90 ]] ; then - if mysql_check_version_range "5.1 to 5.1.99" ; then - bitkeeper_fetch "mysql-5.1-ndb" - elif mysql_check_version_range "5.2 to 5.2.99" ; then - bitkeeper_fetch "mysql-5.2-falcon" - else - bitkeeper_fetch - fi - cd "${S}" - einfo "Running upstream autorun over BK sources ..." - BUILD/autorun.sh - else +=09 mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}" cd "${S}" - fi =20 # Apply the patches for this MySQL version EPATCH_SUFFIX=3D"patch"