Fix LICENSE by Ulrich Müller (bug #446060).

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

3 files changed, 7 insertions, 39 deletions

diff --git a/net-analyzer/siphon/ChangeLog b/net-analyzer/siphon/ChangeLog
index 757833c470f0..bbfd592d810c 100644
--- a/net-analyzer/siphon/ChangeLog
+++ b/net-analyzer/siphon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/siphon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.18 2012/02/05 18:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.19 2012/12/05 16:28:50 jer Exp $
+
+  05 Dec 2012; Jeroen Roovers <jer@gentoo.org> -siphon-666.ebuild,
+  siphon-666-r1.ebuild:
+  Fix LICENSE by Ulrich Müller (bug #446060).
 
   05 Feb 2012; Raúl Porcel <armin76@gentoo.org> siphon-666.ebuild,
   siphon-666-r1.ebuild:
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
index 25e4ce5150d9..62028cb36f6f 100644
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ b/net-analyzer/siphon/siphon-666-r1.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/siphon/siphon-666-r1.ebuild,v 1.4 2012/02/05 18:29:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/siphon-666-r1.ebuild,v 1.5 2012/12/05 16:28:50 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
 HOMEPAGE="http://siphon.datanerds.net/"
 
 SLOT="0"
-LICENSE="as-is"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-analyzer/siphon/siphon-666.ebuild b/net-analyzer/siphon/siphon-666.ebuild
deleted file mode 100644
index d92b657cb414..000000000000
--- a/net-analyzer/siphon/siphon-666.ebuild
+++ /dev/null
@@ -1,36 +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/siphon/siphon-666.ebuild,v 1.15 2012/02/05 18:29:41 armin76 Exp $
-
-IUSE=""
-MY_P=${PN}-v.${PV}
-
-DESCRIPTION="A portable passive network mapping suite"
-SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
-HOMEPAGE="http://siphon.datanerds.net/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc x86"
-
-DEPEND="net-libs/libpcap"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	sed -i "s:osprints\.conf:/etc/osprints.conf:" log.c
-	sed -i "s:^CFLAGS = .*$:CFLAGS = ${CFLAGS} -pthread -ggdb -I.:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin siphon
-	insinto /etc
-	doins osprints.conf
-	dodoc LICENSE README
-}