Fix LICENSE, see COPYING and README files, bug 447290.

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

4 files changed, 26 insertions, 12 deletions

diff --git a/app-accessibility/festival/ChangeLog b/app-accessibility/festival/ChangeLog
index ebefef509229..146489bbce1f 100644
--- a/app-accessibility/festival/ChangeLog
+++ b/app-accessibility/festival/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/festival
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.108 2012/12/04 05:00:55 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/ChangeLog,v 1.109 2012/12/28 18:19:42 ulm Exp $
+
+  28 Dec 2012; Ulrich Müller <ulm@gentoo.org> festival-2.1.ebuild,
+  festival-2.1-r1.ebuild:
+  Fix LICENSE, see COPYING and README files, bug 447290.
 
   03 Dec 2012; Jesus Rivero <neurogeek@gentoo.org> -festival-1.96_beta.ebuild,
   -files/festival-1.96_beta-gcc43.patch,
diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest
index df741149d6b2..25099efbaa7d 100644
--- a/app-accessibility/festival/Manifest
+++ b/app-accessibility/festival/Manifest
@@ -16,14 +16,24 @@ DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811
 DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832
 DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
-EBUILD festival-2.1-r1.ebuild 3745 SHA256 c00bf928fdefb503f8c3ae79a7b02d9e6ab037ac1803f6fde835ed2c19e10f62 SHA512 8663e519b82ba85570f53e44d570da7c38f3eb94e5829c584754e3c351c70c3dd2b409adbedec60c3b1aec6ce7febeb9f83deffa06e8fe5b474dcce8bd88e706 WHIRLPOOL 2ac20c923a36154195d1072a917c765d6bba4d64ffea04636d1d111b44b3ad1de7f96641eda75455a6c6fcc9d75e72d37abb1dd9cd4a74130a0fa60ac9e4e8bc
-EBUILD festival-2.1.ebuild 3692 SHA256 c766cfc5c2762d65bde375da2ef16e7ed040c63f6d2d82a4d78681ee5e15be91 SHA512 0593c5286bd2f40023350f5b52f0f9e6b0cde16c6ad24c4f2d99660b7536deb4ed0d3f9a91df6440f611d2b716ddc05a6fc9c1812f036af711e49089e1a5a741 WHIRLPOOL d60db6810eeb5c1cf3cab8dfef475509cae0285204f3a8a0133004c35e6cca032b5b6f4537de131ac6c18b7223ed00cbd68e15d8d7ad5d9df1f04f2b9e82ebc4
-MISC ChangeLog 20340 SHA256 8c1430ba667eb485830a3ac738db468e5da7b0c8a0ae8b6b3a96a6b6fdcb1a27 SHA512 0c68701e575242de09c70c243d2f96e560bebfa70cefe97ed77ecbdaa0d22881c6ca0fe11135023b9bf9368fe234d16f3977f905b93e284163308f3e0c22fa2f WHIRLPOOL 5a2a9b0d4dd7167156c03943d2847b1319fbb3e37a3dca707b408bda64383e919ddb57c2e0a0f648b74abb3cc26d8650dad8465cf9ae4b921bac5ed9d5bbc692
+EBUILD festival-2.1-r1.ebuild 3766 SHA256 ee02cdfddf61e40ff7f973afc3cf96a22b9483e277f991c721e4c3a4bfba911f SHA512 957729c25d05b1ceb12c2d886324f079f24b24717efcf4e3df6cd1b6d71c645f76a6bb65d00f93eb5a0d4b8f991893a9f6ebcb4a89aae110c920822561c05b44 WHIRLPOOL e6f4ea3c9d497ede556af1a3e0f64121b3c85e61cae67d48804b98f405c4ebe89c1585934535dd6004858c4f4585e6d82d5b8226ea19083150d4a8fa51327839
+EBUILD festival-2.1.ebuild 3715 SHA256 ff3b1d578556f121549a2fcc48d5dd656a9f1ee497ffa33ea35aba64cabac402 SHA512 77b579b95a32c6cb2c99ee85c71781c44a2c446aa0e53b1a94d5b09974357f7ad4e7e8f09009c59fb0fa75b204844d42cb4b6157eb5291878f44228906d79a43 WHIRLPOOL 1d30ddbaff93c616aa93e1e28ae04ffaf92050239d62ee7f0094c2ca9d8bced75d71a7ec7be801da77b595f388368cb6035b914a9c13141080a42e12485b2994
+MISC ChangeLog 20486 SHA256 815d886dec96440f0e3bbf75895ac623a186d8742b48b9bfd4f78eab4e79c9f8 SHA512 6a0e39fdd3e6f34fd79d7419739c8a9cc27ea1622d1c36497fc475ae0b49bcffadce5c482524c4a115e29105e22f6f1bf17f1e482ce9cfc6d61aa1a1e461974b WHIRLPOOL 810d978f1cb20c6a01c7b77d56dd30a58da498ec4ca1804643c9f4a3faa581f5b62a73b515bf9efb82a0ad8857e650b57d40317c5cae2c29d579446146d3e02f
 MISC metadata.xml 276 SHA256 e155e128983e303f69cc7f179118c895267e62f9815e1333ec37b8e221f5ed84 SHA512 5b1c1ae4f078d6656d776ee1d520157de0a10d577766ff3624d1b5dcfe9fc95fe197cb5a9701e7691b1945b7c9405f8d0e834d0415ee7dce1d5d42d2347fd2d7 WHIRLPOOL 3de4d81049e937166690cf304fd3af09ef8359c533413ef83e0bf96f2de823f8ddd7b02d6704b9d7cfd72f592cfc0f064d7a4a6567e821ac2f4c46640c6af10e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC9PasACgkQdIssYB9vBoOFIQCfeswWd7rJnMEC+MMC76/r3wfK
-C8UAn0VUO7IALaXB7ONOnG+DX0EYoPc7
-=0LcL
+iQIcBAEBCAAGBQJQ3eNJAAoJEDxpGckxwJCBZYIP/R/KKJEX2wona1GUTitOZPqw
+J2GCLA6hSXVU73z7TvBZgpq8I3rsONEF9kPCaSGAgl18L0hmah54jP+CPyKf+yHN
+gZT56tZd/SQQ3UgjfYX6MtPYv/4q0KLdsrahI/T5+Mhl4iECJ2Z4dai2uA/ny6OB
+FSdhWFECLjgQiCHtxttl9pccWB8OxXdgaOvzD92BOQ7L6LR8QoBPqJ+JO3lHtDCt
+1TW15Zcs5tGoAjcmsWnTRCu31wkJOlefQXcd/ucRCFsVkiZuAHUteoVVjFr/Oqfh
+4DKNlSh0DpNW5tK+zgwwg0qenxkg98Dj78g5J2b6tkrNzeRKP4F6Po59zOpT6zOn
+bdMJqbRU3h6DX6hxeZni+o8GZR8trWG9ssxS5Y9ximgALIh/eod4ee75TCBJXO9C
+fohLlXpsAr4VBFVFmbazEqg8dip45qz0bhZ1txQHDNADMktDknmumIpioyzG38du
+59P+9ys+jbcaXzn2R/kyb0xOX8Gitiq0Il7IIqF84ufnvlZs9E5O2Yn1DTZUUWJQ
+LC38zM6lCp0V23m+X+bFj1OcqZzY/rTejRgo+lzMzSmQjIU4VuMF2wxy8FgIK2xl
+sHVXHVnrvs6YxL8DwegxLeJLkHNFVDFYGKcmtCQWy+WkzBgBzAs71fVXBcuYVUJ9
+XrEzezJq0DRFIm5x28bl
+=aFRF
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
index 491975aee1e2..80888ea50913 100644
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ b/app-accessibility/festival/festival-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/festival/festival-2.1-r1.ebuild,v 1.1 2012/12/04 04:50:43 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.2 2012/12/28 18:19:42 ulm Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -22,7 +22,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 	${SITE}/festvox_kallpc16k.tar.gz
 	${SITE}/speech_tools-${MY_PV}.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
diff --git a/app-accessibility/festival/festival-2.1.ebuild b/app-accessibility/festival/festival-2.1.ebuild
index 9f5a574ccaff..202cfa560048 100644
--- a/app-accessibility/festival/festival-2.1.ebuild
+++ b/app-accessibility/festival/festival-2.1.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/festival/festival-2.1.ebuild,v 1.12 2012/05/31 02:14:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1.ebuild,v 1.13 2012/12/28 18:19:42 ulm Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs user
@@ -22,7 +22,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
 	${SITE}/festvox_kallpc16k.tar.gz
 	${SITE}/speech_tools-${MY_PV}.tar.gz"
 
-LICENSE="FESTIVAL BSD as-is"
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""