Add copyright info to conf.d script. Add GPL-2 to LICENSE (bug #425992). Move tc-export to src_prepare(). Fix DESCRIPTION. Remove pointless elog message.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 18 insertions, 17 deletions

diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 169c8c56a509..af825dd0c1b8 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sancp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.14 2012/06/12 02:59:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.15 2012/11/21 04:22:05 jer Exp $
+
+*sancp-1.6.1-r4 (21 Nov 2012)
+
+  21 Nov 2012; Jeroen Roovers <jer@gentoo.org> -sancp-1.6.1-r3.ebuild,
+  +sancp-1.6.1-r4.ebuild, files/sancp.confd:
+  Add copyright info to conf.d script. Add GPL-2 to LICENSE (bug #425992). Move
+  tc-export to src_prepare(). Fix DESCRIPTION. Remove pointless elog message.
 
   12 Jun 2012; Zac Medico <zmedico@gentoo.org> sancp-1.6.1-r3.ebuild:
   inherit user for enewgroup and enewuser
diff --git a/net-analyzer/sancp/files/sancp.confd b/net-analyzer/sancp/files/sancp.confd
index 49208434909b..eae3b02c0aa8 100644
--- a/net-analyzer/sancp/files/sancp.confd
+++ b/net-analyzer/sancp/files/sancp.confd
@@ -1,4 +1,6 @@
 # Config file for /etc/init.d/sancp
+# Copyright 1999-2012 Gentoo Foundation                                                                                             
+# Distributed under the terms of the GNU General Public License v2
 
 # Interface to listen on
 IFACE="eth0"
diff --git a/net-analyzer/sancp/sancp-1.6.1-r3.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
index 792fb470f03f..5f9cbc1cacce 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r3.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.2 2012/06/12 02:59:01 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1-r4.ebuild,v 1.1 2012/11/21 04:22:05 jer Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs user
 
-DESCRIPTION="SANCP is a network security tool designed to collect statistical \
-	information regarding network traffic and collect the traffic itself in pcap format."
+DESCRIPTION="collect statistical information regarding network traffic and collect it in pcap format"
 HOMEPAGE="http://www.metre.net/sancp.html"
-SRC_URI="http://www.metre.net/files/${P}.tar.gz
+SRC_URI="
+	http://www.metre.net/files/${P}.tar.gz
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch
 	http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch"
+	http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch
+"
 
-LICENSE="QPL"
+LICENSE="QPL GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -37,11 +38,8 @@ src_prepare() {
 	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 CC
-	emake || die "make failed"
 }
 
 src_install() {
@@ -69,9 +67,3 @@ src_install() {
 	fowners sancp:sancp /var/log/sancp
 	fperms 0770 /var/log/sancp
 }
-
-pkg_postinst() {
-	elog
-	elog "Please modify /etc/sancp/sancp.conf to suit your environment"
-	elog
-}