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

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

5 files changed, 42 insertions, 39 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/Manifest b/sys-apps/usbmon/Manifest
index 9512bf1c28d6..64d4bab99d7d 100644
--- a/sys-apps/usbmon/Manifest
+++ b/sys-apps/usbmon/Manifest
@@ -1,8 +1,26 @@
-DIST usbmon-6.tar.gz 16796 RMD160 9a1dc8a0550825f419aa5b76a3027a4524a6417e SHA1 cb1006145ba7f8bdefd30b85128ce43d0ba9ab04 SHA256 32a804ccdd7af002c3e44e7c8abb0e7e1b6ccd6c7b9a70c7371cd5558d07e459
-DIST usbmon.4.tar.gz 7602 RMD160 6814f0089d4fa7c613e719165db591d3a8bdf198 SHA1 e362d4c14eb1c5b953a12072382651a095602c6a SHA256 e17f4cbf9d8d9078c75c654c56437dc781c8c3718aa8d8f8ccaace79389734e4
-DIST usbmon.5.tar.gz 20832 RMD160 9296957f2dfc88437d5fefed61b9631558021a2d SHA1 8191e1e7406a3e931f52a1aa918ef9cf659ca425 SHA256 e3e82c5a3b93d8bf8700db906e86bce6f6e63b743f245586e4334c4be590ee58
-EBUILD usbmon-4.ebuild 647 RMD160 b415b5891295f2aa50da4cee67175bfee28f64d0 SHA1 48ece1fbc9b22b65a5cf819d7fa08f3eb17826b9 SHA256 88d09b1c5f2a4fa109a5829067bc146b1ab8949cf82876c66d788f4bce5075f8
-EBUILD usbmon-5.ebuild 647 RMD160 f7c89e1def878474854ac35c09ae0cb97e9b8951 SHA1 63dfc4b6cc6101f429338acba55d1599d1acf205 SHA256 312523a9066844b09494016626419d7d3998fadd227da5065f5f4abe2c50ba43
-EBUILD usbmon-6.ebuild 625 RMD160 70e786180043b5af12ec7e755e82696c8a72a560 SHA1 726cb87971dfd4371cd9422d0fa7f9ae57a9acc4 SHA256 a9e9ad02915c081c8166c2ea5937334d54a1876587e356e87ccb512cd3830342
-MISC ChangeLog 830 RMD160 f074b8cb29ad6e873c74b4166f0223e067f4f04f SHA1 0c5097774bd96d8d409e04f2c081f452606f2422 SHA256 53c94f753e559b71e44ef107f9583ae741c1bff39b460297a93a88080e8171a7
-MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST usbmon-6.tar.gz 16796 SHA256 32a804ccdd7af002c3e44e7c8abb0e7e1b6ccd6c7b9a70c7371cd5558d07e459 SHA512 4ee41379196b86697a5156d4411860ba31540b98e50165c65f873e22eee1c3caadbc73a2c61903531f968797eca8e7f95490255a0820dc0778fba82c7eb260f5 WHIRLPOOL f985043dcba6fe2f0401f3588298b5a393d07cdd0745a93c684d3510550286a0a8dda7873954ef24e41cbb63679e4fa3093e15e583aef953ed939d50c40d5970
+DIST usbmon.5.tar.gz 20832 SHA256 e3e82c5a3b93d8bf8700db906e86bce6f6e63b743f245586e4334c4be590ee58 SHA512 ad0adaf120fc5d523513b58b1a70ff3ad9544e3369c55b3e37f04b6ed8b8e512efd80ceaf3fb22ef85528e8e9f7ecad5d0b50f06f95cb1a53000eca35f61a41f WHIRLPOOL 80fac8feb43a8b51160b0ce7cebde5639352ce8ea87a913c1991b9b5d8924eb941e0b3e4235253ce5e9bef850d019cb4dc28585f1fab928d0cb6b49a9e7ba753
+EBUILD usbmon-5.ebuild 620 SHA256 bee1fec317078dafc95330946b7ea30fbdaf8059675e388e1a03909f874b1d41 SHA512 7aa6d1396b357b49e3ec21f6d5eb9cd8c4354e6bec649ca5d017fef45b52a0bf703f0ddfe8f67006b8f81f8fc4aaaff48ed0b1d5f215c2519960d617a55c8dcc WHIRLPOOL 0db55e00d057e65b6633f0e658a83956ce52f4e420f7940b3669cf2016c2b42e3dbdb5e4e4054b2ad9429bf4d73bf14389912a90fc0f3b80e35bf0767fdd88dd
+EBUILD usbmon-6.ebuild 636 SHA256 f1fa6f75ba2ae21e3c7ce972263e1837c875477038719771b4662f2f89ad496c SHA512 97dd3f114ccf922907f995f9935612e37763076a136f2447d7777b974991343705a66868e33ac89796146dda42d95912a7cb2f47d6e931a499f971b387838ed9 WHIRLPOOL 3f98a3b2c4eb5d0f39a225683b857f383e651d9059e266304c019bcf5ba10a3668fbae251689ba05dd68985dca38662a2a3fc37b926c97cf40234f23ac77a202
+MISC ChangeLog 995 SHA256 84a3868694b45a298dda9fcff94956b8adf1411440f5a5c155b1774bd79b2415 SHA512 ae5fb04c261f1faf8a5a44e8c9b0ddbaa28eedb0f7733c63068baaf82096c5fa1805957131a802d94e4fde9d2d3b41573112da0fb64249db8ff0f3f49b5bf2f1 WHIRLPOOL 95adadf60ec8f672aa9f012450702c524461b2352c8b7eb9a90e01cd5055cecd487012f0ee16ac44803597e5524163fa160354742616ef92ec8c1d8141c086ca
+MISC metadata.xml 202 SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a SHA512 bd1c14da72bdd52e3bea3056f5b9f908c31d6915b651d15d80a0a7d26778c97cde493ae9ca4352bd313eb16ddbed9b169c6b620c7f4a9b77973f7077fa8d997c WHIRLPOOL c073cc4c903e3377c7aee652c5661a1657cc5ba70c3deb4b2d7b2d0e31a78fb8b362b2f255de3faddbf4c46250d14d2d5d39a6a13b910ad18f8d53df362163a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQqOr2AAoJEDxpGckxwJCBmugQALmH/K6guyc7ZJzZUxO2Q3f9
+AsoL5iShlZuFGIoBVVWR6CnpCwYOXBf/su8n7iKi0BYnbklntQu2WYspQURLg0lj
+lp19OfoAONTftO3/rtEekER4Bl+2nga26VxvvT7me/X0G6fCXxIdDXWaXcb6N6Lj
+Hk3wbl4lTG8VezwskvhC9wjKdiT7lvdGUWFkef/0QuZMvltseLSzOKWnZRj/lh5L
+HWoTmwJ5wAphUeaewhtjOZwtITtSc4iqzbICMbtOQdxKLfMbG5GbAvmT7wqc7gWr
+xNixHBA9aKutgaBMFnobp4ONfFwlP36oRWnjaQqrgYgQXRjnqIUzNxqb7c7pt6MP
+mMxbO/rn10YwWusHATZOzz08opndIboTlRJzzA2db70TPqQb564/VmiUsowrEUzr
+YUuBu9NHUas1OT6MYwYwBDTm1NLv4+C2y5l9YSJZtWqrU3yiYDeRceDU+lcvEHtF
+47uQuV3JTkCf7E2RV48acJjzc/+SSCrbP1FV9NOj7v8oE4AHsIc83a7LjtFqDWHu
+VX3IKZqgv0D2Sc/7Oz2+t72D5hBT+A+W2k6pcpQ/JsiZn89tu96Hm7rsrUwwyWcc
+Xh56R+dQWF1QEhgCP4cnvcCWID0kDJXngy5oAwQlt4Rg2yytbvhHUVRy1icxiT+L
+Me0pYnqJhePbC3PY32wf
+=o+3T
+-----END PGP SIGNATURE-----
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() {