Fix bug #135641 again, remove unused version, drop virtual/libc dep as it is in system anyway

(Portage version: 2.1.2.7)

8 files changed, 16 insertions, 131 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 8d92cd351df9..1ea693415012 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.99 2007/04/22 20:00:56 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.100 2007/05/11 19:12:07 aballier Exp $
+
+  11 May 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/ocaml-3.08.3-gcc4.patch, -ocaml-3.08.3.ebuild, ocaml-3.08.4.ebuild,
+  ocaml-3.09.2.ebuild, ocaml-3.09.3.ebuild, ocaml-3.09.3-r1.ebuild:
+  Fix bug #135641 again, remove unused version, drop virtual/libc dep as it is
+  in system anyway
 
   22 Apr 2007; Christian Heim <phreak@gentoo.org> ocaml-3.09.3-r1.ebuild:
   Restricting FEATURES=test for now, make bootstrap deletes the *.opt files
diff --git a/dev-lang/ocaml/files/digest-ocaml-3.08.3 b/dev-lang/ocaml/files/digest-ocaml-3.08.3
deleted file mode 100644
index 40d13b57defe..000000000000
--- a/dev-lang/ocaml/files/digest-ocaml-3.08.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b0b238fb4b059890457d3d35b138785 ocaml-3.08.3.tar.bz2 2026597
-RMD160 83fcab89371f228c35d826eb204c80e3380ddf27 ocaml-3.08.3.tar.bz2 2026597
-SHA256 20aca649bacd75728d3566ccb52bd7a2899208fbc6de8aceb3bf19a87894e539 ocaml-3.08.3.tar.bz2 2026597
diff --git a/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch b/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch
deleted file mode 100644
index b172ace08a6b..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.08.3-gcc4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ocaml-3.08.3/otherlibs/num/bng_ia32.c.x86	2005-05-09 15:24:29.000000000 -0400
-+++ ocaml-3.08.3/otherlibs/num/bng_ia32.c	2005-05-09 22:02:50.000000000 -0400
-@@ -121,7 +121,7 @@
-         "leal 4(%1), %1 \n\t"
-         "decl %2 \n\t"
-         "jnz 1b"
--        : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out)
-+        : "+&r" (a), "+&r" (b), "+m" (blen), "+&r" (out)
-         : "rm" (d)
-         : "eax", "edx");
-   }
-@@ -164,7 +164,7 @@
-         "leal 4(%1), %1 \n\t"
-         "decl %2 \n\t"
-         "jnz 1b"
--        : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp)
-+        : "+&r" (a), "+&r" (b), "+m" (blen), "+m" (out), "=&r" (tmp)
-         : "rm" (d)
-         : "eax", "edx");
-   }
diff --git a/dev-lang/ocaml/ocaml-3.08.3.ebuild b/dev-lang/ocaml/ocaml-3.08.3.ebuild
deleted file mode 100644
index be2fdb8f414c..000000000000
--- a/dev-lang/ocaml/ocaml-3.08.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.3.ebuild,v 1.16 2007/02/17 19:16:10 grobian Exp $
-
-inherit flag-o-matic eutils multilib
-
-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/ocaml-3.08/${P}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="tk latex"
-
-DEPEND="virtual/libc
-	tk? ( >=dev-lang/tk-3.3.3 )"
-
-pkg_setup() {
-	ewarn
-	ewarn "Building ocaml with unsafe CFLAGS can have unexpected results"
-	ewarn "Please retry building with safer CFLAGS before reporting bugs"
-	ewarn
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	#GCC4 patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-	replace-flags "-O?" -O2
-
-	local myconf
-	use tk || myconf="-no-tk"
-
-	# Fix for bug #23767.
-	if [ "${ARCH}" = "sparc" ]; then
-		myconf="${myconf} -host sparc-unknown-linux-gnu"
-	fi
-
-	# Fix for bug #46703
-	export LC_ALL=C
-
-	./configure -prefix /usr \
-		-bindir /usr/bin \
-		-libdir /usr/$(get_libdir)/ocaml \
-		-mandir /usr/share/man \
-		--with-pthread ${myconf} || die
-
-	sed -i -e "s/\(BYTECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
-	sed -i -e "s/\(NATIVECCCOMPOPTS=.*\)/\1 ${CFLAGS}/" config/Makefile
-
-	make world || die
-
-	# Native code generation unsupported on some archs
-	if ! use ppc64 ; then
-		make opt || die
-		make opt.opt || die
-	fi
-}
-
-src_install() {
-	make BINDIR=${D}/usr/bin \
-		LIBDIR=${D}/usr/$(get_libdir)/ocaml \
-		MANDIR=${D}/usr/share/man \
-		install || die
-
-	# silly, silly makefiles
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
-	# documentation
-	dodoc Changes INSTALL LICENSE README Upgrading
-}
-
-pkg_postinst() {
-	if use latex; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > /etc/env.d/99ocamldoc
-	fi
-
-	echo
-	elog "OCaml is not binary compatible from version to version,"
-	elog "so you (may) need to rebuild all packages depending on it that"
-	elog "are actually installed on your system."
-	elog "To do so, you can run: "
-	elog "sh ${FILESDIR}/ocaml-rebuild.sh [-h | emerge options]"
-	elog "Which will call emerge on all old packages with the given options"
-	echo
-}
diff --git a/dev-lang/ocaml/ocaml-3.08.4.ebuild b/dev-lang/ocaml/ocaml-3.08.4.ebuild
index 18837ee7670e..e88039b8d55b 100644
--- a/dev-lang/ocaml/ocaml-3.08.4.ebuild
+++ b/dev-lang/ocaml/ocaml-3.08.4.ebuild
@@ -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/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.14 2007/02/17 19:16:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.08.4.ebuild,v 1.15 2007/05/11 19:12:07 aballier Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 -s390 sparc ~x86"
 IUSE="tk latex"
 
-DEPEND="virtual/libc
-	tk? ( >=dev-lang/tk-3.3.3 )"
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )"
 
 pkg_setup() {
 	ewarn
diff --git a/dev-lang/ocaml/ocaml-3.09.2.ebuild b/dev-lang/ocaml/ocaml-3.09.2.ebuild
index 63ee9c458cad..082536215ea8 100644
--- a/dev-lang/ocaml/ocaml-3.09.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.2.ebuild
@@ -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/dev-lang/ocaml/ocaml-3.09.2.ebuild,v 1.11 2007/02/06 08:26:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.2.ebuild,v 1.12 2007/05/11 19:12:07 aballier Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="tk latex"
 
-DEPEND="virtual/libc
-	tk? ( >=dev-lang/tk-3.3.3 )"
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )"
 
 pkg_setup() {
 	ewarn
diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
index 840e521c822d..b1655054f7e8 100644
--- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
@@ -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/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.2 2007/04/22 20:00:56 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.3 2007/05/11 19:12:07 aballier Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="tk latex"
 
-DEPEND="virtual/libc
-	tk? ( >=dev-lang/tk-3.3.3 )"
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )"
 
 # ocaml deletes the *.opt files when running bootstrap
 RESTRICT="test"
@@ -64,7 +63,7 @@ src_compile() {
 	strip-flags
 	replace-flags "-O?" -O2
 
-	use tk || myconf="-no-tk"
+	use tk || myconf="${myconf} -no-tk"
 
 	# ocaml uses a home-brewn configure script, preventing it to use econf.
 	./configure -prefix /usr \
diff --git a/dev-lang/ocaml/ocaml-3.09.3.ebuild b/dev-lang/ocaml/ocaml-3.09.3.ebuild
index bc6ff09052f3..dd28c3dbfcdd 100644
--- a/dev-lang/ocaml/ocaml-3.09.3.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3.ebuild
@@ -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/dev-lang/ocaml/ocaml-3.09.3.ebuild,v 1.9 2007/04/15 20:17:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3.ebuild,v 1.10 2007/05/11 19:12:07 aballier Exp $
 
 inherit flag-o-matic eutils multilib
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="tk latex"
 
-DEPEND="virtual/libc
-	tk? ( >=dev-lang/tk-3.3.3 )"
+DEPEND="tk? ( >=dev-lang/tk-3.3.3 )"
 
 pkg_setup() {
 	ewarn