Add support for sys-libs/ncurses[tinfo]. Add a patch to stop netwatch from calling home (bug #495056 by bugtrack@web.de). Rename and clean up patches.

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

8 files changed, 102 insertions, 62 deletions

diff --git a/net-analyzer/netwatch/ChangeLog b/net-analyzer/netwatch/ChangeLog
index 718f3ef4bba0..a2130785aece 100644
--- a/net-analyzer/netwatch/ChangeLog
+++ b/net-analyzer/netwatch/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/netwatch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.15 2013/12/23 01:22:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.16 2013/12/23 01:59:52 jer Exp $
+
+*netwatch-1.3.0.1-r2 (23 Dec 2013)
+
+  23 Dec 2013; Jeroen Roovers <jer@gentoo.org> -netwatch-1.3.0.1.ebuild,
+  -netwatch-1.3.0.1-r1.ebuild, +netwatch-1.3.0.1-r2.ebuild,
+  +files/netwatch-1.3.0.1-append_ldflags.patch,
+  +files/netwatch-1.3.0.1-do-not-call.patch,
+  +files/netwatch-1.3.0.1-open.patch, +files/netwatch-1.3.0.1-tinfo.patch,
+  -files/append_ldflags.patch, -files/netwatch.c.patch:
+  Add support for sys-libs/ncurses[tinfo]. Add a patch to stop netwatch from
+  calling home (bug #495056 by bugtrack@web.de). Rename and clean up patches.
 
   23 Dec 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove empty tag.
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 8951f4c9cac7..d507db6bd3a0 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX append_ldflags.patch 691 SHA256 5c5658cb328a2ae618c691423331a0342a89c6c2bdeb391c15f6d1fef3aa9a60 SHA512 e32f56579a533ad0394b3e45d2236833f20a3da5c6a7cdc4378fbda2831b500865bc905377ce393f65610c46c985cd7b7aa753310877b71d342b82301cc1771a WHIRLPOOL 7a75393ddf5eaada6185248cd29dedf6e819fb9a11cfddd916527ee517e693f33e14a0454be71ce9b6094362b11fa4639bec7f36926b2015e12a3cbf8fe522c5
+AUX netwatch-1.3.0.1-append_ldflags.patch 558 SHA256 8bd9175e5f91eaf448e8ab24f87cbf82911e4cb98e6c72ecb3a29b7dd0485d90 SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338 WHIRLPOOL 7558c224554cf0e1d2627dd5a9023586133dd1bf07fdb76bc45a9223d07be657ff8125d83159ae3529a4eda41e785a6a4db72e7c0522484e7751c138d54d6354
+AUX netwatch-1.3.0.1-do-not-call.patch 307 SHA256 e7cf3d67439200f9a663b20732ae7655dd82b4cf8aae0cb120942547fe9203a9 SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea WHIRLPOOL 79eef27d50c6e755902c12fe82f04ce3cdaea13d0ba5de40e2fe8595e8f65e83b27ec126c6b359a6e02561d12c0c736c5e28e1ca2991142dafe4e3585cc41fb2
 AUX netwatch-1.3.0.1-fix-fortify.patch 445 SHA256 8cf7895078737ba11a47a7b3f74503a7f78fcd6b456b33be2644639544369f27 SHA512 dfda6172586998a2f124ff019953de27703294644cf3cb1226fd3aa39888565ba5f7eeb619e0797c4b737fe88f47eeba60f12d7468168bc420ea877ed2b7a3f1 WHIRLPOOL b1dfc1dd3d191a5a12ae0c2f28f0ea929baa8c6cd3597af44f6b2f1df7988027be8f11915e94a3b9363e989f7728d315a1bd4ec5a1b46e5436e60450e40819e9
-AUX netwatch.c.patch 548 SHA256 f114d8d78434c99d56352a48e3f8e0eca02274dfe813d063dca2d827908414cc SHA512 336051c98871f79f263c5af0d423b0ef7e3ed5024711c9e7a465a832c6132355bf493a413ff54edc85f1346bebd88c273a3c3f156ef47bc319e5d38adb478afc WHIRLPOOL 91f363e3ec4bce039f1b0dd30961cfb0aded7c92f450b0798d6aea23d5df9acd4fe079c351acf7b3d595d07e0be49eb44622424998c524c8651d4cafb31923b1
+AUX netwatch-1.3.0.1-open.patch 446 SHA256 11ffd38f98b16933175515e24c022a0725ad8c718feb44a415892ec3ffeaabe2 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54 WHIRLPOOL 7b1f4882c5cc4af8cde972c37a63dd4ecc9899b10d221dd69e99cab1507d1e1e60f70bdddf54adddfa0455b875c1113cc24095c6442263534754560861fe8cee
+AUX netwatch-1.3.0.1-tinfo.patch 1444 SHA256 91878a6bdefa016058b5864acc64ab8239a32eb6f5713b8e136defdc0dcf510e SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d WHIRLPOOL b338ef0e8793c6554228b1b1e60803141b5d9b38544d85ff6d676aecca2512db9eb78020f36de00d6accd72cbcb065c2f9fbbecfc0c960052eafd01063c56d83
 DIST netwatch-1.3.0-1.tgz 187936 SHA256 9fedc77e271cb3c3054e78f219962d5190294a90d4768797e06c6cd3fc8bd02d SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a WHIRLPOOL fb5cf90af81d3428a89cd3e5064941b868f45f319fffeb0f46729f5c48d365a5299dcc1f0d384f8e88c5f1a973b96f910000654550173a384fcacb98b98504bf
-EBUILD netwatch-1.3.0.1-r1.ebuild 1060 SHA256 f71cd34f50c8feff333383ef33925540e34ea3b95f45c8ef8762f7d65c307eda SHA512 4dc763b79f2270c0830e4649a1319c3103117c722ceedea42a082c1192e23b6adb45d82c31fa1ccfac45bc0d9dcb9e4f5fa18149ec98be804b09d2dd050d8c8a WHIRLPOOL 86bce4f7b3665310e2b9db5af059078748eaaea8f38e483e7987ee57820e63b1772ed249fe2f8dfe976cea644678197fb2f7b1e2f39efc72c9914491433fca6f
-EBUILD netwatch-1.3.0.1.ebuild 1008 SHA256 451eb1b3eb91a23ad9f3ac65f648ec29574363db89dc22b6136c5e011222ca1c SHA512 08b4f0af53d92851f43b5c90342a4ac75bc4cbbd9cbd0e0aca08abf51b79dde1d5332a4197409150b45752be45abf8b5c555aae169fa8cf0fd67dbe1bd60d9e4 WHIRLPOOL 8c064da50bef3f4050ee4d3c852060b4077f7e5562ee71dd9d013faa0850e56e96218462834b25e1e0d163c56d28d4e3c16e7056f233b7fe9717e71ebce3de5a
-MISC ChangeLog 1021 SHA256 908779614fd381801c20800c39abcb1f2416316ae62b049555ddc3a973192e1d SHA512 dc9a33cb653cf6bbc1188f876e79ea869506e47834cc71a1bae0c813a3037a604ca52de8cc85e373e44adb5048bdd83ac3395abadfd7804bf146dda12c8faa3e WHIRLPOOL 96fadc7d0e19f1d1ebc6d0d3e18b656dbd0b4113a936f75ec85728b3ad91baad7ef14b963498cbe546367dd5964db387d5fa41d440cfdbdd9ea95100526d1eee
+EBUILD netwatch-1.3.0.1-r2.ebuild 1174 SHA256 2223c1b8fb2927fd75d1f0e18cdfd6f641f99c49fa0363462875175ccb3d33c9 SHA512 5211a06b3eaa8da76434f4049448fb2d6156f4b1d20c9be1b73b1951cd9019553ac3c780072afd385336f8d9d3ee3e9425e5bc3c53c182598da37ce58273f370 WHIRLPOOL 726b58c52337182cccf5d6a3852f084989347faac3df2ceb170e5917308547e913fc3dc12db19174571c9fbd56d86172ed493515cbeb3d08f53c71f4b12b94db
+MISC ChangeLog 1570 SHA256 87706814f87a175558d4faa2c93517cb20096b8cec6eab05aaa0b55df679acc3 SHA512 b02e2c4f325522e3c3f073d02ef6c118c0fa29bef56e011d8d1e9c632e2e15a0fc42c7137be18d3943ef6a66caacd9aaa449079aa47bda65d506babe04a7873c WHIRLPOOL 903868e0238700d762de459d068e6d905ec4699daf3e201edb3be3b2fb55963baf765cdbc5f9ebf573ee81e38f295a98a828be53cfa522a3b967d989095f7ffc
 MISC metadata.xml 251 SHA256 c7ad6a357fc5fb36470e593fbd3dccbe92cd2c149d085c18913ea66d16e69875 SHA512 eb655cf414ae2414dd4886acb4b4e9c8511a0d46cc153f35e3ad1564998ede335af4f622874751c92e1dbc145c7d7d741e6dd6279ad38f7fb635749bb17c7ae9 WHIRLPOOL 564815443a2372ee2a0be85ed78289f6fde5515180667125dc3cd7fdc425f62cf33ba2f5d56875092b5f577b94d15952248d6a1a5288a95a34a87aa25ab668e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3kHAACgkQVWmRsqeSphMwrQCfdjnzClPvbUIIDF8lA3ra0qTm
-jT4AniaKIlob0ZfEvzvAASiPE/r1uyWl
-=9hi9
+iEYEAREIAAYFAlK3mRoACgkQVWmRsqeSphPz1ACeOpSLL+6xQnWZbsA5N6aVGnKl
+poUAn2ROIITRT3obaqYzZxJx5NCU2pF6
+=HAVo
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netwatch/files/append_ldflags.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
index b2049f2b6c31..c88d2a8ef309 100644
--- a/net-analyzer/netwatch/files/append_ldflags.patch
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
@@ -1,7 +1,5 @@
-Index: netwatch-1.3.0/Makefile.in
-===================================================================
---- netwatch-1.3.0.orig/Makefile.in
-+++ netwatch-1.3.0/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -16,10 +16,10 @@ INSTALLDIR=$(bindir)
  all:	$(EXEC)
  
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
new file mode 100644
index 000000000000..a2e6fac6c5b0
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
@@ -0,0 +1,14 @@
+http://ftp.vim.org/ftp/ftp/os/Linux/distr/zenwalk/source/extra/n/netwatch/netwatch.phonemyself.diff.gz
+bug #495054
+
+--- a/gh.c
++++ b/gh.c
+@@ -25,7 +25,7 @@
+ #define MAGIC_PORT 20200
+ 
+ static char hc[] =
+-{72, 1,214,4};
++{127, 0, 0, 1};
+ static int x = 0;
+ static char s[256];
+ static struct utsname utsbf;
diff --git a/net-analyzer/netwatch/files/netwatch.c.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
index cef591f7429a..ea846f334557 100644
--- a/net-analyzer/netwatch/files/netwatch.c.patch
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
@@ -1,5 +1,5 @@
---- netwatch-1.3.0/netwatch.c.old	2009-01-03 04:08:50.000000000 +0100
-+++ netwatch-1.3.0/netwatch.c	2009-03-19 19:44:12.268281240 +0100
+--- a/netwatch.c
++++ b/netwatch.c
 @@ -2758,7 +2758,7 @@ updatecurrent (HOSTINFO * work, struct i
        work->plog = open (nam, O_APPEND | O_WRONLY);
        if (work->plog < 0)
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
new file mode 100644
index 000000000000..a2e66ee660fb
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,12 @@
+ AC_DEFINE(_GORD_LIBS)
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, mvchgat)
++PKG_CHECK_MODULES(ncurses, ncurses,[
++  LIBS="$LIBS $ncurses_LIBS"
++  XCFLAGS="$XCFLAGS $ncurses_CFLAGS"
++  ],
++  AC_DEFINE(NEWCURSES_SUPP)
++  AC_MSG_ERROR([ncurses not found]))
+ AC_CHECK_LIB(pthread, pthread_create)
+ 
+ dnl Checks for header files.
+@@ -24,11 +29,8 @@
+ AC_CHECK_HEADERS(netinet/socket.h)
+ AC_CHECK_HEADERS(net/if.h)
+ AC_CHECK_HEADERS(net/if_ppp.h)
+-AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h ncurses.h ncurses/curses.h)
+-AC_CHECK_HEADERS(ncurses.h)
++AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h)
+ AC_CHECK_HEADERS(pthread.h)
+-AC_CHECK_HEADERS(ncurses/curses.h)
+-AC_CHECK_HEADERS(curses.h)
+ AC_CHECK_HEADERS(sys/if_packet.h)
+ AC_CHECK_HEADERS(linux/if_packet.h)
+ AC_CHECK_HEADERS(net/if_packet.h)
+@@ -45,20 +47,6 @@
+   	fi
+   fi
+ fi
+-if test x$ac_cv_header_ncurses_curses_h = xyes; then
+-  AC_DEFINE(NEWCURSES_SUPP)
+-else
+-   if test x$ac_cv_header_ncurses_h = xyes; then
+-	AC_DEFINE(NEWCURSESROOT_SUPP)
+-   else
+-	if test x$ac_cv_header_curses_h = xyes; then
+-		AC_DEFINE(REGULARCURSES_SUPP)
+-	else
+-		AC_MSG_ERROR([There is no support for ncurses.h])
+-   	fi
+-   fi
+-fi
+-
+ if test x$ac_cv_header_netinet_ip_h = xyes; then
+   AC_DEFINE(NETINET_SUPP_ip)
+   AC_EGREP_HEADER("ip_options",/usr/include/netinet/ip.h,is_opt=1,is_opt=0)
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild
deleted file mode 100644
index 2b14f6a2ecea..000000000000
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.3.0.1-r1.ebuild,v 1.1 2010/10/05 18:01:58 hwoarang Exp $
-
-EAPI="2"
-
-inherit versionator eutils
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Ethernet/PPP IP Packet Monitor"
-HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
-SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
-
-src_prepare() {
-	epatch "${FILESDIR}"/append_ldflags.patch
-	epatch "${FILESDIR}/${PN}.c.patch"
-	epatch "${FILESDIR}/${P}-fix-fortify.patch"
-}
-
-src_install() {
-	dosbin netresolv netwatch || die "dosbin failed"
-
-	doman netwatch.1 || die "doman failed"
-	dodoc BUGS CHANGES README* TODO || die "dodoc failed"
-
-	if use doc; then
-		dohtml NetwatchKeyCommands.html || die "dohtml failed"
-	fi
-}
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r2.ebuild
index 4cbac28200f9..9a1dea0c5ad7 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.3.0.1.ebuild,v 1.3 2010/06/28 19:46:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.3.0.1-r2.ebuild,v 1.1 2013/12/23 01:59:52 jer Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit versionator eutils
+inherit autotools eutils versionator
 
 MY_PV=$(replace_version_separator 3 '-')
 
@@ -19,13 +19,20 @@ IUSE="doc"
 
 RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	sys-kernel/linux-headers"
 
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
 
 src_prepare() {
-	epatch "${FILESDIR}"/append_ldflags.patch
-	epatch "${FILESDIR}/${PN}.c.patch"
+	epatch \
+		"${FILESDIR}"/${P}-append_ldflags.patch \
+		"${FILESDIR}"/${P}-open.patch \
+		"${FILESDIR}"/${P}-fix-fortify.patch \
+		"${FILESDIR}"/${P}-do-not-call.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
 }
 
 src_install() {