From 9f8bccf0f8d9c4eb50bef8ec9c7423c8af7935ea Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Tue, 19 Jan 2021 23:26:38 +0000 Subject: [PATCH] app-emulation/libguestfs: Dep ocaml-gettext-stub. Depend on ocaml-gettext-stub instead of ocaml-gettext or ocaml-gettext versions lower than 0.4.2, which is before the -stub package was split off. Closes: https://bugs.gentoo.org/762613 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Rafael Kitover Closes: https://github.com/gentoo/gentoo/pull/19095 Signed-off-by: Sam James --- ...uestfs-1.36.13-r1.ebuild => libguestfs-1.36.13-r2.ebuild} | 5 ++++- ...uestfs-1.36.15-r1.ebuild => libguestfs-1.36.15-r2.ebuild} | 5 ++++- app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild | 5 ++++- ...stfs-1.38.6-r101.ebuild => libguestfs-1.38.6-r102.ebuild} | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) rename app-emulation/libguestfs/{libguestfs-1.36.13-r1.ebuild => libguestfs-1.36.13-r2.ebuild} (98%) rename app-emulation/libguestfs/{libguestfs-1.36.15-r1.ebuild => libguestfs-1.36.15-r2.ebuild} (98%) rename app-emulation/libguestfs/{libguestfs-1.38.6-r101.ebuild => libguestfs-1.38.6-r102.ebuild} (98%) diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild similarity index 98% rename from app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild rename to app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild index 001b38548e911..6e0a070c07173 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild @@ -70,7 +70,10 @@ COMMON_DEPEND=" ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= + || ( + =dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild similarity index 98% rename from app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild rename to app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild index 8f882320e7cbf..34525b3474320 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild @@ -68,7 +68,10 @@ COMMON_DEPEND=" ocaml? ( >=dev-lang/ocaml-4.02:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= + || ( + =dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild index aeb2c8d3d6cf2..007b01984ed28 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild @@ -86,7 +86,10 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext + || ( + =dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild similarity index 98% rename from app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild rename to app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild index 72a08330bca8c..b6657fede6470 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild @@ -90,7 +90,10 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf >=dev-lang/ocaml-4.03:=[ocamlopt] dev-ml/findlib[ocamlopt] - dev-ml/ocaml-gettext:= + || ( + =dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )