Apply at least some of the licenses from WHENCE that we already have in the tree.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 23b2e092f9d95b46028db8b2c447769f3a7342a2..afdd5dd39d45a8b40dea4d3832a68185e64e13db 100644 (file)
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.4 2010/05/07 18:11:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.5 2010/05/07 18:18:21 robbat2 Exp $
+
+  07 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  linux-firmware-20090421.ebuild, linux-firmware-99999999.ebuild:
+  Apply at least some of the licenses from WHENCE that we already have in
+  the tree.
 
   07 May 2010; Robin H. Johnson <robbat2@gentoo.org>
   linux-firmware-20090421.ebuild, linux-firmware-99999999.ebuild:

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 6dc889802d7e5b40ea73f57aebc85c9daefe58f8..bffcd3356b0c06b5d3c4fe149d1023232e414460 100644 (file)
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,5 +1,5 @@
 DIST linux-firmware-20090421.tar.bz2 4419117 RMD160 4eb474907ed3e38982462fe8df18711239c2f2e5 SHA1 650b6c548b69ddace298e94971db9254ed3e89b7 SHA256 382c6291c7b2dd881ea1d8f0b3ad33f5f35159b2ee4da0ec890c8a8a289274da
-EBUILD linux-firmware-20090421.ebuild 611 RMD160 89f559211fbb913da9e121a169c53773a7b15291 SHA1 26af904648fa0295d049af0dad910fc901cda914 SHA256 7f75a9029d1f3646082b77bf20ba84607cc2f69c3e2160153cc11e083a61c6f8
-EBUILD linux-firmware-99999999.ebuild 755 RMD160 168795558570eee7cc730be0c7afa8349a7532b9 SHA1 369a5f85786ac1b4985f7fe2ec82c4e75c4d64f5 SHA256 692d93735f13702c69a8657048a78825ca464db9dbcdbd1a57b0daaaed6fe24e
-MISC ChangeLog 901 RMD160 d45d044d1dc9eba32799189317030685000dfce4 SHA1 dd22909eaa1209d715485d8e301b35d47966b4fd SHA256 378a5d1312ac7ca33105d8a5e6d1d8691063c2830baf59f102ad76acbb83e7aa
+EBUILD linux-firmware-20090421.ebuild 627 RMD160 8cf754b221d60e0a480772b10331399ee05801bb SHA1 bdb7b6f7f60fad1bffeda340019f4041a9cbcb7e SHA256 1cacf6c4b254b73e7f68140b2c3591454138b787fc22e16be46479ee53c77ff3
+EBUILD linux-firmware-99999999.ebuild 771 RMD160 27d2317e4550129e1a9a31bd1c9aa28c60fd7a3f SHA1 2eb804d31fa988e3e2ccd39e784fd0403e174e2a SHA256 4c7ac283727965d2ef6cd118c38d758b7aa1b783c5ba7a5f9c4cad0657691a82
+MISC ChangeLog 1107 RMD160 c5ff2c324c8c2b22d867a1993b89e7b5fc252898 SHA1 d6c9dd4ec65ad7e910a7712cfa402e65a51dc0f9 SHA256 de70dcd5c17163fbe785762627ab219d8e5742e2aba73b64b075edd52b59beb0
 MISC metadata.xml 253 RMD160 e7d67595772b3d216ee7df5ddcfc44ec593de81c SHA1 814e59cac069bf55b6221bce39f4f831493b6ee6 SHA256 50865a07dab85c706d604493e4ceda9f8347c89952dfadd1ea500f78864338bc

diff --git a/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild
index 156e897830f19ba4c52c9aed681c09f28e4273e6..f82af28d4baa2c26e619a1b36538b04ceb448734 100644 (file)
--- a/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild,v 1.3 2010/05/07 18:11:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20090421.ebuild,v 1.4 2010/05/07 18:18:21 robbat2 Exp $
 
 DESCRIPTION="Linux firmware files"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
 SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2"
 
-LICENSE="GPL-2 freedist"
+LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 

diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index d1d480d0a41fabea4dd4de2a193f2a4d85ebe42a..28d6d6e642842442141dc7140eede1a46059ac6e 100644 (file)
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.3 2010/05/07 18:11:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.4 2010/05/07 18:18:21 robbat2 Exp $
 
 inherit git
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
 SRC_URI=""
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
 
-LICENSE="GPL-2 freedist"
+LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
 SLOT="0"
 KEYWORDS=""