Add GPL-2 to LICENSE (bug #425984).

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

3 files changed, 7 insertions, 49 deletions

diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog
index aa1c43b44521..e96f821343a8 100644
--- a/net-analyzer/ipcad/ChangeLog
+++ b/net-analyzer/ipcad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ipcad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.35 2012/01/06 16:54:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.36 2012/11/21 04:14:53 jer Exp $
+
+  21 Nov 2012; Jeroen Roovers <jer@gentoo.org> -ipcad-3.7.ebuild,
+  ipcad-3.7.3.ebuild:
+  Add GPL-2 to LICENSE (bug #425984).
 
   06 Jan 2012; Brent Baude <ranger@gentoo.org> ipcad-3.7.3.ebuild:
   Marking ipcad-3.7.3 ppc for bug 385355
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
index 260f2768b5fd..a1637eb1c7ca 100644
--- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.4 2012/01/06 16:54:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.3.ebuild,v 1.5 2012/11/21 04:14:53 jer Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -9,7 +9,7 @@ DESCRIPTION="IP Cisco Accounting Daemon"
 HOMEPAGE="http://ipcad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
diff --git a/net-analyzer/ipcad/ipcad-3.7.ebuild b/net-analyzer/ipcad/ipcad-3.7.ebuild
deleted file mode 100644
index 7d937cf15bd1..000000000000
--- a/net-analyzer/ipcad/ipcad-3.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.7.ebuild,v 1.11 2011/01/20 09:10:59 pva Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-DESCRIPTION="IP Cisco Accounting Daemon"
-HOMEPAGE="http://ipcad.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz
-	mirror://gentoo/${P}-20060828-cvs.patch.bz2"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	net-firewall/iptables"
-
-src_prepare() {
-	epatch "${DISTDIR}/${P}-20060828-cvs.patch.bz2"
-	epatch "${FILESDIR}/${P}-linux-2.6.27.patch"
-	epatch "${FILESDIR}/${P}-linux-2.6.35.patch"
-	eautoreconf
-}
-
-src_install() {
-	sed -i -e "s/^chroot = \/adm\/tmp;/chroot = \/var\/ipcad;/" ipcad.conf.default
-	sed -i -e "s/^interface/#interface/" ipcad.conf.default
-	sed -i -e "s/^aggregate/#aggregate/" ipcad.conf.default
-	sed -i -e "s/^pidfile = ipcad.pid;/pidfile = \/run\/ipcad.pid;/" ipcad.conf.default
-
-	dodoc AUTHORS ChangeLog README BUGS FAQ ipcad.conf.simple ipcad.conf.default
-	dosbin ipcad
-
-	insinto /etc
-	insopts -m0600
-	newins ipcad.conf.default ipcad.conf
-
-	keepdir /var/ipcad/run
-
-	doman ipcad.8 ipcad.conf.5
-
-	newinitd "${FILESDIR}"/ipcad.init ipcad
-	newconfd "${FILESDIR}"/ipcad.conf.d ipcad
-}