Correct LICENSE (bug #425976).

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

3 files changed, 8 insertions, 69 deletions

diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 7ce70d96c2d9..5fe3f68e59aa 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/arpwatch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.64 2013/02/16 12:45:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.65 2013/02/16 17:47:11 jer Exp $
+
+  16 Feb 2013; Jeroen Roovers <jer@gentoo.org> -arpwatch-2.1.15-r5.ebuild,
+  arpwatch-2.1.15-r6.ebuild:
+  Correct LICENSE (bug #425976).
 
   16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #96436
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild
deleted file mode 100644
index beb820ca570a..000000000000
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 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-r5.ebuild,v 1.10 2012/06/12 02:22:05 zmedico Exp $
-
-inherit eutils user versionator
-
-PATCH_VER="0.4"
-
-MY_P="${PN}-$(replace_version_separator 2 'a')"
-DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
-HOMEPAGE="http://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 ~x86-fbsd"
-IUSE="selinux"
-
-DEPEND="net-libs/libpcap
-	sys-libs/ncurses"
-
-RDEPEND="${DEPEND}
-		selinux? ( sec-policy/selinux-arpwatch )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_preinst() {
-	enewuser arpwatch
-}
-
-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_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.initd arpwatch
-	newconfd "${FILESDIR}"/arpwatch.confd arpwatch
-}
-
-pkg_postinst() {
-	# Workaround bug #141619 put this in src_install when bug'll be fixed.
-	chown arpwatch:0 "${ROOT}var/lib/arpwatch"
-
-	elog "For security reasons arpwatch by default runs as an unprivileged user."
-	ewarn "Note: some scripts require snmpwalk utility from net-analyzer/net-snmp"
-}
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r6.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r6.ebuild
index 92043a497431..331bcfd705f3 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r6.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r6.ebuild,v 1.9 2012/06/12 02:22:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.15-r6.ebuild,v 1.10 2013/02/16 17:47:11 jer Exp $
 
 EAPI="2"
 inherit eutils user versionator
@@ -13,7 +13,7 @@ HOMEPAGE="http://ee.lbl.gov/"
 SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz
 	mirror://gentoo/arpwatch-patchset-${PATCH_VER}.tbz2"
 
-LICENSE="BSD"
+LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc sparc x86 ~x86-fbsd"
 IUSE="selinux"