Version bump (bug #532488). Fix a bashism (bug #526268). Fix building against sys-libs/ncurses[tinfo] (bug #457530). Add USE=static-libs.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 78 insertions, 12 deletions

diff --git a/sys-fs/iprutils/ChangeLog b/sys-fs/iprutils/ChangeLog
index f34250efa1e8..383deac08bc7 100644
--- a/sys-fs/iprutils/ChangeLog
+++ b/sys-fs/iprutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/iprutils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.41 2014/12/25 13:02:26 pinkbyte Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/ChangeLog,v 1.42 2015/06/04 17:07:16 jer Exp $
+
+*iprutils-2.4.7 (04 Jun 2015)
+
+  04 Jun 2015; Jeroen Roovers <jer@gentoo.org> +iprutils-2.4.7.ebuild,
+  +files/iprutils-2.4.7-tinfo.patch, files/iprupdate:
+  Version bump (bug #532488). Fix a bashism (bug #526268). Fix building against
+  sys-libs/ncurses[tinfo] (bug #457530). Add USE=static-libs.
 
 *iprutils-2.3.18 (25 Dec 2014)
 
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index c547edf679c4..8bfaebe409c4 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -3,23 +3,22 @@ Hash: SHA256
 
 AUX iprdump 255 SHA256 f2aa711e346b3a8030879dec4ff7197087070a474cc3b6cb58bcc29047cc7a9a SHA512 7403246196c811546c0733445e7018b50868484ecd1fc66dc038a8569e158ef436289256fba2f6b983fe439a7dabb95fd71e90f3dbc0763cbe4c93a14ee3abb5 WHIRLPOOL bfe2dca45c33fab5639580a620159afaa77a15b006dd0f1b73e124efc64cd7e659774b1957ad56ae14820ff45ac18d80a1706d84cbd4b780903dcc9027d67a1d
 AUX iprinit 345 SHA256 b3f07b3cd9ac828a2faa3be7c598fb709f929996e6ee46cb6d2c6628d77a2a2b SHA512 8f2f95d6c59ba786ac0e98564fa76a832fa42d1b039c456a0f3f41a3b14e041eeccb814791ce35ccaa61674da2e94b53be8defbf1f0fdc2b90827bc3c9f18a51 WHIRLPOOL da404337ccee3ff9ccd61d38a05c2e1cfd0840fe7d32ef31162508242d2ae4ea2f4b4f06f508f56f38c3c345e21aef637c5d5c41637e3bdf8383c186790f279d
-AUX iprupdate 188 SHA256 44380207d4ef8897f6d7a30c8515cce1c67a9342fefb112f84e9ad40ee460ef8 SHA512 4d128dc63f3a93b5f0e0ed5a1c036cce1935a45c3913c64db56f69d28f17f2f0a3ae0dd2f23a6062c2291dea023236bfdce5ed3cd983cb391387737e42a65beb WHIRLPOOL a47bcf7cb6fdd256fb7da6e07745f50e616b98ab90cfd6030764544a3f901e5f63b67bb6fb5dad1d2a333e7a182450dc88b291754eefb6593753a24cf83c441f
+AUX iprupdate 192 SHA256 04c6aaa576d162bdfba0036381c2be5e769cbcef30693a46219b82620375283c SHA512 c0c8365e2e1db2363999c0dbc85336f03fc467fa179824b6caf2c9dc951491c5776ab852b255aa8c5f41ecd2f17e2d9c0cf56a660c734e1e5cb6ca44220ad7e5 WHIRLPOOL 7d08b6c2c00c0ff84d533885d3f3fd0c95471035928c76b97df246895ab148b2379230d83f660c670feb82712f67c34cb7f216e29f85acdcacee14a06cb0439f
+AUX iprutils-2.4.7-tinfo.patch 569 SHA256 19ef925e52ee1f57ddb28d887155ee3ba1db7133c4dd97915ef567f55e5fe8c7 SHA512 2d489b2a5107fe16c0cbdbcaeb589249d27b7bf40633d9c830d7384053e0659690d2db974a2447a3383bf5af04cc94d64d0fcadc5b18432f57dbc69e338aa0fc WHIRLPOOL c64d1df7520727c05f60a37745ad0c6dd14df0c7e9f42a8d4f79fc2646c9f8b4806e663ea72416ec89e7b5e041ed257b92b7fa0b224e0232d794ecb847e0f0ae
 DIST iprutils-2.3.13-src.tgz 180225 SHA256 a225095819dce9402a24066ee65062ad57e0d9ba7f338477042ad7e45193ae7d SHA512 7c185f05300a25147e2b3a7c2e66be7fd5d8a9d5b2655dd86a1c845b9c71175cf8f211b869836b16c9b93655e701837496d736990f022bbccd5eff0056d1ecf0 WHIRLPOOL caeb901d78cf94b24dc4510a5de8b8a45561e583084f0ee4e22a0f1bf33d5c9f2b7998ef455a8bcacf7f0225495fd9ec6d4abc54259e1f1b5b11a62f50337fea
 DIST iprutils-2.3.18-src.tgz 1384924 SHA256 8e510659e740c00e2200bb3d1726c3bbe0c0f93e1c4320a63c007ff5ceceffa3 SHA512 230722556c080b6784574f05066230cfd932e0fb9812a19ec6d911f2b281b6a52b15dd4084c7dc29c2004edbfcc6e4b94080a6f0869746a9021116949ec318e0 WHIRLPOOL 88bb686c3128806a77b55a9a871c95c63fc31a3d24046f8ac519a04204e6ec3ce1a74c259322762ab3f1f35204a0938c11cb6af496da2f80bbfe78864d5c3603
 DIST iprutils-2.3.9-src.tgz 169854 SHA256 9d56d058dc377ec21323e6a8710742168f5d2148d13dc249021f7123b8ba360f SHA512 d9b05d070941970827140ef6b2b69d2566f862b06e85c91ceec2561dfb08c4c428fd3fafe36657acb7481f2f7c695d355cd1b43f60ad241275facd6bb8d43535 WHIRLPOOL 7f21d6212465338f93f97e0ee7a521065923a57ce9c28b266e7f8929927e0a4bb2d6dd2f89af9bbb8c43c8ad2498abd8a3370d8b7fdf72b1bc0725617f097162
+DIST iprutils-2.4.7.tar.gz 467671 SHA256 bb3a729b35824428d9a7d4db0a25d5ec89ff1dfcc13dd3c62fe254dc56408dd0 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91 WHIRLPOOL 190a906a91114f56b434e9efb657f9b3ba8a6b145715934f20919dc18521ee696604403134d35a5196c0d8d823c32b5f9e08aaa40bacddebeb42e5dae7ceab02
 EBUILD iprutils-2.3.13.ebuild 1103 SHA256 b153d3a595c9bfcd60ad075a5a8b6dbc5a2d4b5209ada1948659f7f825bcad64 SHA512 9afba4c3a49d9cba7d71e418ed702b027f1abce2f8fb26eef6cffa6e982c5423236d7536661fc7b3cad24eaa91ab962f2714aedf713c2b9313997423272e4020 WHIRLPOOL 18b183372e12ddb2f00543638b67d7d1b64791ac3b9cf0f348ca7dba4eed24cc45f32a7727d7f2597bd61e7d88f19588ffa2b0cd828257e38a1abf304900c6a7
 EBUILD iprutils-2.3.18.ebuild 1331 SHA256 f72a7f478dc9d34aa55b69860b966c16083bbec8b5d8e4e4c0cedd7c821b0ee2 SHA512 1ca0e3a1f4e5fba8f3230088942a03f80ef415dad6a88e392b027058d2a669663a3dafae3ed8e9f5eedb3b47f0907b6fb49ff60aeb46f71dd5ab9a519465f95f WHIRLPOOL 2ed3798127156cfcdbb847e644c9743a2df2a213c231502d17145abdb10a52704f8791eac843a64ea5b07a69033ef87b5817b30c76c789afa1fbfc041df9306e
 EBUILD iprutils-2.3.9.ebuild 1100 SHA256 a8158f95d4d234c93dbb024063c42e941ad0833836ae84d24a97c0c6cf5d93bd SHA512 c955b237a33eddd7a31bef7d430eb02044985048cf4f9e6355c2a481ba483472cbd80e82540950a5653f9e8913457cd7aa76537380b5cb1adf11a8a398046962 WHIRLPOOL 72d63a0a3bf30e2c511e849910365764253759bd089f8bdf8702d1349059956dbf93aa6bd0e6d60793345d6050e073af1018c92a4471d64539ec9b139f7ea101
-MISC ChangeLog 7028 SHA256 fdaa19e8171250c7d3438a488614e19a9fb0678da0ec49b93ad1b8e6515318ee SHA512 0184fbe82f8273bcdf30ab7d500abec0ed4af6d254f4c9a04d4340f3d4717db80f5753570382cd517d0063298ab67e16d64c9288aebc191436709859fd05919a WHIRLPOOL 6bc369c50ce40f10bb39838def05ced77bd2380c4b2a9ddd87c0a9d1c2072c10157255bbae6acb380247528c2bf38236cf4978f9bcd742c384498a44bba324fa
+EBUILD iprutils-2.4.7.ebuild 936 SHA256 bf8fe644e3951cc05ee33930db0b9b6da895b5754fdbfbb8e3dbd96d9731e275 SHA512 40d7fe98266ff382321ff29d32fda3a19ebf8569309fe498f63ee202f1fdbe9996df6512ee57fe3399eb9f140cd22ba18d0b978e2046eb69a2e09408f2e94c8e WHIRLPOOL 302d1055c0311cd5eb0925b28b2da0892cc52499bed8c6733025f639d29c812eaa2c1f81560c39f0232b25bdfbafd48419e2b9c7fa536636cdd315f2aa865694
+MISC ChangeLog 7322 SHA256 cddc27da256cdcc6f936c096626d1c8a69d9208d68bc44a120e4de8ba6b68013 SHA512 23e038f9fa179a0f11975793b990693f3f3a8afd42141e7418340340275cbb0dd538fa558961f5c2073e3739a06cc94dff5f90aa3f81c84ac9b9fb6e22b7d543 WHIRLPOOL 756bcca6610097ec152684d4b783755c2fb0dd0ae15f6491c3c68f6b3718ad23319ce9f39e5f56531b302465c2b9b7c2d2200aff475b97b4dacab4a6dfc6b939
 MISC metadata.xml 158 SHA256 32350539e29186f246efdc4907b750f94365676eaf013b11832b2a7015e8e218 SHA512 2b3864962e76bbd67cfb69646b7d711d56b4683d06affa2a6368a2f929cc7a07519db67aeba222992481ff45f933685af3ece8c14369564758c1415159bcd67d WHIRLPOOL b385a4234685513271b55e7533c02a268c12138467441c9fbf2e2f4bc7516d04495fbc006fba3022244f0a5f71a7e85136166195a6355a9a7f2bf763d0857b77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUnArhAAoJECo/aRed9267DG8H/i9t6UIrVDxc6s85jiHxVFyC
-+TezLBcUYC0nH7PPNcGh/z3sQjF/xVZD93tdr0a/ezL5gU3wteJDTZ7c2KT5Cnmp
-m6tSe6IIESypwJBsEwjgEBsj56cZK8hASalZaNuM7MZ3HOwd19QsOXsLdfkT9aRm
-GOFJbxK9YwRwGgBC5rBXx6p49d6nFZ2bfqOJYe3ooN8MHB4mj4/XS40D4ef6P3vg
-xVCEIWdZ4DQ59B/zxbgEL9MYrUnyYDSLnVdBq/wnvvx6xNPPC9niTbo7OHwPniLx
-bHEdctzI1gI5Gxiq//rbKGxp4AzNhhhV0oEHJBwNJ0YX+UYbCbjcXpqNLE50EaQ=
-=obNg
+iEYEAREIAAYFAlVwhcUACgkQVWmRsqeSphMyjQCcCYiIBXC33kAWWa50nnjmhyXR
+zhkAn0FskkeUv9lEiASHk/tntZOaH6O/
+=ys/A
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/iprutils/files/iprupdate b/sys-fs/iprutils/files/iprupdate
index 196f913b94ed..9aba8fee8303 100755
--- a/sys-fs/iprutils/files/iprupdate
+++ b/sys-fs/iprutils/files/iprupdate
@@ -6,6 +6,6 @@ depend() {
 
 start() {
 	ebegin "Checking ipr microcode levels"
-	/sbin/iprupdate &> /dev/null
+	/sbin/iprupdate 2>&1 > /dev/null
 	eend $? "Failed to complete ipr microcode updates"
 }
diff --git a/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch b/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch
new file mode 100644
index 000000000000..406f3efff2a7
--- /dev/null
+++ b/sys-fs/iprutils/files/iprutils-2.4.7-tinfo.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,10 @@
+ AC_CHECK_LIB([menu], [new_menu], [], [AC_ERROR("libmenu not found.")])
+ AC_CHECK_LIB([panel], [show_panel], [], [AC_ERROR("libpanel not found.")])
+ AC_CHECK_LIB([ncurses], [curses_version], [],
+-	     [AC_ERROR("libncurses not found.")])
++	AC_CHECK_LIB([tinfo], [curses_version], [],
++		[AC_ERROR("libncurses not found.")]))
++AC_CHECK_LIB([ncurses], [wnoutrefresh], [],
++	[AC_ERROR("libncurses not found.")])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h libintl.h locale.h netinet/in.h nl_types.h \
diff --git a/sys-fs/iprutils/iprutils-2.4.7.ebuild b/sys-fs/iprutils/iprutils-2.4.7.ebuild
new file mode 100644
index 000000000000..cede33bc9019
--- /dev/null
+++ b/sys-fs/iprutils/iprutils-2.4.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/iprutils/iprutils-2.4.7.ebuild,v 1.1 2015/06/04 17:07:16 jer Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="IBM's tools for support of the ipr SCSI controller"
+SRC_URI="mirror://sourceforge/iprdd/${P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/iprdd/"
+
+SLOT="0"
+LICENSE="IBM"
+KEYWORDS="~ppc ~ppc64"
+IUSE="static-libs"
+
+DEPEND="
+	>=sys-libs/ncurses-5.4-r5
+	>=sys-apps/pciutils-2.1.11-r1
+	virtual/udev
+"
+RDEPEND="
+	${DEPEND}
+	virtual/logger
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.7-tinfo.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install () {
+	default
+
+	newinitd "${FILESDIR}"/iprinit iprinit
+	newinitd "${FILESDIR}"/iprupdate iprupdate
+	newinitd "${FILESDIR}"/iprdump iprdump
+
+	prune_libtool_files
+}