[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/

["Maciej Barć" <xgqt@gentoo.org>]

commit:     2fbe493222fb71695c2ba1fcb1bce863e3a8dca9
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Tue Apr 18 13:17:33 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 21:55:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fbe4932

dev-ml/ocaml-gettext: drop dev-ml/camomile dep, EAPI 7 -> 8

Closes: https://bugs.gentoo.org/904506
Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 ...ttext-0.4.2.ebuild => ocaml-gettext-0.4.2-r1.ebuild} | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
similarity index 72%
rename from dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
rename to dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
index fea75c4363e8..d42dbf39239e 100644
--- a/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild
+++ b/dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DUNE_PKG_NAME="gettext"
 inherit dune
@@ -14,15 +14,15 @@ LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~x86"
 IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"  # Tests fail
 
 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
 "
@@ -34,10 +34,11 @@ DEPEND="
 src_prepare() {
 	default
 
-	# Port to dev-ml/ounit2
-	sed -i -e 's/oUnit/ounit2/' test/{,common,test-camomile,test-stub}/dune || die
-}
+	# 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
 
-src_install() {
-	dune_src_install
+	# Port to dev-ml/ounit2
+	sed -i -e 's/oUnit/ounit2/' test/{,common,test-stub}/dune || die
 }