[gentoo-commits] repo/gentoo:master commit in: net-irc/ninja/

[Sam James]

commit:     da9d504fe8a2e94b83ff3a590ede19914dfce684
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 22:10:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 22:13:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da9d504f

net-irc/ninja: port to EAPI 7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild 
b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
index ab35441f4f5..d4712c50f4b 100644
--- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-S=${WORKDIR}/${P/_*/}
+inherit toolchain-funcs
 
 DESCRIPTION="Ninja IRC Client"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage";
 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz";
+S="${WORKDIR}"/${P/_*/}
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
@@ -15,17 +17,26 @@ IUSE="ncurses ipv6 ssl"
 
 RESTRICT="test"
 
-DEPEND="ncurses? ( sys-libs/ncurses )
-       ssl?  ( dev-libs/openssl )"
+DEPEND="
+       ncurses? ( sys-libs/ncurses:= )
+       ssl?  ( dev-libs/openssl:= )
+"
 RDEPEND="${DEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_configure() {
+       tc-export CC
+
        econf $(use_enable ipv6)
+
+       # Generated post-configure
+       sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die
 }
 
 src_install() {
        default
-       mv "${ED}"/usr/bin/ninja{,_irc} || die #436804
+
+       # bug #436804
+       mv "${ED}"/usr/bin/ninja{,_irc} || die
 }