Update LICENSE as pointed out by Marc MERLIN.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 27 insertions, 23 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index c15fc213c17e..13fdd5878533 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.64 2013/08/07 22:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.65 2013/10/19 02:28:16 vapier Exp $
+
+  19 Oct 2013; Mike Frysinger <vapier@gentoo.org> xz-utils-5.0.5-r1.ebuild,
+  xz-utils-9999.ebuild:
+  Update LICENSE as pointed out by Marc MERLIN.
 
   07 Aug 2013; Michał Górny <mgorny@gentoo.org> xz-utils-5.0.5-r1.ebuild,
   xz-utils-9999.ebuild:
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 5045a2fa4a19..8286992d2816 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -15,27 +15,25 @@ EBUILD xz-utils-5.0.2.ebuild 1685 SHA256 aedca58672d5f10d617cad24ccb2afbdc32f325
 EBUILD xz-utils-5.0.3.ebuild 1678 SHA256 9f08362e86257864070388a2d3f40b3ec52cb5b62492c4f59a313d61fbd7f346 SHA512 5731bfa63e70dee4b12b8caf166ac4bd5ed6446888cecf9a92322b50bfed3d36f972a8a6f79159787517245c56f168e1c524b8ffb1c9e251f1c47cdb43e59364 WHIRLPOOL bc8d1e5221fdc0feee598843e2ce38131407831300b6ef62a8f7963faabceff873df3934ae8e083d5d4031b58706436da1233dfd53ce6961d902ceb9c6b7050b
 EBUILD xz-utils-5.0.4-r1.ebuild 1906 SHA256 284ac5f7f7ab037eb535121e1910a077263e943c8622a2bdb44c41cc9ecbe8e4 SHA512 7fe7cdbc52ff1abe60a9f5715ddda6ab87ba5ffd6d19b9949247453c1ddfb60e2af212bc50d23d54d6c56b516d5f5b29b862bec8a9fef3c8ee00531359ca1a39 WHIRLPOOL aaa9f5a90888c578751f5511fa48e6fef8916f24ad1e9d9dd47ca52294214d2cd6321310b1ee3ee1cb75c269832caa1e14f312d7b88303504a8679a125cff7c1
 EBUILD xz-utils-5.0.4.ebuild 1916 SHA256 2441fbe41aa27861136717702b49b419560e6f2290d326c51827dc1c75fbecb8 SHA512 d91c9930d2190d631de6ff3ccf8d177d9432bfce40ac6e09498070e50f48c026630ed0909646dd2c38e3a8be18f67e7b3f354b4f6f66f2e1dea85de16d739fc9 WHIRLPOOL 526580bc196c132b24585b18aeac5630099bcaa6857495a6eeba5247cd080ef6d0c190d9ed4608c76ca939aedc24938e57f5020928bfe25430c1dc8b83be5b96
-EBUILD xz-utils-5.0.5-r1.ebuild 2125 SHA256 c50fa125e020c9c10d79fa31d129708310136dc18395d69a533a902a92b01fd6 SHA512 8bef79904271be34d1bc776cae7934ab428e79dc491d3bb3b15675bd556d4fb92226dd46ccccdad8400231c1f4b0afbe5c0e809eee0cc577a47e62f926833699 WHIRLPOOL c9551fdef8776cd78fe51ab5ff7b30f196a50e3c03f1e698e055bb9690f1ad3b52ce3879e6ffe0b442c97cc2cb0672b41d813876705a535099994f91b38850b8
+EBUILD xz-utils-5.0.5-r1.ebuild 2230 SHA256 222f603f15ecada6399d08660ef8d02b55aa96afc2bf82e218c94be7c9ab6b7f SHA512 811407cbb6f7e7f28ec4010b749c097a6fb65d2c87f0f8da5fc9002ce112b1db06276614cad6b5b9435e09ae20f3e8990106a63c3f4d03c4de8fd0cf71ecf337 WHIRLPOOL eca391501604fbf18220398d50322fc6c62db69a644a4626542313bb0cd39c2862f1cb5e7e9d6a609b0b7e5996f561542f8d239d78ff2e388be69d05751ec813
 EBUILD xz-utils-5.0.5.ebuild 1914 SHA256 3bc11fcc7a87e58a67b92c42fad6c6baa5fc5a334ff84a8f64c0bb0334e56623 SHA512 f4dd0121777dd50862884c0d0ed10cb7b63952c7bcf57d9a5786b2bf07026b1722e0832ed3403b5ff16d2b70eebabd3ce19ddeb56be538ecdc2f754240744d65 WHIRLPOOL dc8dabcde50b51c0e6a359b530d7be2cd1c70fc24a463fb598712f8d0c05ede86b0f89ad508cd5f70c75d7e7fa6974fdf24b074a267492d785efe765b35676ef
-EBUILD xz-utils-9999.ebuild 2111 SHA256 125b5c742619248a04aeb65d4377dfb2f8028218d4d731fd6d6d9717a7d05922 SHA512 da5bd7c84def6bd0022e27f6e9868d077fa6f4b3308bee1ba190d963bae4618614b1e228a676c52bceb464c2657015739e8f27a94c58c28b47d174a3d3e4bbc6 WHIRLPOOL 0d59b5c029c811cc771422c0b607fb0a0922e6ff9119bead493b4f3086c13f898e24ea5ab2f49f2a1e93ceb3c6fe9452a18a4e730aa98004cea857f2ae55baf2
-MISC ChangeLog 8414 SHA256 c0c8ba7779cc0a01fc7cb832f3cdba33e87b2bd5334afc6ddec8846970546e88 SHA512 9a1aa5e7e7211cd016ba8793a07fca5fa2346cd0b3982e944e82198e143bb2fb012f33758c1375e455b41cdbf30f3702e640eee2c875cb73741207d5a4d50bfd WHIRLPOOL 9460a8e810e3c6ddb98d925f49708afefd5c391d4364a71189afc33caeaac9439a432187beb8d4b08dd38e98fa039ef0a1487dfd4edfcea8cf3efb0db6391335
+EBUILD xz-utils-9999.ebuild 2216 SHA256 e2aa6a0005d49914dc528ab2fbd17e3c5ccdebdc7e76c8a075d1c6fddc460841 SHA512 a566f3d4b325b490b833ed2f7105c7dff0d74aaf9a78ea3a0f9f55c58fda06cc6ef2e66a59d84ca5bf3455c9f75ef88aedbd35cb047b997b5255dadc7218887b WHIRLPOOL ddef270331324210c1f3d47059a5a44b337ae2b50587f06729c5ec0d21ff7863c592acb4a61dbabd3b37efdf62b517494f8dca002e4cb91650e0734483a18042
+MISC ChangeLog 8563 SHA256 7eab6a10479a177cec51f4bf53907fb21e677e6ab37e06cb0fb21b6e340bdc22 SHA512 4b959aa1a98f2f998833ba818d83d265693255e8dca61b02acfad69d38e711d2e2c0dd5ca28ae5f598d25b53dd07f46728424ace5710782eecded4dd0b3cfa26 WHIRLPOOL 7394a8679ce8d5662ee376eec0644e0d30866dce64e693acfac0cb65429019c24ca01c299530d15184f0efca158b9f20dbd1a0c0af944149fba654bce0630716
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSAs6qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDio0P/Audg1JEBKdQR3paEFm5Org2
-K25rIHOaHCDPcEuEo98xf92O2FooeCZxkSN73mmWmre0w+0CIFv5ueDNMwyVOaBd
-oPjhb/20oFyHIHWDoubM1ZWCTpXk4349/LmpMHdjRWwrZFupDdItChxJL3aHlLlu
-GS/gcARgVcOuGF8QiZ+LkQLcpUa5fs4jiUuZFD4IemGGam08KYTfPnF3DTy3Tvuy
-8LLbi7tnDJMqkyw5DBYUwGaqBNmR3Wkgsq4N7KWdRXrXxm42s3JuvmYvut8ezGIB
-AmWae5U7MKU29UYL2AEcN+C8d5ujwjqvVj8TAJrCR5upBCan8RHf5p/zATqYi6FN
-Rg9A+T7Iwd+SFmhwmKjOrYMIdpEMeUpB9kUL4otb6mewv5eaRbhMfC8L1MZEgxxu
-JEuhi/f/lWRIpwnW4/WURiVQ91+za4KOOqtIGGCaHNch9iwA9S6k4IVDWg+5c1AW
-eV0masgU5eNS+P6/oqDCBGwcQtXxv4wx8lhFecuRN+6j7UzF2IF6dVB5n2+VQJ8r
-fp8Zx6pr9EmdilUOHqZzfhuek4LbTOBXNutzOlcvE28Z98+JqxSrA8FPCvwDtSxM
-FvFORZ8HXX4jOV0Ql96u1WTT6p0omjiDyDXMaP+0OyzRuKzl5eEECfishcuD2gwT
-tn71O/SgQ3ceXoxQYt/+
-=yhRZ
+iQIcBAEBCAAGBQJSYe5HAAoJELEHsLL7fEFW0joP/RL3q9Ei4jad1l5gcxoTmmHm
+T+Pr9OAyve11L+PukZtoHtTv5tZBhsZgNOU7PPIruBlEshhbA8L/5/fSzbhLq7nl
+3tY58hvj2j9SxrlVlF2Zcv1ib0c3BRveoaCdpkLjBLrfHKaXvGEkuM1cFJOv2Ta0
+OB09ZNOlHtrAoO5MpxRwDxZh4j0tNcvYIRpIoUUBl8aPHQoJ6e4r5dWNU/fZ9TQs
+Rq/PSg3jWVfH/abxf7rRZkbzSRmluBCBqhtNIZsIlhoFA9pzR/W40wijKnosj1rN
+edlAkpsdTm8okDgXIUK5w/t56SsWM0ti1NG/kpkSaMMiKxARtcu+S1PNcqTCp9Lk
+6ONf2OBuhqGZYVDAfra8Kua0WqSWdvLty6YxsNF5Y8WeURCPf7Ij4ZBjMfwuJTaE
+uMR7HMrG6zDGmYrQygZW81685lXxCX7Qw12LCboJeZXBlifo94cF8UWF0U/FYwoP
+D3DZaWkXj4v+KC3zhnCM/DQOV8LjOzDdR/sGZGVvr1OKPUYzrqULtZCqoNRljfGn
+b9dGc+fdZHxJf5mKLgw8hpNHCn0EPm2wSFNHfV15GCr80EJDG2jD+OZAtX4gIwxn
+/JvFH8QEjZsK6k4nd0MKQaqcikgeujMQsTj/hMudPKIB2G3qU7L4Pg3RFyl5w2CT
+fIOWi3ZsL4YEHZUeQ7t2
+=rMfl
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
index cf2e8f30ed28..c20763974b02 100644
--- a/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild,v 1.2 2013/08/07 22:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild,v 1.3 2013/10/19 02:28:15 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -25,7 +25,8 @@ fi
 DESCRIPTION="utils for managing LZMA compressed files"
 HOMEPAGE="http://tukaani.org/xz/"
 
-LICENSE="LGPL-2.1"
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
 IUSE="nls static-libs +threads"
 
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index 13a90a032dd0..400b93dd6bde 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.16 2013/08/07 22:47:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.17 2013/10/19 02:28:15 vapier Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
@@ -25,7 +25,8 @@ fi
 DESCRIPTION="utils for managing LZMA compressed files"
 HOMEPAGE="http://tukaani.org/xz/"
 
-LICENSE="LGPL-2.1"
+# See top-level COPYING file as it outlines the various pieces and their licenses.
+LICENSE="public-domain LGPL-2.1+ GPL-2+"
 SLOT="0"
 IUSE="nls static-libs +threads"