BitKeeper is long dead.

1 files changed, 4 insertions, 92 deletions

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 9546282cae26..4b33982d1c76 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -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/28 10:50:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.109 2009/02/28 10:51:57 robbat2 Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainer: MySQL Team <mysql-bugs@gentoo.org>
@@ -23,14 +23,6 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
 	inherit git
 fi
 
-if [[ ${PR#r} -lt 60 ]] ; then
-	IS_BITKEEPER=0
-elif [[ ${PR#r} -lt 90 ]] ; then
-	IS_BITKEEPER=60
-else
-	IS_BITKEEPER=90
-fi
-
 # MYSQL_VERSION_ID will be:
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
 # This is an important part, because many of the choices the MySQL ebuild will do
@@ -76,10 +68,6 @@ mysql_version_is_at_least "5.1" \
 mysql_version_is_at_least "5.1.12" \
 && DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 
-# BitKeeper dependency, compile-time only
-[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"
-
-
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
@@ -138,69 +126,6 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \
 # HELPER FUNCTIONS:
 #
 
-bitkeeper_fetch() {
-	local reposuf
-	if [[ -z "${1}" ]] ; then
-		local tpv
-		tpv=( ${PV//[-._]/ } )
-		reposuf="mysql-${tpv[0]}.${tpv[1]}"
-	else
-		reposuf="${1}"
-	fi
-	einfo "Using '${reposuf}' repository."
-	local repo_uri="bk://mysql.bkbits.net/${reposuf}"
-	## -- ebk_store_dir: bitkeeper sources store directory
-	local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
-	## -- ebk_fetch_cmd: bitkeeper fetch command
-	# always fetch the latest revision, use -r<revision> if a specified revision is wanted
-	# hint: does not work
-	local ebk_fetch_cmd="sfioball"
-	## -- ebk_update_cmd: bitkeeper update command
-	local ebk_update_cmd="update"
-
-	# addread "/etc/bitkeeper"
-	addwrite "${ebk_store_dir}"
-
-	if [[ ! -d "${ebk_store_dir}" ]] ; then
-		debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
-		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=${reposuf}
-
-	if [[ ! -d "${wc_path}" ]] ; then
-		local options="-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="BK/" . "${S}" || die "BK: couldn't export to ${S}"
-
-	echo
-	popd
-}
-
 mysql_disable_test() {
 	local testname="${1}" ; shift
 	local reason="${@}"
@@ -529,22 +454,9 @@ mysql_src_unpack() {
 	unpack ${A}
 	# Grab the patches
 	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${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
-		mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
-		cd "${S}"
-	fi
+	
+	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+	cd "${S}"
 
 	# Apply the patches for this MySQL version
 	EPATCH_SUFFIX="patch"