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

Package-Manager: portage-2.1.2.7

9 files changed, 40 insertions, 167 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/Manifest b/dev-lang/ocaml/Manifest
index 0b3d949c9065..782c9586e3fc 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ocaml-3.08.3-gcc4.patch 710 RMD160 7c7399b1a1aa383815021721b4f4a5261137dc15 SHA1 19482bd2cc736a54645e0b48c82edd9863be0375 SHA256 007606bb38a7d66a003a94c9b45288055faacf5f15334a9ff6c33fdc91504e09
-MD5 c57fc46d92565b5d44c8c4f2a4a072d3 files/ocaml-3.08.3-gcc4.patch 710
-RMD160 7c7399b1a1aa383815021721b4f4a5261137dc15 files/ocaml-3.08.3-gcc4.patch 710
-SHA256 007606bb38a7d66a003a94c9b45288055faacf5f15334a9ff6c33fdc91504e09 files/ocaml-3.08.3-gcc4.patch 710
 AUX ocaml-3.09.3-Makefile.patch 1489 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43e2c0 SHA1 16d5cfa7e12d542928d90c144125fbc3deb049f7 SHA256 da690e61fd4f72e28ed4f41a0b7c18a26a11f9ad42d4d8aa95301c02317336b9
 MD5 0d21d3b76fc3a724bd2b8d2e8d3a603f files/ocaml-3.09.3-Makefile.patch 1489
 RMD160 2405669fdfe7ac35191c59d51c36dcea4f43e2c0 files/ocaml-3.09.3-Makefile.patch 1489
@@ -25,41 +21,33 @@ AUX ocaml-rebuild.sh 1361 RMD160 a9c452fbea18de3b38d8240f887f8595e529643e SHA1 2
 MD5 bcc5109143faee7e7b8f7f76bd4726a7 files/ocaml-rebuild.sh 1361
 RMD160 a9c452fbea18de3b38d8240f887f8595e529643e files/ocaml-rebuild.sh 1361
 SHA256 a8004cd4bca96ab3fc595fcfd7dbe88903833f9e430149c3d04c9fda84362b64 files/ocaml-rebuild.sh 1361
-DIST ocaml-3.08.3.tar.bz2 2026597 RMD160 83fcab89371f228c35d826eb204c80e3380ddf27 SHA1 2ebbc72faea2ae8b96a42c489ecbcf34df9dbe76 SHA256 20aca649bacd75728d3566ccb52bd7a2899208fbc6de8aceb3bf19a87894e539
 DIST ocaml-3.08.4.tar.bz2 2054019 RMD160 448ed9af56cacb9c32208d064e1c9732a2086bd2 SHA1 d9eb54611d24f9e1c33736f12c7ba87412057cbb SHA256 8d4322791d0dd424f355636ba50934ac17dbefde269736dad0da0683c8888684
 DIST ocaml-3.09.2.tar.bz2 2036341 RMD160 45edae84e5787775a5beed29a1ad2881f4df8505 SHA1 578c66707532882782735352a3628b78193da5e7 SHA256 2115d6a4e420b5517ed7313c64bd6bd93f610ec208250b7d025595376180b0b1
 DIST ocaml-3.09.3.tar.bz2 2038617 RMD160 fdc124218c556c62c897ee6720970279e2d5426b SHA1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b SHA256 607842b4f4917a759f19541a421370a834f5b948855ca54cef40d22b19a0934f
-EBUILD ocaml-3.08.3.ebuild 2354 RMD160 7c961ab1d4c0f72e7bc6a611e5f5f86c37eb927d SHA1 ffcb51bf9ad1ae55fb2ff7e8ee4e2b105136fd30 SHA256 7e73246980685d42a7e7567e49a5ccbb8412c4da8272ea3303550c950830882d
-MD5 f48e661648ce36d459a0b2007d7535d6 ocaml-3.08.3.ebuild 2354
-RMD160 7c961ab1d4c0f72e7bc6a611e5f5f86c37eb927d ocaml-3.08.3.ebuild 2354
-SHA256 7e73246980685d42a7e7567e49a5ccbb8412c4da8272ea3303550c950830882d ocaml-3.08.3.ebuild 2354
-EBUILD ocaml-3.08.4.ebuild 2561 RMD160 4a738aa7398e99facca1bfd068144b3071bcf1a0 SHA1 37ac77c2175ef986a037b08afd8dcc3a84fbbdfc SHA256 8b082fc3ad1e00ad280176a95c6897dc724876297ff21443779dfdb702f4b810
-MD5 10542ee2a5d355f04325846b532f7635 ocaml-3.08.4.ebuild 2561
-RMD160 4a738aa7398e99facca1bfd068144b3071bcf1a0 ocaml-3.08.4.ebuild 2561
-SHA256 8b082fc3ad1e00ad280176a95c6897dc724876297ff21443779dfdb702f4b810 ocaml-3.08.4.ebuild 2561
-EBUILD ocaml-3.09.2.ebuild 2414 RMD160 575a8b85655e7a6099eadfc3e8434866b7b9fbf4 SHA1 7c64e66a385b0a7a3660a2a3115c9a8ddf449efb SHA256 7f1202a717cdce1a89f05ca049d5a2469fd212c13fcf0f03881cedd0f75a1b63
-MD5 ad4b43bea4ee37b5d152f02e44da38f5 ocaml-3.09.2.ebuild 2414
-RMD160 575a8b85655e7a6099eadfc3e8434866b7b9fbf4 ocaml-3.09.2.ebuild 2414
-SHA256 7f1202a717cdce1a89f05ca049d5a2469fd212c13fcf0f03881cedd0f75a1b63 ocaml-3.09.2.ebuild 2414
-EBUILD ocaml-3.09.3-r1.ebuild 4606 RMD160 1cad2dc36a1f36bb4f31cbd623c49852fa5a1a1e SHA1 e9b1eb12e471e7cdb6deb0ffbd15a2277bfaa13c SHA256 f71bf2bd732e3bd25950867147a3a7723c1c5ed403c12ed14d3ce84cb1f6ccc2
-MD5 5126d38106fe2a0b2899ecfca9fdf6b5 ocaml-3.09.3-r1.ebuild 4606
-RMD160 1cad2dc36a1f36bb4f31cbd623c49852fa5a1a1e ocaml-3.09.3-r1.ebuild 4606
-SHA256 f71bf2bd732e3bd25950867147a3a7723c1c5ed403c12ed14d3ce84cb1f6ccc2 ocaml-3.09.3-r1.ebuild 4606
-EBUILD ocaml-3.09.3.ebuild 2546 RMD160 3633ad343af82d4ccd960520be42a6818f65e1eb SHA1 0e31867ac7a27d946a7e64c6ecc5f711d396aaa2 SHA256 d9ebc69c806a36354d9cc53132095ccce0d1001cc38b22dbbb20ac625e9b9aff
-MD5 34cae488a62c65feb4a5a7a2ecec483a ocaml-3.09.3.ebuild 2546
-RMD160 3633ad343af82d4ccd960520be42a6818f65e1eb ocaml-3.09.3.ebuild 2546
-SHA256 d9ebc69c806a36354d9cc53132095ccce0d1001cc38b22dbbb20ac625e9b9aff ocaml-3.09.3.ebuild 2546
-MISC ChangeLog 15352 RMD160 a2fd53c1bcbf519154ee5d2fa4df117375261733 SHA1 830e01626184d511e22a91c6690c9c7f9ce981a0 SHA256 dd368667418084f8c319dabf0724c37272b0c09002129e635b9e57188a36bd5d
-MD5 cd9e3e24be23f0af2ae7d72156839498 ChangeLog 15352
-RMD160 a2fd53c1bcbf519154ee5d2fa4df117375261733 ChangeLog 15352
-SHA256 dd368667418084f8c319dabf0724c37272b0c09002129e635b9e57188a36bd5d ChangeLog 15352
+EBUILD ocaml-3.08.4.ebuild 2548 RMD160 c99ebd7b7ed7487e3987db53b9f0ddf0f54921d4 SHA1 3fec4a3874b4ea48b87f6cc20b138f8e69a0a452 SHA256 0b7f8a81f5db0d96d6f04384c0943b6793d22040ae3f7f95a343a41c939e9725
+MD5 4e81125b11cc324ab0858900e935af51 ocaml-3.08.4.ebuild 2548
+RMD160 c99ebd7b7ed7487e3987db53b9f0ddf0f54921d4 ocaml-3.08.4.ebuild 2548
+SHA256 0b7f8a81f5db0d96d6f04384c0943b6793d22040ae3f7f95a343a41c939e9725 ocaml-3.08.4.ebuild 2548
+EBUILD ocaml-3.09.2.ebuild 2402 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 SHA1 eaad5d7242bcacae2fdf83947e21764b9733efb7 SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030
+MD5 8cb80568d2fffd2db8db680e611b1323 ocaml-3.09.2.ebuild 2402
+RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 ocaml-3.09.2.ebuild 2402
+SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030 ocaml-3.09.2.ebuild 2402
+EBUILD ocaml-3.09.3-r1.ebuild 4604 RMD160 2544c649bc02a210617333b60a055a329fa42b61 SHA1 83807b054de5dbda1a2f1fd71f69a55aa3b0ca90 SHA256 8c1fcccd80b9a452cfeeafd4598c77c909e7a45d15d8702d8c7beb35be8db539
+MD5 5de3d5e51ccec855c200e2a8bd82fea7 ocaml-3.09.3-r1.ebuild 4604
+RMD160 2544c649bc02a210617333b60a055a329fa42b61 ocaml-3.09.3-r1.ebuild 4604
+SHA256 8c1fcccd80b9a452cfeeafd4598c77c909e7a45d15d8702d8c7beb35be8db539 ocaml-3.09.3-r1.ebuild 4604
+EBUILD ocaml-3.09.3.ebuild 2534 RMD160 f37fa7e4ddeb0cdf9026c6cfb9e9438d38722504 SHA1 a8a93633033fc7c2efe9fc8470223ad90d065152 SHA256 251bf61f5483314179947004159d023bd846d66f7a6dab4299db4293dadee14d
+MD5 9629164cca5ba04887c0087f6cfc9bc2 ocaml-3.09.3.ebuild 2534
+RMD160 f37fa7e4ddeb0cdf9026c6cfb9e9438d38722504 ocaml-3.09.3.ebuild 2534
+SHA256 251bf61f5483314179947004159d023bd846d66f7a6dab4299db4293dadee14d ocaml-3.09.3.ebuild 2534
+MISC ChangeLog 15651 RMD160 238caa310211b0015b723e55739a9bd91d479529 SHA1 aa49aa3a6d183005f646b8f2feeba06be45c1d63 SHA256 70d6c4c694af9fc22a567b637fe2bf1978f34ca3466f5292d882e58b59b834b2
+MD5 e86a7f9d89bba2c7d3c85dc48e77da53 ChangeLog 15651
+RMD160 238caa310211b0015b723e55739a9bd91d479529 ChangeLog 15651
+SHA256 70d6c4c694af9fc22a567b637fe2bf1978f34ca3466f5292d882e58b59b834b2 ChangeLog 15651
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 metadata.xml 155
-MD5 32e668c99988d463934c5ead1a603d29 files/digest-ocaml-3.08.3 244
-RMD160 0068922a3d2f5c6172d9dd866a1e1e1e85db8abe files/digest-ocaml-3.08.3 244
-SHA256 dab059cc4714a36ee9d9b3dd15b35dec829ec0fcfc952aed6936a2bd7b9e279b files/digest-ocaml-3.08.3 244
 MD5 616991884ec513ca3018b0505bdb5707 files/digest-ocaml-3.08.4 244
 RMD160 660afa0d675ca64d6bf0e8013af19fc169048733 files/digest-ocaml-3.08.4 244
 SHA256 f2fd468f6c4554ab21e0c0fa7e9a1d1bac5b3760d5184f4ffd53c5fecd90b82e files/digest-ocaml-3.08.4 244
@@ -73,9 +61,9 @@ MD5 71f3dc5bc2ee57a403689b56bc1a85c1 files/digest-ocaml-3.09.3-r1 244
 RMD160 e7f0898889b94faae3b1481555bac42e9298b370 files/digest-ocaml-3.09.3-r1 244
 SHA256 19708f759185ed39623e03921462ba20fb6f3533268673d2bcd7dd07cef57350 files/digest-ocaml-3.09.3-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGK78DyuNVb5qfaOYRAuu1AJsENfbH9M9gfS7w3fogczQDtBj9tACeLkaU
-NLLmK/3NOii9crPE4gatzO0=
-=PYSt
+iD8DBQFGRL+dvFcC4BYPU0oRAmONAJ4mzqeIsBtrtgmjjjcqHwpsZPibQQCZAddx
+MDEVifK5ScIkIw4gkubr7lQ=
+=TL65
 -----END PGP SIGNATURE-----
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