gentoo resync : 21.06.2020

3 files changed, 59 insertions, 2 deletions

diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
index 63990651126f..8935a3a34df0 100644
--- a/dev-ml/ocplib-simplex/Manifest
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -1,5 +1,6 @@
+AUX ocplib-simplex-0.4-flags.patch 1596 BLAKE2B 7bc7a8a70245756937c5c1de5fb3bdb21de5233dd978ca1a8ac781d98c0d4e4bb22384d5e8df0601d42c413522824c9c697d706e64fc9d9ca848294da0ec9e4b SHA512 09f4edb690922d7a460a1a4ba7d72773cd26abc699fe5e9d1c130c2e5321edfd99e913b121f274f026c0d8ca26833b7e08677e0047821ef0e4dceacb7797f3bf
 DIST ocplib-simplex-0.3.tar.gz 31013 BLAKE2B 30d1541f15bf9d2c55f51ed565f2feb63c2b0fbe0095c15849a22df0876ad992a3e6c15924dbbe5a798ab278c7e171e30cda815b1de2ec9bc19fc92bbe79ad95 SHA512 43373deb6e921a31526c27d33808c3520b4f375caf9e5237179db0e8d84b5be3bf43e061e2d991fc6de694958c64c7ede0b258400fb921c4139664e367958630
 DIST ocplib-simplex-0.4.tar.gz 31784 BLAKE2B 89ebb43ba59debc658b1400b24379dcb717f44f484742a4ea2227e1692f2d1d359469add4e3c22bd15b7a5044e4d45877994b40e80f28ec8639989bf28565d9a SHA512 5eb80f0c8ad32291d24423255c0359e139cd85e2262b0cbbfaffcab66d9a7eb66c9bf04bb9d5d5c103574ec7041a72cde5412e6cb03fc9fe4a8fd257dab49a76
 EBUILD ocplib-simplex-0.3.ebuild 755 BLAKE2B b3c1b4fb214ea1c3a4deb79508ebcd58eb75b753899dc63edae5b38bbedeadb9baf26a8ecd2f57e44e267e3973248fe9bfe538fdcdb55e351156c6ab9bc9954e SHA512 665c3ca7adeeb547c390742ffe3127f6783a90262b7719b119d6aa962b58d9210c4b63c3c9341fd92d7083cb472b4aab748510a45015c18faa429ce4b084d3e9
-EBUILD ocplib-simplex-0.4.ebuild 754 BLAKE2B 9603a6d2f46e41ec57cfa749fe2642cf694556c83c99fba1007c7d2acc8a141309a9d557a98194228880c3e188e5ba14ad25e104648384364b8282162217163a SHA512 762d891cd7f9df64cfb42fe032bf55f480ac748a14fd8b237dab22a81556c90f6c61ce5692a66f6314dd5db50b97143d6f3a6250b1d782e6bf20826839a742d4
+EBUILD ocplib-simplex-0.4.ebuild 873 BLAKE2B 28c840cc9fd1fa52b199140191b20c951cf4bd9bd930d466786f35ce47e8e3378c37308b10f8e93b26272e21d57242646dbef6be3d7a45d5ec73f325b25508bc SHA512 ba17ac1c46113fcd36930de84e37c221c84af9f689bc74fdd12acd98ee27219177ebd6b8bbe3420364ddb1abdf2a63f09219ab9b39adb53872af262af6e2e6e3
 MISC metadata.xml 410 BLAKE2B 517ce557434537aa6fcaf30b4d9ff7aab1c817bd3bdb9f4d2a7f7a8556e3911db55a79d6cadebe86ba018577ad9a1434b3073ed8811513a72c1522069f8bed41 SHA512 caf6a675ff8f7950d06b2ed55e0d8a1eed290fe4f14a68fc87e9c60b6b394cc029787692be7041b7d7e727d6187249ba61a324315742c1af50556496da23eb0f
diff --git a/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch
new file mode 100644
index 000000000000..ac76488238d4
--- /dev/null
+++ b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch
@@ -0,0 +1,48 @@
+--- a/Makefile.in	2020-06-13 22:27:11.971906805 +0200
++++ b/Makefile.in	2020-06-13 22:28:14.193938195 +0200
+@@ -73,19 +73,19 @@
+ opt: src/$(LIBNAME).cma src/$(LIBNAME).cmxa  src/$(LIBNAME).cmxs
+ 
+ src/$(LIBNAME).cma: src/$(LIBNAME).cmo
+-	$(OCAMLC) -a $(BFLAGS_LIGHT) -o $@ $^
++	$(OCAMLC) -a $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmxa: src/$(LIBNAME).cmx
+-	$(OCAMLOPT) -a $(OFLAGS_LIGHT) -o $@ $^
++	$(OCAMLOPT) -a $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmxs: src/$(LIBNAME).cmx
+-	$(OCAMLOPT) -shared $(OFLAGS_LIGHT) -o $@ $^
++	$(OCAMLOPT) -shared $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -cclib "$(LDFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmo: $(CMO) # src/$(LIBNAME).cmi
+-	$(OCAMLC)   $(BFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmo $^
++	$(OCAMLC)   $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -pack -o src/$(LIBNAME).cmo $^
+ 
+ src/$(LIBNAME).cmx: $(CMX) # src/$(LIBNAME).cmi
+-	$(OCAMLOPT) $(OFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmx $^
++	$(OCAMLOPT) $(OFLAGS_LIGHT) -pack -ccopt "$(CFLAGS)" -o src/$(LIBNAME).cmx $^
+ 
+ src/extSigs.ml: src/extSigs.mli
+ 	cp src/extSigs.mli src/extSigs.ml
+@@ -125,16 +125,16 @@
+ .SUFFIXES: .mli .ml .cmi .cmo .cmx .mll .mly .tex .dvi .ps .html
+ 
+ .mli.cmi:
+-	$(OCAMLC) -c $(BFLAGS) $<
++	$(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.cmo:
+-	$(OCAMLC) -c $(BFLAGS) $<
++	$(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.o:
+-	$(OCAMLOPT) -c $(OFLAGS) $<
++	$(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.cmx:
+-	$(OCAMLOPT) -c $(OFLAGS) $<
++	$(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .mll.ml:
+ 	$(OCAMLLEX) $< > /dev/null
diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
index e43a4e3d0841..d032ec5579be 100644
--- a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
+++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,14 @@ RDEPEND="${DEPEND}"
 
 DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+)
+
+QA_FLAGS_IGNORED=(
+	/usr/lib64/ocaml/ocplib-simplex/ocplibSimplex.cmxs
+)
+
 src_prepare() {
 	default
 	mv configure.{in,ac} || die