Add Aladdin license for URW Garamond (bug #434262). Bump to EAPI=5. Tighten up formatting.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

3 files changed, 32 insertions, 20 deletions

diff --git a/media-fonts/urwvn-fonts/ChangeLog b/media-fonts/urwvn-fonts/ChangeLog
index be335b4a88a7..b7aca8074e85 100644
--- a/media-fonts/urwvn-fonts/ChangeLog
+++ b/media-fonts/urwvn-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/urwvn-fonts
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urwvn-fonts/ChangeLog,v 1.32 2011/05/25 16:50:24 flameeyes Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urwvn-fonts/ChangeLog,v 1.33 2015/02/21 17:24:15 yngwin Exp $
+
+  21 Feb 2015; Ben de Groot <yngwin@gentoo.org> urwvn-fonts-3.05.ebuild:
+  Add Aladdin license for URW Garamond (bug #434262). Bump to EAPI=5. Tighten up
+  formatting.
 
   25 May 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -urwvn-fonts-3.04.ebuild:
@@ -118,4 +122,3 @@
 
   20 Nov 2004; <pclouds@gentoo.org> +metadata.xml, +urwvn-fonts-2.0.ebuild:
   Initial ebuild for urwvn
-
diff --git a/media-fonts/urwvn-fonts/Manifest b/media-fonts/urwvn-fonts/Manifest
index 04a701a9fe00..ab0ea9c60332 100644
--- a/media-fonts/urwvn-fonts/Manifest
+++ b/media-fonts/urwvn-fonts/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 65-urwvn.conf 459 RMD160 b9ae899933451082022bc40992ea575d7d8e45c6 SHA1 b0b5f906eaef588b34869d6147361a537c5b903e SHA256 2fcb5842cebd4c6b9292684e2e6d48f8a15122b1e8cf5b08244ce300b664f397
-DIST urwvn-3.05-ttf.tar.bz2 1322045 RMD160 cdea64d12c8345335b0876d118148d85a5225d95 SHA1 7c7a9a67d41b27a88bde011bb921cda14d8fbfd1 SHA256 0a46ae92129eb5857d61c9e82af2811fd6492efe382a1389024f7de9527f0981
-EBUILD urwvn-fonts-3.05.ebuild 1061 RMD160 b56e5ec3210b4ccedce5963603d9bc784b347d39 SHA1 dbd6d41a2bf938bfa1b9659368ffb9f751825ef7 SHA256 615ba0ce11d085701fbe917dc97d11febb4bb927bdb26ffb83e95e408f3bc650
-MISC ChangeLog 3753 RMD160 fcfaa9562a088d36de5aec4611167ea8ded7ab9d SHA1 eb23f8521713b6b2319a355869281939cf4bceb0 SHA256 37b484870c3d7ac6fdfd52273ae1104b26312c4c7d0cdb7eff6cee94d7966768
-MISC metadata.xml 160 RMD160 7341b210c1d8144efb1038c1cd47784185104798 SHA1 9b934050a10b9c1b5db1b71d5a7348d1ba3b90ef SHA256 f98af670c6967591fe20a2cf4ef27d68f8b6dfb2799f8a4cc051003f5c95f7c0
+AUX 65-urwvn.conf 459 SHA256 2fcb5842cebd4c6b9292684e2e6d48f8a15122b1e8cf5b08244ce300b664f397 SHA512 a0a676f600fae81ccc0909a2d1ba2c45cad77039be3bf367fe9213dd0bee6decd02637e83079ec4c03957b93e62b01c8c62d22456a55f26cd9b0d9d53fac3a0c WHIRLPOOL 9b47dbea4e89e97877daa2ea0fc6bc4852c7193e19d339083561529e2fd1d2f42a58fd4510139310b44e99c30cce7a915f25f9cb776eabc921f8d9ca58ef091c
+DIST urwvn-3.05-ttf.tar.bz2 1322045 SHA256 0a46ae92129eb5857d61c9e82af2811fd6492efe382a1389024f7de9527f0981
+EBUILD urwvn-fonts-3.05.ebuild 1074 SHA256 7c571a2b6d1d4ae25c750e5048f5a3825d40ae8c389f80f28a4248838199c5e7 SHA512 6c54529d93fe109df30218d8af9d7ae33307e3d75bb7d5a8b0165f7f4260db86a85117e747a06f2d4e7ca7c2818e1201580c114788b3ebf4b288e3ad60306415 WHIRLPOOL 91e8d6f42da188a3e3bb34e5348e6dca1c624cd48220f9b9edaf0c34fc9178d16e5af63d28470d841b3e77842ab286653c3f266e0155710aa68ef3a700bee4f9
+MISC ChangeLog 3918 SHA256 1e6c8816c69e2071397397e77d1a21d5ebe3a6198ec14cd38d6b56a15aba4b57 SHA512 615558a32e5fc1209c4c285d14a1b46b2b2ac4f1dd6929f23dbc4d1b60e41aa7fa281e5a62ffea82139c4441db67406ae0f975d1c1fd4bd4bc3344e0bad51c3d WHIRLPOOL 54bfa3dd1fd08828e2df35887b11a30dd0e25c5c47422a810b83cca3409d9a68eca5134f9159302d80b354692b3d666f5008361ba2c86db5e6874ebf6eb24ed7
+MISC metadata.xml 160 SHA256 f98af670c6967591fe20a2cf4ef27d68f8b6dfb2799f8a4cc051003f5c95f7c0 SHA512 309b994cd299c4e1e99212e9f531f63773f48b1255b1c5518f5f7c61f245045c579a7854b481c9b7ffdd79f7e71c417bfdd353ed6431903288a40e2e357b19ad WHIRLPOOL fc94ab822cf0a7455b83c600ee9333f3ad6a683f71bb17b33a21dc86d25dafa060192d7576a849668bb3f88b46f3ff7422a4d06830154bd33540a9f7a50bc1d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAk3dM0UACgkQAiZjviIA2XhCzQCgyfm38PjGEC4S+4RqZHjI6G4D
-zQIAniSTcQfVPX+XODdHn2crKpYp4vEx
-=7BA8
+iQJ8BAEBCABmBQJU6L9BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOuFUQAMEik3rw8y4WAVgUbsY9dN1W
+ElXG09900t+cA7mlqR36ONdTYkBSouxDh69+ni4tOGfyZdz4oydoQfl81aLTdw2+
+86A929uKde76flO/PEyBnSOBMDPUyD8GQYqVE5DzZsEw7UAvrcrCJYh98WXZu+rb
+ajlt3WeeNVCqQukG/c1cXuoyYUPxcUqroJpXv0+b4/+dwTbYj+/aS+1cALj3ajoy
+f1IGXAEng6R+AzvG6ez9PJrZQ2cL7B+a0saqXajtVjTXGg1b+rbaDqFARoAG4jpS
+cp/ZquPwUtSnedLoT72i8Zv4q9OmpWgyKFAXBNvAeNUesYc1K+9ibMszpc1FxdqR
+oIUA4ryYiDj7uUorUPIz+wm8dgbNFN3+CDWsAhHS5B0J635soOhMno1+AsmomJ+5
+tCh786TYaMpXcyJclrFgG6+n8ztQShBj9msFyPXt2QMAhn52pHsLA6raxLhgAmcR
+XtzXjHaVUZNja9AbPBwmjyh1giHfh7xU/o6AriaIRAyth1lRt/ENvmhgph8T1aY+
+saFR0eVVNL2Xb3SyhJ+WtFWHrYkFXhakjiZTKslj7mljw621NFQDhwPQiJ1LlQ9y
+r7Q2k0S/oaSBt1nshUJvJV1aKMY9UpTu2ZP+oaHC45U4SQz5T3oDjvsya/LF3k1T
+yClA+PnYRP6cEVOc+934
+=JsC7
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
index dadf9035a9d6..fa0bbda4a27b 100644
--- a/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
+++ b/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild,v 1.6 2010/07/20 16:14:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild,v 1.7 2015/02/21 17:24:15 yngwin Exp $
 
+EAPI=5
 inherit font
 
 MY_P=${P/_/-}
@@ -13,18 +14,14 @@ DESCRIPTION="fonts gpl'd by Han The Thanh, based on URW++ fonts with Vietnamese
 HOMEPAGE="http://vntex.sf.net"
 SRC_URI="mirror://sourceforge/project/vntex/urwvn-ttf/${MY_P}-ttf.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 Aladdin" # see bug #434262
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 S="${WORKDIR}/${MY_P}-ttf"
 FONT_SUFFIX="ttf"
 FONT_S=${S}
-
 FONT_CONF=( "${FILESDIR}/65-urwvn.conf" )
 
 pkg_postinst() {