jnettop merged. pymc and netcat-openbsd underway

8 files changed, 21 insertions, 174 deletions

diff --git a/net-analyzer/cacti.patch b/net-analyzer/cacti.patch
deleted file mode 100644
index a18fa5b..0000000
--- a/net-analyzer/cacti.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- cacti-0.8.7i.ebuild	2012-05-06 20:51:13.000000000 +0900
-+++ cacti-0.8.8a.ebuild	2012-05-06 21:10:38.000000000 +0900
-@@ -22,7 +22,7 @@ if [[ -n ${UPSTREAM_PATCHES} ]]; then
- fi
- 
- LICENSE="GPL-2"
--KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86"
-+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
- IUSE="snmp doc"
- 
- DEPEND=""
-@@ -70,12 +70,12 @@ src_install() {
- 
- 	edos2unix `find -type f -name '*.php'`
- 
--	dodir ${MY_HTDOCSDIR}
-+	dodir ${MY_HTDOCSDIR#${EPREFIX}}
- 	cp -r . "${D}"${MY_HTDOCSDIR}
- 
--	webapp_serverowned ${MY_HTDOCSDIR}/rra
--	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
--	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
-+	webapp_serverowned ${MY_HTDOCSDIR#${EPREFIX}}/rra
-+	webapp_serverowned ${MY_HTDOCSDIR#${EPREFIX}}/log/cacti.log
-+	webapp_configfile ${MY_HTDOCSDIR#${EPREFIX}}/include/config.php
- 	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- 
- 	webapp_src_install
diff --git a/net-analyzer/jnettop/Manifest b/net-analyzer/jnettop/Manifest
deleted file mode 100644
index 405601b..0000000
--- a/net-analyzer/jnettop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jnettop-0.13.0-asneeded.patch 496 RMD160 af2d9b6e76e41d2c2f38fd8b3b82249105927008 SHA1 c3bfcf231ff5496f834f5938031401a53dd5dc20 SHA256 f1b7cc63da40d56d1d5db26a6907fa138b583edd87c60771d40ed421790390bf
-DIST jnettop-0.13.0.tar.gz 131009 RMD160 707c89b8df0425b2fe90457563dd60978dbbabf7 SHA1 59f4c28db6f8b1c58050d72aaa4b3b6d5a4a75e0 SHA256 e987a1a9325595c8a0543ab61cf3b6d781b4faf72dd0e0e0c70b2cc2ceb5a5a0
-EBUILD jnettop-0.13.0-r1.ebuild 753 RMD160 bc7e95b0bf23f3f94ed9ee2fee57e807d2fc9ea3 SHA1 f4f7c3afc6ddbd04b06c14d547de593fefa79ef7 SHA256 ebaad9edf54860dd4def7d4b5281158ac891a59d90e15dcce37d53e48953a9a5
-MISC metadata.xml 240 RMD160 f724f79660076c24676f93654968e5aa3432aafc SHA1 4d8a1b8fca36e46b5756037cbe1ca318e5ed32d9 SHA256 708da94aea60e308d7b14137f96d1d76949cf66841fe1b329b53fcc1fbe7439c
diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
deleted file mode 100644
index dc648f5..0000000
--- a/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/Makefile.am b/Makefile.am
---- a/Makefile.am	2006-04-14 11:32:14.000000000 -0500
-+++ b/Makefile.am	2009-02-12 22:44:49.000000000 -0600
-@@ -1,8 +1,7 @@
- # $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/files/jnettop-0.13.0-asneeded.patch,v 1.1 2009/06/02 11:55:37 flameeyes Exp $
- 
- INCLUDES = -I$(top_srcdir)/include @GLIB_CFLAGS@
--AM_LDFLAGS = @GLIB_LIBS@ @NSL_LIBS@ @SOCKET_LIBS@
--CFLAGS = -g -O0
-+jnettop_LDADD = @GLIB_LIBS@ @NSL_LIBS@ @SOCKET_LIBS@
- 
- man_MANS = jnettop.8
- 
diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
deleted file mode 100644
index 052efaf..0000000
--- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild,v 1.3 2009/06/02 11:55:36 flameeyes Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="A top like console network traffic visualiser"
-HOMEPAGE="http://jnettop.kubs.info/"
-SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86-linux"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
-	>=dev-libs/glib-2.0.1"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	eautoreconf
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README .jnettop
-}
diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml
deleted file mode 100644
index 07768d7..0000000
--- a/net-analyzer/jnettop/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>netmon</herd>
-<longdescription>A top like console network traffic visualiser</longdescription>
-</pkgmetadata>
diff --git a/net-analyzer/netcat-openbsd/netcat-openbsd-1.84.ebuild b/net-analyzer/netcat-openbsd/netcat-openbsd-1.84.ebuild
index 7abf87b..3094417 100644
--- a/net-analyzer/netcat-openbsd/netcat-openbsd-1.84.ebuild
+++ b/net-analyzer/netcat-openbsd/netcat-openbsd-1.84.ebuild
@@ -2,24 +2,22 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=4
+
 inherit eutils toolchain-funcs rpm
 
-DESCRIPTION="the network swiss army knife openbsd porting"
+DESCRIPTION="the OpenBSD network swiss army knife"
 HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/"
-SRC_URI="http://vault.centos.org/5.7/os/SRPMS/nc-1.84-10.fc6.src.rpm"
-LICENSE="as-is"
+SRC_URI="ftp://ftp.redhat.com/pub/redhat/linux/enterprise/6Server/en/os/SRPMS/nc-1.84-22.el6.src.rpm"
+LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="static"
 
-RDEPEND=">=dev-libs/glib-2
-        !net-analyzer/netcat
-        !net-analyzer/gnu-netcat"
-
-#disable mirrors
-RESTRICT="mirror"
+DEPEND=""
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/nc
 
@@ -27,16 +25,19 @@ src_unpack() {
         #unpack the source and do package patching
         rpm_src_unpack
         cd "${S}"
-        epatch "../nc-1.84-glib.patch"
-        epatch "../nc-1.78-pollhup.patch"
-        epatch "../nc-1.82-reuseaddr.patch"
-        epatch "../nc-gcc_signess.patch"
-        epatch "../nc-1.84-connect_with_timeout.patch"
-        epatch "../nc-1.84-udp_stop.patch"
-        epatch "../nc-1.84-udp_port_scan.patch"
-        epatch "../nc-1.84-crlf.patch"
-        epatch "../nc-1.84-verb.patch"
-
+		epatch "../nc-1.84-glib.patch"
+		epatch "../nc-1.78-pollhup.patch"
+		epatch "../nc-1.82-reuseaddr.patch"
+		epatch "../nc-gcc_signess.patch"
+		epatch "../nc-1.84-connect_with_timeout.patch"
+		epatch "../nc-1.84-udp_stop.patch"
+		epatch "../nc-1.84-udp_port_scan.patch"
+		epatch "../nc-1.84-crlf.patch"
+		epatch "../nc-1.84-verb.patch"
+		epatch "../nc-1.84-man.patch"
+		epatch "../nc-1.84-gcc4.3.patch"
+		epatch "../nc-1.84-efficient_reads.patch"
+		epatch "../nc-1.84-verbose-segfault.patch"
 }
 
 src_compile() {
@@ -56,4 +57,3 @@ src_install() {
         dodoc scripts/*
         dosym ${INSTDIR}/nc.openbsd ${INSTDIR}/nc
 }
-
diff --git a/net-analyzer/ssldump.old b/net-analyzer/ssldump.old
deleted file mode 120000
index 926b32a..0000000
--- a/net-analyzer/ssldump.old
+++ /dev/null
@@ -1 +0,0 @@
-/usr/portage/net-analyzer/ssldump/
\ No newline at end of file
diff --git a/net-analyzer/ssldump.patch b/net-analyzer/ssldump.patch
deleted file mode 100644
index 1b7a9e1..0000000
--- a/net-analyzer/ssldump.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naurp ssldump.old/files/ssldump-0.9-makefile-fix.patch ssldump/files/ssldump-0.9-makefile-fix.patch
---- ssldump.old/files/ssldump-0.9-makefile-fix.patch	1970-01-01 09:00:00.000000000 +0900
-+++ ssldump/files/ssldump-0.9-makefile-fix.patch	2012-05-04 17:20:08.945629498 +0900
-@@ -0,0 +1,21 @@
-+eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
-+--- Makefile.in	2001-11-27 07:38:13.000000000 +0900
-++++ Makefile.in.new	2012-05-02 16:13:10.000000000 +0900
-+@@ -46,13 +46,12 @@ BINDIR=@sbindir@
-+ MANDIR=@mandir@
-+ RM=rm -f
-+ 
-+-ROOT=./
-+-ANALYZE_SRCDIR=$(ROOT)base/
-++ANALYZE_SRCDIR=base/
-+ COMMONDIR=common/
-+ COMMON_LIB_SRCDIR=$(COMMONDIR)lib/
-+-ANALYZE_NULL_SRCDIR=$(ROOT)null/
-+-ANALYZE_SSL_SRCDIR=$(ROOT)ssl/
-+-ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/
-++ANALYZE_NULL_SRCDIR=null/
-++ANALYZE_SSL_SRCDIR=ssl/
-++ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/
-+ include rules.mk
-+ 
-+ include $(COMMON_LIB_SRCDIR)/targets.mk
-diff -Naurp ssldump.old/ssldump-0.9-r1.ebuild ssldump/ssldump-0.9-r1.ebuild
---- ssldump.old/ssldump-0.9-r1.ebuild	2011-12-10 01:15:55.000000000 +0900
-+++ ssldump/ssldump-0.9-r1.ebuild	2012-05-04 17:24:03.220640642 +0900
-@@ -13,7 +13,7 @@ SRC_URI="http://www.rtfm.com/ssldump/${M
- 
- LICENSE="openssl"
- SLOT="0"
--KEYWORDS="amd64 ppc sparc x86"
-+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
- IUSE="ssl"
- 
- RDEPEND="net-libs/libpcap
-@@ -26,7 +26,8 @@ src_prepare() {
- 	epatch "${FILESDIR}"/${P}-libpcap-header.patch \
- 		"${FILESDIR}"/${P}-configure-dylib.patch \
- 		"${FILESDIR}"/${P}-openssl-0.9.8.compile-fix.patch \
--		"${FILESDIR}"/${P}-DLT_LINUX_SLL.patch
-+		"${FILESDIR}"/${P}-DLT_LINUX_SLL.patch \
-+		"${FILESDIR}"/${P}-makefile-fix.patch
- 
- 	sed -i configure.in -e 's|libpcap.a|libpcap.so|g' || die
- 
-@@ -35,8 +36,18 @@ src_prepare() {
- 
- src_configure() {
- 	local myconf
--	use ssl || myconf="--without-openssl"
--
-+	myconf="${myconf} \
-+		--with-pcap-inc=${EPREFIX}/usr/include \
-+		--with-pcap-lib=${EPREFIX}/usr/$(get_libdir)"
-+
-+	if use ssl; then
-+		myconf="${myconf} \
-+			--with-openssl-inc=${EPREFIX}/usr/include \
-+			--with-openssl-lib=${EPREFIX}/usr/$(get_libdir)"
-+	else
-+		myconf="${myconf} --without-openssl"
-+	fi
-+	
- 	econf ${myconf}
- }
-