Directory cleanup.

11 files changed, 10 insertions, 257 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 952330467218..c6d68581d6e2 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.32 2004/07/06 20:40:57 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.33 2004/07/06 20:51:30 mattam Exp $
+
+  06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> -ocaml-3.06-r1.ebuild,
+  ocaml-3.06-r2.ebuild, -ocaml-3.06.ebuild, -ocaml-3.07.ebuild,
+  -ocaml-3.07_beta2.ebuild:
+  remove old, no longer needed versions.
 
   06 Jul 2004; Matthieu Sozeau <mattam@gentoo.org> +files/ocaml-rebuild.sh,
   ocaml-3.07-r1.ebuild:
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 40d3d9e88108..2e8be03e7af6 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,18 +1,10 @@
-MD5 6c0fa31a3cc320cf92598943d8cc674d ChangeLog 5634
+MD5 ede2cf3169b8424e0975ec8f5853b072 ChangeLog 5842
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 3a7afe8684854ac0439153b0470b05fd ocaml-3.06-r1.ebuild 1440
-MD5 42f30acb621ab480ec8cce2c97eea617 ocaml-3.06-r2.ebuild 1549
-MD5 eeb66a2e9d94f92e4fcc896e85376b7d ocaml-3.06.ebuild 1372
+MD5 5caaff592069914b134a83a6752ec138 ocaml-3.06-r2.ebuild 1543
 MD5 7813da80e5da5b82d2a364f55584477c ocaml-3.07-r1.ebuild 1945
-MD5 03472deb472381be819bdcf021d6694b ocaml-3.07.ebuild 1369
-MD5 78875af737cfc5792a4c199d76456a93 ocaml-3.07_beta2.ebuild 1567
 MD5 f7d5ef0353678210ba7972b7cab4caad files/ocaml-rebuild.sh 836
-MD5 30ac0d14e37ff0be57927d84e4e7e1c6 files/digest-ocaml-3.06 197
-MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r1 63
 MD5 13c4abf06e236e8835011a387f90ecc9 files/digest-ocaml-3.06-r2 63
-MD5 6e02dcc33419f9e035b77ff4a0104e8b files/digest-ocaml-3.07 63
 MD5 c42de320103c2d3eb1aa4002e2e0716b files/digest-ocaml-3.07-r1 130
-MD5 775d7436073205d935d3979a326b0729 files/digest-ocaml-3.07_beta2 68
 MD5 91579cecf8659312c2324d8d40709433 files/ocaml-3.06-sparc-configure.patch 1660
 MD5 4df214d6cd74b3c5955d868879dd6cc7 files/ocaml-3.06-tcltk-8.4compat-patch.bz2 639
 MD5 45ff13419dd955aa86d021abbf325fc2 files/ocaml-3.07-hppa.patch 15730
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.06 b/dev-lang/ocaml/files/digest-ocaml-3.06
deleted file mode 100644
index 88506c394a9d..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.06
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8120e097a0f40c921bcf811cb355d46 /files/ocaml-3.04-ppc.diff.tgz 2967
-MD5 71516833e12927d7935f31937866dbdb /ocaml-3.06.ebuild 1176
-MD5 51530ed183b511ce19fed325c8ab1b43 ocaml-3.06.tar.gz 2436887
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.06-r1 b/dev-lang/ocaml/files/digest-ocaml-3.06-r1
deleted file mode 100644
index 9f9f472447f2..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.06-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51530ed183b511ce19fed325c8ab1b43 ocaml-3.06.tar.gz 2436887
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.07 b/dev-lang/ocaml/files/digest-ocaml-3.07
deleted file mode 100644
index 33759519a3ff..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.07
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2dd038055f5e1350078ad81270411b78 ocaml-3.07.tar.gz 2537449
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.07_beta2 b/dev-lang/ocaml/files/digest-ocaml-3.07_beta2
deleted file mode 100644
index aa4552b22bb9..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.07_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ecc68d67871aeae91bd807f3a3e388cb ocaml-3.07beta2.tar.gz 2533946
diff --git a/dev-lang/ocaml/ocaml-3.06-r1.ebuild b/dev-lang/ocaml/ocaml-3.06-r1.ebuild
deleted file mode 100644
index a0126e0fffd4..000000000000
--- a/dev-lang/ocaml/ocaml-3.06-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r1.ebuild,v 1.8 2004/07/02 04:29:48 eradicator Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="tcltk"
-
-DEPEND="virtual/libc
-	tcltk? ( >=dev-lang/tk-3.3.3 )"
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	local myconf
-	use tcltk || myconf="-no-tk"
-
-	epatch ${FILESDIR}/ocaml-3.06-tcltk-8.4compat-patch.bz2
-
-	# Fix for bug #23767
-	if [ "${ARCH}" = "sparc" ]
-	then
-		# We need a patch and to make sure it builds
-		# for the right host type
-		epatch ${FILESDIR}/ocaml-3.06-sparc-configure.patch
-		myconf="${myconfg} -host sparc-unknown-linux-gnu"
-	fi
-
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
-		-mandir /usr/share/man \
-		--with-pthread ${myconf} || die
-
-	make world || die
-	make opt || die
-	make opt.opt || die
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/lib/ocaml \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
-
-	# documentation
-	dodoc Changes INSTALL LICENSE README Upgrading
-}
diff --git a/dev-lang/ocaml/ocaml-3.06-r2.ebuild b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
index 62e3fd723e59..d4705ffa6848 100644
--- a/dev-lang/ocaml/ocaml-3.06-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.06-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.6 2004/07/02 04:29:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06-r2.ebuild,v 1.7 2004/07/06 20:51:30 mattam Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz"
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ppc alpha"
+KEYWORDS="x86 sparc ppc alpha"
 IUSE="tcltk"
 
 DEPEND="virtual/libc
diff --git a/dev-lang/ocaml/ocaml-3.06.ebuild b/dev-lang/ocaml/ocaml-3.06.ebuild
deleted file mode 100644
index 116c8624e9e9..000000000000
--- a/dev-lang/ocaml/ocaml-3.06.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.06.ebuild,v 1.14 2004/07/02 04:29:48 eradicator Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="tcltk"
-
-DEPEND="virtual/libc
-	tcltk? ( >=dev-lang/tk-3.3.3 )"
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	local myconf
-	use tcltk || myconf="-no-tk"
-
-	# Fix for bug #23767
-	if [ "${ARCH}" = "sparc" ]
-	then
-		# We need a patch and to make sure it builds
-		# for the right host type
-		epatch ${FILESDIR}/ocaml-3.06-sparc-configure.patch
-		myconf="${myconfg} -host sparc-unknown-linux-gnu"
-	fi
-
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
-		-mandir /usr/share/man \
-		--with-pthread ${myconf} || die
-
-	make world || die
-	make opt || die
-	make opt.opt || die
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/lib/ocaml \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
-
-	# documentation
-	dodoc Changes INSTALL README Upgrading
-}
diff --git a/dev-lang/ocaml/ocaml-3.07.ebuild b/dev-lang/ocaml/ocaml-3.07.ebuild
deleted file mode 100644
index 3aa00b35bffd..000000000000
--- a/dev-lang/ocaml/ocaml-3.07.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07.ebuild,v 1.7 2004/07/02 04:29:48 eradicator Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
-HOMEPAGE="http://www.ocaml.org/"
-
-SRC_URI="http://caml.inria.fr/distrib/${P}/${P}.tar.gz"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha -amd64"
-IUSE="tcltk"
-
-DEPEND="virtual/libc
-	tcltk? ( >=dev-lang/tk-3.3.3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -rle "head -1" . | xargs sed -i "s:head -1:head -n 1:g"
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	local myconf
-	use tcltk || myconf="-no-tk"
-
-	# Fix for bug #23767.
-	if [ "${ARCH}" = "sparc" ]; then
-		myconf="${myconf} -host sparc-unknown-linux-gnu"
-	fi
-
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
-		-mandir /usr/share/man \
-		--with-pthread ${myconf} || die
-
-	make world || die
-	make opt || die
-	make opt.opt || die
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/lib/ocaml \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
-
-	# documentation
-	dodoc Changes INSTALL LICENSE README Upgrading
-}
diff --git a/dev-lang/ocaml/ocaml-3.07_beta2.ebuild b/dev-lang/ocaml/ocaml-3.07_beta2.ebuild
deleted file mode 100644
index 1e810702dd51..000000000000
--- a/dev-lang/ocaml/ocaml-3.07_beta2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.07_beta2.ebuild,v 1.8 2004/07/02 04:29:48 eradicator Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="fast modern type-inferring functional programming language descended from the ML (Meta Language) family"
-HOMEPAGE="http://www.ocaml.org/"
-
-MyPV="${PV/_/}"
-SRC_URI="http://caml.inria.fr/distrib/${PN}-${MyPV}/${PN}-${MyPV}.tar.gz"
-S="${WORKDIR}/${PN}-${MyPV}"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha -amd64"
-IUSE="tcltk"
-
-DEPEND="virtual/libc
-	tcltk? ( >=dev-lang/tk-3.3.3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	grep -rle "head -1" . | xargs sed -i "s:head -1:head -n 1:g"
-
-	# Fix for bug #23767
-	if [ "${ARCH}" = "sparc" ]
-	then
-		# We need a patch and to make sure it builds
-		# for the right host type
-		epatch ${FILESDIR}/ocaml-3.06-sparc-configure.patch
-		myconf="${myconfg} -host sparc-unknown-linux-gnu"
-	fi
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	local myconf
-	use tcltk || myconf="-no-tk"
-
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
-		-mandir /usr/share/man \
-		--with-pthread ${myconf} || die
-
-	make world || die
-	make opt || die
-	make opt.opt || die
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/lib/ocaml \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/lib/ocaml/ld.conf
-
-	# documentation
-	dodoc Changes INSTALL LICENSE README Upgrading
-}