Fix LICENSE, see README file in tarball. Remove old. Bug 441994.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

4 files changed, 16 insertions, 31 deletions

diff --git a/sys-apps/usbmon/ChangeLog b/sys-apps/usbmon/ChangeLog
index eed758dfa111..cb4159eb7621 100644
--- a/sys-apps/usbmon/ChangeLog
+++ b/sys-apps/usbmon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usbmon
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/ChangeLog,v 1.5 2011/11/07 03:44:26 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/ChangeLog,v 1.6 2012/11/18 14:03:40 ulm Exp $
+
+  18 Nov 2012; Ulrich Müller <ulm@gentoo.org> -usbmon-4.ebuild,
+  usbmon-5.ebuild, usbmon-6.ebuild:
+  Fix LICENSE, see README file in tarball. Remove old. Bug 441994.
 
 *usbmon-6 (07 Nov 2011)
 
diff --git a/sys-apps/usbmon/usbmon-4.ebuild b/sys-apps/usbmon/usbmon-4.ebuild
deleted file mode 100644
index 8b6fecfe99e3..000000000000
--- a/sys-apps/usbmon/usbmon-4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/usbmon-4.ebuild,v 1.2 2008/06/25 03:55:42 robbat2 Exp $
-
-DESCRIPTION="Userland for USB monitoring framework"
-HOMEPAGE="http://people.redhat.com/zaitcev/linux/"
-SRC_URI="${HOMEPAGE}/${P/-/.}.tar.gz"
-LICENSE="as-is" # need to consult with upstream still
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-DEPEND="!=sys-apps/usbutils-0.72-r2"
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e '/CFLAGS =/s, = , \+= ,g' "${S}"/Makefile
-}
-
-src_install() {
-	dosbin usbmon
-	doman usbmon.8
-}
diff --git a/sys-apps/usbmon/usbmon-5.ebuild b/sys-apps/usbmon/usbmon-5.ebuild
index 674584c544c9..3d8b3419d091 100644
--- a/sys-apps/usbmon/usbmon-5.ebuild
+++ b/sys-apps/usbmon/usbmon-5.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/usbmon-5.ebuild,v 1.2 2008/06/25 03:55:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/usbmon-5.ebuild,v 1.3 2012/11/18 14:03:40 ulm Exp $
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="http://people.redhat.com/zaitcev/linux/"
 SRC_URI="${HOMEPAGE}/${P/-/.}.tar.gz"
-LICENSE="as-is" # need to consult with upstream still
+
+LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
+
 DEPEND="!=sys-apps/usbutils-0.72-r2"
 S="${WORKDIR}/${PN}"
 
diff --git a/sys-apps/usbmon/usbmon-6.ebuild b/sys-apps/usbmon/usbmon-6.ebuild
index f47af690e83b..08aadc9afef4 100644
--- a/sys-apps/usbmon/usbmon-6.ebuild
+++ b/sys-apps/usbmon/usbmon-6.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/usbmon-6.ebuild,v 1.1 2011/11/07 03:44:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbmon/usbmon-6.ebuild,v 1.2 2012/11/18 14:03:40 ulm Exp $
 
 EAPI=4
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="http://people.redhat.com/zaitcev/linux/"
 SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-LICENSE="GPL-2"
+
+LICENSE="GPL-2" # GPL-2 only
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
+
 DEPEND="!=sys-apps/usbutils-0.72-r2"
 
 src_unpack() {