gentoo resync : 25.11.2020

6 files changed, 44 insertions, 122 deletions

diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 212f0d3fb89f..09c8bc6b9641 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -1,8 +1,6 @@
-AUX oc43.patch 773 BLAKE2B 8b5d3892c5cc050000a6c2512a84e890871df90d93c62f952d68309949776a6cd17dc1a38b0bdab6c4698c22198a4fcc98f595efbc28e37e3620c71d1c5297fa SHA512 99d2a01f3a7db768d5832e6527adc77e4272675b1027c96972171e5da71b29654ddf06a91b0882f957419aa19a651da92ba7b1eef5e0cde9542f812ed386cf4a
 AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca049c77801a81c2d4a5191c50eea5650a2db2f34df1bd49169fa2bd49dbf957fee57e3fe181ef6c37252df04d693 SHA512 78ba4efdfb0e681c4ab77af7d957de7e56a67cd97557db991ab62ec857f8fa19d374c979b4773d2a9e146db5942ce124c1603aefab065c503ddded38eef9f6b7
-DIST ocaml-gettext-0.3.5.tar.gz 165238 BLAKE2B 3da80a80cf3e722dc2a765e005bff0e7613967a5810d13c9d3c0a5b70a919b092627d398dc777775dd2b51dfc7bbe12040b844c609027b4c60cb5d23eda47198 SHA512 a60d51c09dad3076415ef24a9bb3121f84ad649d7a9fa1b9a7da719dd385e4ed7cd9ffbabefbade7ea0daf7b0a5a5eb71b1d0ed21b369914b49f66d0d918c446
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
-EBUILD ocaml-gettext-0.3.5-r1.ebuild 1232 BLAKE2B dc4ce36eda01887a0a0c2bf578145927fd05d595ce0c9abb88ae13da5db6f77186d6a9dc468b4e82696bb43c59e9309145e403be28dcc17b703d378b86875968 SHA512 3e196fb9d695413a7e2c4e7715fa575e87d40b7a54811b1583fd8f7dcdae5df90c76394eb76a5d8f514d32cd49c9025fb2dcf091fff79cd5cf0dac88a796c68f
-EBUILD ocaml-gettext-0.3.7-r1.ebuild 1261 BLAKE2B cfecfc4af8590c4192c91ed4c0018358b4056d6d3e5fd453c3f5b777d7b8e93a0f7e7724dc96b9471e2024a97510612ddcde19fcbde035aee7198fcbca595c91 SHA512 bd22e47e7a27b0b129378367b533dbd85428b153827ad29d36a618d49d3d701a8ae931cf2fa4241be93a43fa92ddb2c83afce5c3cc598b6b5a90ddaca9f2034d
-EBUILD ocaml-gettext-0.3.7.ebuild 1194 BLAKE2B 589c2f26e5752fe7267cfe2a2b327c55e98fc06240c828d4964c0f5fbefabe91b62f76622e3e84c3ef94ef430054df2a5efc2d80e068a0b7503def0adefccc23 SHA512 f0ad1b9ea7c1a2d320eb6ced4cb67638155f7f14234a3d946c2a6eaa5ba832d84fa1e6a2d525dcf36bfc938204dbb571ba25775e21c7fe77093aba10f06a2bbd
+DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
+EBUILD ocaml-gettext-0.3.7-r2.ebuild 1359 BLAKE2B 7ec1b27566f101a7e71cef5f63bf498dacc1f5f1452ab00f96b7cc7061964a1e60d4c7ea9e285f1991a8168675ff537ba99f6fbc7f2e65d9bfd185e8cf62fca7 SHA512 1aff6ac57461fe13814c0c905657bdce746f40813c4f0980bc25e98a805dd7007ca9fac5d7856b098c862c55794949702630668078642b871bdbeda88fa622e4
+EBUILD ocaml-gettext-0.4.2.ebuild 749 BLAKE2B 95dcdcaf9df4b0e51860abbc446a4c687ebfefb84d65fe6f5af6681cce65bf01e5760c434f316a970bbd1de1bba3a45e124b8d2dd53443710e8b2f827b0b9f3a SHA512 b606c611cdaa288e7cfd5885f78ece34685bed98262b011da34edc1d9791facf21e4563650bb43f289e03f6a82e8b1f3cde177810bbd46cdfd4e999c2b1027a9
 MISC metadata.xml 255 BLAKE2B 9f20991c7f1da432327bc91492493455f3a029b147991795fe5e5eca1842a70342e85957766de7c6781a64f2fef770d1c8fcee6da23d87df6c5aed04cad21fbd SHA512 fbc3e6b159b378b12c4ba12e0dcf1dcf86aba2029af9959c244a9da1b4264dda7a1ff8c18655400b966bba88fcf26ba04ee371ede500e0c0c6bfc45350e954d5
diff --git a/dev-ml/ocaml-gettext/files/oc43.patch b/dev-ml/ocaml-gettext/files/oc43.patch
deleted file mode 100644
index 41996b941122..000000000000
--- a/dev-ml/ocaml-gettext/files/oc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ocaml-gettext-0.3.5/ocaml-gettext/Makefile
-===================================================================
---- ocaml-gettext-0.3.5.orig/ocaml-gettext/Makefile
-+++ ocaml-gettext-0.3.5/ocaml-gettext/Makefile
-@@ -64,7 +64,6 @@ uninstall: ocaml-xgettext-uninstall
- ocaml-xgettext: $(BUILDBIN)
- 	$(OCAMLC)                                                            \
-            -I +camlp4 dynlink.cma camlp4lib.cma                              \
--           unix.cma                                                          \
-           `$(OCAMLFIND) query -r -predicates byte gettext.extract -i-format` \
-           `$(OCAMLFIND) query -r -predicates byte gettext.extract -a-format` \
-           `$(OCAMLFIND) query -r -predicates byte gettext.extract -o-format` \
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
deleted file mode 100644
index af60301a3390..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="Provides support for internationalization of OCaml program"
-HOMEPAGE="http://forge.ocamlcore.org/projects/ocaml-gettext"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1433/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ocaml-3.12.1:=
-	>=dev-ml/ocaml-fileutils-0.4.0:=
-	>=dev-ml/camomile-0.8.3:=
-	sys-devel/gettext
-	dev-ml/camlp4:=
-	"
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
-	test? ( dev-ml/ounit )"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
-}
-
-src_configure() {
-	econf \
-		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
-		$(use_enable doc) \
-		$(use_enable test)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake -j1 DESTDIR="${D}" \
-		BINDIR="${ED}/usr/bin" \
-		PODIR="${ED}/usr/share/locale/" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		MANDIR="${ED}/usr/share/man" \
-		install
-	dodoc CHANGELOG README THANKS TODO
-}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
index c4643c7c33ae..a71acc3dd624 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r1.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7-r2.ebuild
@@ -17,7 +17,11 @@ RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/ocaml-unsafe-string.patch )
 
-RDEPEND=">=dev-lang/ocaml-3.12.1:=
+# OCaml 4.10 does not support -unsafe-string by default
+# bug #666149
+RDEPEND="
+	>=dev-lang/ocaml-3.12.1:=
+	<dev-lang/ocaml-4.10.0:=
 	>=dev-ml/ocaml-fileutils-0.4.0:=
 	>=dev-ml/camomile-0.8.3:=
 	sys-devel/gettext
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
deleted file mode 100644
index c6b4aeea4409..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.3.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils autotools
-
-DESCRIPTION="Provides support for internationalization of OCaml program"
-HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/ocaml-3.12.1:=
-	>=dev-ml/ocaml-fileutils-0.4.0:=
-	>=dev-ml/camomile-0.8.3:=
-	sys-devel/gettext
-	dev-ml/camlp4:=
-	"
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )
-	test? ( dev-ml/ounit )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-docbook-stylesheet="${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/" \
-		$(use_enable doc) \
-		$(use_enable test)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	findlib_src_preinst
-	emake -j1 DESTDIR="${D}" \
-		BINDIR="${ED}/usr/bin" \
-		PODIR="${ED}/usr/share/locale/" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		MANDIR="${ED}/usr/share/man" \
-		install
-	dodoc CHANGELOG README THANKS TODO
-}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
new file mode 100644
index 000000000000..d9e81851498d
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="gettext"
+inherit dune
+
+DESCRIPTION="Provides support for internationalization of OCaml program"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-ml/cppo-1.6.6
+	dev-ml/dune-configurator
+"
+RDEPEND="
+	dev-ml/base:=
+	>=dev-ml/camomile-0.8.3:=
+	>=dev-ml/ocaml-fileutils-0.4.0:=
+	sys-devel/gettext
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit )
+"
+
+src_install() {
+	dune_src_install
+}