diff options
Diffstat (limited to 'dev-ml/ocamlbuild')
| -rw-r--r-- | dev-ml/ocamlbuild/Manifest | 10 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch | 39 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/metadata.xml | 5 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild | 2 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild | 40 | ||||
| -rw-r--r-- | dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild | 8 |
7 files changed, 98 insertions, 8 deletions
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest index a8a0883de7a7..61b3b7bebf7c 100644 --- a/dev-ml/ocamlbuild/Manifest +++ b/dev-ml/ocamlbuild/Manifest @@ -1,7 +1,9 @@ +AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B d5ef0954e0a998b1ede15404fa2ed2e4aa8cbdb556aa22665e3193e179348274963303f384e984f73c808f5745ef347b5764f4408ca20110fe03383f0d92ffc7 SHA512 84671a1db5e4df6b4c21e313bb7b620e83016015ee32f508bbb14f791d7e09f138e83891b5c18a7a8ea2f9dd0d056bc9757152211e818275182df02c9701570e DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07 -EBUILD ocamlbuild-0.10.1.ebuild 1037 BLAKE2B fd534a1bde1eae3851f7109695a012017657443dd4ef95ba6959dabbae19d2013ca8453fb6eb45392f5c66fbffb180b649574a030d7f79123d2f751c8023dcb2 SHA512 ff0de8a77cd41249d3c0953342665bd7a4ef70956040039f0f91004a09f03cfe0293287929ab654b8bad38605056f7c193dd52a69aac127d85d68b9245580b5b -EBUILD ocamlbuild-0.11.0.ebuild 1127 BLAKE2B d95b57e29d00d3411b20b57499cca09f3f06929b1e715935e598e457dc9d9557f465a5024fe5ba5d7a1ac8e998a9997c81592832df9aa784f5e037f2a32a3e15 SHA512 e94a9ff4a40e32518392106fa92dd904cb702b414af75bdac79c718bc7542392b709371c61770f67609d005a127a9d05d562a25c9ecd1d52bda8cfe3bc05a3e1 -EBUILD ocamlbuild-0.14.0.ebuild 1068 BLAKE2B f40fc6a22f2f331b459acf31eda285532339d23f1e5bf49b59bd6d77db157a82d0c71251e7ca8c5475bea7844534959fca5a5a1063714d8ebf4ee0efd91389cb SHA512 a13864a59e50a74b8f06d9c749e941ebc0c20494f06324efdf3bfa6d8030811bc30f81ef79204ab6f44c8a1d87cfebbc7baa3b11001b6a3dc9319f0ac9854110 -MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326 +EBUILD ocamlbuild-0.10.1.ebuild 1031 BLAKE2B edadfe7eab8fb9bbac62d1711fb56ebb329e8fd200debca7e5a8d47faf724b42f914ab7fa7f081cc1e5a1592a1ebc354b3c3b8e70c80d3e6e5bad65bbd2951f3 SHA512 c1df06d5e700637d6727dc043d2961d780913fb331452ebf1e5a0e6238dc575037d3d732164c3f192ad82c458aa5baacec276577c5fe44e07bde7060173f1156 +EBUILD ocamlbuild-0.11.0.ebuild 1120 BLAKE2B 92d4e78b8838ebfaa40e65d6661b5bd9af4f927ca73cdb54cd16876449009749399b582f4b2027313d2007db7eef6d8687cfffb565ef6fcbc74b7f025c737381 SHA512 59f0cedc3c19c20615648a9b8b7ac985b69e15feefb6a300f8e1d31e537c1fd37c64b58d1e0560020536c8c5f53f10968b6b7aa9a481515dc73a0b46514f706f +EBUILD ocamlbuild-0.14.0-r1.ebuild 1150 BLAKE2B 592a50d86404cc499729403e4ea98abb559561de32ef7cedd6cf1cbdfd8b3879824362a1e4a783bdf5b811dcbebff8c16a0b9a6cf195ea11c52bc2614129528e SHA512 308ea522a74c0616cc6be9b444d6e0aa1e09197d1e9e0b687b137063c790dc8a9f286e2356a81e62edf4b1723478140b50301abbcad7de99c69541d1157ccbe9 +EBUILD ocamlbuild-0.14.0.ebuild 1177 BLAKE2B 3303eaaddf96eb32aef1a71937ec85389b3108e18ad059aa7bf50f9ca6f0c6bb5d575ff735cf18ff6722b5f2250e725fbb00c48902010c8a43f6c7bde9b61699 SHA512 cc11a58163fba7984148f8cc5524229c27cc7d71f6e0628d1b0439199ab324377e9dfc0ae54d575cc24ada2ab64e9054b8fec749d05169675b8dd5d1a623a3ee +MISC metadata.xml 325 BLAKE2B 4474d60afbe0f4d19ef042c32db7f2c5b34bdf57a2b701d5d56c332fb29cd0416085a29f929f97b19fa0a54c74884122b978e6d893e83b28414cbacee54ea8f1 SHA512 aa8a60033589617e002ee8a9b4cbc4eff318e26246365c380174a69ddc124c38a4d3e8da0227288cdcdd0d509c52ddd5011a15313c96fb029d3783ca872d69bf diff --git a/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch new file mode 100644 index 000000000000..991f13238c05 --- /dev/null +++ b/dev-ml/ocamlbuild/files/ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch @@ -0,0 +1,39 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Fri, 2 Aug 2019 13:08:55 +0200 +Subject: Disable tests failing with OCaml 4.08.0 + +--- + testsuite/internal.ml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/testsuite/internal.ml b/testsuite/internal.ml +index d3c2004..a87f5e2 100644 +--- a/testsuite/internal.ml ++++ b/testsuite/internal.ml +@@ -200,7 +200,7 @@ let () = + "] + ~targets:("src/foo.cmxs",[]) ();; + +-let () = test "StrictSequenceFlag" ++let _ignored () = test "StrictSequenceFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"strict_sequence tag" + ~tree:[T.f "hello.ml" ~content:"let () = 1; ()"; +@@ -219,7 +219,7 @@ Command exited with code 2." + ) + ~targets:("hello.byte",[]) ();; + +-let () = test "StrictFormatsFlag" ++let _ignored () = test "StrictFormatsFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"strict_format tag" + ~tree:[T.f "hello.ml" ~content:"let _ = Printf.printf \"%.10s\""; +@@ -230,7 +230,7 @@ Error: invalid format \"%.10s\": at character number 0, \ + Command exited with code 2." + ~targets:("hello.byte",[]) ();; + +-let () = test "PrincipalFlag" ++let _ignored () = test "PrincipalFlag" + ~options:[`no_ocamlfind; `quiet] + ~description:"-principal tag" + ~tree:[T.f "hello.ml" diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml index 4b8b15880263..234a45293e62 100644 --- a/dev-ml/ocamlbuild/metadata.xml +++ b/dev-ml/ocamlbuild/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>gienah@gentoo.org</email> + <name>Mark Wright</name> + </maintainer> <upstream> <remote-id type="github">ocaml/ocamlbuild</remote-id> </upstream> diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild index a1e8c0d4d690..e290c9b2c3cc 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" # does not compile with ocaml-4.09 (bug # 708696 and #708872) diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild index 96f238627e93..57eaf9b9882c 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt test" RESTRICT="!test? ( test )" diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild new file mode 100644 index 000000000000..9f64c4e22b01 --- /dev/null +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" +HOMEPAGE="https://github.com/ocaml/ocamlbuild" +SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+ocamlopt test" +RESTRICT="!test? ( test )" + +DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" +RDEPEND="${DEPEND} + !<dev-ml/findlib-1.6.1-r1 +" +DEPEND="${DEPEND} + test? ( dev-ml/findlib )" + +PATCHES=( + "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch + ) + +src_configure() { + emake -f configure.make Makefile.config \ + PREFIX="${EPREFIX}/usr" \ + BINDIR="${EPREFIX}/usr/bin" \ + LIBDIR="$(ocamlc -where)" \ + OCAML_NATIVE=$(usex ocamlopt true false) \ + OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \ + NATDYNLINK=$(usex ocamlopt true false) +} + +src_install() { + emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install + dodoc Changes +} diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild index 9589db20dd0f..913b9be0fc9c 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild @@ -3,13 +3,15 @@ EAPI=5 +inherit eutils + DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs" HOMEPAGE="https://github.com/ocaml/ocamlbuild" SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt test" RESTRICT="!test? ( test )" @@ -20,6 +22,10 @@ RDEPEND="${DEPEND} DEPEND="${DEPEND} test? ( dev-ml/findlib )" +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch +} + src_configure() { emake -f configure.make Makefile.config \ PREFIX="${EPREFIX}/usr" \ |