Use toolchain. Use dobin. Do not strip (bug #251984).

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 63 insertions, 9 deletions

diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 9e8e92831be8..a5bc6e1e085e 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sancp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.11 2008/08/04 19:54:06 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.12 2009/01/15 07:28:38 jer Exp $
+
+  15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/sancp-1.6.1-compiler.patch, sancp-1.6.1-r2.ebuild:
+  Use toolchain. Use dobin. Do not strip (bug #251984).
 
   04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Describe local USE flags for GLEP 56.
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 68b17f61e19f..1ca903ff72f8 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,3 +1,4 @@
+AUX sancp-1.6.1-compiler.patch 4473 RMD160 93cbe3b204a7f7d4f894e59c587d316d96490c00 SHA1 5609f8945f6250675ea53f9ac1f8593a88024c6a SHA256 7fe87c94d54c4a755cfe50d79f36bcaffe092ff9af939e11f1d307fdfb5e9c67
 AUX sancp.confd 275 RMD160 ed6c5c4c13e631111260791bfd97e829c33bc31e SHA1 7ad2fb5b7c6e45835733fe63a8324927ea33ea82 SHA256 272192ceb2d7e371c6ef1467baa91da2542ed22158eb5afe1a99a0f68b8f8390
 AUX sancp.rc1 969 RMD160 1799aaebe92662c8b9ac943ce7a1bcc31d37eab6 SHA1 65e8338cc421df9b63b5190882de6c8c809dfd9c SHA256 64c172dc81927bd7b3adced16d183c699023588607fbda7f28168115b855dd93
 AUX sguil_sancp.conf 2133 RMD160 d7506587b0a0a00e4b40daad193bdea7ac19948c SHA1 11d38c964e48032a00c6d2899f9d41a25a664872 SHA256 e611481d8dcd66187db52f17c6e4505364bd1cc2f6e8cda45c0035fbeb77cd25
@@ -6,6 +7,6 @@ DIST sancp-1.6.1.fix200511.b.patch 870 RMD160 519932df5a6645cac639862e67325d6320
 DIST sancp-1.6.1.fix200601.c.patch 3578 RMD160 0dd5c242998e87121ba4db93910538e7b88f4c3e SHA1 b1d7939c078070e4ddac4345114b0724b3d39d7e SHA256 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f
 DIST sancp-1.6.1.fix200606.d.patch 6847 RMD160 be2247f43dda501406eb82b3fa0a4ee904e90a9d SHA1 d5da6d2024e4e5543bc65eafa08345f51cb208e3 SHA256 1c62a44d75f3cd8b07445b02d9535f3eede3a60329bda111dd855c674e2745a9
 DIST sancp-1.6.1.tar.gz 69986 RMD160 033c64427f8a61f77823e48ea89c0d8e510f0083 SHA1 9d09ffea003d252129232a5b574163cc71e491d2 SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3
-EBUILD sancp-1.6.1-r2.ebuild 1919 RMD160 4470537d987d0e68c3133f28da453988d75974b2 SHA1 4cf5fe24e5773d0862ac8bc5b571fc3885570e47 SHA256 515244f1e5b7f8e694005339bb2dc78f3677154bd78a86c723f816ff177c0c8c
-MISC ChangeLog 1773 RMD160 018586049d599879a9e7135e1d654e9c059fe3e3 SHA1 419722d38b00015c8e002e96d5424d3693bf093e SHA256 8926b87ffe979d5b37c78a50a968fe95f606f36dabf419182df1572cbc6154be
+EBUILD sancp-1.6.1-r2.ebuild 2019 RMD160 5e0dc64a6dc49a8b37dafebfc7092b056d4e6cd5 SHA1 b5c17fc93bf1ce6eaa1744b9603eec9246d4e4fc SHA256 088a3758958837d8a01f7c56da300cc6779423d6c2a26bd76347437a27c07419
+MISC ChangeLog 1937 RMD160 1118c3866811d42b420c6c31332f96394eab6cbd SHA1 39ef41416b188d6e175af7fb5832687e26f22bfe SHA256 c5e668c2088136ab96bc1182872c0d5a1a3ff726491dc919944643a3244b193f
 MISC metadata.xml 350 RMD160 de3439eb58fe6a14c4f6133783886bf2bbf0215c SHA1 cad224db31a37f211bd45b0e2cd363138cafa11e SHA256 5a5fd52a83d098385b2a612ab479b4c6439d935b54c41ed16f5b0c4ad758c71d
diff --git a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
new file mode 100644
index 000000000000..95f3aa32fb86
--- /dev/null
+++ b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch
@@ -0,0 +1,44 @@
+--- sancp-1.6.1/Makefile.orig	2004-01-19 23:04:56.000000000 +0100
++++ sancp-1.6.1/Makefile	2009-01-15 08:21:54.000000000 +0100
+@@ -1,26 +1,26 @@
+ 
+ # !!! Uncomment this CFLAGS for a small binary !!!
+-CFLAGS	=  -O3 -s -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
++CFLAGS	+=  -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
+ 
+ # !!! or uncomment this CFLAGS for a large binary with symbols; use for debugging  !!!
+ #CFLAGS	=  -O0 -g -I/usr/include/pcap -L/usr/lib/libpcap.so.0.6.2
+ 
+ final : sancp.cc Makefile
+-	if [ ! -f build_acl.o -o build_acl.cc -nt build_acl.o ]; then g++ -Wall $(CFLAGS) -c build_acl.cc -o build_acl.o; fi
+-	if [ ! -f misc_functs.o -o misc_functs.cc -nt misc_functs.o ]; then g++ -Wall $(CFLAGS) -c misc_functs.cc -o misc_functs.o; fi
+-	if [ ! -f outputFileHandle.o -o outputFileHandle.cc -nt outputFileHandle.o ]; then g++ -Wall $(CFLAGS) -c outputFileHandle.cc -o outputFileHandle.o; fi
+-	if [ ! -f apply_rule.o -o apply_rule.cc -nt apply_rule.o ]; then g++ -Wall $(CFLAGS) -c apply_rule.cc -o apply_rule.o; fi
+-	if [ ! -f decode.o -o decode.cc -nt decode.o ]; then g++ -Wall $(CFLAGS) -c decode.cc -o decode.o; fi
+-	if [ ! -f fileHandle.o -o fileHandle.cc -nt fileHandle.o ]; then g++ -Wall $(CFLAGS) -c fileHandle.cc -o fileHandle.o; fi
+-	if [ ! -f MemoryPool.o -o MemoryPool.cc -nt MemoryPool.o ]; then g++ -Wall $(CFLAGS) -c MemoryPool.cc -o MemoryPool.o; fi
+-	if [ ! -f pcapFileHandle.o -o pcapFileHandle.cc -nt pcapFileHandle.o ]; then g++ -Wall $(CFLAGS) -c pcapFileHandle.cc -o pcapFileHandle.o; fi
+-	if [ ! -f sancp.o -o sancp.cc -nt sancp.o ]; then 	g++ -Wall $(CFLAGS) -c sancp.cc -o sancp.o; fi
++	if [ ! -f build_acl.o -o build_acl.cc -nt build_acl.o ]; then $(CXX) -Wall $(CFLAGS) -c build_acl.cc -o build_acl.o; fi
++	if [ ! -f misc_functs.o -o misc_functs.cc -nt misc_functs.o ]; then $(CXX) -Wall $(CFLAGS) -c misc_functs.cc -o misc_functs.o; fi
++	if [ ! -f outputFileHandle.o -o outputFileHandle.cc -nt outputFileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c outputFileHandle.cc -o outputFileHandle.o; fi
++	if [ ! -f apply_rule.o -o apply_rule.cc -nt apply_rule.o ]; then $(CXX) -Wall $(CFLAGS) -c apply_rule.cc -o apply_rule.o; fi
++	if [ ! -f decode.o -o decode.cc -nt decode.o ]; then $(CXX) -Wall $(CFLAGS) -c decode.cc -o decode.o; fi
++	if [ ! -f fileHandle.o -o fileHandle.cc -nt fileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c fileHandle.cc -o fileHandle.o; fi
++	if [ ! -f MemoryPool.o -o MemoryPool.cc -nt MemoryPool.o ]; then $(CXX) -Wall $(CFLAGS) -c MemoryPool.cc -o MemoryPool.o; fi
++	if [ ! -f pcapFileHandle.o -o pcapFileHandle.cc -nt pcapFileHandle.o ]; then $(CXX) -Wall $(CFLAGS) -c pcapFileHandle.cc -o pcapFileHandle.o; fi
++	if [ ! -f sancp.o -o sancp.cc -nt sancp.o ]; then 	$(CXX) -Wall $(CFLAGS) -c sancp.cc -o sancp.o; fi
+ 	if [ ! -f pcap_functions.o -o pcap_functions.c -nt pcap_functions.o ]; then 	gcc -Wall $(CFLAGS) -c pcap_functions.c -o pcap_functions.o; fi
+-	if [ ! -f help.o -o help.cc -nt help.o ]; then 	g++ -Wall $(CFLAGS) -c help.cc -o help.o ; fi
+-	if [ ! -f permissions.o -o permissions.cc -nt permissions.o ]; then 	g++ -Wall $(CFLAGS) -c permissions.cc -o permissions.o ; fi
+-	if [ ! -f check_packet.o -o check_packet.cc -nt check_packet.o ]; then 	g++ -Wall $(CFLAGS) -c check_packet.cc -o check_packet.o; fi
+-	if [ ! -f statefull_logging.o -o statefull_logging.cc -nt statefull_logging.o ]; then 	g++ -Wall $(CFLAGS) -c statefull_logging.cc -o statefull_logging.o ; fi
+-	g++ -Wall $(CFLAGS) -o sancp sancp.o misc_functs.o check_packet.o statefull_logging.o build_acl.o apply_rule.o decode.o pcap_functions.o pcapFileHandle.o fileHandle.o MemoryPool.o help.o permissions.o outputFileHandle.o -lpcap
++	if [ ! -f help.o -o help.cc -nt help.o ]; then 	$(CXX) -Wall $(CFLAGS) -c help.cc -o help.o ; fi
++	if [ ! -f permissions.o -o permissions.cc -nt permissions.o ]; then 	$(CXX) -Wall $(CFLAGS) -c permissions.cc -o permissions.o ; fi
++	if [ ! -f check_packet.o -o check_packet.cc -nt check_packet.o ]; then 	$(CXX) -Wall $(CFLAGS) -c check_packet.cc -o check_packet.o; fi
++	if [ ! -f statefull_logging.o -o statefull_logging.cc -nt statefull_logging.o ]; then 	$(CXX) -Wall $(CFLAGS) -c statefull_logging.cc -o statefull_logging.o ; fi
++	$(CXX) -Wall $(CFLAGS) -o sancp sancp.o misc_functs.o check_packet.o statefull_logging.o build_acl.o apply_rule.o decode.o pcap_functions.o pcapFileHandle.o fileHandle.o MemoryPool.o help.o permissions.o outputFileHandle.o -lpcap
+ 
+ clean :
+ 	rm -f *.o sancp
diff --git a/net-analyzer/sancp/sancp-1.6.1-r2.ebuild b/net-analyzer/sancp/sancp-1.6.1-r2.ebuild
index 6790d501a07c..7325ee29eda0 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r2.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1-r2.ebuild,v 1.3 2007/05/20 08:29:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1-r2.ebuild,v 1.4 2009/01/15 07:28:37 jer Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="SANCP is a network security tool designed to collect statistical \
 	information regarding network traffic and collect the traffic itself in pcap format."
@@ -36,6 +36,12 @@ src_unpack() {
 	# bug 138337
 	epatch "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch
 	epatch "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch
+	epatch "${FILESDIR}"/${P}-compiler.patch
+}
+
+src_compile() {
+	tc-export CXX
+	emake || die "make failed"
 }
 
 src_install() {
@@ -50,8 +56,7 @@ src_install() {
 		doins etc/sancp/sancp.conf
 	fi
 
-	exeinto /usr/bin
-	doexe sancp
+	dobin sancp
 
 	newinitd "${FILESDIR}"/sancp.rc1 sancp
 	newconfd "${FILESDIR}"/sancp.confd sancp