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/Manifest.gz                                 | Bin 37144 -> 37136 bytes
 dev-ml/charinfo_width/Manifest                     |   2 +-
 .../charinfo_width/charinfo_width-1.1.0-r1.ebuild  |  26 ++++++++++++
 dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild  |  26 ------------
 dev-ml/ocaml-gettext-camomile/Manifest             |   2 +-
 .../ocaml-gettext-camomile-0.4.2-r1.ebuild         |  44 +++++++++++++++++++++
 .../ocaml-gettext-camomile-0.4.2.ebuild            |  44 ---------------------
 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 --------------------
 10 files changed, 117 insertions(+), 116 deletions(-)
 create mode 100644 dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
 delete mode 100644 dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
 create mode 100644 dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
 delete mode 100644 dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
 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')

diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1eae48e5e8ea..5c786235c062 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/charinfo_width/Manifest b/dev-ml/charinfo_width/Manifest
index bcd4bb0c8e54..eca669b18715 100644
--- a/dev-ml/charinfo_width/Manifest
+++ b/dev-ml/charinfo_width/Manifest
@@ -1,3 +1,3 @@
 DIST charinfo_width-1.1.0.tar.gz 8307 BLAKE2B fcb37b82e2eb914322c78bcfebf901d713b55edc1c069b46cb157bbe1292b63aa69f4679f9077308a17e7d31d7c972e6b636ce7dad22fc963aedc33039dfbcfb SHA512 c8dac9eb6f520213de69b23433e2f0d6a21578c70ae69fb682065e707363968959395a6ddc6c88893e08372a138287318634b52a8b4fb70ac988b4ad4a18b140
-EBUILD charinfo_width-1.1.0.ebuild 550 BLAKE2B 9463df45de66f3c05a2c293ba76fbb912e58ad08cee699d4f77504005dcfd1a38256a2ce0d1d1c185ee44ce6616359ece1cc2932ec7d778ecc003c55692b7aec SHA512 3c89edce883b866ed39e06b76df0a3fb93702205bc0d912ae706f48d631cc586d360fd8353060870c7314f108dd6eb708e8ac6184224d06f8fa8e5c0e7973e43
+EBUILD charinfo_width-1.1.0-r1.ebuild 557 BLAKE2B 76a4de79be94ccad47d924951d6c78081fd30f8ecd1c564734e1129805bd5acf94264f1ebcf7419011a0785e0a5729ce2b4a5d28ba551583dd95718d80093b8f SHA512 4e1d7f48e5c608b06e46a4242df2d808a6a60c8124748b06fc812b6b677b9dab2d0c15bb16fd6cc60810eb66337712791e462f2afaba9ceba98ad39fb54d4d05
 MISC metadata.xml 400 BLAKE2B 7153a7494e177bc1660e135a0773c0012e4caad4b245eab089f893287ecc73b3f9beb131bd254e8f1ba64deb19db0cf51dc4a04bb573639a010b883e32858b97 SHA512 579ae1cdcd950e9ed124a38c6768f5bfe9d0915064ee30be5ce20a0c06d988e07ce9bfdbc31c5be43805b9183cd648402e80253331d458020a9179312b425648
diff --git a/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..6191c758438e
--- /dev/null
+++ b/dev-ml/charinfo_width/charinfo_width-1.1.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="charInfo_width"
+DUNE_PKG_NAME="${MY_PN}"
+
+inherit dune
+
+DESCRIPTION="Determine column width for a character"
+HOMEPAGE="https://github.com/kandu/charInfo_width"
+SRC_URI="https://github.com/kandu/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+RDEPEND="
+	<dev-ml/camomile-2.0.0:=
+	dev-ml/ppx_expect:=
+	dev-ml/result:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild b/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
deleted file mode 100644
index 93fb360c531e..000000000000
--- a/dev-ml/charinfo_width/charinfo_width-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="charInfo_width"
-DUNE_PKG_NAME="${MY_PN}"
-
-inherit dune
-
-DESCRIPTION="Determine column width for a character"
-HOMEPAGE="https://github.com/kandu/charInfo_width"
-SRC_URI="https://github.com/kandu/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-
-RDEPEND="
-	dev-ml/camomile:=
-	dev-ml/ppx_expect:=
-	dev-ml/result:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ml/ocaml-gettext-camomile/Manifest b/dev-ml/ocaml-gettext-camomile/Manifest
index 05859f3d6c2a..a2f2a35e2685 100644
--- a/dev-ml/ocaml-gettext-camomile/Manifest
+++ b/dev-ml/ocaml-gettext-camomile/Manifest
@@ -1,3 +1,3 @@
 DIST ocaml-gettext-0.4.2.tar.gz 110249 BLAKE2B 54a25ba9f8fb20194fdfaf651586222fab68f927ebfa711812f7c9a387ff40c19e1bf3f63124127356b32b0ca0be2c5ff4e1cdfaf5f3afe690b90c0ca96c470d SHA512 fb89be8d8d9e0ed9327b81a0c81c884ff3f1a97e46b475ef8084abded5c84a256de05d5aa0f42be94f43ab438276a4506af726b6950e4161359a9616fb5832ec
-EBUILD ocaml-gettext-camomile-0.4.2.ebuild 958 BLAKE2B d51c009980965418c634ee867e47d4a5c61338e98c2cf575e0e041d0dcc43c3847cc43c5b40aa12dfff12ad6859779161d9d97d210d6f3295dedff51e584e9a5 SHA512 07d87a1dbaf7e26ba05a11fde7c2e62380dc49cbc4f2bd546249bd61166773d91c2b41796b138a1a33597f996c6ffb0f9615e421e932a6d58d729678bc7ddbb3
+EBUILD ocaml-gettext-camomile-0.4.2-r1.ebuild 968 BLAKE2B 38c504e43a2da80a9f2c282dd3fd9235f130b2563a387c61bf31cd12df6514a670ffcf6c38c37aced27e70209c94d8a83dd67e0810385bca0b1398dbd7b5f39d SHA512 f63d06e03db98ecaa269533dce6ab47894225d60ca7b97246d4874ad8a0cdee3384b7dd0e46b1303112cbc54b4a61a4553b560ad64b10a311126fbeaf4dcd564
 MISC metadata.xml 674 BLAKE2B 806edfc89d39599c87e260663a38a2731334263749174d711f8d7945d6d3f58b2c2c69f3f19d2fadd832a0bbb61e25521152d981c221dea5134950defae029db SHA512 b1523bc49ed5770d32248b932aa74c7332f0282390aacdd4dcca0ef5753d04df90c35d274f9f215df4117added7d9cb5a649d2077db67092efc854920946c41b
diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..a9d71a8d2edf
--- /dev/null
+++ b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-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
+
+MY_PN=${PN/-camomile/}
+MY_P=${P/-camomile/}
+DUNE_PKG_NAME="gettext-camomile"
+inherit dune
+
+DESCRIPTION="Support for internationalization of OCaml programs using the Camomile library"
+HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
+SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="amd64"
+IUSE="+ocamlopt test"
+RESTRICT="test"  # Tests fail
+
+BDEPEND="
+	>=dev-ml/cppo-1.6.6
+	dev-ml/dune-configurator
+"
+RDEPEND="
+	dev-ml/base:=
+	<dev-ml/camomile-2.0.0:=[ocamlopt]
+	dev-ml/ocaml-gettext:=
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-ml/ounit2[ocamlopt=]
+		dev-ml/ocaml-fileutils
+	)
+"
+
+src_prepare() {
+	default
+
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
+}
diff --git a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild b/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
deleted file mode 100644
index f55d99f5f09a..000000000000
--- a/dev-ml/ocaml-gettext-camomile/ocaml-gettext-camomile-0.4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${PN/-camomile/}
-MY_P=${P/-camomile/}
-DUNE_PKG_NAME="gettext-camomile"
-inherit dune
-
-DESCRIPTION="Support for internationalization of OCaml programs using the Camomile library"
-HOMEPAGE="https://github.com/gildor478/ocaml-gettext"
-SRC_URI="https://github.com/gildor478/ocaml-gettext/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="amd64"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-ml/cppo-1.6.6
-	dev-ml/dune-configurator
-"
-RDEPEND="
-	dev-ml/base:=
-	dev-ml/camomile:=[ocamlopt]
-	dev-ml/ocaml-gettext:=
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-ml/ounit2[ocamlopt=]
-		dev-ml/ocaml-fileutils
-	)
-"
-
-src_prepare() {
-	default
-
-	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
-}
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