Fix the patch or ncurses will not be used after all. Reinstate mistakenly overridden default src_install().

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

4 files changed, 16 insertions, 13 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/Manifest b/net-analyzer/pinger/Manifest
index 15fa723a4b06..80d0c4d0950a 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX gtk-2.0.m4 7539 SHA256 a70f40690ad9fb41178131d63d3e5579baff4d15c412b1c74e2bde92b4c7dd3b SHA512 efaa503adf5653a60cd807e9ed8a4ab0bc1ef93610ff022b7fd74cbddc3940adf210c0dd419d348686b3f1761aec51c1d8ff335d1bf6b765739270b08337089e WHIRLPOOL 69656aaab982f4a515bbb9394c84f3bf6e4bf2a8c94b1e3c62b9ae51374e1b1ae73e87eb4d6540eede799354a453e346a497f3905e79d467ffccdfff00683881
-AUX pinger-0.32e-tinfo.patch 647 SHA256 5d8406f3ba39ddd93b0cd963eb1f116d84c81d4dff31e74908a6652f14cae60b SHA512 b494bb09e7165d77bdbbb65dca167dc1cecc5e4073999d5744515e4c6cfce70ec7102740fd6a52b61dcd8ae4b65eefd66aab51dd590bd8074a7d07ad48c42421 WHIRLPOOL f45788c2f86fe38c900e1736ff5248eec372e3cdd6d98e076554083802a38b9883f0568ef7a3be119fcb831bf1fc69d8159212c909b74c7941e5906969a5f671
+AUX pinger-0.32e-tinfo.patch 722 SHA256 0404d6e4f88c18090b331958a052766cd3c30003dc77e2432f5073cfd62ed015 SHA512 0be3acd8c7f64a9683df992c017fe2fec33b312a41a8be6fd4e7e99ecc02b9026bc3bdd1157e743ac9e4b6d151c07f09fd5e50c990482a8a0c251422b7ab5e99 WHIRLPOOL bafac25881a9115cfb14efce5459bd409f6a0156b5f67f8ef4288baa8961b52aadfd174d98b28f0a4dcd70ad9eaeaefdea9b360e1e89b4bd8f852bf26b94a6e3
 DIST gtk-2.0-for-pinger.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
 DIST pinger-0.32d.tar.gz 240800 SHA256 4eb47ad8309a37de1d0c6604ba136e016d52c7305bcea93c510461c32a1f962e SHA512 cb30a58e3c08c3c15b0a61282fadfeb92636087f0c1bdcc69e16cb704467ce39e6d8701f57c102ec19f1d98f24220141e67b5973fdbadc3bfefc1ed377c78948 WHIRLPOOL c67ec3150945b5e89baccc3c50553fe6ec3e492f424d2312fa460578c2538b94ed82ee2f79fc949533598b3d071e762bb5e09e384adb6bf56f47749ad71b1502
 DIST pinger-0.32e.tar.gz 239002 SHA256 73edc85b1b45d6f7721e619b62e4dc7303306297a90f2ffd292d7fe9578321b2 SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7 WHIRLPOOL 08c2549c4d8361cc5dd97fe2498769b9c40f59b574bd04d40c6d1183699fa535c23388ff3de6f41f92faa19f9a62e36a58f46acaf06d3a1e1a6d5a18f31f80d6
 EBUILD pinger-0.32d.ebuild 982 SHA256 b984b9fece65f9d0c07b2019156f5fd2b58f320dc804489cb3957f1b0dafec3d SHA512 af405847eac4084de6d2d74395b2f85ed2ffee8e8809f3a89e308d0b4443d69b22117db43f6444fdc9bed7d73785ed00450ef797cc7f2832f79d42c831d4260f WHIRLPOOL e5c8c540967430dbd7436f9ee69d41e9215a79a15b0cf3cebb8943d9f72e250f70e03f52e7316a7fdb0b78f448a834fc9e436bb9f0ee6727ad8f30e03f216b01
-EBUILD pinger-0.32e.ebuild 1015 SHA256 626a0f3580a314a5f6cb18a793bbffcad2904fa32f39f7ac6832cf470daa4580 SHA512 ddabde49802b9015ab37992150d75b82c4e2cf2ac19d8cd2f4a066c5caf412b8ea38c99d544b478e2e1700fb8c1ed5028983d6f4b8000bfff59435156c4f9a1a WHIRLPOOL b71f40350174654e539e5e019d1c443708e726416d95f21a0639b5f9e99270033607adac9c3707e0fc90e8ebfd3c8f0916e967278f9118c96a31f3996df566a8
-MISC ChangeLog 2941 SHA256 776b00973bb2cd5b589806373ab80c811b9927fac1e98b97630210870c13d042 SHA512 6f2b950af9cab1976317fe5740bb2689e82515b3bbf1ffe0f516039fe3d5f43a8d34897508b5e6936dd507e398d9c9b7e8cdd99ca03446ff6072ad04b5767afc WHIRLPOOL 8c6884d289f0e92d0e7283bf6e9716ddcc5a25345a0cc1f6639f49221027158bba5b8633a67f022fd6fecdc9911aa3c47b29e3f377e03084da4e1931743a10ed
+EBUILD pinger-0.32e.ebuild 978 SHA256 d9c66611801acb260b2c42d534654e776c56a00536d2d9b3dd495671e2f91657 SHA512 19b987f0a4e07d1c3c331b15265bb3ae0690590e149c00287181387cc44bf3cf6997b6e739ee110980e2a1c53044651dcb070a481a19c6fd898cc5fae2669be3 WHIRLPOOL 6425ed894dde3a1afd7409d2cb99da307cfbd3470f82bfe54f4a8dd5e78220fa408639e0610227ea178bd72e2ecf5f5368e34450d76a9ab9d9c8a7feab95c05b
+MISC ChangeLog 3156 SHA256 70fb192d890729e067508776823f231e3926bba9338d8b7310d20d145516bd24 SHA512 41fd279c701636b69da6c79f419b2e5c9683952edb6b80c68626a90e8da0000116fdfa01f2810c279dbeff6adb7f125738a626e447d7e54b214b39f53c0fdda8 WHIRLPOOL 93bee7236e6d2d5534119654c639f090a37ffcb7b63bd21c37db0b87926f718498480e6c87a1ac5423e98028e690593271419f96db7d6ebf072bb57277aa70d5
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKxynkACgkQVWmRsqeSphOYNwCggFrlHP8kYYPAYB11LOT9XI4F
-Z0oAnivc5/haBosib77X9x9KM0t3vW4V
-=sd/a
+iEYEAREIAAYFAlKxzhAACgkQVWmRsqeSphOt2gCfUkHIDKK3x/sTPUmvui/ZqciW
+Rt4AniMGC07mngWB3s6gMu/mIMsat1Up
+=TZZX
 -----END PGP SIGNATURE-----
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
-}