clean up unused patch

Package-Manager: portage-2.1.4_rc10

5 files changed, 23 insertions, 86 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index e9203208eef9..d05a59f1aa2f 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,11 @@
 # 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.129 2007/12/20 19:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.130 2007/12/20 20:24:12 aballier Exp $
+
+  20 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+  -files/ocaml-3.10.0-execheap.patch, ocaml-3.10.0.ebuild,
+  ocaml-3.10.1_rc1.ebuild:
+  clean up unused patch
 
 *ocaml-3.10.1_rc1 (20 Dec 2007)
 
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 7f1b1d2386dd..e210ad07e331 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -45,10 +45,6 @@ AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e2
 MD5 e501625f274c57f8c0041879ee1e6241 files/ocaml-3.10.0-exec-stack-fixes.patch 9395
 RMD160 00d5e1ac85a090baeaf9b9cba2e277c72bef5792 files/ocaml-3.10.0-exec-stack-fixes.patch 9395
 SHA256 a260416a0fc1cf05ff3b2dceac83bd00043ee7ad6a8f2487934723f5b9f406da files/ocaml-3.10.0-exec-stack-fixes.patch 9395
-AUX ocaml-3.10.0-execheap.patch 1954 RMD160 4fd8ce0568f04460ad5ee0a2821702d5efecd5b2 SHA1 7ac15edd7b052cb6be7dfa59b2e7494b8a48fd15 SHA256 29d77bc4cd3ac8e34a3a7905ece1ea18522eab9fdaf886813edfbf11aa0438c1
-MD5 57e1c16f5c1201c1bdbf3216a7074512 files/ocaml-3.10.0-execheap.patch 1954
-RMD160 4fd8ce0568f04460ad5ee0a2821702d5efecd5b2 files/ocaml-3.10.0-execheap.patch 1954
-SHA256 29d77bc4cd3ac8e34a3a7905ece1ea18522eab9fdaf886813edfbf11aa0438c1 files/ocaml-3.10.0-execheap.patch 1954
 AUX ocaml-rebuild.sh 1363 RMD160 8eda8892012f6600fb54be8ef3dd0594a649c81f SHA1 2790ddbed9cf897b7927264b7a86ad9f8f1b5965 SHA256 49e8ce024cdc2f665437c869d59931c136215971ec97d2c0b27d33668ebffa30
 MD5 3ce1fdaa9acb7d4594aa612bd81a2c4e files/ocaml-rebuild.sh 1363
 RMD160 8eda8892012f6600fb54be8ef3dd0594a649c81f files/ocaml-rebuild.sh 1363
@@ -78,18 +74,18 @@ EBUILD ocaml-3.09.3.ebuild 2500 RMD160 a9c43b49383ea186faff06647001ecf0875c00d3
 MD5 14a3fd57aa2dd66ab113573aa6606d36 ocaml-3.09.3.ebuild 2500
 RMD160 a9c43b49383ea186faff06647001ecf0875c00d3 ocaml-3.09.3.ebuild 2500
 SHA256 e17bb81382f905b0ca1e46408d07e41a742edc11d94b6cd69ac6e3e4515e1195 ocaml-3.09.3.ebuild 2500
-EBUILD ocaml-3.10.0.ebuild 4511 RMD160 16942e59cf6fba64f0f9c9ad5262c380273f3df5 SHA1 0af5adc83520723762b54f36506ce583bce39f22 SHA256 5ce24c87a9d972eb9cdfa1a02f002f1cfee484186b0747964329c4dfdf75888d
-MD5 607ec385b3e5698804239dc5aac9fded ocaml-3.10.0.ebuild 4511
-RMD160 16942e59cf6fba64f0f9c9ad5262c380273f3df5 ocaml-3.10.0.ebuild 4511
-SHA256 5ce24c87a9d972eb9cdfa1a02f002f1cfee484186b0747964329c4dfdf75888d ocaml-3.10.0.ebuild 4511
-EBUILD ocaml-3.10.1_rc1.ebuild 4593 RMD160 0c2d28c9dd788260b2e2fac774ab1eaf68fb7677 SHA1 466d7a0b25d965d1db5bd552ff9fb00283681a8e SHA256 0e9e8aa93191f0589f0d2f7bbf187039a84d10a4cd20a8e89680d835d8ecfb2d
-MD5 8bc0446d6151c143cef55db57485fb65 ocaml-3.10.1_rc1.ebuild 4593
-RMD160 0c2d28c9dd788260b2e2fac774ab1eaf68fb7677 ocaml-3.10.1_rc1.ebuild 4593
-SHA256 0e9e8aa93191f0589f0d2f7bbf187039a84d10a4cd20a8e89680d835d8ecfb2d ocaml-3.10.1_rc1.ebuild 4593
-MISC ChangeLog 20465 RMD160 e10cb0eab8af69997943c3c2fd937658ab9b1dc9 SHA1 79c24bd78e1ff2189b42a372080cde9fbce21ae8 SHA256 4d9404812cb017bd6c41d04e9d8d3743357e5f661abfcd187ecbd9976241be26
-MD5 c2bd26b8edb10d65fec0bc577008a543 ChangeLog 20465
-RMD160 e10cb0eab8af69997943c3c2fd937658ab9b1dc9 ChangeLog 20465
-SHA256 4d9404812cb017bd6c41d04e9d8d3743357e5f661abfcd187ecbd9976241be26 ChangeLog 20465
+EBUILD ocaml-3.10.0.ebuild 4281 RMD160 6ca096d81a7d6fe395b4ebfe9a0205ae202e6ab2 SHA1 b851396310fd5e1ee8dc097b98b4997e4efd9ceb SHA256 7a8d68d9a2e3f8994a933f69d5b8b9a5f17b9097da7daaefdbf4885bac1868bd
+MD5 08c50219db6431b7985ce2bc02f48446 ocaml-3.10.0.ebuild 4281
+RMD160 6ca096d81a7d6fe395b4ebfe9a0205ae202e6ab2 ocaml-3.10.0.ebuild 4281
+SHA256 7a8d68d9a2e3f8994a933f69d5b8b9a5f17b9097da7daaefdbf4885bac1868bd ocaml-3.10.0.ebuild 4281
+EBUILD ocaml-3.10.1_rc1.ebuild 4363 RMD160 8dd55a8fd1d2055c3c46dafc4062106a8a02912a SHA1 124d695707f34c0269bd59cde8bb1f82f1517693 SHA256 d8cb00245bf05fa5525519b273d431f3e84a77231dd5d05c448715a38ab83c27
+MD5 7828c982de2934061db57b7d2c9a1c7c ocaml-3.10.1_rc1.ebuild 4363
+RMD160 8dd55a8fd1d2055c3c46dafc4062106a8a02912a ocaml-3.10.1_rc1.ebuild 4363
+SHA256 d8cb00245bf05fa5525519b273d431f3e84a77231dd5d05c448715a38ab83c27 ocaml-3.10.1_rc1.ebuild 4363
+MISC ChangeLog 20628 RMD160 e273be4a88dbbf14568fcf4f500d4ab9626e6e89 SHA1 e2e735fa33ef4f95453d737f04c246edba31cc9a SHA256 89900cd00dda4f0a2513f0f8d5a643b1ddefed0061650641614c8121ce607c88
+MD5 022d1c4b6d672f786da09f65974de8c3 ChangeLog 20628
+RMD160 e273be4a88dbbf14568fcf4f500d4ab9626e6e89 ChangeLog 20628
+SHA256 89900cd00dda4f0a2513f0f8d5a643b1ddefed0061650641614c8121ce607c88 ChangeLog 20628
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
@@ -118,7 +114,7 @@ SHA256 86fe3acae1fe08f7ea793e557b3282a9c84cca491a9990dd14f7b1020634e326 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHasZjvFcC4BYPU0oRAiofAKCPzqJP8Lb7UqLe6E/BnnbMzZkELwCfV/mO
-NgzNnlpyI6kIqNJq+tXCJz8=
-=SE37
+iD8DBQFHas+DvFcC4BYPU0oRAlZiAKCcfKUlGDrc7jaic45eYAOEkqPJxACcCvFn
+LLLgKNv8o2nnieI3b8RTyow=
+=1oei
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-3.10.0-execheap.patch b/dev-lang/ocaml/files/ocaml-3.10.0-execheap.patch
deleted file mode 100644
index 05ab9d479173..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.0-execheap.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: ocaml-3.10.0/Makefile
-===================================================================
---- ocaml-3.10.0.orig/Makefile
-+++ ocaml-3.10.0/Makefile
-@@ -284,7 +284,7 @@ clean:: partialclean
- 
- ocamlc: $(COMPOBJS)
- 	$(CAMLC) $(LINKFLAGS) -o ocamlc $(COMPOBJS)
--	@sed -e 's|@compiler@|$$topdir/boot/ocamlrun $$topdir/ocamlc|' \
-+	@sed -e 's|@compiler@|$$topdir/boot/ocamlrun $$topdir/ocamlc|g' \
- 	  driver/ocamlcomp.sh.in > ocamlcomp.sh
- 	@chmod +x ocamlcomp.sh
- 
-@@ -295,7 +295,7 @@ partialclean::
- 
- ocamlopt: $(OPTOBJS)
- 	$(CAMLC) $(LINKFLAGS) -o ocamlopt $(OPTOBJS)
--	@sed -e 's|@compiler@|$$topdir/boot/ocamlrun $$topdir/ocamlopt|' \
-+	@sed -e 's|@compiler@|$$topdir/boot/ocamlrun $$topdir/ocamlopt|g' \
- 	  driver/ocamlcomp.sh.in > ocamlcompopt.sh
- 	@chmod +x ocamlcompopt.sh
- 
-@@ -385,7 +385,7 @@ ocamlc.opt: $(COMPOBJS:.cmo=.cmx)
- 	$(CAMLOPT) $(LINKFLAGS) -ccopt "$(BYTECCLINKOPTS)" -o ocamlc.opt \
-           $(COMPOBJS:.cmo=.cmx) \
-           asmrun/meta.o asmrun/dynlink.o -cclib "$(BYTECCLIBS)"
--	@sed -e 's|@compiler@|$$topdir/ocamlc.opt|' \
-+	@sed -e 's|@compiler@|$$topdir/ocamlc.opt|g' \
- 	  driver/ocamlcomp.sh.in > ocamlcomp.sh
- 	@chmod +x ocamlcomp.sh
- 
-@@ -396,7 +396,7 @@ partialclean::
- 
- ocamlopt.opt: $(OPTOBJS:.cmo=.cmx)
- 	$(CAMLOPT) $(LINKFLAGS) -o ocamlopt.opt $(OPTOBJS:.cmo=.cmx)
--	@sed -e 's|@compiler@|$$topdir/ocamlopt.opt|' \
-+	@sed -e 's|@compiler@|$$topdir/ocamlopt.opt|g' \
- 	  driver/ocamlcomp.sh.in > ocamlcompopt.sh
- 	@chmod +x ocamlcompopt.sh
- 
-Index: ocaml-3.10.0/driver/ocamlcomp.sh.in
-===================================================================
---- ocaml-3.10.0.orig/driver/ocamlcomp.sh.in
-+++ ocaml-3.10.0/driver/ocamlcomp.sh.in
-@@ -2,4 +2,9 @@
- 
- topdir=`dirname $0`
- 
-+# evil hack for evil build system.
-+if [ -x /usr/bin/scanelf ]; then
-+       [ "$(scanelf @compiler@ -BF%x#f)" != "--mxe-" ] && scanelf -qXx -z mxe @compiler@ > /dev/null
-+fi
-+
- exec @compiler@ -nostdlib -I $topdir/stdlib "$@"
diff --git a/dev-lang/ocaml/ocaml-3.10.0.ebuild b/dev-lang/ocaml/ocaml-3.10.0.ebuild
index eb5fe59a48bf..c8d7ce42ad61 100644
--- a/dev-lang/ocaml/ocaml-3.10.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.0.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.10.0.ebuild,v 1.9 2007/12/19 20:04:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.0.ebuild,v 1.10 2007/12/20 20:24:12 aballier Exp $
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
@@ -39,11 +39,6 @@ src_unpack() {
 	# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
 	epatch "${FILESDIR}"/${P}-exec-stack-fixes.patch
 
-	# Quick and somewhat dirty fix for bug #110541
-	# The sed in the Makefile doesn't replace all occurences of @compiler@
-	# in driver/ocamlcomp.sh.in. Reported upstream as issue 0004268.
-	#epatch "${FILESDIR}"/${P}-execheap.patch
-
 	# The configure script doesn't inherit previous defined variables,
 	# overwriting previous declarations of bytecccompopts, bytecclinkopts,
 	# nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267.
diff --git a/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild b/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild
index bbf2354c5cf2..fcf8d61dc439 100644
--- a/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.1_rc1.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.10.1_rc1.ebuild,v 1.1 2007/12/20 19:45:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.1_rc1.ebuild,v 1.2 2007/12/20 20:24:12 aballier Exp $
 
 inherit flag-o-matic eutils multilib versionator toolchain-funcs
 
@@ -41,11 +41,6 @@ src_unpack() {
 	# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
 	epatch "${FILESDIR}"/${PN}-3.10.0-exec-stack-fixes.patch
 
-	# Quick and somewhat dirty fix for bug #110541
-	# The sed in the Makefile doesn't replace all occurences of @compiler@
-	# in driver/ocamlcomp.sh.in. Reported upstream as issue 0004268.
-	#epatch "${FILESDIR}"/${P}-execheap.patch
-
 	# The configure script doesn't inherit previous defined variables,
 	# overwriting previous declarations of bytecccompopts, bytecclinkopts,
 	# nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267.