Version bump. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

4 files changed, 55 insertions, 132 deletions

diff --git a/dev-util/ninja/ChangeLog b/dev-util/ninja/ChangeLog
index 9b71173c2250..bf0cf017eec3 100644
--- a/dev-util/ninja/ChangeLog
+++ b/dev-util/ninja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ninja
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.30 2014/06/10 00:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.31 2014/07/22 16:20:56 phajdan.jr Exp $
+
+*ninja-1.5.1 (22 Jul 2014)
+
+  22 Jul 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> -ninja-1.3.3.ebuild,
+  -ninja-1.3.4.ebuild, +ninja-1.5.1.ebuild:
+  Version bump. Remove old.
 
   10 Jun 2014; Mike Frysinger <vapier@gentoo.org> ninja-1.4.0.ebuild:
   Add arm64/m68k/s390/sh love.
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index bc469677471d..f3b2562e029d 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,28 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ninja-1.3.3.tar.gz 147703 SHA256 6212af69c2bdb9b6e7a4a5b45802483aebfb5d8967e437981fa66f0da3d17a3e SHA512 8e088f7c82f99f7eb974cd0c564d85a87206c7341df33af53f001b6d46ee34e29406ea196dc79dcc8101fd5c567f1bbc46095a6911e9830ffa6a89ff06d5672e WHIRLPOOL b5828d4c75007541a0e895443471305bf602d03508de918b5c619414a0fba54907365901cf9ac7e89c0d1bb0837dbd999c8ac31f4583c8de6e2306d90ec7bf62
-DIST ninja-1.3.4.tar.gz 148750 SHA256 e71066b1db7b68f0aada6e93639ae8986844491d18bbca209338853d706f6099 SHA512 4bcd5b357729bbcbddae4eedac1dbd0bce2932474182f32cbbcef80b5f1c8e0bb3046bcd1e0f092a9df711727b27046bfb7f63b4eaa1ac3f8815ca6c26c0344e WHIRLPOOL b8f15a67672d839a8e5717830ed253ac298ed84f098162943436a28fb9290a46540654f39a8ce3d3a3320b6b5fc028f5b7d88f3e0fe089604ac5759b2afb6f04
 DIST ninja-1.4.0.tar.gz 152385 SHA256 701cab33c5c69bcdeedad7a3f7bff4c3e61d38e8c2a0ab79d86e3b702de4c317 SHA512 8c939d586f30db884b2f3783fa6cd9a6f1b0904d231d1cd9b9196efdc0144585cdff11f5d7821f0f7d45643b82f65889e5fc950d7ae2c6d83c57c2cd43ba9361 WHIRLPOOL b052b3afe42c905236117fad27db7c69deac539417ac6d9bf8a505fc39ffb8567e2772f481c96534db57cf41f482573439314154721ce9d92bbc446cf93c1e54
-EBUILD ninja-1.3.3.ebuild 2206 SHA256 2ca975cd394315318623d01fc765da42842d845b5f2815cfa5e4df3c5637158f SHA512 78ef23f9fa86ddc959d7601de0ff7bf09adacd7b4f6a64dcb63d3633e891dab3cdfee52b39409dcc4967211ce8795a6f6cb16fa95fa8b3f17b09f9d959ceab93 WHIRLPOOL da7ce299a61da07e5730c328b1ef008648940a72fd043432864ced050a5ab52bba75ccdfc60c90b5f6848e8d3295c75559f63ed82ace638dc7d7fe48219b5734
-EBUILD ninja-1.3.4.ebuild 2214 SHA256 4eacd12d8acd59b93492d4c9572d0aaf8b403ec453d1d991ed9b76f499ef17a1 SHA512 03689a69721506c3fb2addc95ee4f0f92c6d28814a652ba1275252bce6cce98eb39d9ae63debc1660bc21791844604f40aa7ac06fd586fb27d128cb697f4678f WHIRLPOOL 8d0c62be8986a44f05ed48db744fd0198fa253a86e312cd740acba8cf59de19337e48627db1a8dfd79ed89c37c1face1ba6db4fb6cf8b69f099fac219281029e
+DIST ninja-1.5.1.tar.gz 163437 SHA256 fba77b9ed4b4dd0e86c4513776938dc64bd4508dc2055b04c0c6df68bcfa397d SHA512 ab82389ee88bd68ec57e720dabb47494371990dca581cf9bb35650177164f04bf41c81ab3e5019a370eeacc7f5f49ae81d41d8b21e1b07cc8abedce37e00da61 WHIRLPOOL 3fdd76505aa39a3960c8d47fc04e7fb12f613561ecf8f29d88329c06b78a0ef47fda02226d6ebb12718676c2ea9dc6bf7352564150de8b92f1b0c189bcf21e3a
 EBUILD ninja-1.4.0.ebuild 2696 SHA256 c24f026ab0475c6fc22cbea2efdbb9409d5d5760ca850f016fbe98f0cc38d991 SHA512 96ca78181f439bf35cd99f3282769632a9c89d2c8ad5ce7ff588b2c86335f7f5b8b2ffaf0535ff6cf4c28c3b1c56bbc5501045b7e557f1f0a245b1904d5f562b WHIRLPOOL 22988dadd99f8be970bead90c539fe9b43f52ca2cc1742dcca907e8c8cf75ff3473363d14ead1975b01e96ab89b1132614b5bab8c84db27b0421e3c6cd69e2c4
-MISC ChangeLog 3746 SHA256 3d6848b6986c9aeaea0b32f6aff893e459163c72133ebe3f47cba247314c2852 SHA512 87b37521a93fc98ea4b135da2614f94a7b2216b9e0e1372cfa4e0299a89ebc35d36bd562edc02a520a36a6af534efb3a9cae0fc3abc48d31fa301b37d30fac7b WHIRLPOOL 49b77247eb0e68dbb5bca270c85214eb14266b5bcdaff1e624698dbffd92e9113351c753544476700d3f4a051d2c6df5e8e9d56f0fce13614536c85c593c354b
+EBUILD ninja-1.5.1.ebuild 2709 SHA256 9260753a8bce4cef8001989e77436a894cf46b936f5aaaecd29e9658fb0c5ea1 SHA512 df54a4c5f01e1783ef6512cea8a953e6d7b9c3cf56b31bdd82f2c30bbb1dd74352dd01be62cf518b76b94c5eba6b7acc6a1dc39c8621231c3b0e80b22aec199a WHIRLPOOL fd6cb75668b993a2f11492527399c854f6ca82bfe89906a6bd442f9e5049cbf2f18abf8321e5797652e72ff0057948a84bbccb11267af4842ed2defb8dcecccc
+MISC ChangeLog 3927 SHA256 fb4b2b4ead78d5515546d9cef6519ded67dd74092fce1f1db04fec30eca1336d SHA512 c3fb411922c1a18ceaad948315d36a9c7db74986153b5b9a2dc9bd5086f2140481a8df2f6ad7b6ccb0ad5a1a980ecf284199030206d577d021bac6d4e23dd22b WHIRLPOOL d3645fd4d1b536628a5032c2affa8af3c070125b6f39c9a69bd6a06ef6f42b35361497bdb1da17bc73a475486f16f29cb2c94b6fa52b34f45bddfc6b0b86a08c
 MISC metadata.xml 240 SHA256 caac354df74906d7606c88d7a5d83921d448eada98dde1d7f64adf2fbd1af949 SHA512 f2f8acaa676739cfaa332bb42e7f1ae8a55b2c954af075bc77fd66d93d67a6c1eee2b0d5c040b8a130411631edf9296301ebb741771fd08906800c32a7dde8d9 WHIRLPOOL 347bf9d228f83878ce5cf99bd36d54dd96aee791fd4ad34f628b3596c52324371f4f2d9d94ecd0df7cc9311541522d98099fd7c1ac21dc0152c726301339786c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTllAeAAoJEPGu1DbS6WIAIqwP/RuzYV2j/jy6Kw+a+x7u7QoZ
-FTv06p+TCyizlwVlb1RyuAfPcv8o2OQig5wXT2y0SBZSQOgLN6+GnKZsZYtq7sj9
-YIRKP3g6UeJXiYjfWhAVk/k0fLfAhMR8T8MEy+96swLfbbAc3ggJ15yucJGG+Z8R
-8NsEMaQVSWfm81xU4AoShDEJpU0pYu8zIxw1kuI1NYassnu2oyaE1dWzYfZMJHpf
-+QOhxRcj9I6jxoL7V+B8hdZ9mSc0aXYGqZD78eYyTh5xkj/DhoK/qAu6Wnbk5157
-4c8dcTY+W43AP/XvRRjmqH+8gKg4iSabvUJGO6nP4XTUqBMnntPTtSkwre1+h+jS
-0VO7BAXuzNhhYtsNJEtyZ+ldq6j9Ukq78c0zgc8rgNcMubeyC5fNri5zebbhKg7r
-zXyqnN3cB/5Gf1NQtX+j8j3FRZSiXYdZc2PWUTs0GhlOJYgSL66CilNhKmV7XtFl
-gsu3QWHE7qOzjurSs2O/JFphpyOA4PnOODQ6Lr4jEI8iLSrZ18LY4dex/dR6D7ia
-ukkP+k63gUtVZDCYeAe0CpeJ6ve0pmS+wKP4x/XEWY7QCAY73lq354ZAAe+8KvWH
-Pq0B7vt5DR30/rE2ojMDRBRIGKJsssBASWiuB4Ag0d1JEJ0Du6qq3rMM/kqcIsjM
-I8QSKIeGdd8ZV+Xco0FZ
-=JYoc
+iQIcBAEBCAAGBQJTzhNpAAoJEE8aJVXqcZkdXSAQAIIepTITO/xG5s0GVVW5HR8n
+k0H+LcvLoprHfg/FM6iM/uXi+ex5kzlqvUdR1M+A13PNSY2PA7rkjP4lKBoTVRDg
+r7GgK6RFR2dGh3kPrbw0vNXYYWYfwBrjolcglA5X0MAhqeSU1majpOEheeggVLLg
+7SMX2pJk2PNhJEHO/WTDyPvAEjattV4uLmVVAoZc0M/e3pUQFHZAfodtaqARaZJK
+a7IV+RrIVfRw6pudZlDc2bxj9bsq5d/eQWJ4IVkBXozgNGQkG0LqNhDwdjG5fP2n
+Ba7fsooeE8Ze90tyI16QlpPo5vU5T48uhzEvHvD4XU6G0xp740DxbGK9HicMuQWo
+EShww2e3/NsIgTajtg84GLoE6BHfD3ecgB+wb0PIVbf/bN6kKdE1ANB4tBRKk2Oo
++4+rWQ8s0HdT3r+vwrP1HeIO2OHzU/X85dPnOBGEmLqLue1dXQHsJd/sHLBsFWnh
+L6MwKnhVSDl0/W0isMaT8a5D3qkYVS8MM/7HkxAIqb7Y8cvG5WTzqyysbStpmgVx
+jmsmYd4iHZKy2GV/yvQSqqsHgFkr0YfN9x8uanrSNXYyAQuo53GCoX7lzUyMgbIP
+T15WFvZu416/ALtRm34/vQsYdeZbLYQyTe4ssfqsY7hYon93TLJsEJiEmV/DfkeQ
+khSSVKrwKCdY83jKvwXT
+=aLd1
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ninja/ninja-1.3.3.ebuild b/dev-util/ninja/ninja-1.3.3.ebuild
deleted file mode 100644
index 79dacd3febf2..000000000000
--- a/dev-util/ninja/ninja-1.3.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.3.3.ebuild,v 1.6 2013/06/29 19:41:28 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [ "${PV}" = "999999" ]; then
-	EGIT_REPO_URI="git://github.com/martine/ninja.git http://github.com/martine/ninja.git"
-	inherit git-2
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-DESCRIPTION="A small build system similar to make."
-HOMEPAGE="http://github.com/martine/ninja"
-
-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
-
-src_compile() {
-	# If somebody wants to cross-compile, we will probably need to do 2 builds.
-	tc-export CXX
-
-	"${PYTHON}" bootstrap.py --verbose || die
-
-	if use doc; then
-		./ninja -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	./ninja -v ninja_test || die
-	./ninja_test || die
-}
-
-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
-}
diff --git a/dev-util/ninja/ninja-1.3.4.ebuild b/dev-util/ninja/ninja-1.5.1.ebuild
index 702ca861d318..5c6118da85ad 100644
--- a/dev-util/ninja/ninja-1.3.4.ebuild
+++ b/dev-util/ninja/ninja-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.3.4.ebuild,v 1.2 2013/06/22 13:56:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.5.1.ebuild,v 1.1 2014/07/22 16:20:56 phajdan.jr Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [ "${PV}" = "999999" ]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/martine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 fi
 
 DESCRIPTION="A small build system similar to make."
@@ -46,14 +46,34 @@ RDEPEND="
 	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
+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() {
-	# If somebody wants to cross-compile, we will probably need to do 2 builds.
 	tc-export AR CXX
 
-	"${PYTHON}" bootstrap.py --verbose || die
+	# configure.py uses CFLAGS instead of CXXFLAGS 
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" bootstrap.py --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 -v doxygen manual || die
+		./ninja-build -v doxygen manual || die
 	fi
 
 	if use emacs; then
@@ -62,8 +82,12 @@ src_compile() {
 }
 
 src_test() {
-	./ninja -v ninja_test || die
-	./ninja_test || die
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
 }
 
 src_install() {