Removed old ebuilds. Applied x86-sucks patch.

8 files changed, 27 insertions, 217 deletions

diff --git a/dev-util/bitkeeper/ChangeLog b/dev-util/bitkeeper/ChangeLog
index 110e7ecf5f8c..cc73a001b714 100644
--- a/dev-util/bitkeeper/ChangeLog
+++ b/dev-util/bitkeeper/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-util/bitkeeper
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/ChangeLog,v 1.18 2004/06/25 02:20:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/ChangeLog,v 1.19 2004/06/25 09:57:52 dholm Exp $
 
 # README: bitkeeper only offers the latest version of bitkeeper for download,
 # so we need to be all over marking new versions stable
 
+  25 Jun 2004; David Holm <dholm@gentoo.org> -bitkeeper-3.0.3.ebuild,
+  -bitkeeper-3.0.4.ebuild, bitkeeper-3.2.2.ebuild:
+  Applied anti-spock patch.
+  Removed old ebuilds.
+
 *bitkeeper-3.2.2 (24 Jun 2004)
 
   24 Jun 2004; Michal Januszewski <spock@gentoo.org> +metadata.xml,
diff --git a/dev-util/bitkeeper/Manifest b/dev-util/bitkeeper/Manifest
index 38a87c5ef849..40bc35e121f6 100644
--- a/dev-util/bitkeeper/Manifest
+++ b/dev-util/bitkeeper/Manifest
@@ -1,8 +1,4 @@
-MD5 5e1a6e03b5cdc8cf202b8a51e5cb1499 bitkeeper-3.0.4.ebuild 3080
-MD5 333372df5245ea3985e5fffb46fa6762 bitkeeper-3.2.2.ebuild 2486
-MD5 af71c52ba2a763b93c7158fec49e742c bitkeeper-3.0.3.ebuild 3089
 MD5 90ce0f8569bfd61300e482667e3f7938 ChangeLog 2968
+MD5 184d4896709bc824345a6e69ec48b2c2 bitkeeper-3.2.2.ebuild 2877
 MD5 42bb15c37e072cf6216b4692514d08c9 metadata.xml 275
-MD5 faf76ef0a29faebfa7586e42ebbe003d files/digest-bitkeeper-3.0.3 542
-MD5 f6cc4ecef3d0fa2705a3eb95c050c0f3 files/digest-bitkeeper-3.0.4 542
-MD5 9be80f4f5dd4ddba7910771af17c946b files/digest-bitkeeper-3.2.2 76
+MD5 fc4f82f0f4771d07c839e5895764f70b files/digest-bitkeeper-3.2.2 696
diff --git a/dev-util/bitkeeper/bitkeeper-3.0.3.ebuild b/dev-util/bitkeeper/bitkeeper-3.0.3.ebuild
deleted file mode 100644
index 25a41e934d00..000000000000
--- a/dev-util/bitkeeper/bitkeeper-3.0.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/bitkeeper-3.0.3.ebuild,v 1.5 2004/06/25 02:20:41 agriffis Exp $
-
-DESCRIPTION="A scalable configuration management system."
-HOMEPAGE="http://www.bitkeeper.com/"
-SRC_URI="x86? ( bk-${PV}-x86-glibc22-linux.bin )
-	ppc? ( bk-${PV}-powerpc-glibc21-linux.bin )
-	sparc? ( bk-${PV}-sparc-glibc21-linux.bin )
-	alpha? ( bk-${PV}-alpha-glibc22-linux.bin )
-	arm? ( bk-${PV}-arm-glibc21-linux.bin )
-	hppa? ( bk-${PV}-hppa-glibc22-linux.bin )
-	ia64? ( bk-${PV}-ia64-glibc22-linux.bin )"
-
-SLOT="0"
-LICENSE="BKL"
-KEYWORDS="x86 ppc sparc alpha hppa -mips ia64"
-IUSE="X"
-
-# binary package, so no DEPENDs; X optional in RDEPENDs
-DEPEND=""
-RDEPEND="virtual/glibc
-	>=dev-lang/tcl-8.3.3
-	X? ( >=dev-lang/tk-8.3.3 )"
-
-RESTRICT="fetch"
-
-S=${WORKDIR}/bitkeeper
-
-pkg_nofetch() {
-	eerror "You need to perform the following steps to install this package:"
-	eerror " - Sign up at ${HOMEPAGE}"
-	eerror " - Check your email and visit the download location"
-	eerror " - Download ${A} and place it in ${DISTDIR}"
-	eerror " - emerge this package again"
-	eerror "Run 'bk regression' to verify the installation. (Recommended)"
-}
-
-pkg_setup() {
-	cd ${T}
-	cp ${DISTDIR}/${A} .
-	chmod 755 ${A}
-	local DISPLAY=""
-	echo 'none' | ./${A} > output 2>/dev/null
-	installer=`sed -n -e "s/Installation script: \(.*\)/\1/p" output`
-	archive=`sed -n -e "s/Gzipped tar archive: \(.*\)/\1/p" output`
-	mv $archive ${T}/archive
-}
-
-src_unpack() {
-	tar -vxzpf ${T}/archive
-}
-
-src_install() {
-	dodir /opt /usr/share/man/man1 /usr/bin
-
-	mv ${S} ${D}/opt/${P} && cd ${D}
-
-	# BK includes two copies of most man pages; the second copy is a
-	# hard link to the first with its filename prefixed with
-	# 'bk-'. 'prepman' breaks these hard links, so use a
-	# workaround. Furthermore, we want only the 'bk-' versions to be
-	# in ${MANPATH} since there are naming conflicts, so install
-	# symlinks into /usr/share/man. (For example BK includes a
-	# less-detailed man page for grep which would override the
-	# /usr/share/man version.)
-
-	prepman /opt/${P}
-
-	find opt/${P}/man -iname 'bk-*' -printf '
-		F=`echo %f|sed -e "s/bk-//"`
-		rm -f %h/$F
-		dohard /%h/%f /%h/$F
-		dosym /%h/%f /usr/share/man/%P' >${T}/links.sh
-	. ${T}/links.sh
-
-	dosym /opt/${P}/man/man1/bk.1.gz /usr/share/man/man1/bk.1.gz
-
-	# mimic "bk links /opt/${P} /usr/bin"
-	dosym /opt/${P}/admin /usr/bin/admin
-	dosym /opt/${P}/bk /usr/bin/bk
-	dosym /opt/${P}/delta /usr/bin/delta
-	dosym /opt/${P}/get /usr/bin/get
-	dosym /opt/${P}/prs /usr/bin/prs
-	dosym /opt/${P}/rmdel /usr/bin/rmdel
-	dosym /opt/${P}/unget /usr/bin/unget
-}
-
-pkg_postinst() {
-	if grep -H bitkeeper /etc/man.conf; then
-		eerror "Previous BitKeeper ebuilds induced a misconfiguration when sys-apps/man was"
-		eerror "next upgraded. You appear to have fallen victim--edit /etc/man.conf and look"
-		eerror "for the definition of CMP. It should refer to /usr/bin/cmp, not the"
-		eerror "BitKeeper cmp."
-		eerror "For more information, see bugs #18247 and #21638."
-	fi
-}
diff --git a/dev-util/bitkeeper/bitkeeper-3.0.4.ebuild b/dev-util/bitkeeper/bitkeeper-3.0.4.ebuild
deleted file mode 100644
index ac638a5f7e55..000000000000
--- a/dev-util/bitkeeper/bitkeeper-3.0.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/bitkeeper-3.0.4.ebuild,v 1.5 2004/06/25 02:20:41 agriffis Exp $
-
-DESCRIPTION="A scalable configuration management system."
-HOMEPAGE="http://www.bitkeeper.com/"
-SRC_URI="amd64? (bk-${PV}-x86-glibc22-linux.bin )
-	x86? ( bk-${PV}-x86-glibc22-linux.bin )
-	ppc? ( bk-${PV}-powerpc-glibc21-linux.bin )
-	sparc? ( bk-${PV}-sparc-glibc21-linux.bin )
-	alpha? ( bk-${PV}-alpha-glibc22-linux.bin )
-	arm? ( bk-${PV}-arm-glibc21-linux.bin )
-	hppa? ( bk-${PV}-hppa-glibc22-linux.bin )
-	ia64? ( bk-${PV}-ia64-glibc22-linux.bin )"
-
-LICENSE="BKL"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa -mips ia64 amd64"
-IUSE="X"
-RESTRICT="fetch"
-
-DEPEND=""
-RDEPEND="virtual/glibc
-	>=dev-lang/tcl-8.3.4
-	X? ( >=dev-lang/tk-8.3.4 )"
-
-S=${WORKDIR}/bitkeeper
-
-pkg_nofetch() {
-	eerror "You need to perform the following steps to install this package:"
-	eerror " - Sign up at ${HOMEPAGE}"
-	eerror " - Check your email and visit the download location"
-	eerror " - Download ${A} and place it in ${DISTDIR}"
-	eerror " - emerge this package again"
-	eerror "Run 'bk regression' to verify the installation. (Recommended)"
-}
-
-pkg_setup() {
-	cd ${T}
-	cp ${DISTDIR}/${A} .
-	chmod 755 ${A}
-	local DISPLAY=""
-	echo 'none' | ./${A} > output 2>/dev/null
-	installer=`sed -n -e "s/Installation script: \(.*\)/\1/p" output`
-	archive=`sed -n -e "s/Gzipped tar archive: \(.*\)/\1/p" output`
-	mv $archive ${T}/archive
-}
-
-src_unpack() {
-	tar -vxzpf ${T}/archive
-}
-
-src_install() {
-	dodir /opt /usr/share/man/man1 /usr/bin
-
-	mv ${S} ${D}/opt/${P} && cd ${D}
-
-	# BK includes two copies of most man pages; the second copy is a
-	# hard link to the first with its filename prefixed with
-	# 'bk-'. 'prepman' breaks these hard links, so use a
-	# workaround. Furthermore, we want only the 'bk-' versions to be
-	# in ${MANPATH} since there are naming conflicts, so install
-	# symlinks into /usr/share/man. (For example BK includes a
-	# less-detailed man page for grep which would override the
-	# /usr/share/man version.)
-
-	prepman /opt/${P}
-
-	find opt/${P}/man -iname 'bk-*' -printf '
-		F=`echo %f|sed -e "s/bk-//"`
-		rm -f %h/$F
-		dohard /%h/%f /%h/$F
-		dosym /%h/%f /usr/share/man/%P' >${T}/links.sh
-	. ${T}/links.sh
-
-	dosym /opt/${P}/man/man1/bk.1.gz /usr/share/man/man1/bk.1.gz
-
-	# mimic "bk links /opt/${P} /usr/bin"
-	dosym /opt/${P}/admin /usr/bin/admin
-	dosym /opt/${P}/bk /usr/bin/bk
-	dosym /opt/${P}/delta /usr/bin/delta
-	dosym /opt/${P}/get /usr/bin/get
-	dosym /opt/${P}/prs /usr/bin/prs
-	dosym /opt/${P}/rmdel /usr/bin/rmdel
-	dosym /opt/${P}/unget /usr/bin/unget
-}
-
-pkg_postinst() {
-	if grep -H bitkeeper /etc/man.conf; then
-		eerror "Previous BitKeeper ebuilds induced a misconfiguration when sys-apps/man was"
-		eerror "next upgraded. You appear to have fallen victim--edit /etc/man.conf and look"
-		eerror "for the definition of CMP. It should refer to /usr/bin/cmp, not the"
-		eerror "BitKeeper cmp."
-		eerror "For more information, see bugs #18247 and #21638."
-	fi
-}
diff --git a/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild b/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild
index a0f55757f0a5..2f1995ca3fa2 100644
--- a/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild
+++ b/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild
@@ -1,13 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild,v 1.2 2004/06/25 02:20:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bitkeeper/bitkeeper-3.2.2.ebuild,v 1.3 2004/06/25 09:57:52 dholm Exp $
 
 DESCRIPTION="A scalable configuration management system."
 HOMEPAGE="http://www.bitkeeper.com/"
-SRC_URI="x86? ( bk-${PV}-x86-glibc23-linux.bin )"
+SRC_URI="alpha? ( bk-${PV}-alpha-glibc22-linux.bin )
+	arm? ( bk-${PV}-arm-glibc21-linux.bin )
+	hppa? ( bk-${PV}-hppa-glibc22-linux.bin )
+	ia64? ( bk-${PV}-ia64-glibc22-linux.bin )
+	mips? ( bk-${PV}-mips-glibc22-linux.bin )
+	ppc? ( bk-${PV}-powerpc-glibc21-linux.bin )
+	s390? ( bk-${PV}-s390-glibc22-linux.bin )
+	sparc? ( bk-${PV}-sparc-glibc21-linux.bin )
+	x86? ( bk-${PV}-x86-glibc23-linux.bin )"
 LICENSE="BKL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha arm hppa ia64 mips ppc s390 sparc x86"
 RESTRICT="fetch"
 IUSE="X"
 
diff --git a/dev-util/bitkeeper/files/digest-bitkeeper-3.0.3 b/dev-util/bitkeeper/files/digest-bitkeeper-3.0.3
deleted file mode 100644
index f6b2e83ee9dc..000000000000
--- a/dev-util/bitkeeper/files/digest-bitkeeper-3.0.3
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 5a4da518944dfe1dff7cf92e75dbbc35 bk-3.0.3-x86-glibc22-linux.bin 2549608
-MD5 879644e5503edd813b46ff18111a0ceb bk-3.0.3-powerpc-glibc21-linux.bin 2763516
-MD5 2926939334479852a6a1ea77bb166535 bk-3.0.3-sparc-glibc21-linux.bin 2713920
-MD5 96ad4576fcb5242add92a9851e20cf13 bk-3.0.3-alpha-glibc22-linux.bin 3139272
-MD5 1b7d90e1b3f0eebadc8aecdb630fd709 bk-3.0.3-arm-glibc21-linux.bin 2701400
-MD5 0eb6230d2b9bb35e4ac2225ec6ae31e6 bk-3.0.3-hppa-glibc22-linux.bin 2779780
-MD5 d3ee96e80de441693d319e23e52a5792 bk-3.0.3-ia64-glibc22-linux.bin 3453680
diff --git a/dev-util/bitkeeper/files/digest-bitkeeper-3.0.4 b/dev-util/bitkeeper/files/digest-bitkeeper-3.0.4
deleted file mode 100644
index ef9cbfe23c1c..000000000000
--- a/dev-util/bitkeeper/files/digest-bitkeeper-3.0.4
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 2bf7d30253e741f9fcccb9c7ae3241b6 bk-3.0.4-x86-glibc22-linux.bin 2550600
-MD5 ad7a6ad9404eb96e0813f9a96721fe32 bk-3.0.4-powerpc-glibc21-linux.bin 2764876
-MD5 d9cea9df78b720d0450fea0b7ac0de20 bk-3.0.4-sparc-glibc21-linux.bin 2714456
-MD5 0cb99668840208bdc04b155ef2703cdd bk-3.0.4-alpha-glibc22-linux.bin 3139256
-MD5 7991608693b344bad5bb855e67f6f1cd bk-3.0.4-arm-glibc21-linux.bin 2700696
-MD5 6338999a54e7a59140cad20f1ab57be5 bk-3.0.4-hppa-glibc22-linux.bin 2780344
-MD5 c5e1d514abc01405d8901c8e3dd89b75 bk-3.0.4-ia64-glibc22-linux.bin 3452096
diff --git a/dev-util/bitkeeper/files/digest-bitkeeper-3.2.2 b/dev-util/bitkeeper/files/digest-bitkeeper-3.2.2
index 2bbbeb7e7441..d200e20061ee 100644
--- a/dev-util/bitkeeper/files/digest-bitkeeper-3.2.2
+++ b/dev-util/bitkeeper/files/digest-bitkeeper-3.2.2
@@ -1 +1,9 @@
+MD5 d09eb8184ac318989e93dae2a0756dde bk-3.2.2-alpha-glibc22-linux.bin 3601416
+MD5 706900fc1a306ea9b5d6faf196db1d11 bk-3.2.2-arm-glibc21-linux.bin 3136108
+MD5 4d53f80702f142e60e1959d71d5c54b0 bk-3.2.2-hppa-glibc22-linux.bin 3400052
+MD5 3bab6f675a1666239829f1c1ae34f9bc bk-3.2.2-ia64-glibc22-linux.bin 4168624
+MD5 c7fc51550f6ede42d47e357591df5b72 bk-3.2.2-mips-glibc22-linux.bin 3416872
+MD5 06264e2ab9edaf6ca83d1c3b004d2cd4 bk-3.2.2-powerpc-glibc21-linux.bin 3198524
+MD5 60229f4f248dcef890ecbf4b1393a16d bk-3.2.2-s390-glibc22-linux.bin 3147552
+MD5 1d38fb2f62c9da1f8f5bf38128c34716 bk-3.2.2-sparc-glibc21-linux.bin 3139856
 MD5 952c956cafd440c94b73749a427ee701 bk-3.2.2-x86-glibc23-linux.bin 3071260