Update LICENSE and remove non-free prs500 fonts for bug #470212.

Package-Manager: portage-2.2.0_alpha175/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

5 files changed, 84 insertions, 14 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 2d3c34ee353e..ed9f728413ae 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.278 2013/05/17 20:13:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.279 2013/05/18 17:21:28 zmedico Exp $
+
+  18 May 2013; Zac Medico <zmedico@gentoo.org> calibre-0.9.27.ebuild,
+  calibre-0.9.30.ebuild, calibre-0.9.31.ebuild:
+  Update LICENSE and remove non-free prs500 fonts for bug #470212.
 
 *calibre-0.9.31 (17 May 2013)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 6b6addd4271b..6d50c06d10cd 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -8,15 +8,15 @@ AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
 DIST calibre-0.9.30.tar.xz 28894864 SHA256 eab88d0d5ade70dd1bae9522f444ddd3ab71b2d57a159d6ecc6276cd674fc927 SHA512 330a1bdd7b43f6aea06d6a6e056c63991a3c763c2ccbf0fd70adedf2c943813872f9997340455442c8bb0d36fbeae9554a86d131dded662f57fc138ae8c5c231 WHIRLPOOL 1ea65422bb9b4e628ceb847c331148d22f323d82431e2bdee8cfa7f18d8068a6436e54140faeb6f4596ed1a6645d193d983ca2bc4938b5bb4fddc3c0a38fe025
 DIST calibre-0.9.31.tar.xz 28982364 SHA256 94346e605f72bac5cd4fc26d5a6b8644511d68837bc5f29bb30f9b13474ccd1b SHA512 4b287dcbc0ec8db86f8e41e87c7d7ece9781ede7309e84b0ff660efba08267f980fe95c733b0624945f99b805a84f0fbb479d825d4a7673bc68168ccd0059628 WHIRLPOOL af0741eb02296123e6348c6d157535336147d15d34028214536a2e10b66de5e9538d10aa29fff461c480dc4cf6db1091d03eade12be05dd7d36be9847fd6a85c
-EBUILD calibre-0.9.27.ebuild 6628 SHA256 bc4bd901a49da8e5a91424abee5fdc792a89d1b2ec73f557cab21d48e48cfa63 SHA512 62dd9854cdc07286476f260ff07f307481c30ce24b24040b0fd3d80082a7d55bf8bd97abaf774483fc3334d1989f4b8348cf0702cae767ba910d5fcdcd231ad7 WHIRLPOOL ae694e4cebdce94ccf2748b2bf59feffdab8a256b8de818b22b28e632f801f49a5b2966189b6b9c58c3178fab9b5d1c5abfcbe610b2d475507f89893410d5b28
-EBUILD calibre-0.9.30.ebuild 6630 SHA256 f0986d2bf7b3e31572c6b6ab898e9416f475534d8d7773420bbc0761b08b7caf SHA512 e25a3b475ba1c783ec37de7d5371fda7ca5f33c707325b7017045fe555a231fa2a4d46a0fa5b8e607c0b29003abb8cbd98daf20814a76a33a355c275427dd0e3 WHIRLPOOL 82ad36a6f09b0c2e3d2c21a7869f2af5411ba5203c382ed64ce07fb3bd205d5ebb81b65b525e6693f02963bcb1771547eeb971cfc57df807cf24e0d1f9b94519
-EBUILD calibre-0.9.31.ebuild 6630 SHA256 b0cd1755c9de5ebb6249f322310dda74f3384020c8eba7b39e42ee551b6fc124 SHA512 aa9f961896c078ff41ceeb7f27e784738b359581cb9ea292b637b09a20e35f202d12362854539f753d94c0dc860579b304b9da9acb959d1261bcce4cc609cb1b WHIRLPOOL da4d882e9c5841d13032d91b6d16c5cd7f40dde7ad504dae7dd2bf255903b98250ed058ecd651b70486b310b6799955804d00d0d8de6157a68000758b93de9ed
-MISC ChangeLog 44213 SHA256 d65430d1c42b38fa4b6e29c9d39025e299bf860b82bcec0c6c86a310bc56bf3b SHA512 4f15da7bc8af6a9e0453db1942365e8964b9f5404f09a736d31e82d9cc677779d64d4d43666f7ff5562f4d98d21054ce3460daccf54920e44fe6239d85f41782 WHIRLPOOL 0fabb6316d9314f2f2bb888d0d13e3f266307622db0aeb25b69a28150f7e03582218dab2ad3677b7538e72e077cc40570db47440d330f4f3e48ba7673d80c7fd
+EBUILD calibre-0.9.27.ebuild 6874 SHA256 8dafbcee7e6e73d2007702599c53196f59f155d9b61a23a89ff77532661e0d91 SHA512 4add2a0c594085a821687bf8918fe13b9926510718ac07464b6ac22467382d5ce868fd2a91ddf7af3b1e03abe6c89df9b905dbea1159778bf3b0a8b7823c89e0 WHIRLPOOL 065d4213c3ed4bacf0f5b9fb227b9f8ee49afc414a442f6f42b34c22809824c6dd9ec715cede69d1c602ede0a6df5bc6f9c1784a0cca6401eaa43b25ef4eccab
+EBUILD calibre-0.9.30.ebuild 6876 SHA256 965c884cdd48898cc293c01b7ef265a2ae275374345f89ab27c0ee6abf3822eb SHA512 f7548c58e1545878d54d2346caa62fbc0ed5a22b6c63967e7230c29c2a15c903050496f34eb7212cb21e0e27ba093ee16ad5255af66849ced8020b9853e41de2 WHIRLPOOL b810e5f1571bc60f53fc30f8a2d92c6297b9fde5b84459253705b64b3733ccec4c774faf6cc42415e0bedbb746a6fce7576fa8d565a703b6eb2f4f5adfe34aa5
+EBUILD calibre-0.9.31.ebuild 6876 SHA256 e1849d860bbe1a6b40eadc2b7766c859168ab20ee637c50b24d675a684101cc3 SHA512 5790f21904a0cad17198f43e1aa85bc95b9de1bcebedcffaf479cac971730fb8740f0154abf7823a566387a7edeab96de41aa5ac6bf670ddcac293ffd64aca52 WHIRLPOOL f41359dc316e153e54cfbf04c9c1f4e1e68dd8cec0e4d9ce9914e6a7e105498b11e824ea242a37f62f9381666efae9210dc9461768dc6c1199656c0a37a25e74
+MISC ChangeLog 44399 SHA256 f5ecfeb0adcb5541fa9541f49a8183350dcba429dcb5fd034c500727eeaabf99 SHA512 cb6ac917c258110b8aebbec153e9b90c6a9ff5a982edf6f61b7ad8aab93ad63cd57b565875b1b3e07f2c1c350ef2a33449e6da6b7a0f4fe347e7afd4e624a33b WHIRLPOOL e6a60bd8dad362e58d869d0201b9aaf5936e90f95cc1e478212649f51583a4aacec1c1971f3dde21b93f1bd18ee64adb55dec92f37eed35886d34bc7681590fb
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGWj3YACgkQ/ejvha5XGaNv2gCdFy+K/sSj6n6dB9EVaSS4AxY5
-9PMAnRYSUOJM/v49FwMGOhAJLc5pyfH7
-=mlXN
+iEYEAREIAAYFAlGXuJoACgkQ/ejvha5XGaNeLgCglkrBUS3/OzyGMi9NHvsfXVoF
+8D0AnjNfuvTNpHgia3tBU63tbuLGu7DX
+=j9CK
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.27.ebuild b/app-text/calibre/calibre-0.9.27.ebuild
index ff9bbe262ce3..8e713e67ee19 100644
--- a/app-text/calibre/calibre-0.9.27.ebuild
+++ b/app-text/calibre/calibre-0.9.27.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-text/calibre/calibre-0.9.27.ebuild,v 1.4 2013/05/05 02:13:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.5 2013/05/18 17:21:27 zmedico Exp $
 
 EAPI=5
 
@@ -10,7 +10,26 @@ DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
 SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
 
 KEYWORDS="amd64 x86"
 
@@ -88,6 +107,9 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	# Remove non-free fonts (bug #470212).
+	rm -r resources/fonts/prs500 || die
 }
 
 src_install() {
diff --git a/app-text/calibre/calibre-0.9.30.ebuild b/app-text/calibre/calibre-0.9.30.ebuild
index 4a424f9098f6..96d65399ec4d 100644
--- a/app-text/calibre/calibre-0.9.30.ebuild
+++ b/app-text/calibre/calibre-0.9.30.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-text/calibre/calibre-0.9.30.ebuild,v 1.1 2013/05/12 21:43:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.30.ebuild,v 1.2 2013/05/18 17:21:27 zmedico Exp $
 
 EAPI=5
 
@@ -10,7 +10,26 @@ DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
 SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -88,6 +107,9 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	# Remove non-free fonts (bug #470212).
+	rm -r resources/fonts/prs500 || die
 }
 
 src_install() {
diff --git a/app-text/calibre/calibre-0.9.31.ebuild b/app-text/calibre/calibre-0.9.31.ebuild
index 1c1f3c8377ed..9604c36b8be8 100644
--- a/app-text/calibre/calibre-0.9.31.ebuild
+++ b/app-text/calibre/calibre-0.9.31.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-text/calibre/calibre-0.9.31.ebuild,v 1.1 2013/05/17 20:13:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.31.ebuild,v 1.2 2013/05/18 17:21:28 zmedico Exp $
 
 EAPI=5
 
@@ -10,7 +10,26 @@ DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
 SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -88,6 +107,9 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	# Remove non-free fonts (bug #470212).
+	rm -r resources/fonts/prs500 || die
 }
 
 src_install() {