commit: 9f8bccf0f8d9c4eb50bef8ec9c7423c8af7935ea Author: Rafael Kitover <rkitover <AT> gmail <DOT> com> AuthorDate: Tue Jan 19 23:26:38 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jan 22 03:33:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8bccf0
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 <rkitover <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19095 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{libguestfs-1.36.13-r1.ebuild => libguestfs-1.36.13-r2.ebuild} | 5 ++++- .../{libguestfs-1.36.15-r1.ebuild => libguestfs-1.36.15-r2.ebuild} | 5 ++++- app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild | 5 ++++- .../{libguestfs-1.38.6-r101.ebuild => libguestfs-1.38.6-r102.ebuild} | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) 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 001b38548e9..6e0a070c071 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/ocaml-gettext-0.4.2:= + dev-ml/ocaml-gettext-stub:= + ) >=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 8f882320e7c..34525b34743 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/ocaml-gettext-0.4.2:= + dev-ml/ocaml-gettext-stub:= + ) >=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 aeb2c8d3d6c..007b01984ed 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/ocaml-gettext-0.4.2 + dev-ml/ocaml-gettext-stub + ) >=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 72a08330bca..b6657fede64 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/ocaml-gettext-0.4.2:= + dev-ml/ocaml-gettext-stub:= + ) >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
