gentoo resync : 25.11.2020

5 files changed, 92 insertions, 6 deletions

diff --git a/dev-ml/cudf/Manifest b/dev-ml/cudf/Manifest
index 0c5d5c7213e5..bdbb39b45504 100644
--- a/dev-ml/cudf/Manifest
+++ b/dev-ml/cudf/Manifest
@@ -1,3 +1,6 @@
+AUX ounit2.patch 380 BLAKE2B 20d0c2f0b719715fc5f111bfbd81e814a4ae8229a7365ed2073d0ecc3ad1eafa4377bc3c0e497d4bf0ab73af986255ac48e179d34dfb2ded3fd7b55c22f339ba SHA512 d53ac28ba8b8eeda612d7f323bb658f272dcc785596eb47b4148ed7954a6ca0204e42b5e3cb6a55211fc1117432f3088fdc215930c26238dc2d34f063f21b062
 DIST cudf-0.8.tar.gz 55147 BLAKE2B c091a55e438979f73bfd5fd16f1e793ec984b24becc902e6eed856afea0f39586001174847b8626bbf162c2b51cbb98cdb60d9539c9aac0a1d651b693e686704 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3
-EBUILD cudf-0.8-r1.ebuild 1349 BLAKE2B d1f97b4011bfdf30ecce5faff66d3564681e4860801c14d238f894f18e1675d639a81748fa58232528a93b92a8b9e6cee9caefd2d1faa988c91cbc633e4150d1 SHA512 bc0da524efb0a49b041a0d694820f5a0b708a15da1d64de296298ad29e660587d27a3b225c32013625a4154041ae358a49934b88dcca72256fab4e4bfc090b80
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST cudf-0.9.tar.gz 55124 BLAKE2B 013f97d13b732674a7d0f9188590bbb8150ae9dc32ce26b56fb04848629fb27a3c850aa327e687d6aa80eb62ba6f67af2fcf86a647520e73d7f76748871a79cc SHA512 4abdd1a5a3d616273abe9dda87450a922ecd69b64d32f34d8fa3086bbd07fd23ffb01c24b128bf4d1c0c817cfa1da8029e743d33b3ad6a04e7a8f706b098c427
+EBUILD cudf-0.8-r1.ebuild 1369 BLAKE2B 7745e2dcd6ded40d3bc34847f651086156d4425c4c88bea34fde1a10c9e224655625c10bcc4acdd74a67f1e1ecc67c11e9d78cb9cd9d79ca1c88ca808dcd7d87 SHA512 45c6b14fb173794aae906e2b103cdec0c546b7e07954c0bbfa6180f056ceaf58e0915748aed957e2206dff59b040f38e9461873dc1112202fc314aaf3370d577
+EBUILD cudf-0.9.ebuild 1642 BLAKE2B 0bac926cdaba47d0a1204245191cb84c243ebe001bf4d272905832896739e3228939e2eaa9735b0a5fea049b946c5ab6b1dae77ff51c6ef249fa545de3da2e98 SHA512 8f9c6ddac87ed93c18ad19c08057424e0c004d1283debbdbd67ad57af1c5cce6da62dcba62cfae04fc4fe10bb9de392c9ad096c0108ac7a15094ac454d8dbd87
+MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/cudf/cudf-0.8-r1.ebuild b/dev-ml/cudf/cudf-0.8-r1.ebuild
index 3d7e202217bc..682642554816 100644
--- a/dev-ml/cudf/cudf-0.8-r1.ebuild
+++ b/dev-ml/cudf/cudf-0.8-r1.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=5
@@ -34,10 +34,10 @@ src_prepare() {
 		-e 's|make|$(MAKE)|g' \
 		Makefile || die
 	sed -i \
-		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
 		c-lib/Makefile || die
 	sed -i \
-		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
+		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
 		c-lib/Makefile.variants || die
 
 	tc-export CC PKG_CONFIG
diff --git a/dev-ml/cudf/cudf-0.9.ebuild b/dev-ml/cudf/cudf-0.9.ebuild
new file mode 100644
index 000000000000..9877b5c886cd
--- /dev/null
+++ b/dev-ml/cudf/cudf-0.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
+HOMEPAGE="http://www.mancoosi.org/cudf/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/extlib:=
+	dev-ml/findlib:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )
+	dev-ml/ocamlbuild
+	dev-lang/perl
+"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|make|$(MAKE)|g' \
+		Makefile || die
+	sed -i \
+		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+		c-lib/Makefile || die
+	sed -i \
+		-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
+		c-lib/Makefile.variants || die
+
+	tc-export CC PKG_CONFIG
+
+	sed -i \
+		-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
+		c-lib/cudf.pc.in || die
+}
+
+src_compile() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" -j1 all
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib
+	if use ocamlopt ; then
+		emake OCAMLBUILD="ocamlbuild -classic-display" -j1 opt
+		emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-opt
+	fi
+}
+
+src_test() {
+	emake OCAMLBUILD="ocamlbuild -classic-display" test
+	emake OCAMLBUILD="ocamlbuild -classic-display" c-lib-test
+}
+
+src_install() {
+	emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
+	dodoc BUGS ChangeLog README TODO
+}
diff --git a/dev-ml/cudf/files/ounit2.patch b/dev-ml/cudf/files/ounit2.patch
new file mode 100644
index 000000000000..5fbedbf26edf
--- /dev/null
+++ b/dev-ml/cudf/files/ounit2.patch
@@ -0,0 +1,12 @@
+Index: cudf-0.9/_tags
+===================================================================
+--- cudf-0.9.orig/_tags
++++ cudf-0.9/_tags
+@@ -1,5 +1,5 @@
+-<test.ml> or <tests.ml> : pkg_oUnit
+-<test.byte> or <test.native> : pkg_oUnit
++<test.ml> or <tests.ml> : pkg_ounit2
++<test.byte> or <test.native> : pkg_ounit2
+ 
+ <*.ml> or <*.mli> : pkg_extlib
+ <*.byte> or <*.native> : pkg_extlib
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index 6f49eba8f496..a4f6be63adba 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,5 +1,8 @@
 <?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>
 </pkgmetadata>