diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-07-17 00:46:51 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-07-17 00:46:51 +0000 |
| commit | 4e0dcb5c8e126773de210accc76183aeca086fea (patch) | |
| tree | f43945584f356f8f07ea004a1040cd8ed597f8e4 /net-analyzer/sinfo | |
| parent | fix underlinking wrt #517208 (diff) | |
| download | gentoo-2-4e0dcb5c8e126773de210accc76183aeca086fea.tar.gz gentoo-2-4e0dcb5c8e126773de210accc76183aeca086fea.tar.bz2 gentoo-2-4e0dcb5c8e126773de210accc76183aeca086fea.zip | |
Fix building against sys-libs/ncurses[tinfo].
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/sinfo')
| -rw-r--r-- | net-analyzer/sinfo/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/sinfo/files/sinfo-0.0.47-tinfo.patch | 14 | ||||
| -rw-r--r-- | net-analyzer/sinfo/sinfo-0.0.47.ebuild | 35 |
3 files changed, 40 insertions, 17 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/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 |