gentoo Easter resync : 12.04.2020

9 files changed, 221 insertions, 19 deletions

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index dd3f5338f7c6..09bf7a7eff2b 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,11 +1,15 @@
+AUX ninja-1.10.0-readme.patch 1334 BLAKE2B 22543d95e66045b5b2c489cbb823c9c75ca20d415bef6af311cc076c0a1dd329c4056bc68b644b07aab42d4e165aabdb0227463532a06e3abaff1b5a37ee0c5e SHA512 b968751a9bf3df633461a919bc35a5b9d0a210a18afe7c81c04b01676723495ea9b90eee7206f395012e37f2b5503fc2d6e63e92649b4fa13c4f0dc4b1d5f229
 AUX ninja-1.9.0-musl.patch 1997 BLAKE2B 5fa4e9b171a87ebb8fb618a2b4b0c47668d0aaf0a2b3a5b08a3be5649235228d2cd38c3891d52b1d1e0217f16b1e13175a1a077567c07e83ba8cd36aae96c7aa SHA512 78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8
+AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
+DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.8.2-r1.ebuild 2654 BLAKE2B 5d0757bf132dd69674690f2c5f51655f93f0aea24d8d7e38bb4350ea654bfb282bfb9701e2a8c60d79874e51e87957303ffa8dd4847959487c5c092cd7218fc7 SHA512 cd6dbd86067de10d3aaf5b1d770ac326f0f6cdff956cc7fcf3f52a315ede06cbcb49bbded6f738563b6ed81fa058c1491a7ca71864872a89ec8265d499e7313b
-EBUILD ninja-1.8.2-r2.ebuild 2654 BLAKE2B fd8f1228cf17a6ffc0d7e639ccd01adc30074fb176845d6356640623e6d63c8f0cabe16fac2251fae1fe8377d2b6a5df317a7f1eb5748cf05d8985473e79d8ea SHA512 994796da508fca452ae76fe1dadc4b1fb278a5f0f406a948fde2823eabca2167be4a57f020c3675e61e8b496c856e77420ba5c3a51ef6fc3afd14bff12756e8e
-EBUILD ninja-1.8.2.ebuild 2512 BLAKE2B 3f0f843aa2ca6a0b59a89171519065080a66fd6216bbfb23ae9fdc9c51851e4f211efb70048bd650d1dad1ba6006b5091e3dea7f00c174e10f71c2d2fd7355c4 SHA512 60bfe10982ccb0b6a44aa17a690fe674aa740a2c3c6fc251d999c1537b8fbfba56af47b4a1dc30e6de32b097f38d19beece276f7e3e404d6748b5adcd4def9ed
-EBUILD ninja-1.9.0.ebuild 2758 BLAKE2B 741a1dd283d4230ca400290abf865cc00256deadd1796633c563d9c31b4587436dedc85015a6e86471755d054941ee86cdca79c5f82bc80c2ec6fdf1b90d671b SHA512 0494684f2f2f2bab98b9c45f0c3cb7aa414b92636a0494aedb46ee860ea59bc9d59146f850c4a481f6ddb11d75ae4a92001c995b59c3d8a0ecbd07773d3d3689
-EBUILD ninja-9999.ebuild 2707 BLAKE2B 691b88ffd652b9ad6aaa5e881fe6f47a08e9f6e87d8d80b3e9fb20947c59b2b833da7c6bc7ec778945ac8c2316a3496fea1d84d78502460b35808c15ad80842f SHA512 cce1a3a1900b27d9dd1cb2517f70ff65735f8c2c189886797c9d8608681634ce0de6c2a319e12b6c8bfe99dc5bffd51bf296e2260b54ed8dd8057217c732ff56
+EBUILD ninja-1.10.0.ebuild 2651 BLAKE2B 30b09b2a60ef6a996434ff23be9bafc0f5e82b775fd1861de74fce6e8eb61aa40462bd9681a7298911f5bb7cc319c9f23cba7b69ffa7120d5a5286112a718735 SHA512 1576d281b83d7e7c066fd6918fe3b9a83f23f10edd386494445c3a6bfee09fc72f038949928d2a8dedf5716c96cf9010ed46a9aac8a10365dae85027e57c8f5f
+EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
+EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
+EBUILD ninja-1.8.2.ebuild 2510 BLAKE2B 1e759e02b6ae7cdb5921b4031ba8267ffb3d9b3e9e75eea0769539f01754fa8116b7cacca459111eb4b6932a0f3764b7056b5d54330435cb94aa912e608b031b SHA512 cb7127e4ec9d6971cbad5e7408610ce9bdff203c87e320547086b6c2d6bd1c0bd7bc53b04b7e2a5a4ecd25cce748de85f0b1f5f68a611c04933445f630174026
+EBUILD ninja-1.9.0.ebuild 2761 BLAKE2B 1899c84c449d0d55379c60da5cb94f3086e3cc9a28ecd75ab0833b378767daa0e04ab90adb275d2dd1432451c4c646db07a0701adc166ec425b29e8b9ef997cb SHA512 52fa94fc5af0a2ef15df5f013368066f38ccc2d44e68d655f16545dcf17ba9cd4f2479b7cfe34a02036b5f838dc2f4ab175ba0daec83d921db946eb70a76ba5f
+EBUILD ninja-9999.ebuild 2603 BLAKE2B ca20e4c0ce6bb238b81f33dafe9fbb2922d68f27ea55d2bcc2900057f1d464a7ba94ee123080444b53c726cf449db9ca9f92dea693d1910c34562399a26f0914 SHA512 faf4b642e2c53cad0a01e52815112f0bacb64fafea111d8949a705f0e7aae5dc1622af250b4e1d80f0819e3feeed3e1493fcd15449603652531b0909386a3581
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/files/ninja-1.10.0-readme.patch b/dev-util/ninja/files/ninja-1.10.0-readme.patch
new file mode 100644
index 000000000000..1d84f123daf0
--- /dev/null
+++ b/dev-util/ninja/files/ninja-1.10.0-readme.patch
@@ -0,0 +1,38 @@
+From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 20 Mar 2020 19:36:01 -0400
+Subject: [PATCH] Replace references to README with README.md
+
+The README file was renamed to README.md in commit
+a37da20ae74c81703b1c811182fc154d95ed46fe.
+---
+ configure.py              | 2 +-
+ misc/packaging/ninja.spec | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7d8ce9045..8eef7e6eb 100755
+--- a/configure.py
++++ b/configure.py
+@@ -649,7 +649,7 @@ def has_re2c():
+        command='$doxygen_mainpage_generator $in > $out',
+        description='DOXYGEN_MAINPAGE $out')
+ mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage',
+-                   ['README', 'COPYING'],
++                   ['README.md', 'COPYING'],
+                    implicit=['$doxygen_mainpage_generator'])
+ n.build('doxygen', 'doxygen', doc('doxygen.config'),
+         implicit=mainpage)
+diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec
+index 05f5a079a..36e518186 100644
+--- a/misc/packaging/ninja.spec
++++ b/misc/packaging/ninja.spec
+@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/
+ 
+ %files
+ %defattr(-, root, root)
+-%doc COPYING README doc/manual.html
++%doc COPYING README.md doc/manual.html
+ %{_bindir}/*
+ 
+ %clean
diff --git a/dev-util/ninja/files/ninja-cflags.patch b/dev-util/ninja/files/ninja-cflags.patch
new file mode 100644
index 000000000000..0c4ef2813bb7
--- /dev/null
+++ b/dev-util/ninja/files/ninja-cflags.patch
@@ -0,0 +1,25 @@
+From e4530769ef6a497f8f5f06159f6be049dc20e2ea Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 19 Mar 2020 11:21:29 -0400
+Subject: [PATCH] Avoid adding -O2 -DNDEBUG to cflags
+
+---
+ configure.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index 7d8ce90..7566147 100755
+--- a/configure.py
++++ b/configure.py
+@@ -344,8 +344,6 @@ else:
+     if options.debug:
+         cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']
+         cflags.remove('-fno-rtti')  # Needed for above pedanticness.
+-    else:
+-        cflags += ['-O2', '-DNDEBUG']
+     try:
+         proc = subprocess.Popen(
+             [CXX, '-fdiagnostics-color', '-c', '-x', 'c++', '/dev/null',
+-- 
+2.25.1
+
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
new file mode 100644
index 000000000000..aed66121807b
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+	"${FILESDIR}"/ninja-1.10.0-readme.patch
+)
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	echo "$@" >&2
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
+
+	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		${EPYTHON} configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/ninja.vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/ninja.vim"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ninja ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index def8432c182b..366073aff8a9 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 155653a132cb..17b2dfc3f74c 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 3f0879829033..29fe9a3efed9 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index c0e633894cb9..8d2dd26cb265 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
 	MY_P="ninja-${KITWARE_VERSION}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -48,6 +48,7 @@ RDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
 	"${FILESDIR}/ninja-1.9.0-musl.patch"
 )
 
@@ -66,8 +67,8 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
 
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 8c9e987cef2f..95a15369f8c9 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -11,11 +11,8 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-	KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
-	MY_P="ninja-${KITWARE_VERSION}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -47,6 +44,10 @@ RDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+)
+
 run_for_build() {
 	if tc-is-cross-compiler; then
 		local -x AR=$(tc-getBUILD_AR)
@@ -62,8 +63,8 @@ run_for_build() {
 src_compile() {
 	tc-export AR CXX
 
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
+	# configure.py appends CFLAGS to CXXFLAGS
+	unset CFLAGS
 
 	run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 
@@ -94,7 +95,7 @@ src_test() {
 }
 
 src_install() {
-	dodoc README HACKING.md
+	dodoc README.md CONTRIBUTING.md
 	if use doc; then
 		docinto html
 		dodoc -r doc/doxygen/html/.