fixes for #28982 and #28894

5 files changed, 28 insertions, 33 deletions

diff --git a/net-analyzer/paketto/ChangeLog b/net-analyzer/paketto/ChangeLog
index e83160a3f0a9..0c11c3c4c036 100644
--- a/net-analyzer/paketto/ChangeLog
+++ b/net-analyzer/paketto/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-analyzer/paketto
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.4 2003/03/20 14:37:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.5 2003/09/18 16:43:27 vapier Exp $
 
 *paketto-1.10-r1 (20 Mar 2003)
 
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc3 patch #28894 and protect local libnet from system version #28982.
+
   20 Mar 2003; Aron Griffis <agriffis@gentoo.org> paketto-1.0.ebuild,
   paketto-1.10-r1.ebuild, paketto-1.10.ebuild:
   Remove pic USE-flag and bump rev
diff --git a/net-analyzer/paketto/files/1.10-gcc3.patch b/net-analyzer/paketto/files/1.10-gcc3.patch
new file mode 100644
index 000000000000..59fb48b66e20
--- /dev/null
+++ b/net-analyzer/paketto/files/1.10-gcc3.patch
@@ -0,0 +1,15 @@
+diff -ur paketto-1.10/src/paketto.h paketto-1.10-gentoo/src/paketto.h
+--- paketto-1.10/src/paketto.h	2003-09-17 19:46:55.000000000 +1200
++++ paketto-1.10-gentoo/src/paketto.h	2003-09-17 20:28:53.000000000 +1200
+@@ -17,10 +17,7 @@
+ #include <sys/ioccom.h>
+ #endif
+ #ifndef _IOW
+-#error "We couldn't find the system macro _IOW on your machine...if you run
+-find /usr/include | xargs grep _IOW
+-and find some file other than sys/sockio.h containing the macro, email
+-dan@doxpara.com and I'll get it in the next build."
++#error "We couldn't find the system macro _IOW on your machine...if you run find /usr/include | xargs grep _IOW and find some file other than sys/sockio.h containing the macro, email dan@doxpara.com and I'll get it in the next build."
+ #endif
+
+ #include <sys/types.h>
diff --git a/net-analyzer/paketto/files/digest-paketto-1.10 b/net-analyzer/paketto/files/digest-paketto-1.10
deleted file mode 100644
index 935a21aaff24..000000000000
--- a/net-analyzer/paketto/files/digest-paketto-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7fd82af09a6493f24c8681f7bbf03898 paketto-1.10.tar.gz 900104
diff --git a/net-analyzer/paketto/paketto-1.10-r1.ebuild b/net-analyzer/paketto/paketto-1.10-r1.ebuild
index 706bbe4543ad..2464cdc1edbf 100644
--- a/net-analyzer/paketto/paketto-1.10-r1.ebuild
+++ b/net-analyzer/paketto/paketto-1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.2 2003/07/13 11:30:14 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.3 2003/09/18 16:43:27 vapier Exp $
 
 DESCRIPTION="Paketto Keiretsu - experimental TCP/IP tools - scanrand, minewt, lc, phentropy, paratrace"
 HOMEPAGE="http://www.doxpara.com/"
@@ -16,9 +16,16 @@ IUSE=""
 #	net-libs/libnet
 #	dev-libs/libtomcrypt"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+}
+
 src_compile() {
 	# --with-libnet-bin=/usr --with-pcap-lib=/usr --with-pcap-inc=/usr --with-tm-inc=/usr"
-	econf --with-gnu-ld || die
+	export PATH="${S}/Libnet-1.0.2a:${PATH}"
+	econf || die
 	emake || die
 }
 
diff --git a/net-analyzer/paketto/paketto-1.10.ebuild b/net-analyzer/paketto/paketto-1.10.ebuild
deleted file mode 100644
index 0340a9e0f9e8..000000000000
--- a/net-analyzer/paketto/paketto-1.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10.ebuild,v 1.4 2003/07/13 11:30:14 aliz Exp $
-
-DESCRIPTION="Paketto Keiretsu - experimental TCP/IP tools - scanrand, minewt, lc, phentropy, paratrace"
-HOMEPAGE="http://www.doxpara.com/"
-SRC_URI="http://www.doxpara.com/paketto/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-#paketto comes with local copies of these ...
-#DEPEND="net-libs/libpcap
-#	net-libs/libnet
-#	dev-libs/libtomcrypt"
-
-src_compile() {
-	# --with-libnet-bin=/usr --with-pcap-lib=/usr --with-pcap-inc=/usr --with-tm-inc=/usr"
-	econf --with-gnu-ld || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-	dodoc docs/lc_logs.txt docs/minewt_logs.txt docs/paratrace_logs.txt docs/scanrand_logs.txt
-}