From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 net-irc/ninja/Manifest                    |  2 +-
 net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'net-irc/ninja')

diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
index 4dd072ac2652..39c34b58e0fc 100644
--- a/net-irc/ninja/Manifest
+++ b/net-irc/ninja/Manifest
@@ -1,3 +1,3 @@
 DIST ninja-1.5.9pre14.tar.gz 920668 BLAKE2B c2aa578848bb3f2db5a199615bb9a3eeb592627b974c9a989acfeb2306dce7285429b7910f83a77443c2160e936129900f0ca042672dd9f8c0242d8d93f59ba5 SHA512 5a379ed355c06d28f26ed7b97e657b463deec0832ebf822424ed92379e85066e8aca971943ad751e695c003a6ef1ab7fa46ff29e5febe30c439cdfdf6b4d6cfb
-EBUILD ninja-1.5.9_pre14-r1.ebuild 619 BLAKE2B 5722cfb042c512a1f94b8d8bb94997b36bee7889a0fb8199870ec436b2502f5737ae0ceb5d900df83a30cbf73603496df21789e4fb70ef44459c6154919d105e SHA512 ca03c2a87e5a1dfe608194201d0bd9a7f88d2472736f89552f5b01fc34584f20d6f89a91518c2e855c7d8f06ce26d6884bf3d0c73944e3e03731146f2ec35c70
+EBUILD ninja-1.5.9_pre14-r1.ebuild 762 BLAKE2B a7803537f5cab687e8ca13c530bb8613f362b9fd7f71a04bf8df2e60f233f6ec817804e7af10c422ed03539a11f39b5e0ec1986e0f4d430b18e887f241f1223c SHA512 da1af4261ef926d126fed6c35ca87444cb0e80c1a6b27d1411b1b2d564f753177251ccf4bc11640341be3909ca8b9aa293ab785b88388c4f6d419506a7861093
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 ab35441f4f58..d4712c50f4b8 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
 }
-- 
cgit v1.2.3