logo

overlay

My (experimental) gentoo overlay
commit: 1178769a3b4027a42a89e3b924491a450766571d
parent: c428e0f7f5df9e4c14807b0af628ca7b552af925
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri,  8 Mar 2019 09:36:30 +0100

Use dev-util/ninja:virtual instead of dev-util/samurai[replace]

Diffstat:

Mdev-util/ninja/metadata.xml3+++
Mdev-util/ninja/ninja-1.9.0.ebuild13+++++++++++--
Mdev-util/samurai/metadata.xml3---
Mdev-util/samurai/samurai-0.6.ebuild6------
4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml @@ -5,4 +5,7 @@ <email>contact@hacktivis.me</email> <name>Haelwenn (lanodan) Monnier</name> </maintainer> + <use> + <flag name="samurai">Use <pkg>dev-util/samurai</pkg> instead of <pkg>dev-util/ninja</pkg></flag> + </use> </pkgmetadata> diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild @@ -3,6 +3,15 @@ EAPI=7 -DESCRIPTION="Fake ebuild to dev-util/samurai" -SLOT="samurai" +DESCRIPTION="Fake virtual ebuild to allow dev-util/samurai" +SLOT="virtual" KEYWORDS="~amd64" +ISUE="samurai" +RDEPEND=" + samurai ( dev-util/samurai ) + !samurai ( dev-util/ninja:0 ) +" + +src_install() { + use samurai && dosym samu /usr/bin/ninja +} diff --git a/dev-util/samurai/metadata.xml b/dev-util/samurai/metadata.xml @@ -5,7 +5,4 @@ <email>contact@hacktivis.me</email> <name>Haelwenn (lanodan) Monnier</name> </maintainer> - <use> - <flag name="replace">Create a symlink which overrides <pkg>dev-util/ninja</pkg> implementation</flag> - </use> </pkgmetadata> diff --git a/dev-util/samurai/samurai-0.6.ebuild b/dev-util/samurai/samurai-0.6.ebuild @@ -9,13 +9,7 @@ SRC_URI="https://github.com/michaelforney/samurai/releases/download/${PV}/${P}.t LICENSE="ISC Apache-2.0 MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="replace" -RDEPEND="replace? ( !dev-util/ninja )" src_install() { emake DESTDIR="${D}" PREFIX=/usr install - - if use replace; then - dosym samu /usr/bin/ninja - fi }