Fix LICENSE, see README file, bug 447290.

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

7 files changed, 39 insertions, 21 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index b743fb0ac64e..5ddccc3931a5 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.82 2012/12/04 04:09:02 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.83 2012/12/28 18:24:29 ulm Exp $
+
+  28 Dec 2012; Ulrich Müller <ulm@gentoo.org> speech-tools-1.2.96_beta.ebuild,
+  speech-tools-1.2.96_beta-r2.ebuild, speech-tools-2.0.95_beta.ebuild,
+  speech-tools-2.1-r1.ebuild, speech-tools-2.1-r2.ebuild:
+  Fix LICENSE, see README file, bug 447290.
 
 *speech-tools-2.1-r2 (03 Dec 2012)
 
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 94b473551883..4784132e63a9 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -11,17 +11,27 @@ DIST speech_tools-2.0.95-beta.tar.gz 1681824 SHA256 61f6786468872aeb2ba0db3ba8c4
 DIST speech_tools-2.1-patches.tar.gz 5688 SHA256 4b1a3579a39fe78e4d524e69c2199f19509ff9d15f8e74c1ea8c6865efc23f65 SHA512 6b33e8831da2c26fe3d8fe4e1a9628916c6c0b20d01df02131eb2f95dec837eb68f2c2008160e237eb0eefa7f1a9772ff108d9e9937482c48fd4dc3e5555d0c1 WHIRLPOOL 190fdeeac41c282fcf2300786e8b8572575f9e9a152f969f2a031df4b5f48e8831d2718cd3822938cfbb0318a0381bd81c6c4c1ba48eec2d4b9afb5410706a0b
 DIST speech_tools-2.1-r2-patches.tar.gz 6713 SHA256 f8bf6861f2dea5ec7d4d0ddf7b3e3932f92f334382cb91a6c365331cf18527fa SHA512 d1cea1c155d5a7cb00c31dbb8add9bb98d94324b220e0f761ba51750c78e8b015865e6d6bbf63afa6f7567cd8acc3b2fcc9644d20fabda397f546223771344be WHIRLPOOL 9ac4a9f55bce8d8bc31f8302df703a82fad1e88000b7daad8dd7921492e0e7ec4cfe00bf4ebcb6804db0e9707ddfdb49dc76a23102aba569de4a1533e4ee95bc
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
-EBUILD speech-tools-1.2.96_beta-r2.ebuild 2948 SHA256 fad10abfada29f927c1e5bd028d63e50f18ef7cdaf88d93659a67bcb1b9380f6 SHA512 d677a8eec843d5b1830ee7da07c8d303c68ab32a25c6dd772a6db375beeef0b209450e338bb3f252bf7024b7ce575448697b59de39b05a5b9537db26772dac84 WHIRLPOOL b886491996b5faa99bad363b43971fc8d0a96468818956227b15c74462b72d2dc0f4a0d3f1e9aba99833319a7367337ee9c14ea53a9f7655b8247e12f76dbb2a
-EBUILD speech-tools-1.2.96_beta.ebuild 2699 SHA256 4fe4d63cd36bffc3e039c21ec94c6c13e54066e40a3f3893108929b50927f55a SHA512 4d4f405b0dc2acff17887feba81f0a68adb9d93346e6a4f4b0f6b1fd980781deb6938c8e6f06e55803a9e12851017d2fe7471cad951e3c447894d3b5af866873 WHIRLPOOL 3195764d6b8f30675ac096207fc43ce4d274e06d9e7e13700bfa89d91e6f9c8c3cef747194ca82467d4e21e8b4ed5fcecd6677fd21c48dca99d703fdd6d78956
-EBUILD speech-tools-2.0.95_beta.ebuild 2920 SHA256 c1e2dc55b21e6bd9bf49a13b08a61825753e86c66cc18205b57b1725866a2cbd SHA512 89935c37527249bf8f3fa4860a67334c91818cc725959ed1b08c5c0861c6f95943ef176df419608f73936ba6e226597a0e60cb4c315acc3affd8b4fa3f110ba7 WHIRLPOOL 1080e1be88d4911763e99e7df086d42bf53d47b0f89f357cf513c1c6198c297d933a4d99b3e050b1f19a8a3f244b9bdab3b93c48d705ac8a718c781ab1299cf6
-EBUILD speech-tools-2.1-r1.ebuild 2652 SHA256 f145a4dd61e1207668884b1b7f6454fc0330be2de520937c5d21bcc524384096 SHA512 8e4aadd3e795b5974de965fee19400a2b10f870cd492335bd240d42c1db73ec69628a856e38ddf1539f4e28e05cc7f5aa30b18bfa689a3d070fd1438b3362a22 WHIRLPOOL a08f5524a51c7421686113182b61c5c374be3da008787fc16e47efe3db4d7c77ab6febcea5215c3b938d5cceff584d91dbca0f46fdf12703d9d722de0dd443ae
-EBUILD speech-tools-2.1-r2.ebuild 2742 SHA256 60b0c9426df9fd9a98f80a30a065d288dbfa896f6edb860a579c1530a853b0b8 SHA512 a16d14a6ccf49049500a9dfe6316249d87ea33b30685a9c5cc4681a3a1600d0a44435227f10b965da768702296dd9347c4c0734d146495f728f03bb1a00d5bd1 WHIRLPOOL a80cb6e953a96b6ab12cbcd5890bdc495250a3352e92c12f3f47ff1e704aee074e5595e6e1e588c568419d2900bb7bff45081d0efd64f66b0f6d51af2ddb8f2b
-MISC ChangeLog 13366 SHA256 77b7bfda5daec793b573c912d4ed83ffc06292c6be50f907267bb1eed1ce5260 SHA512 ffc5e5b836bd5474335d8d086e607c05d30d198282cecbe06f851a31cedfd99bf65be4f8a78924618a9d9fe05a977f1522e4aaa7332864b3e7301d0b78f22602 WHIRLPOOL 1e269479db90e926f2c7b597143971f4edc192cf23d8d1ead151df8396a8b49f697193f9eddfff650b92459fe462792c01eb66628954ec6bb6a8c9192db04c32
+EBUILD speech-tools-1.2.96_beta-r2.ebuild 2959 SHA256 2e15e46f504291f792db9078119193714ac01c14d0b9151270c2140b6bd88abc SHA512 284103c196a3c827b72eea519cea7c0f93c6dbb3049758a1e6394b0f1d6d0c76d71a39af768c83fd57c4f8742e0358cf5d1978d13b07587c438ae5f7140b2491 WHIRLPOOL e150dfaa412d9421a74e7cc805d8e3d91805676505abc43e9e3cea183b50c8523ff3a4d824e409a82f7c3f19088c555e1d3dafec94de66b82d1d1ed2316e733d
+EBUILD speech-tools-1.2.96_beta.ebuild 2710 SHA256 03e34391b504acc55ff27be83617f34fb736ca4f3b6436b04b30b8c374648fb5 SHA512 c7749edc1e2498f05212f3912efe03a9effee10d5b62846b95d8f434421bdd2aca863e3d6785e29dc3e0ebfe35d74d1fb2f423e019dabaae49ccd7dd364d9058 WHIRLPOOL 42baa258c2d0a69f83e8865082ba568ba1c290e6b6032f700198d0bb864b6e65bd6503bd17f8be0c6b57806fdbdadf0311ba0443f8580e08bca198583023ca45
+EBUILD speech-tools-2.0.95_beta.ebuild 2931 SHA256 b222d5198625e81733d364d6ac0abdc3a04eaa2ffe44ffee45e0d0afb6d05d3c SHA512 e8d8dff2d718e63e72fc8d1c50df166d59555fb60d30d3cd76808fd0dc6f6fadf9f68446920cd8024ff2100568e5ae05dee2d480d46777b4bc501966dbed5f5f WHIRLPOOL cb7a06771ae408fc5e6666cfc805cb71179b93d9b7dfbd2bd7e0f912e43ad61845f42d4626b741b9f4077e7bd1813c0da2d72fdf90f66ac995eefd6ab37411bf
+EBUILD speech-tools-2.1-r1.ebuild 2663 SHA256 0be3245158410ded8f461a2afeed689056bff684d96ca2d3d8d30224e1b047ca SHA512 a608f65cd3dc9a8e8eb3148b85d3053787e8dfb86b678f53fb4ecb5fc255ef6d63eb059c6f46f38ac278a0c561d7ba6f51afe7c321fba472d9b87604b509a895 WHIRLPOOL d220b66d03c7f4cac478f46440dc79a69a65b6948c6fd744bf217e099856b97aa5675485002c6b3fbdd77339913fa61f6befc3c4f302be674c3274a7369921b8
+EBUILD speech-tools-2.1-r2.ebuild 2750 SHA256 8587d8b7b5b0e2aef7751de7b47f97273b19123432f95e1cb6ff0661e352e3f5 SHA512 6cec997d5b0c3d211c95155a088dff555423c8069271a1750da8c615306b7bc433f4dd444740f4106643508b05668593513cbb52a1fb5f6bd12f9b9d78263b36 WHIRLPOOL 0cc57e8bd81327aadecd9953f7900a3ebf5ca6adb31e5bbc3d2633409665f80159754805656ed1e43002be42747009bac32208acc401ea6a22c44c5731730f2c
+MISC ChangeLog 13614 SHA256 b7a1934ab9caaf37ecb7a8eecc098cb487e4368f38c726835a3334269e6ff446 SHA512 8b299106e83cc2b4ffc59f0475c9d755f62164b7beb35b410c3bd5f5cef66644be7d86c4970aa0d49854b287f3f7ff57c8b3287ecb87cb2b0df69873798baf67 WHIRLPOOL 2cd591836d548acf986d4b1215a14ebf8b99cb23dd8846e00887762610779bfc360a2eec2d43c8d6ce72a11c516581e55d2e1cf3bdb402070bf0f44d0f0b762d
 MISC metadata.xml 249 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a SHA512 5d0f694d49c84a53b2f504fe98ab89c54a505cf991603923fd4b255899fd076d832a1b1e4ab30bed1a765e708513434da4f16c64a01aeb7bca9886caf5a6629f WHIRLPOOL 559c9365b8ba9856ef2c25a90d97a3d961c2378680af5e3703da684152eb81ba75faa5bbfdc9bb015df2a2214e94934e5b13fa0d5056d972285fd9e0da363828
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC9MQMACgkQdIssYB9vBoOvrwCfbjH9Ba5G1jrLlJkXvjt6NvWK
-DgMAmgJ7MmcOcWI31yVL+SN1sjfaFTFi
-=0/VA
+iQIcBAEBCAAGBQJQ3eRpAAoJEDxpGckxwJCB+VkP/j+gHC1pyFeOyfONGj1p6kVd
+l0vHznfFkh4E6ievd8rpiymEopU7Nc9EoldbxQzJrPh9TdQC++TUAun7eWOeKX3A
+8ybEky6Ob20UkZEa6tYq6/Lxa5rJ2ehsShAQpfRO5Wn859huXcBPk9SW+gWejBw3
+m6K5YOPAi60UQZhE8h5S6fTxKhUrZxtbE3OpkrEPaTYIs7gNoerpME6nyfKgPS50
+JyMf30F+6qoYIUVKv/1l8Tf+/VVT4UnWLebVOS3LFLncQoHmLarQ/JnDf4gD5Evm
+Da2Eu+nGzY4E3P12RRnZao8PEkQldbGrFq5pYvR6vMJ1fYuZCh6eqJYPXXl6f46X
+vOSiSsTcm4ZkZ484lc8UGqeoQUAl0LYyAv30/8KLAfqFN3RsjmtS1E3LCS/VXmYV
+/8hQLabI5V0Ii4HyS/OLoXkHgdKv8CRPvM9cDFXFnLBCNFRsfMzW/Hr7LW/xV1uy
+ZT4j0ysPLTJBipBF2Q06dfcW1YxH6t2BVlysyD59ZPaV6Ssg7r1e1zIZZg5DCHEB
+hKmRTKuLthGQYdwftwqP8x/axJ1oQAX4fUbyoIXukZHgFGe3iGRlL8YTuZ9Ck20e
+RH7b29XNodmSwaab8On5BvRSPPHkOMfrUrYuZD2Y3tibmfJmiICmqVcbyYXCdE0O
+cRymFSVUqjj6O2NFdzxw
+=9mhc
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
index e23a8866ce11..1a78e868a5be 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.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/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.5 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/1.96/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-patches.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
index b214284b6faa..49457ee2b3c1 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta.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/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.16 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta.ebuild,v 1.17 2012/12/28 18:24:29 ulm Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -10,7 +10,8 @@ MY_P=${MY_P/_beta/-beta}
 DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/latest/${MY_P}.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
index 27b38c7e0cac..abe4569d8e7d 100644
--- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.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/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.5 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.6 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ DESCRIPTION="Speech tools for Festival Text to Speech engine"
 HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV%_beta}/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-patches.tar.gz"
-LICENSE="FESTIVAL BSD as-is"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
index 86a1f27d9cb1..7f54649acd62 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-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/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.9 2012/05/31 02:18:35 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r1.ebuild,v 1.10 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 		 mirror://gentoo/${MY_P}-patches.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="nas X"
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
index 51d47321baa5..16a9ec93d0c9 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.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/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.1 2012/12/04 04:09:02 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.2 2012/12/28 18:24:29 ulm Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
 		 http://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nas X"