5 files changed, 53 insertions, 25 deletions
diff --git a/net-analyzer/slurm/ChangeLog b/net-analyzer/slurm/ChangeLog
index af5b0e5a965b..bf7274f9a140 100644
--- a/net-analyzer/slurm/ChangeLog
+++ b/net-analyzer/slurm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/slurm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.21 2012/06/09 06:37:35 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.22 2014/07/17 01:44:55 jer Exp $
+
+*slurm-0.3.3-r2 (17 Jul 2014)
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -slurm-0.3.3.ebuild,
+  +slurm-0.3.3-r2.ebuild, -files/slurm-0.3.3-asneeded.patch,
+  +files/slurm-0.3.3-gentoo.patch, +files/slurm-0.3.3-theme.patch,
+  metadata.xml:
+  EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Fix theme support.
+  Remove short <longdescription>. Reinstate joke.
 
   09 Jun 2012; Jeff Horelick <jdhore@gentoo.org> slurm-0.3.3-r1.ebuild:
   marked x86 per bug 419233
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
index e61687b37fe8..bd97a10c1e81 100644
--- a/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch
+++ b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -40,41 +40,15 @@
+@@ -40,31 +40,6 @@
  fi
  AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
  
@@ -32,14 +32,17 @@
  # add Slowlaris -R and libraries to LDFLAGS
  if test ${OSTYPE} = "solaris" ; then
  	LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat"
- fi
- 
--AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!", echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.")
+@@ -74,7 +49,12 @@
  ncurses_support="no"
  curses_support="no"
  color_support="no"
 -AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) 
-+AC_CHECK_LIB(ncurses, use_default_colors, LIBS="-lncurses $LIBS"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes")
++PKG_CHECK_MODULES(ncurses,ncurses,
++	LIBS="$LIBS $ncurses_LIBS"
++	AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses])
++	AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color])
++	color_support="yes"; ncurses_support="yes"
++	,AC_MSG_ERROR([ncurses not found]))
  
  # disable color support on Solaris for now
  if test ${OSTYPE} = "solaris" ; then
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
new file mode 100644
index 000000000000..131554ee57f7
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch
@@ -0,0 +1,16 @@
+--- a/theme.c
++++ b/theme.c
+@@ -70,13 +70,7 @@
+ 		if ((f = fopen(filename, "r")) == NULL)
+ 		{
+ 			bzero(&filename, BUFSIZ);
+-#ifdef __NetBSD__
+-			snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name);
+-#elif __Debian__
+ 			snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name);
+-#else
+-			snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name);
+-#endif
+ 			if ((f = fopen(filename, "r")) == NULL)
+ 				error(ERR_FATAL, "cannot find theme '%s'", name);
+ 		}
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 0520dcf80b9b..03aa50bab7e3 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Realtime network interface monitor based on FreeBSD's pppstatus</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/slurm/slurm-0.3.3.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
index 772ab21f4f63..f774444a1df8 100644
--- a/net-analyzer/slurm/slurm-0.3.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 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/slurm/slurm-0.3.3.ebuild,v 1.7 2009/06/02 11:59:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3-r2.ebuild,v 1.1 2014/07/17 01:44:55 jer Exp $
 
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
@@ -10,28 +11,28 @@ SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-overflow.patch \
+		"${FILESDIR}"/${P}-theme.patch
 	eautoreconf
 }
 
 src_install() {
-	# binary
 	dobin slurm
 
-	# themes to use with -t option
-	insinto /usr/share/${PN}/themes
+	insinto /usr/share/${PN}
 	doins themes/*.theme
 
-	# manual and other docs
 	doman slurm.1
-	dodoc AUTHORS ChangeLog COPYRIGHT FAQ KEYS README THANKS \
-		THEMES.txt TODO
+	dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO
 }