Address bug #247987 by adding blocker on net-irc/irc-client to ircii-20060725. Add missing expansion quoting.

Package-Manager: portage-2.2.0_alpha78-r1/cvs/Linux x86_64

3 files changed, 28 insertions, 22 deletions

diff --git a/net-irc/ircii/ChangeLog b/net-irc/ircii/ChangeLog
index baf1196a46f9..74050a434aca 100644
--- a/net-irc/ircii/ChangeLog
+++ b/net-irc/ircii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/ircii
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ChangeLog,v 1.29 2011/12/02 00:17:56 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ChangeLog,v 1.30 2011/12/02 00:35:24 binki Exp $
+
+  02 Dec 2011; Nathan Phillip Brink <binki@gentoo.org> ircii-20060725.ebuild:
+  Address bug #247987 by adding blocker on net-irc/irc-client to
+  ircii-20060725. Add missing expansion quoting.
 
 *ircii-20111115 (02 Dec 2011)
 
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index 3518785b9548..5236a4e74cc8 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -5,25 +5,25 @@ AUX ircii-20110228-glibc.patch 799 RMD160 9375a447fb18f922e36a3af34f91c0340da62f
 DIST ircii-20060725.tar.bz2 560505 RMD160 9273d491c0a02c6235ff8918778171025d8fd053 SHA1 1070667f8bce6fdd5a5dc05af934d79f61ecd42a SHA256 102a1ade89e8e76030d0c7de98ff61fa56d462073ebe9305f18bdaa814713752
 DIST ircii-20110228.tar.bz2 558483 RMD160 e67fc078a8408d6d2a071c37e2a902a5849ffe77 SHA1 9fba750dfd8305f0aa552eb73190e58582af76c8 SHA256 4fc77ddaf473e35817f55945e6275b1501b7d95585b49a44e0fe998382d72fb2
 DIST ircii-20111115.tar.bz2 555731 RMD160 b2cdcafcfde914ead88049d55c0d5ba0680db746 SHA1 723f89ca6c0ef0085da858076865e6493fbe9788 SHA256 5c6b4390b8ed04cf3b08a3ba72f41eba9b125d0fc09c637f7c7f81eb6bdd91e6
-EBUILD ircii-20060725.ebuild 830 RMD160 52211b93a0e9a7c9b10778e036d52ab356a49eb7 SHA1 4ad1249afc85ba8b1b50b6213e8668faa9d1384d SHA256 ab53a12d50e29d475a2dbf5626ef12334d3afcbc55cd03278ddf82955a8fc927
+EBUILD ircii-20060725.ebuild 904 RMD160 3ab66300bc8414fb0d7332db0f3c58fd4e2c1d64 SHA1 b8ec0bfea8f321f05f6190488d81e537b22d16a6 SHA256 3b971c4dc5fb3716a8c71955a6ba652c1a9b1b85d797841343492cb44f2d1578
 EBUILD ircii-20110228.ebuild 989 RMD160 d7a72f29b36f822703349a13e146f4429dc1cf16 SHA1 9fdf855f90d3900035f60a54d9fb43fc136f0897 SHA256 5546e17e331d14233131a764819051ca1f7724d68f67c9693003c704eabc180d
 EBUILD ircii-20111115.ebuild 978 RMD160 fccd0db8139be8070e6c273cb1a94a6b5a291c5e SHA1 263862dda2e074daa96f9c51ce2d308719c6fced SHA256 21f75a493958b95a6d45659b27126b8b7743950b7919e85a364dd0767f291156
-MISC ChangeLog 3901 RMD160 9bc8131af30ff02e24b10cad9c5c52c5967ba0d4 SHA1 8271d3c224f972ccf96446a08e573046d0cbabdc SHA256 c8d1f532ce7642c7161170a75baf256c2b5e320d1578c8c4acbbceb7aebc2d34
+MISC ChangeLog 4094 RMD160 980b9b221ead71acf09f07a1a82f0eac082fab0a SHA1 d147ac845729c747b352d23b5c3c9e7f6847c323 SHA256 57eaaf86094d4fe060b3b34ccb5dc16bada66e945e021a4037254a69e5c41628
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO2BhJAAoJEHQ6UuhrqBBQxQUP/3d1unITNeC8KO0LLJrYFzTH
-1vZfjWSe0WCdmqDDSlpeSY6hkYyLaL5f+vmnh29oc9MShpsi3W/pZkANktf/2h5B
-PEduWSvOULkTc/WjMrX1qWRK5twIQe9WUnpbCvD57k5icgYMls6mbOEtPOnp39bZ
-wHP2XqjIEXrA9e4qqkIPGlHqiO35bC446Flq57kFar1XNEqEujMTCeAnd/9EfnoX
-GYtYhXUovPXuE6O4Pqu/PzLygOIbXmKo8/9gIqg7lIaG3+a+3PXFElXGKxm0e9iZ
-MCUGDnbQIGy7GBPzwlGGfEMaYLdPiud6b++r/meUCnKeGXjDxWBXTJ2v3+2i8kPz
-y99ADNc0kz4XOfAjZdtg57Jy3cmL+IgX90c6/6NCFfEMUjQh2yis5ihnuYAh+6Dn
-JQQUFqlOt20sX9JBCS5MZkpnqL+qULyHX/s8JAjwjLSUplRP6lZm3EJjpp9gibJA
-zgQilNxbnuKe1fO6yMzftQ1BXALMQoIr6+NlH6CLsCFtND7+0vsnV9GWoSPTWtdL
-U+jVGlYaDI6Yx1tDi5mf8CSYqH5mhZKnxWGkl8Q15AbmasMLxwXwReNRefK8GA/x
-sip4olQAVBVMJZVaW7e7U8HCaFkK5jDz+6SbcKCrykYp0U3iup2Tpt6SFaMlONLd
-K87gG4pO4ueCJWxUSNK6
-=ibG1
+iQIcBAEBCAAGBQJO2BxhAAoJEHQ6UuhrqBBQVPAQAKeqrpKKrsmV2FEn5ebL7jaR
+ai/ZV9cVnmniIePNS5MUBaBAnW38E0lmbQQjnIxDqOPHmgK/VYgJ0M5aU/eaReaj
++IaxLovDzx4N+pSq1O+20J6/r9tYgqmWXL78uRzcMwRDBVtc+f8dfGZgthTHfnge
+o9e6I0X7RmbAyulYoXAZEJDAkRYiMIEsEtZg+FRd3v7mn6CIDsL3MHvz0r6PQeM0
+xXc4K110YR8UG8U17efP1G6NQ/Lw2kqfMxHVTIz1s6R6t3JDRBj7e0E0ZqhrVLjk
+By8saYVZgiN3r3we4Pm6maCyiu5Vpnw2KddnKAHcHVw+m5/9ZIj9xBWuTASE39TT
+5oHk3ur4yjtAsSKW76ulPP6YJVfJsXtTqpzLbQMr0Y2gqcSEU0KYBOOySVq8U0rl
+Vm+m5pNGkatzFwdHvEuGjIrzLFkkq16asDJ8CIdifz3sfiaABOJtCXwtMgm5F63o
+wwxO0K5bs3z0ed1XgPdrG4qjgUa+wNos/RRbnJIJeeIGzidL/DFqXrV5xvfzBsXX
+mzQX9EyNU0OGqa1bzvc9WZft1yVccd167sqAB7Q8m2Sepdmoph36/GNbRR18DPSG
+9JrPsPdFnTlhGmgKaRostJusnJkBeCzZbRD98f2GWFUTMRXn7As9ssvJoURdEvmJ
+52mF0Oxio7s7NB2lymUf
+=s5JP
 -----END PGP SIGNATURE-----
diff --git a/net-irc/ircii/ircii-20060725.ebuild b/net-irc/ircii/ircii-20060725.ebuild
index 4f8c92fa54ef..40b113a6bf39 100644
--- a/net-irc/ircii/ircii-20060725.ebuild
+++ b/net-irc/ircii/ircii-20060725.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20060725.ebuild,v 1.6 2009/07/28 02:11:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircii/ircii-20060725.ebuild,v 1.7 2011/12/02 00:35:24 binki Exp $
 
 IUSE="ipv6"
 
-DESCRIPTION="ircII is an IRC and ICB client that runs under most UNIX platforms."
+DESCRIPTION="ircII is an IRC and ICB client that runs under most UNIX platforms"
 SRC_URI="ftp://ircii.warped.com/pub/ircII/${P}.tar.bz2"
 HOMEPAGE="http://www.eterna.com.au/ircii/"
 
 RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+# This and irc-client both install /usr/bin/irc #247987
+RDEPEND="${DEPEND}
+	>=sys-apps/sed-4
+	!net-irc/irc-client"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -22,7 +24,7 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR=${D} install || die "make install failed"
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
 
 	dodoc ChangeLog INSTALL NEWS README \
 		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp \