injected -r2 modifications into -r1 and removed -r2

(-r2 was a testing "release", masked all the time)

3 files changed, 2 insertions, 64 deletions

diff --git a/dev-lang/ocaml/files/digest-ocaml-3.04-r2 b/dev-lang/ocaml/files/digest-ocaml-3.04-r2
deleted file mode 100644
index 89713e68b3bf..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.04-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f2fbb849fccb33308188aa19aa9b0ee ocaml-3.04.tar.gz 1968138
diff --git a/dev-lang/ocaml/ocaml-3.04-r1.ebuild b/dev-lang/ocaml/ocaml-3.04-r1.ebuild
index 904471d26798..c3cab10cb20f 100644
--- a/dev-lang/ocaml/ocaml-3.04-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.04-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 20022 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.04-r1.ebuild,v 1.4 2002/08/14 11:58:50 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.04-r1.ebuild,v 1.5 2002/09/02 18:30:15 george Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Objective Caml is a fast modern type-inferring functional programming language descended from the ML (Meta Language) family."
@@ -8,7 +8,7 @@ SRC_URI="ftp://ftp.inria.fr/lang/caml-light/${P}.tar.gz"
 HOMEPAGE="http://www.ocaml.org/"
 
 DEPEND="virtual/glibc
-	>=dev-lang/tk-3.3.3"
+	tcltk? ( >=dev-lang/tk-3.3.3 )"
 RDEPEND="${DEPEND}"
 
 SLOT="0"
diff --git a/dev-lang/ocaml/ocaml-3.04-r2.ebuild b/dev-lang/ocaml/ocaml-3.04-r2.ebuild
deleted file mode 100644
index a20d5d5e6ccb..000000000000
--- a/dev-lang/ocaml/ocaml-3.04-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 20022 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.04-r2.ebuild,v 1.2 2002/08/14 11:58:50 murphy Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Objective Caml is a fast modern type-inferring functional programming language descended from the ML (Meta Language) family."
-SRC_URI="ftp://ftp.inria.fr/lang/caml-light/${P}.tar.gz"
-HOMEPAGE="http://www.ocaml.org/"
-
-DEPEND="virtual/glibc
-	tcltk? ( >=dev-lang/tk-3.3.3 )"
-RDEPEND="${DEPEND}"
-
-SLOT="0"
-LICENSE="QPL-1.0 LGPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-# The unpack function is needed only so that we can apply a ppc patch from cvs.
-# This should be fixed in v.>3.04, so the function can be removed then.
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	if [ ${ARCH} == "ppc" ]
-	then
-		tar -zxf ${FILESDIR}/${P}-ppc.diff.tgz
-		patch -l -p1 < ${P}-ppc.diff
-	fi
-}
-
-src_compile()
-{
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/lib/ocaml \
-		-mandir /usr/man/man1 \
-		-with-pthread \
-
-	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/man/man1 \
-		install || die
-
-	dodir /etc/env.d
-	echo LDPATH=/usr/lib/ocaml:/usr/lib/ocaml/labltk \
-		> ${D}/etc/env.d/30ocaml
-	dodoc Changes INSTALL LICENSE README Upgrading
-
-}
-
-
-
-