version bump

Package-Manager: portage-2.2.0_alpha141/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

5 files changed, 32 insertions, 108 deletions

diff --git a/dev-util/ninja/ChangeLog b/dev-util/ninja/ChangeLog
index 6243f5bf1401..c5938f1bfb2d 100644
--- a/dev-util/ninja/ChangeLog
+++ b/dev-util/ninja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ninja
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.3 2012/08/25 14:17:27 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ChangeLog,v 1.4 2012/10/23 15:50:41 ottxor Exp $
+
+*ninja-1.0.0 (23 Oct 2012)
+
+  23 Oct 2012; Christoph Junghans <ottxor@gentoo.org> +ninja-1.0.0.ebuild,
+  -ninja-120508.ebuild, -ninja-120715.ebuild, metadata.xml:
+  version bump
 
   25 Aug 2012; Christoph Junghans <ottxor@gentoo.org> ninja-120715.ebuild:
   added ~ppc-macos (bug #432692)
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 1dc7a4fb5068..a9bb39e92953 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST ninja-120508.tar.gz 109976 SHA256 9a3ec8e439386135a8a9b76938fac2550d7400d079c807210410b6313311c106 SHA512 386d5f601ed760109b709fec34b8d54e871f440c23e54dfac2750648182c6fc0f51c9864a2fb4510da66415eb5534a5c5dad2c805df86b75574421e3905bda72 WHIRLPOOL ce116e9cc99101620aec41681de79d4c6cc0de075e6d35c064324778e03b2bc9dc1535e7e8b0dbb23b3945fdf8381f230ca6888c539ab621609bbf4e93537313
-DIST ninja-120715.tar.gz 114853 SHA256 d0579a0181d76883b408f6487af52a18e548e3981df2c8d475d2d08e031a4b02 SHA512 905c148cd98433f484b4d8d17dd52f141069c3afc235243784e655bb73950cbd093f5004cb4031b9c4f0f79b62bdfb3090d962cf42c8875aa6aab4d42f05054a WHIRLPOOL e78967434d3b0880b2e50d999044a0dc24e1bcf07c5ebcb22f51a0e96b48f14a329b3595e879883458e5c6208144d9c023207f83d5e0716b8057ec692fc72864
-EBUILD ninja-120508.ebuild 1848 SHA256 b24b2222f8d366467b8582f75c416b9014a0b6a52fa3ff3990811603e8102ec6 SHA512 0e5d464365886d2367389027dd422b7bea3769b5faf39fc544f0ab8a1eee551446ce9e5015e15f3285a31958fa7e39c430d49d6db076891131ae8c06f93ddc0d WHIRLPOOL 9753ac4a9359b50dff3a0dc2c737e6fc6cda7b041f62d2e6d8c12047c5e1ebe5a83766ec30d13ac4f25708b1a645a3950bbe086dc8c71f1aaf8440da1b82dba1
-EBUILD ninja-120715.ebuild 1859 SHA256 853c26a517e4b852138c6d4396136724662b2ce4c433f6de266a46b34fcf5f43 SHA512 53fec4b3851a02fc8f37ccc1e7baf9214150ce89e9a25db85a287f2b4cc3eadcdc899223fb18e790ddee4298d3bfbbc274d4aff1a5c59932b93089ef005634c5 WHIRLPOOL 3c043b8e74e2323f2c3ec3e8524ede21f6624e7985e3073796dfe927654c096cb1160b8ccc30bd34192a23dc9261e9b6ee834d294744114b22bad0e1a6e0c7f6
-MISC ChangeLog 584 SHA256 15be8528e9acc6f9a917727997c67ab824dfe7bf49a18acb0acdb922afff1afe SHA512 bda695b5f28287314b9251c4b9178e79db9b689e25a72ec54a4fbd3a7f0ece1b857e4c93bfb532a633fdfca9fef426257ad9969db1e9304df6660724fba9ea8a WHIRLPOOL 2b9c32610822c0ecd2a23efa2c71e6451c083106de2e41c993c9f8fbd52771ac7efa1e329968fc04bfb1c9731870ba2ab3f371eb71a3a3ea1a568961b578de8e
-MISC metadata.xml 237 SHA256 7b16ab35f387f952afdef31d1d5d20f82b69ec2e8a55bbe7215cf78ea322755d SHA512 52882e327ceb9391938e5b9fdfcb2f0d9c7380f71bed273c84357ecb0f1f0d4e704d9c53e4791dda1d7eed5df2c4c029281de182a5076849b26718fc83462cc6 WHIRLPOOL 1b5ae26efb6a0d0edd3e21494e52dbc7cfd1621316057dc8d876280444ceb302c94109b4e780982943a7837f19de8f11c85f49b137d31f41d7c79db6387dab90
+DIST ninja-1.0.0.tar.gz 127934 SHA256 43a25892fe4d2da8eb5075490a900bbb48d6ff63308f1327260f51cb6b84657a SHA512 331807e24d14cc01c985a008841e77885abd515abf784ac9efa233bbbcf4a6461cc7a27058b885e3260ed932052b85c5c90d0d19fb2fb00327ec607a081726ec WHIRLPOOL 561e3e5ebf4df34e004399dfe13d131065b5e74337bc6bc02721be1953ac59109bf4ce5bb7da4cb7e1125ef38aca5144d5aafd5f26b4ce16c7bf0351c36bd391
+EBUILD ninja-1.0.0.ebuild 1877 SHA256 ae1dfcce1ed93af016b99472925b6f75b2518f5db05c4f2d10b0911b4e362805 SHA512 aa02fc16996d770556ce334e900dfdf4766bf93090563ec67df3310046149b7df5398b635c7c45346943e071338333f9995fc5768852eab36f12d8ab3e61826e WHIRLPOOL 3c851f3cbfce0ff4f3344b041a42e1800f20ae2094867f9d0594624d775c42d49f388fdf211cff20521ada0fb55afda2a5f31b4d1f175f768f27547ab98eff30
+MISC ChangeLog 763 SHA256 f7f0502fffb779db29fac2b7e769739efc4b43ebc1c897dd183e67dec52355a6 SHA512 5420a7dcb7ac10deadce4c304433daaf3e938586bd48bd5053be79bb95e3dfd2459c282457d6269dafd7b68222de2a77c6d57b7784a85e109a6c22685072fc11 WHIRLPOOL 8307e6c5c0b34dc6cfe0e008f688a85ccb34281958fd56ddb54a5d2693722acdaa1a7b0dcef228b49180b15f2ae4f6d2a3e7d29cfdfbcf970616a2d9576f8698
+MISC metadata.xml 315 SHA256 eed44c7b2fc68f71723be738ba56e06e069aa24f74e73b8f4d17f6ed697e5671 SHA512 fb30b0f54c0a890d90df2e6dbb28c0be447e0f18136210d743004147f1201db8be8e86e43fd4650803c508e180e6e572cc72c62b4f1fea4c1cc1356180808735 WHIRLPOOL 9225be9539e078b5e076d7169253d65c61bd73c91a33f8422f492b7fde931aee3a06fee36446deba25713e5053c1d0fced1eded22b46b24037ce63f28421fa65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQON5+AAoJEOeBhlrCAAWGu+EIAKYna5R/prCIouw8Ui4okRIw
-xGHjy3sWD1LzOdGYpIO53HdVX5xw1OIfNLJb2Ah6AK6j74C+7+Exzz/Dd8VypAGF
-439y+lERrpZrdb19lc+QCVPHnJOI3yAsmXwsOUlU9DxGrgMOIlIr5iqD5J82EAzT
-oRmtxKVpl9mTEknOJPnCbPXHD62RpwwOdXYUD96CxzndlFyA179DAJa84QH8Jvn4
-RNscklrqsuoYKS8PUJA5nyuSa3Gn56F5PeGcpLjamxfcHbOD52jzCtuJSJ3Uq2it
-bnpSIMoqjYoOFguHI7Y4dCif2Scqg0iudxRqpJMoucefrTWG27BIta1qRKzD77g=
-=f28i
+iQEcBAEBCAAGBQJQhrzTAAoJEOeBhlrCAAWGgJ8H/R6sRIqRwcsTSlwZGX7ANQhw
+peTF54sL55zYJFg6neQ9PRsh7xP8K+CHbYOl+5W3U+2f6BWkxXlYkJOxl0wtNSF4
+pB+n+Sd1byQMrTUZ56lGMccESbjlBByMDXDEkiEf1QI+BbD459XY/lUo8oFzhDkj
+UMRLcz0TaIuFSIsjHVipR4i51iwdh0PUvO6teBHwy5gmsL5Auwy+uK4cYXqmJT/b
+aUQ9eJxxw9UCZwVhT2J5Yuihss91G/Es6VRvk0AY8FqSBNkkZir3n76g0Uf64sGN
+68UFHYQ33wiu0rZrs/EgR69ZjYBtsZEyXZek/8DwHsliKARYkgc5R+7CTJ/Lj1U=
+=Uvv8
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml
index 745b9e1ce74b..49598cfb05b7 100644
--- a/dev-util/ninja/metadata.xml
+++ b/dev-util/ninja/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">martine/ninja</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/ninja/ninja-120715.ebuild b/dev-util/ninja/ninja-1.0.0.ebuild
index 745772b176d2..21643bf6e9d4 100644
--- a/dev-util/ninja/ninja-120715.ebuild
+++ b/dev-util/ninja/ninja-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-120715.ebuild,v 1.2 2012/08/25 14:17:27 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-1.0.0.ebuild,v 1.1 2012/10/23 15:50:41 ottxor Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ if [ "${PV}" = "999999" ]; then
 	KEYWORDS=""
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/martine/ninja/tarball/release-${PV} -> ${P}.tar.gz"
+	SRC_URI="https://github.com/martine/ninja/tarball/v${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86 ~ppc-macos"
 fi
 
@@ -26,15 +26,20 @@ SLOT="0"
 
 IUSE="doc emacs vim-syntax zsh-completion"
 
-DEPEND="doc? ( app-text/asciidoc app-doc/doxygen )"
-RDEPEND="zsh-completion? ( app-shells/zsh )
+DEPEND="
+	dev-util/re2c
+	doc? ( app-text/asciidoc app-doc/doxygen )
+	"
+RDEPEND="
 	emacs? ( virtual/emacs )
 	vim-syntax? (
 		|| (
 			app-editors/vim
 			app-editors/gvim
 		)
-	)"
+	)
+	zsh-completion? ( app-shells/zsh )
+	"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -53,7 +58,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc README HACKING
+	dodoc README HACKING.md
 	use doc && dohtml -r doc/doxygen/html/*
 	dobin ninja
 
diff --git a/dev-util/ninja/ninja-120508.ebuild b/dev-util/ninja/ninja-120508.ebuild
deleted file mode 100644
index 7c61d5d205bc..000000000000
--- a/dev-util/ninja/ninja-120508.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ninja/ninja-120508.ebuild,v 1.1 2012/08/08 03:02:16 ottxor Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit bash-completion-r1 elisp-common python 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
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/martine/ninja/tarball/release-${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A small build system similar to make."
-HOMEPAGE="http://github.com/martine/ninja"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs vim-syntax zsh-completion"
-
-DEPEND="doc? ( app-text/asciidoc app-doc/doxygen )"
-RDEPEND="zsh-completion? ( app-shells/zsh )
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_compile() {
-	tc-export BUILD_CXX
-	./bootstrap.py || die
-	if use doc; then
-		./ninja doxygen || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING
-	use doc && dohtml -r doc/doxygen/html/*
-	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
-}