made tk dependency optional

3 files changed, 82 insertions, 2 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index c0be1e62856f..ab7898a2e07e 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.3 2002/06/24 20:54:02 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.4 2002/08/04 00:11:39 george Exp $
+
+*ocaml-3.04-r2 (01 Aug 2002)
+
+  02 Aug 2002; George Shapovalov <george@gentoo.org> ocaml-3.04-r2.ebuild :
+
+  tk dependence is reported (by Tim Hobbs <rectrix@rectrix.cx>) to be optional,
+  made it depend on tcltk use flag.
+  Created and masked new revision to give this some testing without interuption 
+  to the working package.
+  Core devs (cvs access people): please do not unmask it on server! Instead please 
+  let me know that it tested Ok. I will do necessary modifications to the -r1 
+  and delete -r2. This way we will not force everybody to rebuild perfectly 
+  working package.
 
 *ocaml-3.04-r1 (24 Jun 2002)
 
diff --git a/dev-lang/ocaml/ocaml-3.04-r2.ebuild b/dev-lang/ocaml/ocaml-3.04-r2.ebuild
new file mode 100644
index 000000000000..d77be74182d6
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-3.04-r2.ebuild
@@ -0,0 +1,61 @@
+# 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.1 2002/08/04 00:11:39 george 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"
+
+# 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
+
+}
+
+
+
+
diff --git a/profiles/package.mask b/profiles/package.mask
index 38b9ffdf4ad2..7e3d0c8f8806 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -22,6 +22,12 @@
 ##   End example
 ##
 
+# <george@gentoo.org> (03 Aug 2002)
+# masked for testing.
+# PLEASE DO NOT UNMASK ON SERVER! Insted please let me know if it tested Ok 
+# (with USE="-tcltk"). 
+=dev-lang/ocaml-3.04-r2
+
 # <drobbins@gentoo.org> (03 Aug 2002)
 # this version by aliz has 2 rejects
 =sys-apps/pciutils-2.1.10
@@ -82,7 +88,7 @@ app-office/ical
 =app-i18n/xcin-2.5.2.3
 
 # Seemant Kulleen <seemant@gentoo.org> (31 Jul 2002)
-# invalid RDEPEND, invalid LICENSE, no $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.1166 2002/08/03 22:26:53 drobbins Exp $
+# invalid RDEPEND, invalid LICENSE, no $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.1167 2002/08/04 00:11:39 george Exp $
 # repoman had a field day
 sys-apps/discover
 sys-apps/discover-data