Add blocker against net-irc/ircii for bug #247987. Add missing `|| die', misc shell style change (remove backticks). Fix compilation error caused by disagreement between ${CHOST} and ./config.guess with patch.

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

4 files changed, 76 insertions, 8 deletions

diff --git a/net-irc/irc-client/ChangeLog b/net-irc/irc-client/ChangeLog
index 90bfac60f1b8..450849d65d70 100644
--- a/net-irc/irc-client/ChangeLog
+++ b/net-irc/irc-client/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/irc-client
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/ChangeLog,v 1.14 2009/09/23 18:44:17 patrick Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/ChangeLog,v 1.15 2011/12/02 01:14:31 binki Exp $
+
+  02 Dec 2011; Nathan Phillip Brink <binki@gentoo.org>
+  irc-client-2.10.3_p7.ebuild, +files/irc-client-2.10.3_p7-amd64-chost.patch:
+  Add blocker against net-irc/ircii for bug #247987. Add missing `|| die', misc
+  shell style change (remove backticks). Fix compilation error caused by
+  disagreement between ${CHOST} and ./config.guess with patch.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   irc-client-2.10.3_p7.ebuild:
diff --git a/net-irc/irc-client/Manifest b/net-irc/irc-client/Manifest
index ff4a7a878a30..9a65fc1ffc70 100644
--- a/net-irc/irc-client/Manifest
+++ b/net-irc/irc-client/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX irc-client-2.10.3_p7-amd64-chost.patch 741 RMD160 5f18284e4f4cf07019fdfc200c93572307de65e0 SHA1 77080a1dd0fe13460b2ff997f3c8f46bb687f623 SHA256 e9cc422d6c112fa7562c459691dd6f3839549d3031dd0ec83bc6da4809c49819
 DIST irc2.10.3p7.tgz 678412 RMD160 863314a0df77a5c128c7ccdc2400ae77e4c58f4c SHA1 2d38e7ca7de8dd00eca223920c9bb3066e8aa894 SHA256 1c7b5ba8e03d096a1b7412b6a50f2e3e00fce77193e2a66cd0ab8a9de02253b9
-EBUILD irc-client-2.10.3_p7.ebuild 892 RMD160 8847d12a5465b54aa5280c14266dec80811a0a52 SHA1 f88496c8e187cda00c52cd0b99b8380df9543f76 SHA256 f2e6175b7a0010c0e11b99991bacd146d8d0b194e5a9372c545f4948fd4fa1be
-MISC ChangeLog 1832 RMD160 6dde0d86e12b15158eb9e23d752fa625a939c065 SHA1 23354e1b15f0986f96cc623b21bae641d1766c93 SHA256 d9eb580a52989f75d2d279b6efd6802a4cb571956c7b6eff1d7c8b0fb2b367b5
+EBUILD irc-client-2.10.3_p7.ebuild 1106 RMD160 4b99521fe909e339acd94bd9efc248e65d6251cd SHA1 68539b188bb694ad215e93689272774ab15a3310 SHA256 fccc417bfd40cc515ca0b44d86aa120dd7c6e4be84c5ce7fafa01b90a2db7ebf
+MISC ChangeLog 2180 RMD160 421e81a255a75f271ac5dc7cfcb36ed98d754272 SHA1 29d5a71e0ae6b7179760f12a2f5093f0d49a871f SHA256 5160d77f6b8390176f80dce277128eff26bcc315284cc4426c84f7c4c45fce04
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJO2CWNAAoJEHQ6UuhrqBBQ7s4P/RBlWV9jSOibrD9ZI35ZHetv
+rqPDZdcHr9XGbwE+kpzj6g6kZfCJ2O8BqugXSxllf7+IRolHTXpjMIpIpveNpWBb
+pyYvgCf/Hu5CtGNpIh1zqDYP2zOpTKry5JwHs2xW+aTP30fc9zVtwez2PwnlbXIL
+TVAy8ySM91Pg+OQ0ISk09e607AJtMh4eTScTUapXPcqgJ0g7J5BfTIlIxbYzrzsZ
+2rffp0M1Kou8gAMZfvnzJh76ap7plnRuC3NEaryEQlCwZE+Nur2VW87bDVTLpJFz
+x+csj6DBK1Vpu7B2iDyZOoV1qX9a5yjhA9eucxybSYtNBIyk4WR9Hqqh4Hzoxb4q
+KRq9m67iyWC+x0zCAm6T37xQEEA1wPlKdtAq31gsWyNdvhz6YHs1F6eVvYlmMe8v
+wWHsC+LLaSJdlxblcTAa3yZNxCQ11g6SYKwSdT3tIYOfmBMprRgvllecUpOBSMCj
+XV0STIWxB0kshxkCCjrXUTV1xFam0gePc4ZuZKzBAAuB0uwEWA+7BXUe0OR6yWAY
+JSovQrN1A/DR84OScvvx7d/BsSJaPLzy+Rsn6heNikqxFUGFnGMX+AZFtfCT144a
+71CneVtF2Z2w6FYXdHVQVKRJ9TKRc3jZOfRWi0vQyRTXPf8AkITpPbDFEf+cjkIb
+2oP1hloKEPaF+R+6DYPV
+=+kRe
+-----END PGP SIGNATURE-----
diff --git a/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch b/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch
new file mode 100644
index 000000000000..7761a3e5e76d
--- /dev/null
+++ b/net-irc/irc-client/files/irc-client-2.10.3_p7-amd64-chost.patch
@@ -0,0 +1,29 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Do not ignore the --host argument passed to the fake ./configure.
+
+--- a/configure
++++ b/configure
+@@ -10,6 +10,7 @@
+     -version | --version | --versio | --versi | --vers)
+       quick_fwd=yes
+       break ;;
++    --host=*)
++      rev=$(expr "${arg}" : '[^=]*=\(.*\)')
++      ;;
+-    *)
+-      break ;;
+   esac
+@@ -18,8 +21,10 @@
+ then
+   support/configure $*
+ else
+-  echo "retrieving the system name, type and OS release..."
+-  rev=`support/config.guess`
++  if ! test "${rev}"; then
++    echo "retrieving the system name, type and OS release..."
++    rev=`support/config.guess`
++  fi
+   if test "${rev}" 		# test for no output
+   then
+     echo "  your system seems to be ${rev}."
+
diff --git a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
index 0ae322839513..b600e0fcd0c2 100644
--- a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
+++ b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
@@ -1,6 +1,8 @@
-# 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/irc-client/irc-client-2.10.3_p7.ebuild,v 1.6 2009/09/23 18:44:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irc-client/irc-client-2.10.3_p7.ebuild,v 1.7 2011/12/02 01:14:31 binki Exp $
+
+inherit eutils
 
 MY_P=irc${PV/_/}
 DESCRIPTION="A simplistic RFC compliant IRC client"
@@ -14,12 +16,22 @@ IUSE="ipv6"
 
 DEPEND="sys-libs/ncurses
 	sys-libs/zlib"
+# This and irc-client both install /usr/bin/irc #247987
+RDEPEND="${DEPEND}
+	!net-irc/irc-client"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}" || die
+	epatch "${FILESDIR}"/${P}-amd64-chost.patch
+}
+
 src_compile () {
 	econf \
-		`use_with ipv6 ip6` \
+		$(use_with ipv6 ip6) \
 		--sysconfdir=/etc/ircd \
 		--localstatedir=/var/run/ircd \
 		|| die "econf failed"
@@ -31,5 +43,5 @@ src_install() {
 		prefix=${D}/usr \
 		client_man_dir=${D}/usr/share/man/man1 \
 		install-client || die "client installed failed"
-	dodoc doc/Etiquette doc/alt-irc-faq doc/rfc*
+	dodoc doc/Etiquette doc/alt-irc-faq doc/rfc* || die
 }