EAPI bump. Set --disable-pcap-restart to avoid more rude e-mails from libpcap upstream. Force --enable-pcre instead of long shipped obsolete GNU regex. Clean up patches.

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

8 files changed, 61 insertions, 112 deletions

diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog
index 4c9ab543edd3..4468ee91bfd9 100644
--- a/net-analyzer/ngrep/ChangeLog
+++ b/net-analyzer/ngrep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ngrep
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.73 2013/03/17 16:07:17 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.74 2014/07/14 23:41:43 jer Exp $
+
+  14 Jul 2014; Jeroen Roovers <jer@gentoo.org> ngrep-1.45-r3.ebuild,
+  -files/ngrep-1.45-Makefile.in.patch, files/ngrep-1.45-build-fixes.patch,
+  files/ngrep-1.45-prefix.patch, files/ngrep-1.45-setlocale.patch,
+  -files/ngrep-1.45.patch:
+  EAPI bump. Set --disable-pcap-restart to avoid more rude e-mails from libpcap
+  upstream. Force --enable-pcre instead of long shipped obsolete GNU regex.
+  Clean up patches.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index 8135c536aeb1..39060efc492a 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -1,31 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ngrep-1.45-Makefile.in.patch 395 SHA256 25bc9e8de6d9396220d7c07d662b43121d2f025648c841f6b96ff3dc592b89e9 SHA512 8fd0404a18cf7a44efe8554fdb600ac8823bb37268f6c154c7406a41fb5e4a8e185094ed26ac6340823200fe7be772b23f368e4ed05b224dd851f93e94b92df2 WHIRLPOOL 4c4f968cae33be3be03af93a5f6fb06751fa013229abf4c42ea68fbdb589e87c5300c6d2a1ebcfc8ed4f3416235855528a3af0f7184e204470dfb6a9db995de8
-AUX ngrep-1.45-build-fixes.patch 5246 SHA256 4af21aef682c00b78fbf0d93355609ad801f6662e8c38ecd4fc1b24b67787167 SHA512 fe6bcc8f2770929a3b235976fb031e13d9ea54b30e781e5252a36096c735f5ff34761e303d515b86dc89f7aae5392a0990d9a6ec84fc1ec90dd3c03478bc437a WHIRLPOOL 63fd9e146e8217a1b71c29902fa1ee3c5d0b1268ec945b70abcab3c0d8bfb74cdb3fa95979fadcac92405c331d35da1d763fec1e8a4104b567991c5e6fddfaa0
-AUX ngrep-1.45-prefix.patch 628 SHA256 e822752e50558a672c4b63ff982378b0700cc350bb5912a3daba54c14d16aba9 SHA512 38c6b657546b6f443427e505cc3fd65687f3e9aafffb1b286d321f9141380ac40aacac7f8bc2665b90d30a22113ca8d65fd17f2d61e95efc2d5496f519de43ba WHIRLPOOL f8a67ae97d9d75cfe19521eb106f0153a2a8c781832e504f48a63c0c1f1275d78c1e89768c2aace922289dcdd73effa772c01974eff203df516b3be066d5b281
-AUX ngrep-1.45-setlocale.patch 526 SHA256 46fbee8a32f168838afdaf147b614149fec673abc1181a18ae49ba357596723c SHA512 e268863dfecab1808c412b7d4ec14ed8430dd63dd162e8ab98b10e20798c8a63da292b2ab4418c113ddd5cca60beedd4c8714c48a9d6da4ebb1357e811086e15 WHIRLPOOL 4ee683dc42ac44ecd9359849312a791e78b63ae3bbb8af379326358fe417125200258742347154eba67ae60b6459d3fea82f680b2778f7dc91f7efcab5e94f4c
-AUX ngrep-1.45.patch 911 SHA256 586349b83f9d61a8791be62b26c1ee816b20f5eaf6b8b3671c4833f730dda333 SHA512 3332cff880b85196dcb29cec4f73eca73a019ef18679d0edccf3d2d29612d87d6362db0b17227a6d739473a327dbbad31cb231e28919655ff17850de423a1d30 WHIRLPOOL 63f69fdbf5fa0bffc6f7e1c1643e6e43dbda97135153d9eb78bb5690c5d989a8b81570a0aadd5b96e8f2f989abe68f3ef19a9c2f515379fb4c4b924cb128bc1e
+AUX ngrep-1.45-build-fixes.patch 4778 SHA256 0c4ce5aa42491e17b0d2f8a6b8796e2983f14aae912e93f092c02b5464b482b5 SHA512 5e11682d6b360e96840135d8963bdf4c9bf5def0bd38ba716ce201c7bf9b5ce787338f2cff86d38318e0356d9118fde6985ed9a71728549842577ecdb3a5011e WHIRLPOOL 51f775049027362d49099063b8c96b55fdd3983f0fef4e62dac7713721147dbdc6582eab36cda5baa76fa5b898a14121751f44ba6a41145002f48e05d1dc8b2f
+AUX ngrep-1.45-prefix.patch 575 SHA256 16042e174b74b00d2ac743b52c367dd13e34a032ae7b1d5342c9308b3b2c2635 SHA512 e33321ded5c0b86a279108a0d72d5e1d65699c39f50ac9291c4256867ce3f2b06d86d7186e51359deac82beadb7e8503ca5023c5401068aecebaffa4d01c2afc WHIRLPOOL b47d882f1c82f5ddff015dc213188209e42b036629c89b7bcc99bd597c002387ddfda350bfe86aa4df0b763103f8f82127310d5c61e2acf329cc6699779c85c5
+AUX ngrep-1.45-setlocale.patch 495 SHA256 ee2556afb076ca647896e53e46ef6c0b35966f8fdf27b2e2fe3ad4cb99d06d90 SHA512 007cf6793ef407b4069ebe84b9fe5e5a23c3d2d7f5c538ce0a81d1b6c2643b79387136854d50eb68b13aaaf6e3d7b1a469e7afdeebedba79efea1960b2d1a87e WHIRLPOOL e96a92c2b22e981e8311aeb17084f91ee844d1fb9194d0b6b991e4765a9c09078d956da4fb567d5d4e04fa02ab36361b24b8d3dc7a132d280c143c84fd5417cc
 DIST ngrep-1.45.tar.bz2 463361 SHA256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7 WHIRLPOOL 5560c8b341ec9c1b322f0b0838470dfa8cf0b86fe44cb7619d5ed162753bab0f08bcea4ba17af96b01ab1a56311eb964dc87fa8c202a160d9ab1d578af6df924
-EBUILD ngrep-1.45-r3.ebuild 1197 SHA256 190d09f396f45e119fd4f9c37e9426a597d2185de1545263180ce9c59d6ad9c8 SHA512 285f0e1e6baed03e82412e97425752be20a3de82b5412cf4c5085ac08390cfc7d500ecb4963d7c5e6d66a9080947760e1b614c10258d33ebd9b04b146212d32c WHIRLPOOL b32a4f3b66d01283cc1167535aa32f1013dddd1b275a4c31cff6cb81b2f2fd1f2e68002134c384b91c62d958569538de8e4534a0f721daefc2d284eb701622fa
-MISC ChangeLog 9007 SHA256 99ccf8c1422fc71e7eaa6b15929b706fe032b2347b0d8bf588e24cc0662e5785 SHA512 51b24a0ae1147f9bdf4c61b336ec4cc86ff66245051a5108c5e66ace80934ee1f4b652ad87250a847429d3e9bf0127b2d7421f666875d6f550d210120bb7e3ad WHIRLPOOL 3a6a5d249e6c65f0cc6ba7039c6d66536d7916e733d8942b0d5a00ed059fecc7261eb05cdf662b9cdda915261b731558a4bb5b3f5658d0ba47aa04ef054a3986
+EBUILD ngrep-1.45-r3.ebuild 1189 SHA256 8211198eb840f7170f715142be938019f387d36ffede38282362afbdaa705991 SHA512 f323fb4121236a76f6859b9ee49a2c8a3fa8f4af2e34ba8f57783d6c90ff56b879a08d41295c9ff414e3eb9a2e67eb23ee8175cc6eaf2e7b1c379d9c59bffa9e WHIRLPOOL 8f8b84bbb0b4c8fd303754c525519248ac8724c2998a87a93d3bfb7727a3e34aa7e9bae043a62a46de89d8a5d77a4c2351422f9cf3b02dcdc190ac69c40801ec
+MISC ChangeLog 9417 SHA256 27fd53a0089a8f2630890ea2af022ce54bfaf90c7d996c6c3e8a505053c033ab SHA512 324f8967bbfad534fa6149271f9b891aed1ca53cc655f35c06c4a6026ba08cdabf0b9b52e1b73dd62c3569ae4f46dfe385c1d912602018f27ffb8d76ff59811c WHIRLPOOL ded84b16e62f2faea3c716b7f73f03564e6c405782cd6c9d62534b18043beb90f7290af3c138692674f226333bd0e04bca70e9a5f35ae66a641130f741c5f849
 MISC metadata.xml 375 SHA256 8e8a5db34d92a3a734ba13b90ed25d835a31f38ffae27e688212789f7bccc513 SHA512 ee301f5159f44e8b8a953a3d1a9d10da1a14bc887dcc58ab0be1595649bff6d7a400fce7447afb22b14866397ffc0b296ed59fb5ba55e9d5c490e7cd7767ac3e WHIRLPOOL 63748b39ca9bf4503126761bd141193f02e782e3e308aba99893db85823f07fdaae096a27b850b52e3fac786c75c1a79fc74bdaf15fb2f885c8372ae4b61370c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJRReo2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88VVMQAL2adzsSoyPPAvv4wHi+9BHT
-vFOawIgHWLpTOzkZ4hO6jSmaiGITkuZutopSaffULwQw6xrDNy3oimcSL8YpIFP8
-aYP/yDzUGKS6W5c9ObiXTUw18swiMtNeOj7bpeP/iPX1bUDJw8aQd/a82pZZyMXS
-Tyh6B6n2VmqHz4sijAw17YNVoC7nP+HBiFDJWy7W7UcF0nxopLvMXirqLbzGR/Dq
-/NiEedi+8A1WE/LEB/3klQw9fBTw+s1sRSY+pDlTVExxlbk1Ef0P9hKtBicPFaKU
-oLhLkNpu3pUwVRbBHqifU8XIY1NLqsjxZQSbV0ABlvuQkvFMhZkDfhk0AcmuR4C4
-PJ8gKFdjVtRvUSz0h9TD9LFZOZaeDI5Ot1SNCf1ORJVtfCD5LTGnliPsXsLl6JFS
-2htZ6/MEZkmurxi/ql7ygsc+qvZVrTfHJzGLb6SVGmNc0R+WWx2HzYJN8zUEyPHG
-ykd0cLMmo0EQ3oMOZhlO4UxVUMJJpOSLElRQgQedd9PRSzU1oHa6gKDbTTghL31V
-Zy0ufVlzcM5IVcjV9QPNbIBI9TxoTbUCqE6hplPdetyhWzVttP+fthAATDOZLJzd
-uq91YFaApyQPkYwuvwMx5nISMoNSM/1zS4n9rQHWZX6WtqPFFQ+Bfd7BdAA8ttHu
-KiUt2g9g5ZlGw14b3ezZ
-=9Pis
+iEYEAREIAAYFAlPEargACgkQVWmRsqeSphOuGQCeIj0yn5DlhChUq3TksVcrqfLv
+XWYAn0wLXzpZ+jtbFv35X4BCIFP8dJ9L
+=Yd5N
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch b/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch
deleted file mode 100644
index 22548545c4c2..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45-Makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.	2006-11-28 14:35:37.000000000 +0100
-+++ Makefile.in	2008-03-18 23:25:26.000000000 +0100
-@@ -63,7 +63,7 @@
- 	rm -f config.status config.cache config.log config.h Makefile 
- 
- $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h
--	$(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
-+	$(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS))
- 
- $(OBJS): Makefile ngrep.c ngrep.h
- 
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
index 1e30ca9a0c80..9cde0f81926d 100644
--- a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
+++ b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch
@@ -16,9 +16,8 @@ This patch fixes a number of problems with have with build:
  * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug
    #178684)
 
-=== modified file 'Makefile.in'
---- Makefile.in	2008-11-17 09:02:30 +0000
-+++ Makefile.in	2008-11-17 10:42:09 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -7,7 +7,8 @@
  
  CC=@CC@
@@ -70,9 +69,8 @@ This patch fixes a number of problems with have with build:
  $(OBJS): Makefile ngrep.c ngrep.h
  
 
-=== modified file 'configure.in'
---- configure.in	2008-11-17 09:02:30 +0000
-+++ configure.in	2008-11-17 10:11:29 +0000
+--- a/configure.in
++++ b/configure.in
 @@ -124,14 +124,16 @@
    use_pcre="no"
  ])
@@ -115,9 +113,8 @@ This patch fixes a number of problems with have with build:
  
  echo
 
-=== modified file 'ngrep.c'
---- ngrep.c	2008-11-17 09:02:30 +0000
-+++ ngrep.c	2008-11-17 09:55:32 +0000
+--- a/ngrep.c
++++ b/ngrep.c
 @@ -92,7 +92,7 @@
  #endif
  
@@ -128,9 +125,8 @@ This patch fixes a number of problems with have with build:
  #include "regex-0.12/regex.h"
  #endif
 
-=== modified file 'regex-0.12/Makefile.in'
---- regex-0.12/Makefile.in	2008-11-17 09:02:30 +0000
-+++ regex-0.12/Makefile.in	2008-11-17 10:20:52 +0000
+--- a/regex-0.12/Makefile.in
++++ b/regex-0.12/Makefile.in
 @@ -18,23 +18,6 @@
  
  version = 0.12
@@ -165,9 +161,8 @@ This patch fixes a number of problems with have with build:
  default all:: regex.o
  .PHONY: default all
 
-=== modified file 'regex-0.12/configure.in'
---- regex-0.12/configure.in	2008-11-17 09:02:30 +0000
-+++ regex-0.12/configure.in	2008-11-17 10:19:18 +0000
+--- a/regex-0.12/configure.in
++++ b/regex-0.12/configure.in
 @@ -34,4 +34,4 @@
  
  esac
@@ -176,8 +171,8 @@ This patch fixes a number of problems with have with build:
 +AC_OUTPUT(Makefile)
 
 === modified file 'regex-0.12/regex.c'
---- regex-0.12/regex.c	2008-11-17 09:02:30 +0000
-+++ regex-0.12/regex.c	2008-11-17 10:15:58 +0000
+--- a/regex-0.12/regex.c
++++ b/regex-0.12/regex.c
 @@ -34,7 +34,9 @@
    #pragma alloca
  #endif
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
index afd2a2362395..8618f5daae31 100644
--- a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
+++ b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch
@@ -1,8 +1,8 @@
 * refrain from doing an absolutely insane check (to see if pcap is
   installed in more than one place)
 
---- configure.in.orig	2008-01-16 21:30:55 +0100
-+++ configure.in	2008-01-16 21:32:42 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -268,10 +268,7 @@
  
  AC_MSG_CHECKING(for a complete set of pcap headers)
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
index d43f225cab0c..8789e5b8c76b 100644
--- a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
+++ b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch
@@ -1,8 +1,8 @@
 Call setlocale to make isprint() decide what's printable depending
 on the current locale.  See bugs.debian.org/307496 .
 
---- ngrep-1.45.ds1.orig/ngrep.c
-+++ ngrep-1.45.ds1/ngrep.c
+--- a/ngrep.c
++++ b/ngrep.c
 @@ -97,6 +97,8 @@
  #include "regex-0.12/regex.h"
  #endif
diff --git a/net-analyzer/ngrep/files/ngrep-1.45.patch b/net-analyzer/ngrep/files/ngrep-1.45.patch
deleted file mode 100644
index 606b3d93e333..000000000000
--- a/net-analyzer/ngrep/files/ngrep-1.45.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ru ngrep-1.45~/configure.in ngrep-1.45/configure.in
---- ngrep-1.45~/configure.in	2006-12-23 23:44:17.000000000 +0100
-+++ ngrep-1.45/configure.in	2006-12-24 00:32:59.000000000 +0100
-@@ -130,9 +130,10 @@
-   echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' 
-   echo 
- 
--  REGEX_DIR='pcre-5.0'
--  REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o"
-+  REGEX_DIR=''
-+  REGEX_OBJS=""
-   USE_PCRE="1"
-+  EXTRA_LIBS="$EXTRA_LIBS `pcre-config --libs`"
- 
- else
- 
-@@ -161,7 +162,7 @@
- dnl OS-specific options
- dnl
- 
--STRIPFLAG="-s"
-+STRIPFLAG=""
- HAVE_DUMB_UDPHDR="0"
- 
- case "$target_os" in
-diff -ru ngrep-1.45~/ngrep.c ngrep-1.45/ngrep.c
---- ngrep-1.45~/ngrep.c	2006-12-23 23:44:17.000000000 +0100
-+++ ngrep-1.45/ngrep.c	2006-12-24 00:34:37.000000000 +0100
-@@ -92,7 +92,7 @@
- #endif
- 
- #if USE_PCRE
--#include "pcre-5.0/pcre.h"
-+#include <pcre.h>
- #else
- #include "regex-0.12/regex.h"
- #endif
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
index 20f0116dcbf2..bca77effde2d 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
@@ -1,8 +1,8 @@
-# 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-analyzer/ngrep/ngrep-1.45-r3.ebuild,v 1.9 2013/01/16 09:39:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.45-r3.ebuild,v 1.10 2014/07/14 23:41:43 jer Exp $
 
-EAPI="3"
+EAPI=5
 
 inherit autotools eutils user
 
@@ -13,35 +13,43 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
 LICENSE="ngrep"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 pcre"
+IUSE="ipv6"
 
-DEPEND="net-libs/libpcap
-	pcre? ( dev-libs/libpcre )"
+DEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap
+"
 RDEPEND="${DEPEND}"
 
+DOCS=(
+	doc/CHANGES.txt
+	doc/CREDITS.txt
+	doc/README.txt
+	doc/REGEX.txt
+)
+
 src_prepare() {
 	# Remove bundled libpcre to avoid occasional linking with them
-	rm -rf pcre-5.0
-	epatch "${FILESDIR}/${P}-build-fixes.patch"
-	epatch "${FILESDIR}/${P}-setlocale.patch"
-	epatch "${FILESDIR}/${P}-prefix.patch"
+	rm -r pcre-5.0 || die
+
+	epatch \
+		"${FILESDIR}"/${P}-build-fixes.patch \
+		"${FILESDIR}"/${P}-setlocale.patch \
+		"${FILESDIR}"/${P}-prefix.patch
+
 	eautoreconf
 }
 
 src_configure() {
 	econf \
+		$(use_enable ipv6) \
+		--disable-pcap-restart \
+		--enable-pcre \
 		--with-dropprivs-user=ngrep \
-		--with-pcap-includes="${EPREFIX}"/usr/include/pcap \
-		$(use_enable pcre) \
-		$(use_enable ipv6)
+		--with-pcap-includes="${EPREFIX}"/usr/include/pcap
 }
 
 pkg_preinst() {
 	enewgroup ngrep
 	enewuser ngrep -1 -1 -1 ngrep
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc doc/*.txt
-}