summaryrefslogtreecommitdiff
path: root/dev-lang/ocaml
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/ocaml')
-rw-r--r--dev-lang/ocaml/Manifest19
-rw-r--r--dev-lang/ocaml/files/ocaml-4.14.0-clang.patch132
-rw-r--r--dev-lang/ocaml/ocaml-4.09.0-r3.ebuild2
-rw-r--r--dev-lang/ocaml/ocaml-4.10.2-r3.ebuild2
-rw-r--r--dev-lang/ocaml/ocaml-4.11.2-r2.ebuild6
-rw-r--r--dev-lang/ocaml/ocaml-4.12.1.ebuild6
-rw-r--r--dev-lang/ocaml/ocaml-4.13.1.ebuild6
-rw-r--r--dev-lang/ocaml/ocaml-4.14.1.ebuild6
-rw-r--r--dev-lang/ocaml/ocaml-4.14.2.ebuild8
-rw-r--r--dev-lang/ocaml/ocaml-5.2.0.ebuild (renamed from dev-lang/ocaml/ocaml-4.14.0-r1.ebuild)19
10 files changed, 40 insertions, 166 deletions
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index f54368b272a5..f5775f0a188b 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,7 +2,6 @@ AUX ocaml-4.11.2-cflags.patch 1416 BLAKE2B 722ffd7944c3dabd753e98bfb885ad283aa5b
AUX ocaml-4.11.2-glibc-2.34.patch 3318 BLAKE2B 96fe61e553e7c67f76df32f2e5532f7a6eae57fb60752c7c49d71baf416ac74a4c7b925ecfd0bd5874a1728b51ca36b82d636bfa6ab30ec5f3df37fbac2a73b9 SHA512 eb54d912338a42a21f736dcd1591f77403b0dff8772059bd7f39a6e83b8a5e89bd5a7a9d4200bacbcaa8ec0450a5a78ecf6645bb5405d45fd1c077cbe1c36f7f
AUX ocaml-4.12.0-glibc-2.34.patch 3411 BLAKE2B d5138feaf6ca1e4a25ee85100013e343f8867bfe22d1c8c26df56fe1a6266b9cf37738f0b5fa6ee6daaaed9c90880529a50ffa1e789766039727dd407d15da51 SHA512 978a300d28bcb4c4d312e5b9f830140b08a282ba850d7c7a3866ca54413a321695d21315fff423d646085d8eed148a3f84567c08a4e09957b4b87010d65ee694
AUX ocaml-4.12.1-fix-textrel-riscv.patch 1784 BLAKE2B 700fca8fe6c30a301bca5a64ed94038923bec1df80e6a75d4afb88ecfc38c9c55f5c163dfb12506f6b3a1e5784e65314385e13b9f45230b9f3b3e7d771c89b2e SHA512 f4f3a4b1f3f9fd823e09338c7c06ce6abc8699a765c0aa442e3b66ae72a83bb6dee744bfc0cb527a1131bbbe0ae5a5fd1d51c4700b62927f1fdf25a47e541e80
-AUX ocaml-4.14.0-clang.patch 4301 BLAKE2B 6a06b6524167b48cb711c75504d9f724caf90f4a808013d93aebd3429344a45e74350f4de405a298986f5b113ccb661b1307e4fc583f3b58dc013ee8e9a8bd52 SHA512 e68f11cae4bbab9fcd5b591f4082c8b15a79427bd76dfe51025b309601f5ff61ee57863cbe1d1a6249fb5d7f17d3e0f3c6e451925d0e130ea88e64b8d8d151dc
AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06d498037f78c5f6ef040428f9de224b5fe5df4ef64eaed419cda6d8715ea0c0a4c4dad60c5cf75a4147 SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40
AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4
DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f SHA512 94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1
@@ -12,15 +11,15 @@ DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
-DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0 SHA512 3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B 6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673 SHA512 6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
DIST ocaml-4.14.2.tar.gz 5505119 BLAKE2B 518c2a69ee32e1c141b574a9800a64efc445381eb2808985b5dbb9d5ec54228aa25042a1c410307c3556488ba12a751980396b0d9a01e60a1ea84ac5b52e6dd6 SHA512 61bfa7961aae02458210f10865a5703f7a50a9be2452379e820cf2dfac2c6037da553c31835145e50a776880bdeb2ec78cd7a3147d65f418e7b3e593534e8a04
-EBUILD ocaml-4.09.0-r3.ebuild 2748 BLAKE2B 9a7ee1503661a124dc76e21a025b6c008e23179c7d40704465c7998ecdec99fa7130e9c9d0df56f2966baf310e8608437dfa0d8482f138bb4075013ce39a5214 SHA512 0f33c2c71f891736876d10a2f215f58d9c9b1a041025e6cb4ca7295a344b77ca6c00ec988d127b47d6fcb466fe1a54877bc778019795465d453b7f8ecd699fd9
-EBUILD ocaml-4.10.2-r3.ebuild 2755 BLAKE2B afb7113074d413f6b875da714e51fef90b7a68a17dde32cadc13f50966c9cecf31530c426e4e2edc0c30d92629ee120a0d25c1355502f697c84b3802c3bf185d SHA512 4077f3fc0531e78c359a5010defbb2716b87b64cb1bb1a7dd62437252bc7590c0f37b201c969208f1a9c8bd2615cf569c64d240b85c7c581a92449c26bfb950c
-EBUILD ocaml-4.11.2-r2.ebuild 2596 BLAKE2B 4e041684def3d5254bc25f0e92d261313e5c3aefebf232371199040c4d5f81f4a9c2e02ec0218047f4703592f65deadb6f2a03af6d965b6fb9a0c6b70ef929f1 SHA512 2c62f12f3aef53b9d9906a965ee14c2ac0a884e1b8f79d007a1787390694b231803e64bfea9fb5b1fe2a827022a064c71b573ee5dfc6d1e96170a3a8f5c81a82
-EBUILD ocaml-4.12.1.ebuild 2524 BLAKE2B 379f9ca34424f1866d26ac392e49b1e3a276e3487ee25d9ec60dc87bf7b1785052cff0db2cb1ec7e0c9077ad4b0be0690d1858c8af870f8ff25cd4e851421b1e SHA512 36f2e685365502c47c1167b90142172195a81bdbabf62755ca869b8c86f91b499bdb680cc508340967deec2b912f0f460ce3ac2eedff687e4ab0b0618a6bb133
-EBUILD ocaml-4.13.1.ebuild 2487 BLAKE2B 7e78f1e7d2023a5d243b7c4fc770bc439dfcdb245d528a596a08af9aa7d776ec3ccdd822eed9a51c4eca009e6c9712b9da2ed2beb7cea672f86e2271dce4dc50 SHA512 dba4a7593e164e6949ce7daddd9e0234db9d874adb17fd3c2bc2ffc67d67b557735a4a6ddb66af9d2c463a8ac474866395529d5f2b4443b0fbca44b0b6ce0974
-EBUILD ocaml-4.14.0-r1.ebuild 2508 BLAKE2B 333b6a84bc469d964cd8385fde845dc9a9c0f9a9b1463a87623bf09972415a651adb5c6098d3ab77a77c5dc05e5b345f20782838e49889d1fe8f900e4b26e447 SHA512 e41e0849502b7692f990f679fb2e8d50b183643ad71cd9e2171621db57143c7ea01d9caa317222118aa0a5fd5021b00c8548ebad600278a293d18432948c9e9e
-EBUILD ocaml-4.14.1.ebuild 2446 BLAKE2B 09e43241eb2b0c9219963a777648fe7db4ea4829b1e089d4d08f494066e6230a4f4f49f08b3db26b882fe4916a3842af4e637fe4866c811bd8ecfefed5a08219 SHA512 1db8ce4ddb772e4ac7fe3c03e80237ece1c459ab42161cbd6fc9d22a86f59318dda3d2b74eaf7359005f488dfb15c1a30c51c2e6caceed779dbe9ef7e6a7b2d0
-EBUILD ocaml-4.14.2.ebuild 2451 BLAKE2B b1ef54d0818b4495c83eda065b51415122fc1407000c7cb3f3597784d374aa98426d824ebb7566eb74eb9dbc1a5f57d6b023c7bfd810bfa0e9d7f4469f3cbfca SHA512 54221fb06950adc412555abd731407b009c8de8e10cde3dc5ae89c3414cb72d5b1f54a2652d519970c859c49a40a8c440ba08322d4faf3d58592d7df558960cf
+DIST ocaml-5.2.0.tar.gz 6047633 BLAKE2B 5d0a7d48d9ed9fcd2974237a93e30ffee20fc444b5ede296bd35cb3285909f8cf5a489ac1cdc75778ca6d45f8ff40a92939bfcfc42e218aeda0170b1ac0bfd49 SHA512 78115690186c13c1f2480e4812a9fe34cce2c28bf8a89d5c9810bca0391f930cecd9cee2b53daca8a32da1815628b33be68f3948f1ad03fa50b72b14e3ea84f2
+EBUILD ocaml-4.09.0-r3.ebuild 2742 BLAKE2B e4dd877140601c6b52e93587047b5bfa27e39cf833664a22e39448784cbad82d6e5feb2aecfb169725f72f098750d28cef6e98d988c7cbde0abda5776384799e SHA512 0fe114be6a3b02a197b7e42137e43d51f1664438e2a2805e63642e4a1a50e78d865db64dc0f357e13c1fcc2cb1e3bb71a81faa611d67ef01c4036e48c659f166
+EBUILD ocaml-4.10.2-r3.ebuild 2749 BLAKE2B 3450e01f8157a66bc69079030ac3abe35cd8954c9cdd83d70680238c64449661f967cc6ba9a9d8029a3f17b41c8892508868db513faf239407b1b59a0ea87b4c SHA512 6423d21d704eee5b97b177ac98a8ba1794af430a6f3a1c4606946ff213a5d8dfa643787d802b3de1b77832583fc4c55ebafc5ab2073f832e65c5eb0b19344b5f
+EBUILD ocaml-4.11.2-r2.ebuild 2590 BLAKE2B 37ce14549ad68e0d30c9326ed568d921cd3f7fde93b29ac0c826cf2f1de3d9bed2d7dbfe93b8648452b7b48f512bba02d3f3520a72e4fd38247aa1f97cda0914 SHA512 b57778eea9a32e2f3a5e88bbf9a48082e8766aa0409aaa53fda9f2af24b5c0100e0e6ae449930aa4b9cfc4b99e4623145f05867f130fc453c89b870cb887e2fa
+EBUILD ocaml-4.12.1.ebuild 2518 BLAKE2B 2ff12f9411da66ba34171a3b925fedc3c56d8ade80de43f5bd0c569ec9bc4e414dda5f967a3abb945c09e04c5f32ec185d2b92cf2293cea06ba0ed87a4de513e SHA512 cedae5738804ad3336937f26e5130691f8982393e803a99521c98c08e407b2054e18a51e880e261f107f6116f23b2ea97194aa3e4954602f0f14d9b1eb059205
+EBUILD ocaml-4.13.1.ebuild 2481 BLAKE2B 3fb04e2dd03dbabf807ba0620ed494be28b9c4f465f4e52eafde03f3e3e0db6876c7cb73570f3048e6ef6d6f1f4b90447f622d4bb29d9fcbd743ce461c6bb245 SHA512 ea093161ff02e609d4b063b38fa8e29d2dbb471f61c40b1fda63cb733dd5175744449d9b2b1edf758d15adfc0359dfd2cac26042db000ace742edc0eab22eac8
+EBUILD ocaml-4.14.1.ebuild 2440 BLAKE2B ea1cb9fba221ff93a3a4f5ae49db23e0b32aaae0c94ae16ebe075564548da2784370a8da70e4e1e332ae95e233c6c0ba034cd7e4a955c65807fe649f043119ad SHA512 55f97a54904be60ced8ff3a15301e8cd338a19722da39dc76da8a5dc3a25baba32497003ac37bb6cf2e20ac9d490f8596738e03304187c011c7a561b104da2d0
+EBUILD ocaml-4.14.2.ebuild 2589 BLAKE2B 684cf28477f907c85f10b75f097e23d91303f69bff628666b625c718253fd4ff4bd6491f459d19634eb65cd4f10d6dc23079d64658c1e65e7a1cd6fea7a87652 SHA512 864d16ca356cfad16ccf283b1ef2d3d6fe28224810c22ab2fa39fcc8081a62333ea9c65e8acaaaa01d5c08e35d94e0f9d733611986655ce0b5714af9cd5845f8
+EBUILD ocaml-5.2.0.ebuild 2627 BLAKE2B 4dc6c29849839927544941c263ff33b0d24e3617a466a3ef4cf78fe6ae949fb650da9c9cdcc011adf426ff54f0e837482f969f8ade9b0642bab5940196b6e1e6 SHA512 31fc07c3cca11ca8d53d27ffca92b636bea2c112a2a73d437cf57bdfa175021f61db9d656bca5058c0d86c77457f36e012e6aaf233a9de2b6bd9f22d08f02177
MISC metadata.xml 671 BLAKE2B 452ea340c8abacedbdb20a344cffa9b91db2251e0174db596e4f96bf2b1c9d308ceb035e0870e738a15c313003fcbf39bb91c5f68b40a185e5e08e3ea7042616 SHA512 1d8248e2b05b145c804cc9cce6aa617bd6466f26326033cee06ed27ceb93ebc88b62f3badbfe13092fbaa89c3a71087491b88c4fc094da8624ab668cdc73b383
diff --git a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch b/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch
deleted file mode 100644
index cd3c042f2639..000000000000
--- a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 28b553622bd0f168411d86ddcfba1adab0d87b92
-Author: Yawar Amin <yawar.amin@gmail.com>
-Date: Mon Nov 15 22:40:43 2021 -0500
-
- Fix ranlib error
-
- - Always pass ranlib one file argument at a time to avoid error 'Exactly
- one archive should be specified'
- - Call ranlib without cd'ing into the library's directory
- - Use Makefile functionality to simplify recipes
-
-diff --git a/Makefile b/Makefile
-index c2522c775..2e4e44faa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -549,6 +549,8 @@ else
- endif
- $(MAKE) -C tools installopt
-
-+LIBRARIES = $(addsuffix .$(A), ocamlcommon ocamlbytecomp ocamloptcomp)
-+
- .PHONY: installoptopt
- installoptopt:
- $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)"
-@@ -585,8 +587,11 @@ endif
- ifeq "$(INSTALL_OCAMLNAT)" "true"
- $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)"
- endif
-- cd "$(INSTALL_COMPLIBDIR)" && \
-- $(RANLIB) ocamlcommon.$(A) ocamlbytecomp.$(A) ocamloptcomp.$(A)
-+# Some versions of ranlib do not support multiple archives
-+ for library in $(LIBRARIES); \
-+ do \
-+ $(RANLIB) "$(INSTALL_COMPLIBDIR)/$$library"; \
-+ done
-
- # Installation of the *.ml sources of compiler-libs
- .PHONY: install-compiler-sources
-diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common
-index 95ff4d58f..6a4451e47 100644
---- a/otherlibs/Makefile.otherlibs.common
-+++ b/otherlibs/Makefile.otherlibs.common
-@@ -95,7 +95,7 @@ install::
- fi
- ifneq "$(STUBSLIB)" ""
- $(INSTALL_DATA) $(STUBSLIB) "$(INSTALL_LIBDIR)/"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) lib$(CLIBNAME).$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/lib$(CLIBNAME).$(A)"
- endif
-
- $(INSTALL_DATA) \
-@@ -104,7 +104,7 @@ endif
- ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
- $(INSTALL_DATA) \
- $(CMIFILES:.cmi=.mli) \
-- $(CMIFILES:.cmi=.cmti) \
-+ $(CMIFILES:.cmi=.cmti) \
- "$(INSTALL_LIBDIR)/"
- endif
- if test -n "$(HEADERS)"; then \
-@@ -115,7 +115,7 @@ installopt:
- $(INSTALL_DATA) \
- $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) \
- "$(INSTALL_LIBDIR)/"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) $(LIBNAME).a
-+ $(RANLIB) "$(INSTALL_LIBDIR)/$(LIBNAME).$(A)"
- if test -f $(LIBNAME).cmxs; then \
- $(INSTALL_PROG) $(LIBNAME).cmxs "$(INSTALL_LIBDIR)"; \
- fi
-diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile
-index 6b02dc197..dccc45103 100644
---- a/otherlibs/dynlink/Makefile
-+++ b/otherlibs/dynlink/Makefile
-@@ -249,12 +249,12 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
- endif
-
- installopt:
-- if $(NATDYNLINK); then \
-- $(INSTALL_DATA) \
-- $(NATOBJS) dynlink.cmxa dynlink.$(A) \
-- "$(INSTALL_LIBDIR)" && \
-- cd "$(INSTALL_LIBDIR)" && $(RANLIB) dynlink.$(A); \
-- fi
-+ifeq "$(NATDYNLINK)" "true"
-+ $(INSTALL_DATA) \
-+ $(NATOBJS) dynlink.cmxa dynlink.$(A) \
-+ "$(INSTALL_LIBDIR)"
-+ $(RANLIB) "$(INSTALL_LIBDIR)/dynlink.$(A)"
-+endif
-
- partialclean:
- rm -f $(extract_crc) *.cm[ioaxt] *.cmti *.cmxa \
-diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
-index 8fc1bdb92..379c530fa 100644
---- a/otherlibs/systhreads/Makefile
-+++ b/otherlibs/systhreads/Makefile
-@@ -121,7 +121,7 @@ install:
- $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \
- fi
- $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreads.$(A)"
- mkdir -p "$(INSTALL_THREADSLIBDIR)"
- $(INSTALL_DATA) \
- $(CMIFILES) threads.cma \
-@@ -136,11 +136,11 @@ endif
-
- installopt:
- $(INSTALL_DATA) libthreadsnat.$(A) "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreadsnat.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreadsnat.$(A)"
- $(INSTALL_DATA) \
- $(THREADS_NCOBJS) threads.cmxa threads.$(A) \
- "$(INSTALL_THREADSLIBDIR)"
-- cd "$(INSTALL_THREADSLIBDIR)" && $(RANLIB) threads.$(A)
-+ $(RANLIB) "$(INSTALL_THREADSLIBDIR)/threads.$(A)"
-
- %.cmi: %.mli
- $(CAMLC) -c $(COMPFLAGS) $<
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index df34bc2d4..32c5dab56 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -105,7 +105,7 @@ installopt-default::
- $(INSTALL_DATA) \
- stdlib.cmxa stdlib.$(A) std_exit.$(O) *.cmx \
- "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) stdlib.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/stdlib.$(A)"
-
- ifeq "$(UNIX_OR_WIN32)" "unix"
- HEADERPROGRAM = header
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index e77d3241e08f..5e14da3e1c7a 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
index 2f80ff02a1ee..b603a2e9b0e0 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 489cf0a32fef..ecd32dd0094b 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
HOMEPAGE="https://ocaml.org/"
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index 9294aeacdc06..ce17b2f1e1f7 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
HOMEPAGE="https://ocaml.org/"
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-4.13.1.ebuild b/dev-lang/ocaml/ocaml-4.13.1.ebuild
index 73ab996ee176..a293e7c14f64 100644
--- a/dev-lang/ocaml/ocaml-4.13.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.13.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
HOMEPAGE="https://ocaml.org/"
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild b/dev-lang/ocaml/ocaml-4.14.1.ebuild
index fe9b42d885eb..fa9a375965dc 100644
--- a/dev-lang/ocaml/ocaml-4.14.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
HOMEPAGE="https://ocaml.org/"
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild b/dev-lang/ocaml/ocaml-4.14.2.ebuild
index f94e0f851126..c779ae59d556 100644
--- a/dev-lang/ocaml/ocaml-4.14.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
@@ -20,7 +20,7 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
-QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+QA_FLAGS_IGNORED='/usr/lib.*/ocaml/.*.cmxs /usr/lib.*/ocaml/libasmrun_shared.so'
src_prepare() {
default
@@ -79,6 +79,10 @@ src_test() {
}
src_install() {
+ # OCaml generates textrels on 32-bit arches
+ if use arm || use ppc || use x86 ; then
+ export QA_TEXTRELS='.*'
+ fi
default
dodir /usr/include
diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-5.2.0.ebuild
index 83dfc2f12fc2..803f42a3c4d7 100644
--- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-5.2.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
HOMEPAGE="https://ocaml.org/"
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="emacs flambda latex +ocamlopt xemacs"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="emacs flambda latex +ocamlopt test xemacs"
RDEPEND="sys-libs/binutils-libs:="
BDEPEND="${RDEPEND}
@@ -22,9 +22,7 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
-PATCHES=(
- "${FILESDIR}"/${PN}-4.14.0-clang.patch
-)
+RESTRICT="!test? ( test )"
src_prepare() {
default
@@ -53,6 +51,7 @@ src_configure() {
--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
--mandir="${EPREFIX}/usr/share/man"
--prefix="${EPREFIX}/usr"
+ $(use_enable test ocamltest) \
$(use_enable flambda)
)
@@ -83,6 +82,10 @@ src_test() {
}
src_install() {
+ # OCaml generates textrels on 32-bit arches
+ if use arm || use ppc || use x86 ; then
+ export QA_TEXTRELS='.*'
+ fi
default
dodir /usr/include
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 01:56:50 +0000