From: Pawel Hajdan, Jr <phajdan.jr@gentoo.org>
Date: Sun, 15 Jan 2017 18:40:58 +0000 (+0000)
Subject: dev-util/ninja: version bump (1.7.2)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=39dfff0ac9b8476c238397d90651d2d4309806e5;p=gentoo.git

dev-util/ninja: version bump (1.7.2)

Backport a fix for uclibc, bug #553240 by Tom Stellard .
---

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 74f9f6c5fa59..5a2524791335 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,2 +1,3 @@
 DIST ninja-1.6.0.tar.gz 174501 SHA256 b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7 SHA512 551a9e14b95c2d2ddad6bee0f939a45614cce86719748dc580192dd122f3671e3d95fd6a6fb3facb2d314ba100d61a004af4df77f59df119b1b95c6fe8c38875 WHIRLPOOL 74d10df3d112c6cbd524f802978f1a56d2643767d947cff33a276a29f89485576f7d6b40597f9eac1db1446ae22c7f2c73c9d1f7795132e0254fa970df37063b
 DIST ninja-1.7.1.tar.gz 179717 SHA256 51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19 SHA512 6c7bea92942c48d2a810b1edb0187a3b0230eee3a1ce0013e9dcc8dd41d99215f18f0f85be789173e590ee24f517969fd159099541cacd7eb0ba69e50d296f40 WHIRLPOOL ece2737adb37438aa822bab97d3784c7220fd6eb613bfc4852a33ecf26d6e04f5309aec3be558cb072e38a77538c46b38e2f009567d98cc79747bb4cfdc94576
+DIST ninja-1.7.2.tar.gz 180611 SHA256 2edda0a5421ace3cf428309211270772dd35a91af60c96f93f90df6bc41b16d9 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64 WHIRLPOOL 43623778d3f96a87efb4bfd272075b257ebba3760d315c5650fa74493e2193699401c9b6d35d679e7c5235456d48674ac7e913fe1d45b5b98c2542c3b0a72e44
diff --git a/dev-util/ninja/files/ninja-uclibc.patch b/dev-util/ninja/files/ninja-uclibc.patch
new file mode 100644
index 000000000000..e87eea842722
--- /dev/null
+++ b/dev-util/ninja/files/ninja-uclibc.patch
@@ -0,0 +1,18 @@
+diff --git a/src/util.cc b/src/util.cc
+index e31fd1f..1caa1ce 100644
+--- a/src/util.cc
++++ b/src/util.cc
+@@ -585,6 +585,13 @@ double GetLoadAverage() {
+   // Calculation taken from comment in libperfstats.h
+   return double(cpu_stats.loadavg[0]) / double(1 << SBITS);
+ }
++#elif defined(__UCLIBC__)
++double GetLoadAverage() {
++  struct sysinfo si;
++  if (sysinfo(&si) != 0)
++    return -0.0f;
++  return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
++}
+ #else
+ double GetLoadAverage() {
+   double loadavg[3] = { 0.0f, 0.0f, 0.0f };
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
new file mode 100644
index 000000000000..c2fd24561c9b
--- /dev/null
+++ b/dev-util/ninja/ninja-1.7.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+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 ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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 zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+PATCHES=(
+	"${FILESDIR}/${PN}-uclibc.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=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" 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-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		dohtml -r doc/doxygen/html/*
+		dohtml doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}