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.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 34 insertions, 33 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/Manifest b/net-analyzer/sancp/Manifest
index 36f64fc0c40c..d185be5b4fcd 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX sancp-1.6.1-compiler.patch 4603 RMD160 cf9bb59b2df7d6565a2bb6ea4cdc45eac01aa30d SHA1 0f2a42718a4174f52c6598357abd36ee1d04a1b2 SHA256 9fd58d1cb8db0b8b190085ea4bb54ee33b8fa976b2bafdae2063633164b23133
-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
-DIST sancp-1.6.1.fix200511.a.patch 662 RMD160 cd0fbff5b5eb143c585453ad1bd5ef916364dd43 SHA1 fc44e0353ed2f922c29067fe54f9b607565a76a0 SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c
-DIST sancp-1.6.1.fix200511.b.patch 870 RMD160 519932df5a6645cac639862e67325d63200b97bd SHA1 40bea5cc28bb52678c1ef739314df77bd0f3c462 SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0
-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-r3.ebuild 2018 RMD160 3f7ae4099d5cf6bd3be1a2ac40593e47599d39cd SHA1 ac0921906243a2763597b9c7b13c640213441f8f SHA256 7b74afa27ab0f8b933c6994a18f4f4dae809520790c4ca68b08b1d41941d0a3c
-MISC ChangeLog 2254 RMD160 ed236113cd1e6a8d37667f5f1565f177b8d75452 SHA1 444b071b65b9a4d56fdafde3e55585c66895208a SHA256 1bfd85a215910d494d5e6aad97ed2c28411bb6be23d4d0a393646ba37beb2cce
-MISC metadata.xml 350 RMD160 de3439eb58fe6a14c4f6133783886bf2bbf0215c SHA1 cad224db31a37f211bd45b0e2cd363138cafa11e SHA256 5a5fd52a83d098385b2a612ab479b4c6439d935b54c41ed16f5b0c4ad758c71d
+AUX sancp-1.6.1-compiler.patch 4603 SHA256 9fd58d1cb8db0b8b190085ea4bb54ee33b8fa976b2bafdae2063633164b23133 SHA512 7ae67ce719f36ea795eda87d7d9d97885ea544c150f568d7751397172d8608be5980f386b7f24fe4d7e3a9a49b4cae4efb3987cdbb9dfc85c69397e3d603535c WHIRLPOOL a475b3a57b33f01b7ab468b24b11f46ca16f4bfd3073221c3d99281601cfa6229d4473b0ac5991c33341c2b8c126ab2a066520da74bf41743cf92395e0692d10
+AUX sancp.confd 475 SHA256 b8b55d55ac4787a1fd576112a272e6247610c197e4998df899fdf3a0d7ec368b SHA512 a9d341bee62e8a9a4b668c0cc83c718a3ad9531b763c18d876d5246539a9581dcb452e0bd3bac631fac6ee00ac35108c3083ebe96bc761529fba49dba3b8e890 WHIRLPOOL 22a711d964ef0096c368034fbc5644c5b4b4b4571e73f085975d8f52b56fc85f02056fefab52ef477d661737118f3f6bdfc4c26c151fa6c5a2c1425a5df8de24
+AUX sancp.rc1 969 SHA256 64c172dc81927bd7b3adced16d183c699023588607fbda7f28168115b855dd93 SHA512 fb1afe9129113e1001fe71cfd411a868d8cb0a1ffdc59720e871877906c0f79e35132392fe7f7a6610877a32b33703444cc6aa5de79ff21cf3dafe609b13e7cc WHIRLPOOL d2dfaf9fc474f71cce6fa2801d2283afe44d5f2e253aae87cc197c852b2b735025ad8b95772cd18bd14cbb4d3567e8e1d8647c4fafb3ca4e442289430ad2ca2d
+AUX sguil_sancp.conf 2133 SHA256 e611481d8dcd66187db52f17c6e4505364bd1cc2f6e8cda45c0035fbeb77cd25 SHA512 3fd4899e2bfc2daef78bf04bbd36366d8aa3b4d9ba9416c935cec43abd54b3ca4248715c1f08412b967e9da445e3b698148c5cddb5db9053611ae0355b45a2ec WHIRLPOOL a671c4588361489e14e4c364aa81572366ab2c236097565088070f2c4a38e0ee56dffee4e0c89521bc44a340fd444f47a1ba282b58b55c1c81635e0ca0b1d565
+DIST sancp-1.6.1.fix200511.a.patch 662 SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c
+DIST sancp-1.6.1.fix200511.b.patch 870 SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0
+DIST sancp-1.6.1.fix200601.c.patch 3578 SHA256 38fe2e2db7419fb79c57b1e0505dbfda9958f56ab85259a84485111eb644880f
+DIST sancp-1.6.1.fix200606.d.patch 6847 SHA256 1c62a44d75f3cd8b07445b02d9535f3eede3a60329bda111dd855c674e2745a9
+DIST sancp-1.6.1.tar.gz 69986 SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3
+EBUILD sancp-1.6.1-r4.ebuild 1809 SHA256 8b39d6ae9ebd847567b1b77e8b5ab66fb81c77acd0c0a5fdb2869727a4073d96 SHA512 3306128ea49b103a626959cec954e17b6a518b34e9f262a0060fb3500683431e6bbd4ae3b8760a8c14f7583b7b679c6dc78d9e474a72bf686e727cdd05156a9e WHIRLPOOL bdf91e86e9c59ce66262efb20ecfe55b4aa6e2c0a85757e94ce7c87bfc6b969c0e7965b1ed7a58efb360073f9debb5314f0a989a737218e6350200a5ba36c6b4
+MISC ChangeLog 2556 SHA256 bd06b8ab23ae7babcdbe61c278534cc85c4967bca6545aa138609d05f1494b26 SHA512 805d5a768e5a00db3f301c80b924c6f18fd6461b1d9d399a4f97d4e67fb5ec1d58699c20ba2a2a5ef1159f5eaea6fb545f383580e2b485f036cc642d178e1ff7 WHIRLPOOL 6261ea0477796f215571a4e549c54a031455ff3c95e12ccd665495734f2e582e39aadab643742011a6eb19fb102e561dc0c508d4bd16e4df2bc29df15408a778
+MISC metadata.xml 350 SHA256 5a5fd52a83d098385b2a612ab479b4c6439d935b54c41ed16f5b0c4ad758c71d SHA512 825bfa1c5ac91c2b2615692fc2b59ad246a45b6e62f94ce7119acecdf7a49d40fa7b1082a5bd474144dcdfc51ee1eb3b9df458baa1d33ac82044a09cd946fd13 WHIRLPOOL 5120a7f9ce9b3d245b6be1c5dfd9409771028df231e780c268f6ea0f343eed92b67a6fc53ba559846eb15d5fa06089a1dc5129eceecb0650f2fd662c1834a400
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/WsHoACgkQ/ejvha5XGaP+1gCdFg1kZwj28sctkFpxyv0Sc34e
-swcAnj7vtsR9H5ZqqqFdOSNMpus4yfcg
-=2Lkr
+iEYEAREIAAYFAlCsVu8ACgkQVWmRsqeSphMEagCfQ5SSvjXt/2F1AUyqg3PUJGxd
+y18AnRbpqkJMQvtndx/kOLeEyNP7lcRn
+=nsve
 -----END PGP SIGNATURE-----
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
-}