fix collision with dev-util/ninja (bug #436804)

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 62 insertions, 7 deletions

diff --git a/net-irc/ninja/ChangeLog b/net-irc/ninja/ChangeLog
index 98c91e936b42..2f53d6f1a1fb 100644
--- a/net-irc/ninja/ChangeLog
+++ b/net-irc/ninja/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/ninja
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.20 2009/09/23 18:45:04 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.21 2012/12/30 23:51:12 ottxor Exp $
+
+*ninja-1.5.9_pre14-r1 (30 Dec 2012)
+
+  30 Dec 2012; Christoph Junghans <ottxor@gentoo.org>
+  +ninja-1.5.9_pre14-r1.ebuild, ninja-1.5.9_pre14.ebuild:
+  fix collision with dev-util/ninja (bug #436804)
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> ninja-1.5.9_pre14.ebuild:
   Remove virtual/libc
diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
index 07cdb99b1ddf..6e841afdaa41 100644
--- a/net-irc/ninja/Manifest
+++ b/net-irc/ninja/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ninja-1.5.9pre14.tar.gz 920668 SHA256 151422413acf67a6d695346fa21d8b9ce8901ee31d0e6ac07d997d5793ff3c38 SHA512 5a379ed355c06d28f26ed7b97e657b463deec0832ebf822424ed92379e85066e8aca971943ad751e695c003a6ef1ab7fa46ff29e5febe30c439cdfdf6b4d6cfb WHIRLPOOL a735179313f785b8ffeb3b89f67e8af28f069feecb95dd45785234642372d7c16f89c5455d9a82196fe22e7e344c5f64f0d0058e404c117d0d746674e94eb006
-EBUILD ninja-1.5.9_pre14.ebuild 739 SHA256 454541f29795d99014bd8cc6c6188e2b607f15616f9dd5c69a7a8f16a89476e6 SHA512 dad49e79cf953fe52212b4fe9ff75d67d148a3454aeb04cfe51b8cb885922236ad3401a92513fe1a4691d0d43bb383cc76659a0093f01190f082a2237b3397a9 WHIRLPOOL 7c9f0be1879d6de358e3f5a05fbba87e03c2c875e54959a96529f1c20e87e9a5620d0e2de44a7acebf2bc030a9b62e12060d9598bcf7420823a15ceb1b651996
-MISC ChangeLog 2340 SHA256 26acbbebce87ca6f5ad91c646292de3e72c102bbd93eda9a6c6e027b1b6aafb8 SHA512 4b3dc56124d7f4c97be474728805ce1d6e49515fd9ff4ac797827e3c144b7a2201ddacf09ce3f38a50101d79c20cee9e35c608ef212266212a02e7e57745a08d WHIRLPOOL 82a67c03ed555da2638b3bc5653956c0a9d2508eb26875b1488401ca0134c60dd67cbae56b176406343533fc1d86a56de5a1a57fda0eeb354e533b7213c62761
+EBUILD ninja-1.5.9_pre14-r1.ebuild 720 SHA256 6e9621b6bf4d2e2ffa183fd6bd44fda96597d7957701649b9ddc26d3317a5a11 SHA512 718690c7b24aa8cfcbedd92b8659fd7207f314a08ba5146ebc7b3f7eed3ef1910cbf37d2a70a08264cde97b8dd1eb98d5191954a315d4b530fad27d3fc82cc57 WHIRLPOOL 3c7bc53238214edd1370b7246f9cb134d7ca24db9fe92b6c6722fa5207a7c9341d4ab35a083f0f2a58a5ff6e6f8fa2ae6f412303a7df20f8fdeb5f76acb12cf4
+EBUILD ninja-1.5.9_pre14.ebuild 783 SHA256 e214d1c758174fdd3e35322956b0b01a097d962fe703584895ce43bff6fab6e9 SHA512 89b2c16fbd9aed76477b5fa2259fa286d87de286319c9ffa7aea173cbae8012e485bf916601a5124bee3bbccc798b55e1142d9ebda615566349c295ab13fac60 WHIRLPOOL 2efbef62c9ff64d1293f5a7d3cb37f4c4def151cb31515a70ffd7f6e262ab83ba191289feb344a882871838d3e6ffe11707eabcda56906d88660c46275009aa1
+MISC ChangeLog 2539 SHA256 07da5470fac0761002d8a90902724809c2048cc43f9d42434efb865a1ffa231a SHA512 b884d805a580762dcf7292e22c650a29a684f1d20c3503cec3c7cea5507e8acf3878d58e30bffba13e3c19c1a00f5f741bbb275598f0f94821c4eefacce8c3e5 WHIRLPOOL 49a3e885a1bfb670dca2685679a307708161857b0c29f1f9eb6b46a63e1e8f01c92e78631ef57d3804365b6d5e2a186fa0623edf326d93d5aef66bbfd96b35e0
 MISC metadata.xml 160 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 SHA512 9cf2605fc15b592515a931de7a63cf02d1d5ee27ecc3cd022f8e932791008d3ae4445088bebdb48ee0d46e17ebf475c19b15a05b07528f73c351a9846cd3920f WHIRLPOOL 6eb76aae8263e190c7a0a82968b1d7db2f4fb65bb9134b6bad1a5b2d3a513e229eebf303d9952f4933e758e42c0914550d58d5e86a3b76dbdd6df0802dec8e7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ4NNxAAoJEOeBhlrCAAWGz40IAKuF2cPWALqkj4ujyqis2jC0
+tFGEpyJTgP/KfMvlYEkUI5jNfFDAm7AFwheAywuChl+YDMrnST+vmnBxjbua6BaK
+5WnpH9OCiWUOEOjC0oq9JavF+AocYCnRs6mvRPmbVd4pxSEYvzbLPPBD/d0yN2+g
+tKA6AMt3d+wGTYu/cSXnxwARS9CkZ+GhulWWWqSL4ZKHLzL9MKaNV/gWk3t4Y/j5
+1PTAZJUPls8FKRR3+GpmZs0HKytq2b1LNbqtRAdOKOZfET1R+plY+Ah44UuXFELE
+n7ZIOs36VWHMtsUWhITFSLKW/p5meIbr10Jo2wB9HZe4NQehPb/fcbazKxGt9zM=
+=lVs3
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
new file mode 100644
index 000000000000..2a91a355262c
--- /dev/null
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild,v 1.1 2012/12/30 23:51:12 ottxor Exp $
+
+EAPI=5
+
+S=${WORKDIR}/${P/_*/}
+
+DESCRIPTION="Ninja IRC Client"
+HOMEPAGE="http://ninja.qoop.org/"
+SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ncurses ipv6 ssl"
+
+RESTRICT="test"
+
+DEPEND="ncurses? ( sys-libs/ncurses )
+	ssl?  ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/bin/ninja{,_irc} || die #436804
+}
diff --git a/net-irc/ninja/ninja-1.5.9_pre14.ebuild b/net-irc/ninja/ninja-1.5.9_pre14.ebuild
index 5a87e914f622..9eb38743e96e 100644
--- a/net-irc/ninja/ninja-1.5.9_pre14.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild,v 1.5 2009/09/23 18:45:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild,v 1.6 2012/12/30 23:51:12 ottxor Exp $
 
 S=${WORKDIR}/${P/_*/}
 
@@ -15,7 +15,9 @@ IUSE="ncurses ipv6 ssl"
 RESTRICT="test"
 
 DEPEND="ncurses? ( sys-libs/ncurses )
-	ssl?  ( dev-libs/openssl )"
+	ssl?  ( dev-libs/openssl )
+	!dev-util/ninja" #436804
+RDEPEND="${DEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"