Fix building against sys-libs/ncurses[tinfo].

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

4 files changed, 47 insertions, 27 deletions

diff --git a/net-analyzer/sinfo/ChangeLog b/net-analyzer/sinfo/ChangeLog
index b343362d87c6..8a25c6d2de13 100644
--- a/net-analyzer/sinfo/ChangeLog
+++ b/net-analyzer/sinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sinfo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/ChangeLog,v 1.14 2012/10/08 20:21:44 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/ChangeLog,v 1.15 2014/07/17 00:46:51 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> sinfo-0.0.47.ebuild,
+  +files/sinfo-0.0.47-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo].
 
   08 Oct 2012; Tim Harder <radhermit@gentoo.org> sinfo-0.0.47.ebuild:
   Add blocker against sys-cluster/slurm (bug #437476 by Diego Elio Pettenò).
diff --git a/net-analyzer/sinfo/Manifest b/net-analyzer/sinfo/Manifest
index 349bd806264b..2fa29a4cdb04 100644
--- a/net-analyzer/sinfo/Manifest
+++ b/net-analyzer/sinfo/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sinfo-0.0.47-tinfo.patch 407 SHA256 a52acc6cf3cb8900c95ff387d88e233efb6bfc5227e1cf00b569b705254e3cd8 SHA512 4cbe14fb4ae66553af8038fdb6f60488e988185ce79d19662810c332c5345e63423a983187d257e641fd9bccbdb0173f800c6dc1b5324127eb798cb4f538d717 WHIRLPOOL d70fe4ef73705d0ed2f5177416281dbc5c1585f26cd140ea88565114f175df54c5bbb1f7002dea7230a03440c7fc1b14bc6977a6ed2f69d0904ac5a4045f4b65
 AUX sinfod.confd 105 SHA256 1dac559754a56bc0c306bca8afccdc1623c32ed5a09288657f1527e4ff8535d1 SHA512 c9ec8ad6dd6126bc9f2860cf6fe54b2119dda428d8eda8cea283b9755c4d64fdb933d81aa2da194b8453dbc6386d6b2306766eecc627dbd1bd8b226b4520ac88 WHIRLPOOL 2c6b3a30f8a903cd5c687e820a5cec2e6c2ed3472ba5c4ffd9647c253530920d059f21f3a8c66ec78787fb0bd504cc27d931e2d6beb5843b4075fc32b2520304
 AUX sinfod.initd 326 SHA256 79cfa3506f9ffa9605314a1d3fe4e53fbc4a3ebda41915e2fc15bb5d2e942cb4 SHA512 155819141c8689c600d2001fab959e420069eab35f6b7368a8a14f7395d6c38bf9fd91be495baef014141f0d2ec692c90c6bfc47f4f58da0e79853503cb2a8c7 WHIRLPOOL 45585f2b4635ea0c24190c0ddfdec26d89f298a19905e3facfcec59bcb02c739dc2f29e42c2fff5bae6b5428e2cbbe630e329a20813d97338b7ff43403c16d8b
 DIST sinfo-0.0.47.tar.gz 659440 SHA256 4ec531081d765f1b74f86d8a68cdefdd9d2ce50724ce0f1f4b4726f4161d8703 SHA512 be2bac3b86c2e5c36df351b3623cd0639bf6f10dbedc3eb842153498bf6b9aaa2f114a30b000af70f69022ef7d74cf954a77266e2a6c71db504be9a127b1370a WHIRLPOOL 939ba1f6d33256f508e6b991658147646d2f22e4d3ce033f6faff9e735dcfa61ab6338684acadafab80956d337a3a9bd83359995c1ddc55d9fa422aa9dc293ee
-EBUILD sinfo-0.0.47.ebuild 902 SHA256 3e7856509130afc1f1fbe1d8482cf99af019a175141d4ddf96ac026a518b3984 SHA512 a2ffd82536089dcabacc751caf8163efe11b58759cb63db73eea01db040a7c4e2cbdc8c712157b3b7600bd7cb591b77df25e998da4a45b06b6b3c7708840c136 WHIRLPOOL 9f75200dd8f9cd6374dbeb0f79da678875e80006b9576caa48ac683e80c76246117d06034ee2e639a0dec2090e6cfc0e3d11c4ef20e1e858d6e3f206d91843d0
-MISC ChangeLog 2135 SHA256 248103a0798edd93b865e8a6d17a94a23a8ebcbe7c6fdef96d1f30ceb94ecbf0 SHA512 b6d233623016b472d74e2073e083ef1e67cb1b3f5ee3009fd2ee72fcb91d621295afcd2f419fba85d80db63bacfca4b5ce4cd98d8d3a3993d9c561a69e51d105 WHIRLPOOL 96806e04caee504e4241c46dadd12d9100fa60a4f1289a0e9cbacce01a59bfaa6059e0e915e84a158b8c6bd82e7b27a5beb3ef03adde468609e6643d44afb929
+EBUILD sinfo-0.0.47.ebuild 866 SHA256 54105e5e2d0f7d3dd5fbe919e1b060be0a8905efe5ad24b9e8c1f5189ee69590 SHA512 fd5e9f307eeb0774283cd8a3c0b8f7ab890ea064b989ba00b539f6ff880be011196796d98cd8e611825a290010868ff3b6dcb2f514e1ec9051e7456d2af215b4 WHIRLPOOL 7d2163604e63d9cdf4240953f887ba06a5cfaa1d6ecf75fdf15a6a09c5af2f75a9be80feee03bfbf42e54de5192d118a9a753233630e08884d7eaf8190969cb9
+MISC ChangeLog 2281 SHA256 fa51b00d31262820deeb490cf172bea73e0a88356faaf1c8d2ad490afcb79fa5 SHA512 280dcaa959fb025d6a0f89ef23d91dca00f44a39ed5360a6a2ebed95c51ddf71b9869931870bb28fa4f9bc59fc39da3c86e00775c79730df2bfb450191252ab1 WHIRLPOOL 4c3c292d12fcf906cdbb197ec06f06b7d25d32b8af3e3da3da23d1de9aad3510bcde5b35265a18b49a54884d9f000c7e5bb32472010dc5e222de28cb26ab1c17
 MISC metadata.xml 253 SHA256 79bb6d11490801e4aa3b1330f7ec9fee4bdeb3a22f6d88e4cdb4862b91a2ad64 SHA512 9758369ca94fb411c63fefb39e6d5cf0fcbce352e76295ad12d2d84b108cbdfe14bf92767cdd4bdc13ac305a28ec6226137e96c7d992e8cfe93c9b059d04122f WHIRLPOOL 85ff93ff0a84d42b4f48277adab67e4528fad3fde9c828ca4aa9de7222e889bc125084357e27471ddcfd26ab82850c73d4e8a88e23ef262f12d9590efda850af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQczXZAAoJEEqz6FtPBkyj20MH/3z/ETxsSPU0v4B3i27wqA0O
-aXMQMFYDyaN6CVxWFZfvZ/y7NlpPlGMv2Yh52uj4aWYrj57dQe/DBOPjHqWdx13n
-xdPdTJxpwczw5gZeq2SjMtgXxgFTZfMVbaXgOAOy6+JoIzlg5TyvRysdJL9WV+XU
-DC2miKPn3/yeSSRGUpKHo5CkZHOL9kGgo7I7fBf6DMcqpXsYkztCVr4tL0V15U3K
-l9dDiUB43dFhjxMCUcEWMCWv3029ZVS65G/3YjKx+1h9l+eTZr257GHJaMUs/5ZH
-cYsdUd+RiJgTuO7ip32wNwsfk6guBB03xLCcB9BPirJncBYrj2x79nen487Aqxk=
-=7Yqr
+iEYEAREIAAYFAlPHHPwACgkQVWmRsqeSphN9QwCdGPVO7O04fKoAoBnBSTHWdnWb
+pF8AnjUtrgE7okTIKXyQJH8z1BQS9w5O
+=E2uM
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch b/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch
new file mode 100644
index 000000000000..939f05b627ad
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,10 @@
+ 	     [ AC_MSG_RESULT(CPUNO_ADJUST disabled) ] )
+ 
+ dnl ncurses useable?
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses,ncurses,[
++	CURSES_LIB="$ncurses_LIBS"
++	AC_CHECK_HEADER([ncurses.h],AC_DEFINE(HAVE_NCURSES_H)],
++	AC_MSG_ERROR([ncurses not found])))
+ AC_SUBST(CURSES_LIB)
+ 
+ dnl check for use_default_colors() ... not available in  ncurses  << 4.x
diff --git a/net-analyzer/sinfo/sinfo-0.0.47.ebuild b/net-analyzer/sinfo/sinfo-0.0.47.ebuild
index 7db6cbb6d16a..22c9f0b0c082 100644
--- a/net-analyzer/sinfo/sinfo-0.0.47.ebuild
+++ b/net-analyzer/sinfo/sinfo-0.0.47.ebuild
@@ -1,37 +1,42 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/sinfo-0.0.47.ebuild,v 1.2 2012/10/08 20:21:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/sinfo-0.0.47.ebuild,v 1.3 2014/07/17 00:46:51 jer Exp $
 
-EAPI="4"
-
-inherit autotools-utils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="A monitoring tool for networked computers"
 HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/"
-SRC_URI="http://www.ant.uni-bremen.de/whomes/rinas/${PN}/download/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ipv6 static-libs"
 
-RDEPEND="!sys-cluster/slurm
+RDEPEND="
+	!sys-cluster/slurm
 	dev-libs/boost
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
 
 DOCS=( AUTHORS ChangeLog README )
 
 src_configure() {
-	local myeconfargs=(
-		--with-ncurses
-		$(use_enable ipv6 IPv6)
-	)
-	autotools-utils_src_configure
+	econf $(use_enable ipv6 IPv6)
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	newconfd "${FILESDIR}"/sinfod.confd sinfod
 	newinitd "${FILESDIR}"/sinfod.initd sinfod