From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7F6715ACFB for ; Tue, 18 Apr 2023 21:55:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC3FEE0894; Tue, 18 Apr 2023 21:55:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5118E087E for ; Tue, 18 Apr 2023 21:55:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9748A335D97 for ; Tue, 18 Apr 2023 21:55:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBA92A3A for ; Tue, 18 Apr 2023 21:55:15 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1681854911.2fbe493222fb71695c2ba1fcb1bce863e3a8dca9.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-gettext/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/ocaml-gettext/ocaml-gettext-0.4.2-r1.ebuild dev-ml/ocaml-gettext/ocaml-gettext-0.4.2.ebuild X-VCS-Directories: dev-ml/ocaml-gettext/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 2fbe493222fb71695c2ba1fcb1bce863e3a8dca9 X-VCS-Branch: master Date: Tue, 18 Apr 2023 21:55:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fc997a1e-c8df-4379-acae-f7000175eab6 X-Archives-Hash: cf3bcf3972b27c790b712da4475d6fd8 commit: 2fbe493222fb71695c2ba1fcb1bce863e3a8dca9 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Tue Apr 18 13:17:33 2023 +0000 Commit: Maciej Barć gentoo 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 laumann.xyz> Signed-off-by: Maciej Barć 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 }