Bump to ii-1.6 for bug #387907 by Richard Anderson. Install query.sh as ii-query, bump to EAPI=4.

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

4 files changed, 72 insertions, 42 deletions

diff --git a/net-irc/ii/ChangeLog b/net-irc/ii/ChangeLog
index 9836da4b538a..931094f5b691 100644
--- a/net-irc/ii/ChangeLog
+++ b/net-irc/ii/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/ii
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ii/ChangeLog,v 1.6 2008/11/27 09:59:06 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ii/ChangeLog,v 1.7 2011/10/20 18:14:07 binki Exp $
+
+*ii-1.6 (20 Oct 2011)
+
+  20 Oct 2011; Nathan Phillip Brink <binki@gentoo.org> -ii-1.4.ebuild,
+  +ii-1.6.ebuild:
+  Bump to ii-1.6 for bug #387907 by Richard Anderson. Install query.sh as
+  ii-query, bump to EAPI=4.
 
 *ii-1.4 (27 Nov 2008)
 
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index f08b5193b26b..122d4507de83 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,4 +1,24 @@
-DIST ii-1.4.tar.gz 9608 RMD160 4deaa4737e7d299be13303bbb5ae370aea3bf81c SHA1 56dfb24295984feacb4ad87e0678dca32c7fec7d SHA256 811eeb452a387e3d1b7a4fca7995c82efdfc3582c86bef2be521c951a9aa7c8e
-EBUILD ii-1.4.ebuild 771 RMD160 96bd5638fed684366a3dc4115653afe7045af26a SHA1 18fd832f38620698f41e6f0e95becf284786999e SHA256 3ec98f552564f6202fb35dd02a1271ffbde09db32f9f0653d6a525338225a128
-MISC ChangeLog 984 RMD160 5b61dc4a65985169d8c96f1abfaaf494e87f61e9 SHA1 be4b0a2cd0577cc77eb5e47669d6073cfb4cb85d SHA256 045881459bbf61bd087576874ffe91c726e735c9564adaeb936ce0688e62eebc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST ii-1.6.tar.gz 9970 RMD160 2236192d79a0883ec38b20998ec716dedda93c2e SHA1 cd6c2a6c97d1e4d46018709bb25ff96fbdb47d33 SHA256 794fa639b253b4b332fa80e76cde782d9dae021dfaf35a207334c553d962cc29
+EBUILD ii-1.6.ebuild 818 RMD160 0f15ed55d4a457419cf8359c118b487977d4d022 SHA1 7c3a7de33878828850c574a364eac074c1e54b00 SHA256 ee2aa19b7cf2c2d96b2183cc8ad05ae00e4160818d40759392a43b4c26e1c95c
+MISC ChangeLog 1197 RMD160 7026a84381dad994d0534860f3db2136f8fa642b SHA1 2469fca54dc40a7a8f4c6b378068cec0b9eb920c SHA256 9957068b897f8d57fd750e12a6f4d4f31bc45b99f9d26cde150b159ae88eb401
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBCAAGBQJOoGYQAAoJEHQ6UuhrqBBQNPgQAJDW/7dniTpQnOX7O7LTuPIR
+rEpWZUFChvJ1g2bE7W2ZKOUlireCXIeCEWEl2+ZxtS2z1B2cRtAhgxP+f+wkEvn9
+xDEDqLQIw+f1pmlPxHSW26BkGIhHVq4NfeY9L6kTyNZeCJLRwByZxppWeue2Zroa
+2kkQktm1XPUWK45kaieWzceJD+NEKjQUa5f0hnpuSpV2zTp9+aZD0snLoa6tbP/E
+ft+s59Nkt7UlwKChycB54g1Mgopt5V/2BQxW1ycblCSJtCXTvwgOoHAPU6I9aykP
+oq4P76AqcjgKtAj38jzT4SXm8rhqT4rRhJUdM4xUXLNL1G84P2MRm1D9YZiGtJFC
+5pt26Pu86hmb5xTrLjubxEFaaYqbEzLa83OH4C1O4xllY7b65B4WYbrcZL4UZN5Q
+hXaV9eK2nmHt8GeAM914XMNL/GN3QyqKk5JEjcO7Z3ShT4KheAuFqpTN3rUIlqzD
+4EaIOtceo09DnSsnb4aHU7buRstMxazXd0Yoho9acgnt7UCSqXcFlpyUmy3b/vFx
+jbcWHcAJPm4ufTRQls0Tg2pBYKuP82rNVOFDSgpiQuNBrWmWQHUIZSgiq8uE7beN
+yhXgAzbCKfUnZiRVSgGnE5FJARVtxxxGTOoJRkLTtejjxTFPJ9z5Hk8hK/W87c/L
+PGawPs5l/UFYydLDdIyk
+=f771
+-----END PGP SIGNATURE-----
diff --git a/net-irc/ii/ii-1.4.ebuild b/net-irc/ii/ii-1.4.ebuild
deleted file mode 100644
index 3ba44cb4b03f..000000000000
--- a/net-irc/ii/ii-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ii/ii-1.4.ebuild,v 1.1 2008/11/27 09:59:06 armin76 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
-HOMEPAGE="http://www.suckless.org/programs/ii.html"
-SRC_URI="http://code.suckless.org/dl/tools/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s/CFLAGS      = -g -O0/CFLAGS += -g/" \
-		-e "s/LDFLAGS     =/LDFLAGS +=/" \
-		config.mk || die "sed failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "emake failed"
-}
-
-src_install() {
-	dobin ii
-	dodoc README FAQ
-	doman *.1
-}
diff --git a/net-irc/ii/ii-1.6.ebuild b/net-irc/ii/ii-1.6.ebuild
new file mode 100644
index 000000000000..9b328cd2f229
--- /dev/null
+++ b/net-irc/ii/ii-1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ii/ii-1.6.ebuild,v 1.1 2011/10/20 18:14:07 binki Exp $
+
+EAPI=4
+
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="http://tools.suckless.org/ii/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS      = -g -O0/CFLAGS += /" \
+		-e "s/LDFLAGS     =/LDFLAGS +=/" \
+		-e /^LIBS/d \
+		config.mk || die "sed failed to fix {C,LD}FLAGS"
+
+	ht_fix_file query.sh
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin ii
+	newbin query.sh ii-query
+	dodoc CHANGES FAQ README
+	doman *.1
+}