Fix LICENSE, bug 449946.

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

6 files changed, 42 insertions, 37 deletions

diff --git a/media-fonts/umeplus-fonts/ChangeLog b/media-fonts/umeplus-fonts/ChangeLog
index e813e0d2f32a..2ac9d8f15cc3 100644
--- a/media-fonts/umeplus-fonts/ChangeLog
+++ b/media-fonts/umeplus-fonts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/umeplus-fonts
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/ChangeLog,v 1.6 2012/04/12 12:03:54 naota Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/ChangeLog,v 1.7 2013/01/16 20:29:38 ulm Exp $
+
+  16 Jan 2013; Ulrich Müller <ulm@gentoo.org> umeplus-fonts-20090604.ebuild,
+  umeplus-fonts-20090918a.ebuild, umeplus-fonts-20100106.ebuild,
+  umeplus-fonts-20120403.ebuild:
+  Fix LICENSE, bug 449946.
 
 *umeplus-fonts-20120403 (12 Apr 2012)
 
diff --git a/media-fonts/umeplus-fonts/Manifest b/media-fonts/umeplus-fonts/Manifest
index 705b1c2a951c..18035a0a6ee2 100644
--- a/media-fonts/umeplus-fonts/Manifest
+++ b/media-fonts/umeplus-fonts/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST umeplus-fonts-20090604.tar.bz2 5249681 RMD160 4fb72b2d17c78dc4778cdf5a19fe30d70dd1cf0b SHA1 89882cfe16e49bb6d20f4eb03d874931106b847f SHA256 d3220dc7eb4e44f5cc06ef42b3fe807de957e2c6109be7c7ab374a26b12ab4a3
-DIST umeplus-fonts-20090918a.tar.bz2 4972172 RMD160 4f59045d0db3385a59e189451f6798a6fdbe92eb SHA1 f08145756e396d6ef4f6e2deabbd4b744265fded SHA256 f45c204815ce140e81e26936c0c613cc6ad396a16a7acc8a9c7b8e0443875748
-DIST umeplus-fonts-20100106.tar.bz2 4924525 RMD160 a94dba207d1fb9999582c121457a5e8e5c08ff6e SHA1 2167f5de7bd997de6e86732a595957c4dcf49039 SHA256 85a7a29548729c2596c84fea8c557a27aba5fdf58e1d3abbe74e97ee85ca87c9
-DIST umeplus-fonts-20120403.tar.lzma 2048487 RMD160 7d505b0be9dea5ff9f8049bc07bc4fb4cb2094da SHA1 16f209f00d4cbb53aeb639975c32b174b2f10023 SHA256 0415137b5c10cfe76953ddc880367fe4801abe94a1193872107441a9efc084bc
-EBUILD umeplus-fonts-20090604.ebuild 641 RMD160 876dd8960b85c0fcf99011a5c4c5d2d4810dfc07 SHA1 71cc51e18d70c32920527d90d4da7db8a6d6ec27 SHA256 efec21a0eb5d0956c2a8a81f4fd4da9c8d71d4a4561b8c160790704abe4a0275
-EBUILD umeplus-fonts-20090918a.ebuild 644 RMD160 9dd4ab45b2e1e3fb1e22c180cccd46db9fc69306 SHA1 c273528ed323f27c5363d68830e414cccf6776c8 SHA256 5f9aa82fc3c359bc272b05ce3908bc989b32acf2396d42ac90c6307d04acd747
-EBUILD umeplus-fonts-20100106.ebuild 666 RMD160 2546f53420505d7d44e133fe8b3bd551eb159352 SHA1 189a6713a048b4b40b0c645583c58e55714308f8 SHA256 13b939767a76b5e3dc739c799b339f4a86d03757d5700f0d0116555fb8cf921b
-EBUILD umeplus-fonts-20120403.ebuild 638 RMD160 3906634f19ff3b8c930e06ceb7a7c1e674e1804b SHA1 c699286ab8d4e13c6d7dca619cb77ab4239651b1 SHA256 3878f0e28af1d36006398d264fc22f5435c3573f188f021501bdb992c9770c38
-MISC ChangeLog 1049 RMD160 d8fd3983edec0b588c4cb4f1a68616a381f2cb41 SHA1 5efb7e95fa47f83f625bac9c65876d26005842c3 SHA256 bde58ba47d85c3e425f43d05ca9767b895dae1c55960cdbba79da8acee7b6cab
-MISC metadata.xml 177 RMD160 4458ac1eed654672753f6d46ab4db2e69b054f4f SHA1 ebb539d0ef3db83e84765a75dd5bbcf094ac27d0 SHA256 de679fe8d0c67152bec5c8c5ed36c0684745b918ca3e1994c17bb7991ca835fe
+DIST umeplus-fonts-20090604.tar.bz2 5249681 SHA256 d3220dc7eb4e44f5cc06ef42b3fe807de957e2c6109be7c7ab374a26b12ab4a3
+DIST umeplus-fonts-20090918a.tar.bz2 4972172 SHA256 f45c204815ce140e81e26936c0c613cc6ad396a16a7acc8a9c7b8e0443875748
+DIST umeplus-fonts-20100106.tar.bz2 4924525 SHA256 85a7a29548729c2596c84fea8c557a27aba5fdf58e1d3abbe74e97ee85ca87c9
+DIST umeplus-fonts-20120403.tar.lzma 2048487 SHA256 0415137b5c10cfe76953ddc880367fe4801abe94a1193872107441a9efc084bc
+EBUILD umeplus-fonts-20090604.ebuild 646 SHA256 6d45581e45f749d1f233ad16a5ccd6ea79be3c5feb5cab24bc53a92f8ee50061 SHA512 74d718e70127a3e278621c8e988505d316c8a093455924fdebb059ca533ef2363fefe8eb534912463e66126f7a7a1bc89e734ed9b3a9d69db63d93a2df2b8e08 WHIRLPOOL e24a13c57dcbc81507678ef283fdc1307328f9efae2263f3b50415b7b51b3ad1605bade8d3f005e24523e12e663d7f53231a83bd25db45e0ac1b804f12af6ec1
+EBUILD umeplus-fonts-20090918a.ebuild 649 SHA256 afe8e090436562004c18dc72821f28fcac351544cfbd67f305241194fd03aee4 SHA512 303d9b5ed9979fc888ca13e1f36cc48537d57c53983d354d9f2df0865cdaf762729b5c4c069b07b59741744b1fe875836b756ea179e94eb6b3a516cb6efa01a5 WHIRLPOOL 280bf5df5c49da9a221fdcef6d2d2d83fa6a0544d0bc664eebbe61e3adaf993d7ea499432f4cced23e9683d0e1dc25213cf57db2d97e132b58efaa5f190cfac9
+EBUILD umeplus-fonts-20100106.ebuild 670 SHA256 a6ef617feeefa25952dce5892b979d0fd764fc726fab085c0c56024e1662ab7c SHA512 5cfeb7213aef5deecb5bc3547d93cdf6dc23008025d5b4779c5c737ecba83cb6b47ef0134c74a851acc944cc88a6eb918120a34ade4ee1440e7bc370801ee354 WHIRLPOOL 948f210c844f523b491a1b6a60de220d79fe79d0a06d5fe898c48fcba6aa974fb598b7ff8fea052a9c9b23e07ee1db756929161c48003245c358fd327ee8acc4
+EBUILD umeplus-fonts-20120403.ebuild 644 SHA256 91f25057b80696341ace73f6d3726f1d04547e8505cccb3f764f34d3a858c380 SHA512 3fe387855e96eb002c83e0c658382f3d3e2c246f67798497bf7a98788049e1372caf6d7205156869ed94293501c5c910f454a36bc490fb8e58f9a7ec81813d77 WHIRLPOOL 3bf15fbd94e2ea6a781a0d0c64d051f461dfc776cdde36e0b6d96de32811d2de23b5b1efdf2edc3a6fca169e710fc654f0228262fc828c80c591c7533f1c5501
+MISC ChangeLog 1251 SHA256 2572284098fa6be685b2d87b6a56a58407879e60ef59e703ac2adc7facf93c60 SHA512 e98794486f6c52d67ed4cc84fdefca35341f4e30576dcc74ae9f9aca7da2e32222ad99356159c9c5a2134980b60d5ed1e5401ba0197c316c799135a221e1d350 WHIRLPOOL a4620e34a506fee4183f54aa3300897d4f0c65bc3e34f9c5a35907ed7271f94e8d41ae0ac6c080f5f2dd64227768f46f8527775bd82e2c9d72d5b40a1def39f1
+MISC metadata.xml 177 SHA256 de679fe8d0c67152bec5c8c5ed36c0684745b918ca3e1994c17bb7991ca835fe SHA512 690b20b2b97bd9e30395d648b56f186e6a00be8a19b12dccb92f54c7f424b268d00d41a4be31c4fed1bf36db2898a447f04bad7331353f2b181183f8796e4cc9 WHIRLPOOL 4587f770317b31a89835f4c28404bbbc08c8e8d6ffeadd4f8d447a5ac38075f0ae4f7820c901330c513d9f20abcc474fd315c6edc3e4ac650ab3d748a73b13ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPhsSvAAoJEDYO1FT4VRUUcF4P/0TJomCqutuTHdgPKm37Di77
-QXkeHpMvNxDh9vS3rMvipV09sXJrU6ABZdKjJByb+4XRDmBP/G/yR6g9m8f2hr3S
-83U9lOyrP+xID0j7r8qNGGoc+AuFfSWUujQQ9gMoMsGlWHEM70cH7rSjPEiStlpF
-plCKH88zjxNGBme7YvLhAdrN8BoPr46JeM2tD7wCoQGdDX4/Op5EO37Wdd2mLuVY
-WfyUJGfd/3E7pl4EbOcVyztEb306+gGm1nUP7fIdNVOttFZrQmcibhxOos9VE1zH
-n/clir0GjV7oskqecfoV2+US3Cksz0PxhIncvG+GXM0p6XTb4yLtGuMBNfuZf4IH
-27dFeIpYPaR2oEHQCeFBEgFxaeY4nOthyl+1PDzmIsfuZkpc5WkgVEDJbHjAIMTN
-DnsTydHCIfpHCkbJ/0o9G8HDeHCSLIa1YdBFlo+RKs5M5llCyUj762fxxyDFGWvp
-5qoi1O/V0/ndB1nFFjkl7vvElGHr980Hab72C/15JzMkhQsvq/An1MM+A2AOrI4i
-rXd+P4MYG4tKKXhhEdrYPsqq742jApGLWdOVa67RmAsmG/pwskbaxSEk7nGpRFHY
-OjlDAq5mSerGLy44NzBIzY7edKw4B2jsANLAbW9XAu8fvBnNahlLzsk5+1QtDxn8
-vTapYlkV3LLBRMLBk6oZ
-=HeoE
+iQIcBAEBCAAGBQJQ9w5fAAoJEDxpGckxwJCB9bMQALdPDYPaUesFKVW/j8rpDuh0
+QXhab+ukRvy0WCNBVDYee7V4hoyaVkwIBkisXxZtuqsbgboDBevjTCUzDGFpjEZn
+cwgcSZTuJBGBFkyiR0NZuW9uZ2BY0udUWV5+38YpFZ8ban/COD1ztcNSN+22XFuu
+iiMpbF4A9oQqINwYNgIA2+1OvEVdWqlNUSxhC4fFVjjNOU3hBjySD53FstupzAKN
+rFQtWoMp4FABQMWAFl32XK1THQW5G7ioL3H1oBoGTY7GMRMaTmeRrBRpNF4QnpxE
+5WUAIqnBrceq8pzYBq3u0uJvkD7N5RmpFBZ3CptKdBTZPPQO5R5j2vREh5foyleg
+c974rl+qkEyhAkVFeCHmvwy1Jp6A0IxDBoj2aWeHDA0FdOJSApE5fwXy9yzHUq4V
+WD3CIDNJ7Svs/Y6tAlbzEv97yHLkJDpYo3Os00VZmi2a4K4gLR1FYmx2iwS0V6AT
+QFRo3JFuPSgSNL693Lr867YIiNSCKE3iJsZ/akW4gwjTUCLCiNMeugEBl48jgIkU
+u5oa+jYAICI9J0jMb1K0eBgmZ2mPwN22dsbs383ZPdvOfkEC/Esf/+CgcVhCkFUq
+7+a5Cvg7mN/Yi8VBRCN//AB3NgEY4XoPI6rwCPSPLd6/Gv5js34nfGd+YIiYAOKR
+vflALO9qde4KLUnqOjwF
+=1VV1
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild
index c3c9e884c762..8e121012a595 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild,v 1.2 2009/10/07 21:00:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20090604.ebuild,v 1.3 2013/01/16 20:29:38 ulm Exp $
 
 inherit font
 
@@ -8,7 +8,7 @@ DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
 HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
 SRC_URI="http://www.geocities.jp/ep3797/snapshot/modified_fonts/${P}.tar.bz2"
 
-LICENSE="as-is mplus-fonts"
+LICENSE="mplus-fonts public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild
index fbbdde6b986a..af705ede7e2d 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild,v 1.1 2009/10/02 22:45:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20090918a.ebuild,v 1.2 2013/01/16 20:29:38 ulm Exp $
 
 inherit font
 
@@ -8,7 +8,7 @@ DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
 HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
 SRC_URI="http://www.geocities.jp/ep3797/snapshot/modified_fonts/${P}.tar.bz2"
 
-LICENSE="as-is mplus-fonts"
+LICENSE="mplus-fonts public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild
index a56b9552f9ab..fec9d8d0d490 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild,v 1.2 2011/06/14 18:04:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20100106.ebuild,v 1.3 2013/01/16 20:29:38 ulm Exp $
 
 inherit font
 
@@ -8,7 +8,7 @@ DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
 HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
 SRC_URI="http://www.geocities.jp/ep3797/snapshot/modified_fonts/${P}.tar.bz2"
 
-LICENSE="as-is mplus-fonts"
+LICENSE="mplus-fonts public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""
diff --git a/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild b/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild
index 2c5bec897c38..e30eedbc5163 100644
--- a/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild
+++ b/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild,v 1.1 2012/04/12 12:03:54 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/umeplus-fonts/umeplus-fonts-20120403.ebuild,v 1.2 2013/01/16 20:29:38 ulm Exp $
 
 inherit font
 
@@ -8,7 +8,7 @@ DESCRIPTION="UmePlus fonts are modified Ume and M+ fonts for Japanese"
 HOMEPAGE="http://www.geocities.jp/ep3797/modified_fonts_01.html"
 SRC_URI="mirror://sourceforge/mdk-ut/${P}.tar.lzma"
 
-LICENSE="as-is mplus-fonts"
+LICENSE="mplus-fonts public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x86-macos"
 IUSE=""