From 93d0bbd7df69c2081c2b2347ea6c88b8e967d537 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 18 Apr 2023 23:56:27 +0100
Subject: gentoo auto-resync : 18:04:2023 - 23:56:26

---
 dev-ml/ocaml-gettext/Manifest                      |  2 +-
 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild | 44 ++++++++++++++++++++++
 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild    | 43 ---------------------
 3 files changed, 45 insertions(+), 44 deletions(-)
 create mode 100644 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
 delete mode 100644 dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild

(limited to 'dev-ml/ocaml-gettext')

diff --git a/dev-ml/ocaml-gettext/Manifest b/dev-ml/ocaml-gettext/Manifest
index 12b90bbfd269..3f6e916e8e23 100644
--- a/dev-ml/ocaml-gettext/Manifest
+++ b/dev-ml/ocaml-gettext/Manifest
@@ -2,5 +2,5 @@ AUX ocaml-unsafe-string.patch 599 BLAKE2B 22e49acb160c01cfc9eed25bfbfbf45b281ca0
 DIST ocaml-gettext-0.3.7.tar.gz 134316 BLAKE2B 9de6ef9e04afbb6001ddc5ef145a687ad88a20eef1c27d3a3e6136f81ad46100cc6496cb66e3edfbf0f7eacfa8abbccb44d846d2f676862c96b8ceb860d8f424 SHA512 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
 EBUILD ocaml-gettext-0.3.7-r3.ebuild 1595 BLAKE2B a36e1429b377cc63ec4a94323cb10daacc105e0962e73336e4a3d46434e720eccfeec2e4b954cee27e5a179134f3d4847617cab42456011c7e0bc71a77a5d6e1 SHA512 360e9429a63483ee6a6d13b83f227a738b61ad0cab307814ec812da3b843b7b7dffd7bb46acca9f416b82214b585a9ed2007ea53376145c708278c2f6b09c0b7
-EBUILD ocaml-gettext-0.4.2.ebuild 916 BLAKE2B 70dea9b198f4574529ca9f28aa369b0e68a269cced3d9d0c82743771e73e353284cdf00d2d9133c1950e36631b52ddb5baf7f81e42a45b46f99c71abf07b8086 SHA512 d8238c886634cf0fc455f918f2e329f4b2670a721f0f84dfec01ca548cb32acf33df889ead2230a19d15a9ae3480b2a960ff7babf6b7e83cb486714059f381e6
+EBUILD ocaml-gettext-0.4.2-r1.ebuild 999 BLAKE2B dfa037b3a678ab7287b0bcf612533b6d48e531d758b45afc210c0bb2e26e7d9cdbd6651c7d530caf2c7c2a3aaf81022eb6875635b1a8549df1a7f685b3263e24 SHA512 165bf945e71a5ac31e9515802d9a55e548030819b5fdf2332df18d6b76e777a20f901ca5a925cf92993322d49c6fb61264b98491a751b1c72979a5b46234f0a8
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..d42dbf39239e
--- /dev/null
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"  # Tests fail
+
+BDEPEND="
+	>=dev-ml/cppo-1.6.6
+	dev-ml/dune-configurator
+"
+
+RDEPEND="
+	dev-ml/base:=
+	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
+	sys-devel/gettext
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/ounit2[ocamlopt=] )
+"
+
+src_prepare() {
+	default
+
+	# Remove dependency on camomile (see
+	# https://github.com/gildor478/ocaml-gettext/issues/14)
+	rm -r src/lib/gettext-camomile || die
+	rm -r test/test-camomile || die
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
+}
diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
deleted file mode 100644
index fea75c4363e8..000000000000
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 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:=[ocamlopt=]
-	>=dev-ml/ocaml-fileutils-0.4.0:=[ocamlopt=]
-	sys-devel/gettext
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-ml/ounit2[ocamlopt=] )
-"
-
-src_prepare() {
-	default
-
-	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
-}
-
-src_install() {
-	dune_src_install
-}
-- 
cgit v1.2.3