remove old

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

8 files changed, 20 insertions, 727 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 1bd74616d0a8..fbe3b03ed9dc 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.187 2011/01/22 22:58:12 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.188 2011/01/24 09:22:53 aballier Exp $
+
+  24 Jan 2011; Alexis Ballier <aballier@gentoo.org>
+  -files/ocaml-3.10.0-automagic.patch,
+  -files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch,
+  -files/ocaml-3.10.0-configure.patch,
+  -files/ocaml-3.10.0-exec-stack-fixes.patch, -ocaml-3.10.2.ebuild,
+  -files/ocaml-3.10.2-tk85.patch:
+  remove old
 
   22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> ocaml-3.11.2.ebuild:
   ppc/ppc64 stable wrt #343751
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 017d9b2ad7f4..14646d0de248 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,16 +1,19 @@
-AUX ocaml-3.10.0-automagic.patch 1849 RMD160 6986c47d9d2d9bdaf246f3399ccc59a5751fe86d SHA1 d999c1023c5aa07316d8405fde6ebf3a1bcb2b9f SHA256 f959da02f8b31f3d1ad5b76426d493b50c87dc3a6241204470866a321ece40f9
-AUX ocaml-3.10.0-call-ld-with-proper-ldflags.patch 1497 RMD160 7eef667019e79f2877836f77a31466f9d301725b SHA1 36d95fb8b05e7bbff8e5f49a8f1faec5f11f0c78 SHA256 13d6cc7401c8374327e438517975fe9abf1b99030bb3243f2adb91d12570bc8d
-AUX ocaml-3.10.0-configure.patch 5644 RMD160 1a63847a6e632f59fef8ff448b96bc45da15eae5 SHA1 6a030e48dd5fc399b985dd99e21b6c0e6b95a12e SHA256 f42e11db2d184532aa561b0b117f7ce5850bb50981ea997d08eee34f826360ac
-AUX ocaml-3.10.0-exec-stack-fixes.patch 9395 RMD160 00d5e1ac85a090baeaf9b9cba2e277c72bef5792 SHA1 15bc9692307f4781c3d01db7724869f7e9a401d7 SHA256 a260416a0fc1cf05ff3b2dceac83bd00043ee7ad6a8f2487934723f5b9f406da
-AUX ocaml-3.10.2-tk85.patch 2414 RMD160 1b8dc94de1c90264684a300f5f31ffce02e94cec SHA1 98c7a48c167500d3e7d8c34e79124dc0cedc315d SHA256 ba539578fbec539ff481b5fc786612d5e85b01cc2d6eee22a2f9ed340d2d0fd3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-rebuild.sh 1120 RMD160 a5138feb7cadc22f89fd5b1ad628d67e6e6734e0 SHA1 b563c2895858146bd9aa1794298990c5a79cb505 SHA256 893320630726c58ea3b501ef16913c150c50ea9d6cd38ecd26fa0679597d3a7c
-DIST ocaml-3.10.2.tar.bz2 2284860 RMD160 f631230b090dbd9bf9a9f71631cd0347c033cbb1 SHA1 f604580bf2943891d8faf265eeb900bbe90abce0 SHA256 3755a32da1a7490d47fff7838c12c754d3fcfe69d7c9ff2358704259dc477c58
 DIST ocaml-3.11.2.tar.bz2 2346284 RMD160 a407e579b7fa134fc8126c5c5b544dd60cedecb1 SHA1 59053ce0078da2367f4ce61da886d22c6e86a46d SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143
 DIST ocaml-3.12.0.tar.bz2 2639049 RMD160 3d10d5f7431d8200688fa74122e7ed528126a0fa SHA1 33ebbfb1115806f117808f37e40d206c8994943d SHA256 17811756209ec9658e1027b0d3b8e5dedb772ca1c43e0bdfa630a2a183ffec3b
 DIST ocaml-patches-1.tar.bz2 3108 RMD160 ad56f8be4b15347794f3167be82124fcdbf6f6dc SHA1 542ae4c2b1515730fe0c9050b6658106ef69ad19 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49
 DIST ocaml-patches-2.tar.bz2 3405 RMD160 4f15296ce431864d3578176de553bf2a8dd5086a SHA1 4739b5e6c4507a9417327743789991176698559d SHA256 4d056122b6923b7fd2cc1168cb2d747e649da1f009a37667c82c8e7a20e4b6ac
-EBUILD ocaml-3.10.2.ebuild 4594 RMD160 067c0320111323441eba032a996e53dcaedad9d0 SHA1 db6936e27e2937e79b73a52cce926c8d60052c25 SHA256 188f4b1af35af6ca6979e22b56c76a67cb9e250411fec722c747861e9111c755
 EBUILD ocaml-3.11.2.ebuild 4127 RMD160 af407baa063d742b0a1d60f4604c72363963ff91 SHA1 179506aecc9e48cd9e4c7f6319584467d7a137d9 SHA256 89abc74d30c03d2755623f3b9eadcb1a4b975fb9b668616f380640b6af76aeea
 EBUILD ocaml-3.12.0.ebuild 4134 RMD160 9112f7072d7ab8d27c10980b72c38b5e3fc41c40 SHA1 83cd0cb8eb7d82580143291df2f75417704989f1 SHA256 fada6768475837e26fd6e37a78338db141027139e5295b56f77f0e04bfa7cade
-MISC ChangeLog 29257 RMD160 308b1b03901957c9fc64ff315fb527a8a40c99cb SHA1 fd2630a3acb565daf6893fc1282706569d3fb81c SHA256 4f14834502c5ee48f8b8cb78cc74cc49c8f066f53653b59d1c9e7d068d08ba1c
+MISC ChangeLog 29558 RMD160 d71bb98d6e880f70c67b088d936c3c5517de66a0 SHA1 3a91682df09bddb3f8aceb791e8674829ec7772d SHA256 b819e46b1b33053f93ce94ab5ef7de158e9275b6a6fed57dae0ac258d22d8b8f
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk09RPIACgkQvFcC4BYPU0rIWgCgrKn2H0PeLU8thQzW8H6ZT7pR
+T0kAn35rImWWpMb3q6uz5qf+U/z2w5ri
+=A72V
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/ocaml/files/ocaml-3.10.0-automagic.patch b/dev-lang/ocaml/files/ocaml-3.10.0-automagic.patch
deleted file mode 100644
index 0aa90973793a..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.0-automagic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: ocaml-3.10.0/configure
-===================================================================
---- ocaml-3.10.0.orig/configure
-+++ ocaml-3.10.0/configure
-@@ -31,6 +31,8 @@ x11_include_dir=''
- x11_lib_dir=''
- tk_wanted=yes
- pthread_wanted=yes
-+graph_wanted=yes
-+dbm_wanted=yes
- tk_defs=''
- tk_libs=''
- tk_x11=yes
-@@ -87,6 +89,10 @@ while : ; do
-         ;; # Ignored for backward compatibility
-     -no-pthread*|--no-pthread*)
-         pthread_wanted=no;;
-+    -no-dbm|--no-dbm)
-+        dbm_wanted=no;;
-+    -no-graph|--no-graph)
-+        graph_wanted=no;;
-     -no-tk|--no-tk)
-         tk_wanted=no;;
-     -tkdefs*|--tkdefs*)
-@@ -1233,7 +1239,7 @@ do
- done
- 
- 
--if test "$x11_include" = "not found" || test "$x11_link" = "not found"
-+if test "$x11_include" = "not found" || test "$x11_link" = "not found" || test "$graph_wanted" = "no"
- then
-   echo "X11 not found, the \"graph\" library will not be supported."
-   x11_include=""
-@@ -1281,7 +1287,7 @@ for dir in /usr/include /usr/include/db1
-     break
-   fi
- done
--if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
-+if test "$dbm_include" = "not found" || test "$dbm_link" = "not found" || test "$dbm_wanted" = "no"; then
-   echo "NDBM not found, the \"dbm\" library will not be supported."
- else
-   echo "NDBM found (in $dbm_include)"
-@@ -1546,7 +1552,7 @@ echo "        $otherlibraries"
- echo "Configuration for the \"num\" library:"
- echo "        target architecture ...... $bng_arch (asm level $bng_asm_level)"
- 
--if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then
-+if test "$x11_include" != "not found" && test "$x11_lib" != "not found" && test "$graph_wanted" != "no"; then
- echo "Configuration for the \"graph\" library:"
- echo "        options for compiling .... $x11_include"
- echo "        options for linking ...... $x11_link"
diff --git a/dev-lang/ocaml/files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch b/dev-lang/ocaml/files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch
deleted file mode 100644
index 29d94aafb118..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.0-call-ld-with-proper-ldflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-As we now support LDFLAGS in NATIVECCLINKOPTS
-it can happen that -Wl,--foo,--bar option is in that variable
-As ocaml happens to call ld with NATIVECCLINKOPTS
-we have to "translate" it so that ld doesn't bail out with unrecognized option
-Initial patch from Julien Cristau : http://caml.inria.fr/mantis/view.php?id=4142
-Modified a bit to catch comma separated options
-Index: ocaml-3.10.0/Makefile
-===================================================================
---- ocaml-3.10.0.orig/Makefile
-+++ ocaml-3.10.0/Makefile
-@@ -316,6 +316,8 @@ partialclean::
- 	rm -f ocaml toplevel/toplevellib.cma
- 
- # The configuration file
-+comma = ,
-+Wl = -Wl,
- 
- utils/config.ml: utils/config.mlp config/Makefile
- 	@rm -f utils/config.ml
-@@ -326,8 +328,8 @@ utils/config.ml: utils/config.mlp config
-             -e 's|%%BYTELINK%%|$(BYTECC) $(BYTECCLINKOPTS)|' \
-             -e 's|%%NATIVECC%%|$(NATIVECC) $(NATIVECCCOMPOPTS)|' \
-             -e 's|%%NATIVELINK%%|$(NATIVECC) $(NATIVECCLINKOPTS)|' \
--            -e 's|%%PARTIALLD%%|$(PARTIALLD) $(NATIVECCLINKOPTS)|' \
--            -e 's|%%PACKLD%%|$(PARTIALLD) $(NATIVECCLINKOPTS) -o |' \
-+            -e 's|%%PARTIALLD%%|$(PARTIALLD) $(subst $(comma), ,$(subst $(Wl),,$(NATIVECCLINKOPTS)))|' \
-+            -e 's|%%PACKLD%%|$(PARTIALLD) $(subst $(comma), ,$(subst $(Wl),,$(NATIVECCLINKOPTS))) -o |' \
-             -e 's|%%BYTECCLIBS%%|$(BYTECCLIBS)|' \
-             -e 's|%%NATIVECCLIBS%%|$(NATIVECCLIBS)|' \
-             -e 's|%%RANLIBCMD%%|$(RANLIBCMD)|' \
diff --git a/dev-lang/ocaml/files/ocaml-3.10.0-configure.patch b/dev-lang/ocaml/files/ocaml-3.10.0-configure.patch
deleted file mode 100644
index d96d3f5beed1..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.0-configure.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Index: ocaml-3.10.0/configure
-===================================================================
---- ocaml-3.10.0.orig/configure
-+++ ocaml-3.10.0/configure
-@@ -233,75 +233,75 @@ esac
- # Configure the bytecode compiler
- 
- bytecc="$cc"
--bytecccompopts=""
--bytecclinkopts=""
-+bytecccompopts="${CFLAGS}"
-+bytecclinkopts="${LDFLAGS}"
- ostype="Unix"
- exe=""
- 
- case "$bytecc,$host" in
-   cc,*-*-nextstep*)
-     # GNU C extensions disabled, but __GNUC__ still defined!
--    bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
--    bytecclinkopts="-posix";;
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
-+    bytecclinkopts="$bytecclinkopts -posix";;
-   *,*-*-rhapsody*)
-     # Almost the same as NeXTStep
--    bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
-     mathlib="";;
-   *,*-*-darwin*)
--    bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop -no-cpp-precomp $gcc_warnings"
-     mathlib=""
-     # Tell gcc that we can use 32-bit code addresses for threaded code
-     # even if we compile in 64-bit mode
-     echo "#define ARCH_CODE32" >> m.h;;
-   *,*-*-beos*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings"
-     # No -lm library
-     mathlib="";;
-   gcc,alpha*-*-osf*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings"
-     if cc="$bytecc" sh ./hasgot -mieee; then
-       bytecccompopts="-mieee $bytecccompopts";
-     fi
-     # Put code and static data in lower 4GB
--    bytecclinkopts="-Wl,-T,12000000 -Wl,-D,14000000"
-+    bytecclinkopts="$bytecclinkopts -Wl,-T,12000000 -Wl,-D,14000000"
-     # Tell gcc that we can use 32-bit code addresses for threaded code
-     echo "#define ARCH_CODE32" >> m.h;;
-   cc,alpha*-*-osf*)
--    bytecccompopts="-std1 -ieee";;
-+    bytecccompopts="$bytecccompopts -std1 -ieee";;
-   gcc,alpha*-*-linux*)
-     if cc="$bytecc" sh ./hasgot -mieee; then
-       bytecccompopts="-mieee $bytecccompopts";
-     fi;;
-   cc,mips-*-irix6*)
-     # Add -n32 flag to ensure compatibility with native-code compiler
--    bytecccompopts="-n32"
-+    bytecccompopts="$bytecccompopts -n32"
-     # Turn off warning "unused library"
--    bytecclinkopts="-n32 -Wl,-woff,84";;
-+    bytecclinkopts="$bytecclinkopts -n32 -Wl,-woff,84";;
-   cc*,mips-*-irix6*)
-     # (For those who want to force "cc -64")
-     # Turn off warning "unused library"
--    bytecclinkopts="-Wl,-woff,84";;
-+    bytecclinkopts="$bytecclinkopts -Wl,-woff,84";;
-   *,alpha*-*-unicos*)
-     # For the Cray T3E
--    bytecccompopts="-DUMK";;
-+    bytecccompopts="$bytecccompopts -DUMK";;
-   gcc*,powerpc-*-aix*)
-     # Avoid name-space pollution by requiring Unix98-conformant includes
--    bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";;
-   *,powerpc-*-aix*)
--    bytecccompopts="-D_XOPEN_SOURCE=500";;
-+    bytecccompopts="$bytecccompopts -D_XOPEN_SOURCE=500";;
-   gcc*,*-*-cygwin*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings -U_WIN32"
-     exe=".exe"
-     ostype="Cygwin";;
-   gcc*,x86_64-*-linux*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings"
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings"
-     # Tell gcc that we can use 32-bit code addresses for threaded code
-     # unless we are compiled for a shared library (-fPIC option)
-     echo "#ifndef __PIC__" >> m.h
-     echo "#  define ARCH_CODE32" >> m.h
-     echo "#endif" >> m.h;;
-   gcc*)
--    bytecccompopts="-fno-defer-pop $gcc_warnings";;
-+    bytecccompopts="$bytecccompopts -fno-defer-pop $gcc_warnings";;
- esac
- 
- # Configure compiler to use in further tests
-@@ -616,22 +616,22 @@ else
-   nativecc="$ccoption"
- fi
- 
--nativecccompopts=''
--nativecclinkopts=''
-+nativecccompopts="${CFLAGS}"
-+nativecclinkopts="${LDFLAGS}"
- nativeccrpath="$byteccrpath"
- 
- case "$arch,$nativecc,$system,$host_type" in
--  alpha,cc*,digital,*) nativecccompopts=-std1;;
--  mips,cc*,irix,*)     nativecccompopts=-n32
--                       nativecclinkopts="-n32 -Wl,-woff,84";;
--  *,*,nextstep,*)      nativecccompopts="$gcc_warnings -U__GNUC__ -posix"
--                       nativecclinkopts="-posix";;
-+  alpha,cc*,digital,*) nativecccompopts="$nativecccompopts -std1";;
-+  mips,cc*,irix,*)     nativecccompopts="$nativecccompopts -n32"
-+                       nativecclinkopts="$nativecclinkopts -n32 -Wl,-woff,84";;
-+  *,*,nextstep,*)      nativecccompopts="$nativecccompopts $gcc_warnings -U__GNUC__ -posix"
-+                       nativecclinkopts="$nativecclinkopts -posix";;
-   *,*,rhapsody,*darwin[1-5].*)
--                       nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
--  *,*,rhapsody,*)      nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
-+                       nativecccompopts="$nativecccompopts $gcc_warnings -DSHRINKED_GNUC";;
-+  *,*,rhapsody,*)      nativecccompopts="$nativecccompopts $gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
-                        if $arch64; then partialld="ld -r -arch ppc64"; fi;;
--  *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
--  *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
-+  *,gcc*,cygwin,*)     nativecccompopts="$nativecccompopts $gcc_warnings -U_WIN32";;
-+  *,gcc*,*,*)          nativecccompopts="$nativecccompopts $gcc_warnings";;
- esac
- 
- asflags=''
diff --git a/dev-lang/ocaml/files/ocaml-3.10.0-exec-stack-fixes.patch b/dev-lang/ocaml/files/ocaml-3.10.0-exec-stack-fixes.patch
deleted file mode 100644
index 123636098d3b..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.0-exec-stack-fixes.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-Index: ocaml-3.10.0/asmcomp/alpha/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/alpha/emit.mlp
-+++ ocaml-3.10.0/asmcomp/alpha/emit.mlp
-@@ -811,6 +811,11 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+    `  .section .note.GNU-stack,\"\",%progbits\n`
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -843,6 +848,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly () =
-+  nx_stack();
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   `	.text\n`;
-   `	.globl	{emit_symbol lbl_end}\n`;
-Index: ocaml-3.10.0/asmrun/alpha.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/alpha.S
-+++ ocaml-3.10.0/asmrun/alpha.S
-@@ -438,3 +438,7 @@ caml_system__frametable:
-         .word   -1              /* negative frame size => use callback link */
-         .word   0               /* no roots here */
-         .align  3
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: ocaml-3.10.0/asmrun/amd64.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/amd64.S
-+++ ocaml-3.10.0/asmrun/amd64.S
-@@ -366,3 +366,7 @@ caml_negf_mask:
-         .align  16
- caml_absf_mask:
- 	.quad	0x7FFFFFFFFFFFFFFF, 0xFFFFFFFFFFFFFFFF
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: ocaml-3.10.0/asmrun/arm.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/arm.S
-+++ ocaml-3.10.0/asmrun/arm.S
-@@ -337,3 +337,7 @@ caml_system__frametable:
-         .short  -1              /* negative frame size => use callback link */
-         .short  0               /* no roots */
-         .align  2
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-Index: ocaml-3.10.0/asmrun/hppa.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/hppa.S
-+++ ocaml-3.10.0/asmrun/hppa.S
-@@ -532,3 +532,8 @@ G(caml_system__frametable):
-         .long   L104 + 3        /* return address into callback */
-         .short  -1              /* negative frame size => use callback link */
-         .short  0               /* no roots */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmrun/i386.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/i386.S
-+++ ocaml-3.10.0/asmrun/i386.S
-@@ -416,3 +416,8 @@ Lmcount$stub:
-         hlt ; hlt ; hlt ; hlt ; hlt
-         .subsections_via_symbols
- #endif
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmrun/ia64.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/ia64.S
-+++ ocaml-3.10.0/asmrun/ia64.S
-@@ -528,3 +528,8 @@ caml_system__frametable:
- 
-         .common caml_saved_bsp#, 8, 8
-         .common caml_saved_rnat#, 8, 8
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmrun/m68k.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/m68k.S
-+++ ocaml-3.10.0/asmrun/m68k.S
-@@ -242,3 +242,8 @@ _caml_system__frametable:
-         .long   L107            | return address into callback
-         .word   -1              | negative frame size => use callback link
-         .word   0               | no roots here
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmrun/power-elf.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/power-elf.S
-+++ ocaml-3.10.0/asmrun/power-elf.S
-@@ -419,3 +419,7 @@ caml_system__frametable:
-         .short  -1              /* negative size count => use callback link */
-         .short  0               /* no roots here */
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmrun/sparc.S
-===================================================================
---- ocaml-3.10.0.orig/asmrun/sparc.S
-+++ ocaml-3.10.0/asmrun/sparc.S
-@@ -405,3 +405,8 @@ Caml_system__frametable:
-         .type Caml_raise_exception, #function
- 	.type Caml_system__frametable, #object
- #endif
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-Index: ocaml-3.10.0/asmcomp/amd64/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/amd64/emit.mlp
-+++ ocaml-3.10.0/asmcomp/amd64/emit.mlp
-@@ -676,6 +676,13 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+    `  .section .note.GNU-stack,\"\",%progbits\n`
-+
-+
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -689,6 +696,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly() =
-+  nx_stack();
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   `	.text\n`;
-   `	.globl	{emit_symbol lbl_end}\n`;
-Index: ocaml-3.10.0/asmcomp/arm/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/arm/emit.mlp
-+++ ocaml-3.10.0/asmcomp/arm/emit.mlp
-@@ -642,6 +642,13 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+    `  .section .note.GNU-stack,\"\",%progbits\n`
-+
-+
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -661,6 +668,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly () =
-+  nx_stack();
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   `	.text\n`;
-   `	.global	{emit_symbol lbl_end}\n`;
-Index: ocaml-3.10.0/asmcomp/hppa/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/hppa/emit.mlp
-+++ ocaml-3.10.0/asmcomp/hppa/emit.mlp
-@@ -994,6 +994,12 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+      `  .section .note.GNU-stack,\"\",%progbits\n`
-+
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -1022,6 +1028,7 @@ let begin_assembly() =
- 
- 
- let end_assembly() =
-+  nx_stack();
-   `	.code\n`;
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   declare_global lbl_end;
-Index: ocaml-3.10.0/asmcomp/i386/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/i386/emit.mlp
-+++ ocaml-3.10.0/asmcomp/i386/emit.mlp
-@@ -947,6 +947,11 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux_elf" then
-+      `  .section .note.GNU-stack,\"\",%progbits\n`
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -960,6 +965,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly() =
-+  nx_stack();
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   `	.text\n`;
-   `	.globl	{emit_symbol lbl_end}\n`;
-Index: ocaml-3.10.0/asmcomp/ia64/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/ia64/emit.mlp
-+++ ocaml-3.10.0/asmcomp/ia64/emit.mlp
-@@ -1306,6 +1306,11 @@ let data l =
-   `	.align 8\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+      `  .section .note.GNU-stack,\"\",%progbits\n`
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -1315,6 +1320,7 @@ let begin_assembly() =
-   emit_define_symbol (Compilenv.make_symbol (Some "code_begin"))
- 
- let end_assembly () =
-+  nx_stack();
-   `	.data\n`;
-   emit_define_symbol (Compilenv.make_symbol (Some "data_end"));
-   `	.text\n`;
-Index: ocaml-3.10.0/asmcomp/power/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/power/emit.mlp
-+++ ocaml-3.10.0/asmcomp/power/emit.mlp
-@@ -916,6 +916,12 @@ let data l =
-   emit_string data_space;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "elf" then
-+      `  .section .note.GNU-stack,\"\",%progbits\n`
-+
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -932,6 +938,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly() =
-+  nx_stack();
-   if pic_externals then
-     (* Emit the pointers to external functions *)
-     StringSet.iter emit_external !external_functions;
-Index: ocaml-3.10.0/asmcomp/sparc/emit.mlp
-===================================================================
---- ocaml-3.10.0.orig/asmcomp/sparc/emit.mlp
-+++ ocaml-3.10.0/asmcomp/sparc/emit.mlp
-@@ -741,6 +741,12 @@ let data l =
-   `	.data\n`;
-   List.iter emit_item l
- 
-+(* Mark stack as non executable *)
-+let nx_stack() =
-+  if Config.system = "linux" then
-+      `  .section .note.GNU-stack,\"\",%progbits\n`
-+
-+
- (* Beginning / end of an assembly file *)
- 
- let begin_assembly() =
-@@ -754,6 +760,7 @@ let begin_assembly() =
-   `{emit_symbol lbl_begin}:\n`
- 
- let end_assembly() =
-+  nx_stack();
-   `	.text\n`;
-   let lbl_end = Compilenv.make_symbol (Some "code_end") in
-   `	.global	{emit_symbol lbl_end}\n`;
diff --git a/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch b/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch
deleted file mode 100644
index b612ef8eab36..000000000000
--- a/dev-lang/ocaml/files/ocaml-3.10.2-tk85.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: ocaml-3.10.2/configure
-===================================================================
---- ocaml-3.10.2.orig/configure
-+++ ocaml-3.10.2/configure
-@@ -1339,6 +1339,8 @@ if test $has_tk = true; then
-   tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-   for tk_incs in \
-     "-I/usr/local/include" \
-+    "-I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5" \
-+    "-I/usr/include/tcl8.5 -I/usr/include/tk8.5" \
-     "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \
-     "-I/usr/include/tcl8.4 -I/usr/include/tk8.4" \
-     "-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" \
-@@ -1361,6 +1363,7 @@ if test $has_tk = true; then
-     8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;;
-     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
-     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-+    8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
-     *) echo "This version is not known."; has_tk=false ;;
-     esac
-   else
-Index: ocaml-3.10.2/otherlibs/labltk/support/cltkImg.c
-===================================================================
---- ocaml-3.10.2.orig/otherlibs/labltk/support/cltkImg.c
-+++ ocaml-3.10.2/otherlibs/labltk/support/cltkImg.c
-@@ -98,7 +98,11 @@ camltk_setimgdata_native (value imgname,
-   pib.offset[0] = 0;
-   pib.offset[1] = 1;
-   pib.offset[2] = 2;
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
-+  Tk_PhotoPutBlock(cltclinterp,ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
-+#else
-   Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)
-+#endif
- #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-                    , TK_PHOTO_COMPOSITE_SET
- #endif
-Index: ocaml-3.10.2/otherlibs/labltk/tkanim/tkAnimGIF.c
-===================================================================
---- ocaml-3.10.2.orig/otherlibs/labltk/tkanim/tkAnimGIF.c
-+++ ocaml-3.10.2/otherlibs/labltk/tkanim/tkAnimGIF.c
-@@ -334,7 +334,11 @@ FileReadGIF(interp, f, fileName, formatS
-                 goto error;
-             }
-         }
-+#if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 5 || TK_MAJOR_VERSION > 8)
-+        Tk_PhotoPutBlock(interp, photoHandle, &block, 0, 0, imageWidth, imageHeight
-+#else
-         Tk_PhotoPutBlock(photoHandle, &block, 0, 0, imageWidth, imageHeight
-+#endif
- #if (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION >= 4 || TK_MAJOR_VERSION > 8)
-                    , TK_PHOTO_COMPOSITE_SET
- #endif
diff --git a/dev-lang/ocaml/ocaml-3.10.2.ebuild b/dev-lang/ocaml/ocaml-3.10.2.ebuild
deleted file mode 100644
index f0fbfc742d5f..000000000000
--- a/dev-lang/ocaml/ocaml-3.10.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.2.ebuild,v 1.17 2010/04/19 17:43:17 armin76 Exp $
-
-EAPI="1"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-MY_P="${P/_rc/+rc}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/${MY_P}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
-
-DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )
-	gdbm? ( sys-libs/gdbm )"
-RDEPEND="${DEPEND}"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix the EXEC_STACK in ocaml compiled binaries (#153382)
-	epatch "${FILESDIR}"/${PN}-3.10.0-exec-stack-fixes.patch
-
-	# The configure script doesn't inherit previous defined variables,
-	# overwriting previous declarations of bytecccompopts, bytecclinkopts,
-	# nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267.
-	epatch "${FILESDIR}"/${PN}-3.10.0-configure.patch
-
-	# ocaml has automagics on libX11 and gdbm
-	# http://caml.inria.fr/mantis/view.php?id=4278
-	epatch "${FILESDIR}/${PN}-3.10.0-automagic.patch"
-
-	# Call ld with proper flags, different from gcc ones
-	# This happens when calling ocamlc -pack
-	# See comment in the patch
-	epatch "${FILESDIR}/${PN}-3.10.0-call-ld-with-proper-ldflags.patch"
-
-	# Adapted from mandriva to get labltk built with tk8.5
-	epatch "${FILESDIR}/${P}-tk85.patch"
-}
-
-src_compile() {
-	export LC_ALL=C
-	local myconf="--host ${CHOST}"
-
-	# dev-lang/ocaml tends to break/give unexpected results with "unsafe" CFLAGS.
-	strip-flags
-	replace-flags "-O?" -O2
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-	# Fails to build on arm if >=O0 is used
-	use arm && replace-flags "-O?" -O0
-
-	use tk || myconf="${myconf} -no-tk"
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use gdbm || myconf="${myconf} -no-dbm"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	./configure -prefix /usr \
-		--bindir /usr/bin \
-		--libdir /usr/$(get_libdir)/ocaml \
-		--mandir /usr/share/man \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	# bug #279968
-	emake -j1 world || die "make world failed!"
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		emake -j1 opt || die "make opt failed!"
-		emake -j1 opt.opt || die "make opt.opt failed!"
-	fi
-}
-
-src_install() {
-	emake -j1 BINDIR="${D}"/usr/bin \
-		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${D}"/usr/share/man \
-		install || die "make install failed!"
-
-	# Install the compiler libs
-	dodir /usr/$(get_libdir)/ocaml/compiler-libs
-	insinto /usr/$(get_libdir)/ocaml/compiler-libs
-	doins {utils,typing,parsing}/*.{mli,cmi,cmo,cmx,o}
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
-
-	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
-	dodoc Changes INSTALL README Upgrading
-
-	# Create and envd entry for latex input files (this definitely belongs into
-	# CONTENT and not in pkg_postinst.
-	if use latex ; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR
-	dosbin "${FILESDIR}/ocaml-rebuild.sh"
-}
-
-pkg_postinst() {
-	echo
-	ewarn "OCaml is not binary compatible from version to version, so you"
-	ewarn "need to rebuild all packages depending on it, that are actually"
-	ewarn "installed on your system. To do so, you can run:"
-	ewarn "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]"
-	ewarn "Which will call emerge on all old packages with the given options"
-	echo
-}