commit: 3f5b72107bae4c2288a88b32a1595b5832391df3 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Oct 17 02:20:10 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Oct 17 02:24:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5b7210
net-p2p/mldonkey: misc fixups - Drop sparc keyword (OCaml was dekeyworded there recently) - Fix dependencies Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/mldonkey/mldonkey-3.1.7.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild index 5bfcb0e2e21..e4cbea2ab55 100644 --- a/net-p2p/mldonkey/mldonkey-3.1.7.ebuild +++ b/net-p2p/mldonkey/mldonkey-3.1.7.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}- LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="bittorrent doc fasttrack gd gnutella gtk guionly magic +ocamlopt upnp" @@ -22,11 +22,11 @@ RDEPEND="dev-lang/perl gd? ( media-libs/gd[truetype] ) gtk? ( gnome-base/librsvg - dev-ml/lablgtk[svg] + dev-ml/lablgtk:= ) guionly? ( gnome-base/librsvg - dev-ml/lablgtk + dev-ml/lablgtk:= ) magic? ( sys-apps/file ) upnp? ( @@ -35,16 +35,15 @@ RDEPEND="dev-lang/perl ) !guionly? ( acct-user/p2p ) " - +# Can't yet use newer OCaml +# -unsafe-string usage: +# https://github.com/ygrek/mldonkey/issues/46 DEPEND="${RDEPEND} - <dev-lang/ocaml-4.10[ocamlopt?] + <dev-lang/ocaml-4.10:=[ocamlopt?] bittorrent? ( || ( - <dev-lang/ocaml-4.06 - ( - >=dev-lang/ocaml-4.06 - dev-ml/num - ) + >=dev-lang/ocaml-4.06[ocamlopt?] + dev-ml/num ) )"
