gentoo resync : 14.07.2018

4 files changed, 66 insertions, 0 deletions

diff --git a/dev-ml/camlidl/files/META.camlidl b/dev-ml/camlidl/files/META.camlidl
new file mode 100644
index 000000000000..b0aeaf231415
--- /dev/null
+++ b/dev-ml/camlidl/files/META.camlidl
@@ -0,0 +1,5 @@
+description = "Stub generator"
+version = "@VERSION"
+directory = "^"
+archive(byte) = "com.cma"
+archive(native) = "com.cmxa"
diff --git a/dev-ml/camlidl/files/includes.patch b/dev-ml/camlidl/files/includes.patch
new file mode 100644
index 000000000000..060aceefd0a5
--- /dev/null
+++ b/dev-ml/camlidl/files/includes.patch
@@ -0,0 +1,12 @@
+Index: camlidl-1.05/runtime/comerror.c
+===================================================================
+--- camlidl-1.05.orig/runtime/comerror.c
++++ camlidl-1.05/runtime/comerror.c
+@@ -22,6 +22,7 @@
+ #include <caml/callback.h>
+ #include <caml/fail.h>
+ #include <caml/alloc.h>
++#include <caml/printexc.h>
+ #include "camlidlruntime.h"
+ #include "comstuff.h"
+ 
diff --git a/dev-ml/camlidl/files/nowarn.patch b/dev-ml/camlidl/files/nowarn.patch
new file mode 100644
index 000000000000..8b457cf7ed1e
--- /dev/null
+++ b/dev-ml/camlidl/files/nowarn.patch
@@ -0,0 +1,13 @@
+Index: camlidl-1.05/compiler/Makefile
+===================================================================
+--- camlidl-1.05.orig/compiler/Makefile
++++ camlidl-1.05/compiler/Makefile
+@@ -29,7 +29,7 @@ PROG=camlidl$(EXE)
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(OCAMLC) -o $(PROG) $(OBJS)
++	$(OCAMLC) -w -a -o $(PROG) $(OBJS)
+ 
+ clean::
+ 	rm -f $(PROG)
diff --git a/dev-ml/camlidl/files/tests.patch b/dev-ml/camlidl/files/tests.patch
new file mode 100644
index 000000000000..f7272424be80
--- /dev/null
+++ b/dev-ml/camlidl/files/tests.patch
@@ -0,0 +1,36 @@
+Index: camlidl-1.05/tests/unix.idl
+===================================================================
+--- camlidl-1.05.orig/tests/unix.idl
++++ camlidl-1.05/tests/unix.idl
+@@ -15,16 +15,16 @@ quote (C, "
+ 
+   union process_status { int code; };
+ 
+-  enum { WEXITED, WSIGNALED, WSTOPPED };
++  enum { WEXITED2, WSIGNALED, WSTOPPED2 };
+ 
+   static void decode_status(int status, int * kind, union process_status * p)
+   {
+     if (WIFEXITED(status)) {
+-      *kind = WEXITED; p->code = WEXITSTATUS(status);
++      *kind = WEXITED2; p->code = WEXITSTATUS(status);
+     } else if (WIFSIGNALED(status)) {
+       *kind = WSIGNALED; p->code = WTERMSIG(status);
+     } else {
+-      *kind = WSTOPPED; p->code = WSTOPSIG(status);
++      *kind = WSTOPPED2; p->code = WSTOPSIG(status);
+     }
+   }
+ 
+@@ -59,9 +59,9 @@ int execve([in,string] char * path, 
+ int fork(void);
+ 
+ union process_status {
+-  case WEXITED: int code;
++  case WEXITED2: int code;
+   case WSIGNALED: int code;
+-  case WSTOPPED: int code;
++  case WSTOPPED2: int code;
+ };
+ 
+ int wait([out] int * kind,