Fix building against sys-libs/ncurses[tinfo] (bug #459642).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 31 insertions, 9 deletions

diff --git a/net-misc/shmux/ChangeLog b/net-misc/shmux/ChangeLog
index 4046586353fe..430f74300656 100644
--- a/net-misc/shmux/ChangeLog
+++ b/net-misc/shmux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/shmux
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/ChangeLog,v 1.32 2014/03/15 13:53:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/ChangeLog,v 1.33 2014/10/31 11:11:02 jer Exp $
+
+  31 Oct 2014; Jeroen Roovers <jer@gentoo.org> shmux-1.0.2.ebuild,
+  +files/shmux-1.0.2-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #459642).
 
   15 Mar 2014; Manuel Rüger <mrueg@gentoo.org> metadata.xml:
   Add Alice Ferrazzi as maintainer. Proxied by me.
diff --git a/net-misc/shmux/files/shmux-1.0.2-tinfo.patch b/net-misc/shmux/files/shmux-1.0.2-tinfo.patch
new file mode 100644
index 000000000000..802d5973bdc7
--- /dev/null
+++ b/net-misc/shmux/files/shmux-1.0.2-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,7 +27,7 @@
+ fi
+ 
+ # Checks for libraries.
+-AC_SEARCH_LIBS([tgetent], [termcap curses ncurses])
++AC_SEARCH_LIBS([tgetent], [termcap tinfo curses ncurses])
+ AC_SEARCH_LIBS([basename], [gen])
+ if test "x$with_pcre" != "xno"; then
+    AC_SEARCH_LIBS([pcre_compile], [pcre], ,
diff --git a/net-misc/shmux/shmux-1.0.2.ebuild b/net-misc/shmux/shmux-1.0.2.ebuild
index f3c23c30648d..4a1526f2184b 100644
--- a/net-misc/shmux/shmux-1.0.2.ebuild
+++ b/net-misc/shmux/shmux-1.0.2.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/shmux-1.0.2.ebuild,v 1.6 2013/04/17 07:59:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/shmux/shmux-1.0.2.ebuild,v 1.7 2014/10/31 11:11:02 jer Exp $
+
+EAPI="5"
+inherit autotools eutils
 
 DESCRIPTION="Program for executing the same command on many hosts in parallel"
 HOMEPAGE="http://web.taranis.org/shmux/"
@@ -19,13 +22,17 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/awk"
 
-src_compile() {
-	econf $(use_with pcre) || die "econf failed"
-	emake || die "emake failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with pcre)
 }
 
 src_install() {
-	dobin src/shmux || die "dobin failed"
-	doman shmux.1 || die "doman failed"
-	dodoc CHANGES || die "dodoc failed"
+	dobin src/shmux
+	doman shmux.1
+	dodoc CHANGES
 }