cleanup and drop old

Package-Manager: portage-2.1.2.9

8 files changed, 39 insertions, 170 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 0ec9cfdffd56..a4a7120a0da1 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/arpwatch
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.45 2007/05/05 17:59:43 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.46 2007/06/02 22:37:16 jokey Exp $
+
+  02 Jun 2007; Markus Ullmann <jokey@gentoo.org> -files/arpwatch.init-2,
+  files/arpwatch.confd, -files/arpwatch.init, +files/arpwatch.initd,
+  -arpwatch-2.1.15-r3.ebuild, arpwatch-2.1.15-r4.ebuild:
+  cleanup and drop old
 
   05 May 2007; nixnut <nixnut@gentoo.org> arpwatch-2.1.15-r4.ebuild:
   Stable on ppc wrt bug 176697
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index 8c812c296121..2636c5333390 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,37 +1,35 @@
-AUX arpwatch.confd 255 RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c SHA1 9ca8f47b6957fe46b51fcab80bb0c49557435d5b SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f
-MD5 ee7d2c3e5a7af87e4b18a1e23183c88d files/arpwatch.confd 255
-RMD160 7da14036617ccd32f8a8b2b50487b56446153f4c files/arpwatch.confd 255
-SHA256 d45291719550899a6c8be2b1a4c6a416cf894b30b3be654adf7182151f63b77f files/arpwatch.confd 255
-AUX arpwatch.init 1006 RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 SHA1 140a89d24f6b6f8b34b3cfec75daa68541bfc307 SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b
-MD5 406db1599d9945f5e6f259c203b9511c files/arpwatch.init 1006
-RMD160 b614b20f56f84601638f4ea3f62bb21f5c423c94 files/arpwatch.init 1006
-SHA256 4d5c827ea3f592380c52870d957d23c539254be62cfc0de917f9d511a7c2408b files/arpwatch.init 1006
-AUX arpwatch.init-2 1105 RMD160 d7a87c04d89bbf50408a3e3032d06f4030063be8 SHA1 955514265bba8bb5f174ebe45c630e0636370e95 SHA256 ca5e22f422efd7fd3381e6aa8e0619dc22a45b5ad287fa8ab252a2e2306c7078
-MD5 752d993c043f97261fcf08abf6314c6d files/arpwatch.init-2 1105
-RMD160 d7a87c04d89bbf50408a3e3032d06f4030063be8 files/arpwatch.init-2 1105
-SHA256 ca5e22f422efd7fd3381e6aa8e0619dc22a45b5ad287fa8ab252a2e2306c7078 files/arpwatch.init-2 1105
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX arpwatch.confd 397 RMD160 3aaca5de34fbe828dbb4828d198ecd1d4e307162 SHA1 54919e3a923c594e1c977a3efdec34c6e9809607 SHA256 05b8bb65fef34f0189746264cf4b701c468a4f70645e4b1aabbeb633780defab
+MD5 50454a780237b61440635d08ed07a34d files/arpwatch.confd 397
+RMD160 3aaca5de34fbe828dbb4828d198ecd1d4e307162 files/arpwatch.confd 397
+SHA256 05b8bb65fef34f0189746264cf4b701c468a4f70645e4b1aabbeb633780defab files/arpwatch.confd 397
+AUX arpwatch.initd 1106 RMD160 a9db01d5b2157742d6f9d48c157718e158017cb4 SHA1 8cafd84754f8e32a7fcec4180e79e3b62d4964ec SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d
+MD5 e65866b9c08fc503975440c49cf21247 files/arpwatch.initd 1106
+RMD160 a9db01d5b2157742d6f9d48c157718e158017cb4 files/arpwatch.initd 1106
+SHA256 c336b18759d188ef6c77e2177fdfbf4ed5c488f04fc2357c556ff406d2eeea1d files/arpwatch.initd 1106
 DIST arpwatch-2.1a15.tar.gz 202729 RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c SHA1 9dffaec0f132e5bb7aedfc840c5c67068bfbce69 SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898
-DIST arpwatch-patchset-0.3.tbz2 15934 RMD160 5e21ac57fa5beca751d1d5a42ea3632e70ee953e SHA1 43952e686965211eb930bcd82bf54d75012883fb SHA256 7721f983ea21f5e0bfb265982e59d0de9d76f1021abf2c2e359f91805922bfe3
 DIST arpwatch-patchset-0.4.tbz2 16350 RMD160 9e9ae77ef38591af72687fa7014b4c56fc4c4d2c SHA1 009eaa110fc93b40aa91c838b57b71a071210692 SHA256 f49deed64301078a00881fa9c27bb3a4116b9096cfe880f5a0bcc9913b439a18
-EBUILD arpwatch-2.1.15-r3.ebuild 2107 RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 SHA1 b6b6cf53d689abf75a016ae456da7d934e34ad1f SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451
-MD5 030bbb2603f8d3402736aeded7cb4490 arpwatch-2.1.15-r3.ebuild 2107
-RMD160 334fd542bab6f4a8df564062a9747a6ac1f15806 arpwatch-2.1.15-r3.ebuild 2107
-SHA256 461cfc6c18343b8a2d694221adcf262b7b9d52f3d95d27f55bc2306e69b1d451 arpwatch-2.1.15-r3.ebuild 2107
-EBUILD arpwatch-2.1.15-r4.ebuild 2110 RMD160 eccc3e1079c92b5d4f3e8841a7df61920c0c7251 SHA1 3dd87bbd81f52bb83c428ed24ebe13e6c40533ad SHA256 7957211fe952a91884f484d0f061f76387a9656170ca7a80c3612b1e87692859
-MD5 b47170b4b6cbc7807e3d623b77eea222 arpwatch-2.1.15-r4.ebuild 2110
-RMD160 eccc3e1079c92b5d4f3e8841a7df61920c0c7251 arpwatch-2.1.15-r4.ebuild 2110
-SHA256 7957211fe952a91884f484d0f061f76387a9656170ca7a80c3612b1e87692859 arpwatch-2.1.15-r4.ebuild 2110
-MISC ChangeLog 6792 RMD160 f99de7a704a2f020184cf659cbac19eb57dc9855 SHA1 a1642e4ec76c74d0599e2a131925e7c23f88a2ba SHA256 6d43a31c03366ef04eed9f3b732786386cb46c98a22945edfbdb456e7fa19f43
-MD5 31411ca125a910e789f7a2b627adf0e5 ChangeLog 6792
-RMD160 f99de7a704a2f020184cf659cbac19eb57dc9855 ChangeLog 6792
-SHA256 6d43a31c03366ef04eed9f3b732786386cb46c98a22945edfbdb456e7fa19f43 ChangeLog 6792
+EBUILD arpwatch-2.1.15-r4.ebuild 1785 RMD160 9283764e16a7492f337715124b7d134a6d9f22a0 SHA1 7efc857a718f3c7e6de4405fcf23fda0722e8a33 SHA256 871c3c31bbd2469040e500ecc1bdbcacef27d6614381ef152b09e9ddc060e154
+MD5 c1e6fba0580c76bb99e1c78d30edb304 arpwatch-2.1.15-r4.ebuild 1785
+RMD160 9283764e16a7492f337715124b7d134a6d9f22a0 arpwatch-2.1.15-r4.ebuild 1785
+SHA256 871c3c31bbd2469040e500ecc1bdbcacef27d6614381ef152b09e9ddc060e154 arpwatch-2.1.15-r4.ebuild 1785
+MISC ChangeLog 7014 RMD160 60cdde9fa577170ae293913c805baaa644674a8f SHA1 b367248277e9f36f267d2ac8a2b896ff0a078e61 SHA256 1f85f0ddfab96be67c34a566b9019f4d48402acdb23a9a31e62fe097bdcaf933
+MD5 74f85e738afb8e500d4905ba6b30132d ChangeLog 7014
+RMD160 60cdde9fa577170ae293913c805baaa644674a8f ChangeLog 7014
+SHA256 1f85f0ddfab96be67c34a566b9019f4d48402acdb23a9a31e62fe097bdcaf933 ChangeLog 7014
 MISC metadata.xml 710 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b SHA1 577dd460a6f15f5ad111b93ce181b449da1f7ae5 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814
 MD5 5be7208eacb14b197c97ef6fc4aa67c7 metadata.xml 710
 RMD160 886aee2e0f5caa3d1c48daf0af7bef106c11a87b metadata.xml 710
 SHA256 60196eb6cbbcb6926cba32eadc9350cd4c536f7b2a62936d9100aab2355e0814 metadata.xml 710
-MD5 374e59ae14b38c9bfafe88c19ba7f4e8 files/digest-arpwatch-2.1.15-r3 503
-RMD160 b740c7ece11d2de3cbeb9744d7751211d8987854 files/digest-arpwatch-2.1.15-r3 503
-SHA256 c8d0bcbe625c4b707591bc2e74117dbde9d7dfe3c962552c7ade8004a178674f files/digest-arpwatch-2.1.15-r3 503
 MD5 abe5d4b3782eed39b55a75ec3e8a2c4f files/digest-arpwatch-2.1.15-r4 503
 RMD160 19aa0cc8af201bda117843c673cbb0302f6db534 files/digest-arpwatch-2.1.15-r4 503
 SHA256 29091799f2ad72bd873679570c2949af516e55e96f4fdae602f1ddbbc0848482 files/digest-arpwatch-2.1.15-r4 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGYfElz974XjDVpbkRAtBtAJ0VcJOQhhBLYa5CzhTLKyl+ShzryACcDexq
+xPtiWd/FfVR7e+Lz53YlB7s=
+=SKXT
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild
deleted file mode 100644
index 90068c1fafe7..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r3.ebuild,v 1.3 2007/02/01 21:09:13 jokey Exp $
-
-inherit eutils versionator
-
-PATCH_VER="0.3"
-
-MY_P="${PN}-$(replace_version_separator 2 'a')"
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
-HOMEPAGE="http://www-nrg.ee.lbl.gov/"
-SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
-	mirror://gentoo/arpwatch-patchset-${PATCH_VER}.tbz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="selinux"
-
-DEPEND="virtual/libpcap
-	sys-libs/ncurses"
-
-RDEPEND="${DEPEND}
-		selinux? ( sec-policy/selinux-arpwatch )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/
-	EPATCH_SUFFIX="patch"
-	epatch
-	cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die "Failed to get man-pages from arpwatch-patchset."
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh
-	doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8
-
-	insinto /usr/share/arpwatch
-	doins ethercodes.dat
-
-	insinto /usr/share/arpwatch/awk
-	doins duplicates.awk euppertolower.awk p.awk e.awk d.awk
-
-	keepdir /var/lib/arpwatch
-	dodoc README CHANGES
-
-	newinitd "${FILESDIR}"/arpwatch.init arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
-}
-
-pkg_config() {
-	enewgroup arpwatch
-	enewuser arpwatch -1 -1 /var/lib/arpwatch arpwatch
-
-	einfo "Setting permitions for data directory"
-	chown -R arpwatch:arpwatch /var/lib/arpwatch
-
-	cat >> /etc/conf.d/arpwatch << EOF
-
-# Uncomment this line if you wish arpwatch to drop privileges.
-ARPUSER="arpwatch"
-EOF
-	einfo "Done."
-}
-
-pkg_postinst() {
-	elog "For security reasons it is better to run arpwatch as an unprivileged user."
-	elog "If you wish to do so, please, run:"
-	elog "      emerge --config arpwatch"
-	echo
-	ewarn "Note: some scripts require snmpwalk utility from net-analyzer/net-snmp"
-}
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
index 44b8c70968b1..fc8b1a1a6632 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild,v 1.7 2007/05/05 17:59:43 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r4.ebuild,v 1.8 2007/06/02 22:37:16 jokey Exp $
 
 inherit eutils versionator
 
@@ -53,25 +53,10 @@ src_install () {
 	keepdir /var/lib/arpwatch
 	dodoc README CHANGES
 
-	newinitd "${FILESDIR}"/arpwatch.init-2 arpwatch
+	newinitd "${FILESDIR}"/arpwatch.initd arpwatch
 	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
 }
 
-pkg_config() {
-	enewgroup arpwatch
-	enewuser arpwatch -1 -1 /var/lib/arpwatch arpwatch
-
-	einfo "Setting permitions for data directory"
-	chown -R arpwatch:arpwatch /var/lib/arpwatch
-
-	cat >> /etc/conf.d/arpwatch << EOF
-
-# Uncomment this line if you wish arpwatch to drop privileges.
-ARPUSER="arpwatch"
-EOF
-	einfo "Done."
-}
-
 pkg_postinst() {
 	elog "For security reasons it is better to run arpwatch as an unprivileged user."
 	elog "If you wish to do so, please, run:"
diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd
index 960454e79d79..dcf11eac077a 100644
--- a/net-analyzer/arpwatch/files/arpwatch.confd
+++ b/net-analyzer/arpwatch/files/arpwatch.confd
@@ -7,3 +7,7 @@ IFACES="eth0"
 
 # Additional options to pass to arpwatch.
 OPTIONS="-N -p"
+
+# Uncomment this line if you wish arpwatch to drop privileges.
+# Don't forget to adjust permissions on /var/lib/arpwarch
+#ARPUSER="arpwatch"
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
deleted file mode 100644
index f4c45bf90a9c..000000000000
--- a/net-analyzer/arpwatch/files/arpwatch.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init,v 1.10 2007/02/01 21:09:13 jokey Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	for IFACE in ${IFACES}
-	do
-		ebegin "Starting arpwatch on ${IFACE}"
-		DATAFILE=/var/lib/arpwatch/${IFACE}.dat
-		[ ! -f ${DATAFILE} ] && touch ${DATAFILE}
-
-		if [ -z ${ARPUSER} ]; then
-			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} ${OPTIONS}
-		else
-			start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-			/usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} ${OPTIONS}
-		fi
-		eend $?
-	done
-}
-
-stop() {
-	for IFACE in ${IFACES}
-	do
-		ebegin "Stopping arpwatch on ${IFACE}"
-		start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \
-		/usr/sbin/arpwatch
-		eend $?
-	done
-}
diff --git a/net-analyzer/arpwatch/files/arpwatch.init-2 b/net-analyzer/arpwatch/files/arpwatch.initd
index 4929e6278c01..23e852544eff 100644
--- a/net-analyzer/arpwatch/files/arpwatch.init-2
+++ b/net-analyzer/arpwatch/files/arpwatch.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.init-2,v 1.2 2007/03/27 19:33:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/files/arpwatch.initd,v 1.1 2007/06/02 22:37:16 jokey Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r3 b/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r3
deleted file mode 100644
index 2095be93fb6b..000000000000
--- a/net-analyzer/arpwatch/files/digest-arpwatch-2.1.15-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cebfeb99c4a7c2a6cee2564770415fe7 arpwatch-2.1a15.tar.gz 202729
-RMD160 a27ee53275dcec3cafb85eb3df2451d42ec32b0c arpwatch-2.1a15.tar.gz 202729
-SHA256 c1df9737e208a96a61fa92ddad83f4b4d9be66f8992f3c917e9edf4b05ff5898 arpwatch-2.1a15.tar.gz 202729
-MD5 baf2334920b032cce0d01decf049d5b3 arpwatch-patchset-0.3.tbz2 15934
-RMD160 5e21ac57fa5beca751d1d5a42ea3632e70ee953e arpwatch-patchset-0.3.tbz2 15934
-SHA256 7721f983ea21f5e0bfb265982e59d0de9d76f1021abf2c2e359f91805922bfe3 arpwatch-patchset-0.3.tbz2 15934