summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-12-18 16:32:15 +0000
committerJeroen Roovers <jer@gentoo.org>2013-12-18 16:32:15 +0000
commitc4e7e83c00e056aa86152f93c9ec468f7ed03704 (patch)
tree332e60bc90a2127137cde13f9659204719618ef4 /net-analyzer/pinger
parentamd64/x86 stable wrt bug #492126 (diff)
downloadgentoo-2-c4e7e83c00e056aa86152f93c9ec468f7ed03704.tar.gz
gentoo-2-c4e7e83c00e056aa86152f93c9ec468f7ed03704.tar.bz2
gentoo-2-c4e7e83c00e056aa86152f93c9ec468f7ed03704.zip
Fix the patch or ncurses will not be used after all. Reinstate mistakenly overridden default src_install().
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer/pinger')
-rw-r--r--net-analyzer/pinger/ChangeLog7
-rw-r--r--net-analyzer/pinger/files/pinger-0.32e-tinfo.patch4
-rw-r--r--net-analyzer/pinger/pinger-0.32e.ebuild6
3 files changed, 10 insertions, 7 deletions
diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index 7650b4d78ff9..f6007641e2ba 100644
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/pinger
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.20 2013/12/18 16:16:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.21 2013/12/18 16:32:14 jer Exp $
+
+ 18 Dec 2013; Jeroen Roovers <jer@gentoo.org> pinger-0.32e.ebuild,
+ files/pinger-0.32e-tinfo.patch:
+ Fix the patch or ncurses will not be used after all. Reinstate mistakenly
+ overridden default src_install().
18 Dec 2013; Jeroen Roovers <jer@gentoo.org> pinger-0.32e.ebuild,
+files/pinger-0.32e-tinfo.patch:
diff --git a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
index f30d8a7fa03e..8a08ef14cb05 100644
--- a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
+++ b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch
@@ -1,10 +1,12 @@
--- a/configure.in
+++ b/configure.in
-@@ -65,8 +65,12 @@
+@@ -65,8 +65,14 @@
AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2),
HAVE_GTK_2=0)
fi
+PKG_CHECK_MODULES(ncurses, ncurses,[
++ AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)
++ HAVE_CURSES=1
+ LIBS="$LIBS $ncurses_LIBS"
+ CFLAGS="$CFLAGS $ncurses_CFLAGS"],
AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses";
diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
index ac1193bbb6ef..d9b11f665a48 100644
--- a/net-analyzer/pinger/pinger-0.32e.ebuild
+++ b/net-analyzer/pinger/pinger-0.32e.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32e.ebuild,v 1.3 2013/12/18 16:16:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.32e.ebuild,v 1.4 2013/12/18 16:32:14 jer Exp $
EAPI=5
@@ -42,7 +42,3 @@ src_configure() {
econf $(use_enable gtk) $(use_enable nls)
}
-
-src_install() {
- dobin src/pinger
-}