From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 8 Oct 2021 23:06:07 +0100
Subject: gentoo resync : 08.10.2021

---
 dev-ml/num/Manifest          |  2 +-
 dev-ml/num/num-1.4-r1.ebuild | 32 --------------------------------
 dev-ml/num/num-1.4-r2.ebuild | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 33 deletions(-)
 delete mode 100644 dev-ml/num/num-1.4-r1.ebuild
 create mode 100644 dev-ml/num/num-1.4-r2.ebuild

(limited to 'dev-ml/num')

diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index 2f03573e7cdd..820ce07ce9b5 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -2,5 +2,5 @@ AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a5
 DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
 DIST num-1.4.tar.gz 66327 BLAKE2B 59eae642e19f452dd911ef6c32b89978f2034a5fcaece4a358f3da447c8d6cb2b2581c39d032eb117edaf7ecf942583281eb6e31716b06960e768c2a985e099e SHA512 0cc9be8ad95704bb683b4bf6698bada1ee9a40dc05924b72adc7b969685c33eeb68ccf174cc09f6a228c48c18fe94af06f28bebc086a24973a066da620db8e6f
 EBUILD num-1.3-r1.ebuild 781 BLAKE2B 00e2a293bd75493d356699c154a45c4bbc82b9f35fd5167896a9ed581ac2d10405db1c60a3acd5634c02774ab3695cea2931adcc636c71fbb7c29e9a8ccef32e SHA512 83d3167348b0beb3699362207258ce9f12a4b9b9229f1f2c9c4590104f5d854f86db2b4b1dc6e137797513436e46afb2d581dc6027c8809a39ceee9daf6a5b38
-EBUILD num-1.4-r1.ebuild 854 BLAKE2B b579243489891f48f792ea9bd75444e921bbd827eb7b888efa0954d1a45d433fec34c28ad20e7d96e1f98ae4403936b9a371a0d5da7c6d3e3ff48322d33bec8a SHA512 c16cf43aea2bc87f0785d471a5f22efddfe86f12481b09ed24d9f9701850fc9b36611b040cd6b528dd447a27ba3c4c9c68c446042f0a3a78783e3a963fe34fcd
+EBUILD num-1.4-r2.ebuild 904 BLAKE2B 771d388a4a36a9c124762e7d37249d552335832d5e04b19b7384d8e76c4f9c4cc13e960654330fc294475b0595c548faf1954d6113b48f8e0113851843b8fb9b SHA512 5710ea0c169ac296be0173f5f74690127e7cc7722f23f521d852da3c9072a4bc439765c1260393ba24b4068daf14cc038bc6fab91ac34afd0dc6f8ecf46fa35c
 MISC metadata.xml 338 BLAKE2B f947fa0825c1a3fd959515164da36ffc9694c570ed6eb6eef8686fc24b4582ee88ecb7304507c79cf2733fb77ae3570468ec8da886367d79721c81f148931833 SHA512 9d052ada92f441fa4908f4ec9a2561f7276872281ffa65f0ad92c8d0f7c15aeea11d6c887d4af7535d7d72bce3dec8f12622aee5eb9a79e510e8baaa208a54cd
diff --git a/dev-ml/num/num-1.4-r1.ebuild b/dev-ml/num/num-1.4-r1.ebuild
deleted file mode 100644
index cf5b56b7a6d8..000000000000
--- a/dev-ml/num/num-1.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Not using dune for now, bug #775119
-inherit findlib
-
-DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
-HOMEPAGE="https://github.com/ocaml/num"
-SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
-}
-
-src_test() {
-	# Override needed to not use dune
-	emake test
-}
-
-src_install() {
-	findlib_src_preinst
-	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}" NATDYNLINK="$(usex ocamlopt true false)"
-}
diff --git a/dev-ml/num/num-1.4-r2.ebuild b/dev-ml/num/num-1.4-r2.ebuild
new file mode 100644
index 000000000000..cf3d3b3bc4c9
--- /dev/null
+++ b/dev-ml/num/num-1.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not using dune for now, bug #775119
+inherit findlib
+
+DESCRIPTION="Library for arbitrary-precision integer and rational arithmetic"
+HOMEPAGE="https://github.com/ocaml/num"
+SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="+ocamlopt"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
+DEPEND="dev-ml/findlib:="
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
+}
+
+src_test() {
+	# Override needed to not use dune
+	emake test
+}
+
+src_install() {
+	findlib_src_install
+
+	if has_version ">=dev-ml/findlib-1.9" ; then
+		# See bug #803275
+		rm "${ED}/usr/$(get_libdir)/ocaml/num-top/META" || die
+	fi
+}
-- 
cgit v1.2.3