Remove old; remove 'need net' from init script.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

5 files changed, 15 insertions, 99 deletions

diff --git a/net-analyzer/nsca/ChangeLog b/net-analyzer/nsca/ChangeLog
index bbd8e12d12d5..f3ab91a6d03e 100644
--- a/net-analyzer/nsca/ChangeLog
+++ b/net-analyzer/nsca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nsca
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/ChangeLog,v 1.9 2012/10/14 18:42:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/ChangeLog,v 1.10 2012/10/22 02:53:56 flameeyes Exp $
+
+  22 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/nsca-nagios3,
+  -nsca-2.7.2-r100.ebuild, files/nsca.init:
+  Remove old; remove 'need net' from init script.
 
   14 Oct 2012; Raúl Porcel <armin76@gentoo.org> nsca-2.7.2-r103.ebuild:
   alpha/sparc/x86 stable wrt #436740
diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest
index bea89765edd9..ffd0e50d2131 100644
--- a/net-analyzer/nsca/Manifest
+++ b/net-analyzer/nsca/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nsca-nagios3 595 SHA256 5744bb0360d71ffa1ffb028c4049d8f708f7f60c4ea4daf554d39b2069a7526a SHA512 fc73ff72c38d707ddc9cea39bd4fe3192213ddc744bba514b14d30f755da9cae11e5730559730ce930ef16425e773c9c9606ba9cf71367204110f55efed09a5f WHIRLPOOL d7f77df6a46f1b32f72252f3515575f84fc8607878502f9ffc5777b3df62d7b51d39e107defa3c18006d616383cce20afac77c0f137c29a575b3089b572850d3
 AUX nsca.conf 219 SHA256 f455eb68f207b7217026c2a5bb9e562956f3203dd1f3923f1bd4370f119485df SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2 WHIRLPOOL 27abdd1e5e50e20490fac87b01e0e4da878733ed12cc86c60ee06e625e91987dcf63632625480bc551412945b2e726421e9fdf6191217dd705c5a050919e65dc
-AUX nsca.init 768 SHA256 1cbaec10532bf3913d8a9140e22921506dcd6b51115722e65f121d4ed8cce01f SHA512 dddd6d019d8cad7e035caf3beb21fd23e1cef1ee52d33862308aef9dcf1e3ff511fd4ab7272dbb06dbf5554fc41f1a18749c0d6ee0b38fbce06bd421a85037b9 WHIRLPOOL bf1ff9a0e4b27bc5f00dbc69a09df30ae112cf3688cb606596494966cc7b057e49d3ff519f5ed5c52f2f10fe44273557e7cf2a704733d72d43394fa8e697fa9f
+AUX nsca.init 755 SHA256 5963ee78212243a3feab9a6dcce82fd03d59328c5f1cb84ee2733b4e5b3b7261 SHA512 00b73ef4670883b271c78493b6987742dca05f02b9cc2cf9a0d467ee3bba23e10336f84f547c7aa25296b87dfee82161f4097a62aa95ceadcb1e4de2c17d7e00 WHIRLPOOL c41818b7fa0c823decf9a8e5c7a04b76bc3923a6d99c5ca3fc3075eaa29fd768e6dded1964f20e4d1e031cea30a505668484f9b773489ef10856111195d367e5
 DIST nsca-2.7.2.tar.gz 104953 SHA256 fb41e3b536735235056643fb12187355c6561b9148996c093e8faddd4fced571 SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010 WHIRLPOOL 77daad5cef0434e243fab3eff56b4df8b91abc15a166068f5398667483fb4de04ebdeeda6c340ef19ae17b5da5264e2b8cfe8e958866fc1f35ef504df2c4340c
-EBUILD nsca-2.7.2-r100.ebuild 1421 SHA256 24d9302093ceba2a9de3f089660ffcd8ab616b4d1fed397c8d9e6cbd28c87ea2 SHA512 1983b048a3ff24f8d0a2e18f84d048ace5ddea8b4e46077a011b06533846dfe93080e6b1da533d29eeff13c3cebbfe41c1714a3fcd34c6c85fcb6bd29d9ef7f9 WHIRLPOOL 2feec12600d9e63f603664c46b40df15b92f70b62895ef49a91f3be5a59d844c37047cf3b24236974377aacfd9dfa353cb1d4890a86bd138d37227a491cb276f
 EBUILD nsca-2.7.2-r103.ebuild 2239 SHA256 93b0f4b200cb711f6f0d354cc143bbf49bbf52db30f3019d86bfcfcaeaf81968 SHA512 c6bd445ba13a79a47f5a77cecd4b2013d81428f42a104ca3ca481af5e0f1738f5ae7a8a3820c3b80afcec672f742351372244d197e49bc8586c0f8f93402678b WHIRLPOOL 44d8a6e144b6aa2ca468b76b1654e611420e203f0171c6fd4383987b884fcec9d97185acf61b0789acb19d8636a49194693b4638342c9cbd3d7077739c47878b
-MISC ChangeLog 7534 SHA256 60128d998f5cd7a880bdb4c463e701e3146a8b95c1ca566f1222cc12d4c80bec SHA512 854f4ee78c573db00dd0f956d033a97d4bd6445ffedb16a0f9a9a3ff3dc7e3cd29f1729103bffb692a8a545dbf69a4a8ad5b7717a0d0c3ed2e07b0b75dc36d03 WHIRLPOOL 7042acc851e785012930e8a2d22957cf9b64acf122f23d59a465ac46a94005396c76091872ba9e83d133faa7cec10fdc860c582040db3d61f6a36cdb19655df8
+MISC ChangeLog 7709 SHA256 692e213b97797d54ff170963168efa3433dd70cac876470c8d0ad86096d2e874 SHA512 fec8b5665fdd919a8bc3ff5a5adc4b35a2eb8b22a8791ee4d362e59c8dd2edea729837abdc65ba310f433167af5600913a0f11840d18f8d1350f279c7e3bc70d WHIRLPOOL 46eed89dafd28ea730196a0e0934b535998bb19e2d10f6e3bdc18197e7228a57d4e8ad26bf7f4ac341ea24103f2403ab348f226eb877e0d6103b3f88423dec23
 MISC metadata.xml 1548 SHA256 cda092817a666c43e03205f58dc986948eb16ac87ca025c86398ca990bf766ed SHA512 a34427847e45e2139532cfaa6710827437e716e43ec8d7c426a1776a18b4b98d2398e7d88168d0b9722f90e604427cdb7bc7ca8aa4ccdfe701ee4003f47ef118 WHIRLPOOL ebb131f51aecea605737f6bdec4557020dbd644bf94c4dd18697d53a9801abe72633269484588317d5be1d9115ea916a54be724b3c76e6397590fb834b9c5617
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB7B7IACgkQuQc30/atMkBtmgCfQnbqL5WQTtG8u3d+zwE1PT8s
-zFIAnAq1G4o2QWVgi4UaPIddWtQGtguF
-=UsCm
+iQEcBAEBCAAGBQJQhLVNAAoJEBzRPIrUMBNCdrYH/3ImsHivwp4HveD/LHYXeyoD
+Wl6oDBB4efSnKmJLNQuX30rh0C/EA/5yqsm44G0c8mUUBrKmJEpI5S/Pb094Lts1
+UBHMbWjM8HHeVsorRAktlOFMP1mhKzMzY1QwK4dLP0llCRdlblJxRkOKxuuxk55w
+9JSaRyMBMZs7CbsqQ85564fjrHvfE2XDpywcAwOMzQwiuV/rXSUYWIxXC6gEIB69
+y1Oi4uHIgvo9wshGAnLN9w1QJ7/6T+nACTu4+qzCGav332nE1djN0tyfvrlfnxIL
+22bobaO+tAitvvR+/CkyHTpGpIYP4iLpE8/pWas98mVqLKdnEV7mB4GSsSd90q8=
+=W+Vy
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nsca/files/nsca-nagios3 b/net-analyzer/nsca/files/nsca-nagios3
deleted file mode 100644
index bef0cb7db976..000000000000
--- a/net-analyzer/nsca/files/nsca-nagios3
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-
-opts="${opts} reload"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting nsca"
-	start-stop-daemon --start --quiet --name nsca \
-	--startas /usr/bin/nsca \
-		-c nagios:nagios \
-		-- -c /etc/nagios/nsca.cfg \
-		--daemon
-	eend $? "Failed to Start nsca"
-}
-
-stop() {
-	ebegin "Stopping nsca"
-	start-stop-daemon --stop --quiet -n nsca
-	eend $? "Failed to Stop nsca"
-}
-
-reload() {
-        ebegin "Reloading nsca"
-        kill -HUP `pgrep nsca`
-        eend $? "Failed to reload nsca"
-}
-
-restart() {
-	ebegin "Restarting nsca"
-	svc_stop
-	svc_start
-	eend $? "Failed to Restart nsca"
-}
diff --git a/net-analyzer/nsca/files/nsca.init b/net-analyzer/nsca/files/nsca.init
index 36c72d5c5700..c95b955730f1 100644
--- a/net-analyzer/nsca/files/nsca.init
+++ b/net-analyzer/nsca/files/nsca.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/files/nsca.init,v 1.2 2012/08/23 23:08:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsca/files/nsca.init,v 1.3 2012/10/22 02:53:56 flameeyes Exp $
 
 : ${CFGFILE:=/etc/nagios/nsca.cfg}
 
@@ -21,7 +21,6 @@ pidfile=$(get_config pid_file)
 depend() {
     config ${CFGFILE}
 
-    need net
     case $(get_config nsca_user) in
 	icinga) need icinga ;;
 	nagios) need nagios ;;
diff --git a/net-analyzer/nsca/nsca-2.7.2-r100.ebuild b/net-analyzer/nsca/nsca-2.7.2-r100.ebuild
deleted file mode 100644
index 8c4e3fabc230..000000000000
--- a/net-analyzer/nsca/nsca-2.7.2-r100.ebuild
+++ /dev/null
@@ -1,53 +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/nsca/nsca-2.7.2-r100.ebuild,v 1.1 2012/08/23 21:27:08 flameeyes Exp $
-
-inherit multilib
-
-DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=net-analyzer/nagios-plugins-1.3.1
-	>=dev-libs/libmcrypt-2.5.1-r4"
-S="${WORKDIR}/nsca-${PV}"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--with-nsca-user=nagios \
-		--with-nsca-grp=nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	dodoc LEGAL Changelog README SECURITY
-	insinto /etc/nagios
-	doins "${S}"/sample-config/nsca.cfg
-	doins "${S}"/sample-config/send_nsca.cfg
-
-	exeinto /usr/bin
-	doexe src/nsca
-	fowners nagios:nagios /usr/bin/nsca
-
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe src/send_nsca
-	fowners nagios:nagios /usr/$(get_libdir)/nagios/plugins/send_nsca
-	newinitd "${FILESDIR}"/nsca-nagios3 nsca
-}
-pkg_postinst() {
-	einfo
-	einfo "If you are using the nsca daemon, remember to edit"
-	einfo "the config file /etc/nagios/nsca.cfg"
-	einfo
-}