Add Tahoma optionally. Include shipped EULA (bug #416735).

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

5 files changed, 51 insertions, 40 deletions

diff --git a/media-fonts/corefonts/ChangeLog b/media-fonts/corefonts/ChangeLog
index c5ffe3985eb9..0fa32da86fea 100644
--- a/media-fonts/corefonts/ChangeLog
+++ b/media-fonts/corefonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/corefonts
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/ChangeLog,v 1.38 2014/01/18 12:17:10 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/ChangeLog,v 1.39 2015/03/29 14:22:51 yngwin Exp $
+
+*corefonts-1-r7 (29 Mar 2015)
+
+  29 Mar 2015; Ben de Groot <yngwin@gentoo.org> +corefonts-1-r7.ebuild,
+  -corefonts-1-r5.ebuild, corefonts-1-r6.ebuild, metadata.xml:
+  Add Tahoma optionally. Include shipped EULA (bug #416735).
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> corefonts-1-r4.ebuild,
   corefonts-1-r5.ebuild, corefonts-1-r6.ebuild:
diff --git a/media-fonts/corefonts/Manifest b/media-fonts/corefonts/Manifest
index caaa802d8d61..7ff4a5e952db 100644
--- a/media-fonts/corefonts/Manifest
+++ b/media-fonts/corefonts/Manifest
@@ -12,26 +12,29 @@ DIST impact32.exe 173288 SHA256 6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51
 DIST times32.exe 661728 SHA256 db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab SHA512 6035b971290cd0795389c2e8a0f02d2f079468e197a1db791189519e12aaf3fcdaf6e8842a7eeca386ad7f48f85a0b07cc5480b98ee06b0529688fd5550d3ee2 WHIRLPOOL 62306ceb9e50a99099e1334c64a71ece8b5a0227d443f5a9527272b1c51a24e058130999a1b2ab7b1d80e30b910f4ecfe90aebfe6a7eef1852f35f37415000a2
 DIST trebuc32.exe 357200 SHA256 5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9 SHA512 4ba8afac0a419e30286f5b209b9fabf41aa480ceabb1bf3141deb775793510db826ba915b67fdfe3423d227c3e640bf7d682b26c0ce90f3c0e2cdf8d4831537e WHIRLPOOL 645030fdf78d9c327218231ef2d9e2b5a6cde6ddd4a7ae0361963dd2f67e6a3454543c061d93167451fb0e82a1fe94204e6542c5fa01ed06ae421a61733ac7e0
 DIST verdan32.exe 351992 SHA256 c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96 SHA512 96749fd17e4efeccdd467cb8f42ce30fc3a9e86eceef8b9c0934a4693d12944b54864006c5852c0d641a5c7b250553e5c6c21d716e446d02ef392299c7833d58 WHIRLPOOL 3872c60c371220c186a99834f5c9af593f0d7a3d84dffdf18864a623a42b7510cf9e46171ea9bb548d0d1803e7eb0107abcbfd4792be4ea20e92bf54b7f11919
+DIST wd97vwr32.exe 3953640 SHA256 f61126a6d17b2d126a7f31b142504dce4934f7989c55f1c13c6477b3fe80b3d2 SHA512 e5db496471970e358af5fdb6d02853fd45bfca1aa89d49ba8644622c28610f09a4b85c2387407b9d33a4055965e0b5e184704c161741ac69250327449da12122 WHIRLPOOL b46516a4f4bdba1eac696ae604ad06691eb2fa3a4d3e9de8ca336dcd1e3a745a8d24bd448fb07854586712dd0fd8029db6147c93f5268f2ef4c4e8397edc3469
 DIST webdin32.exe 185072 SHA256 64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a SHA512 2784ce1cee66f0f00f77d84d7aaa52a44d017245e0269558729003205c10a5e5368f9909beee733e77e202730b3cee2b2357fdbdb597a0023c6412e050b3a3ad WHIRLPOOL 1fc9a10d40bf4a81384897dcdcd08d8dfbb5e8ddf5f93f721a80a2462a49dae65d16c88f9ef0b477d13eafb5a9af110400350e8852213ed5e867681983e10d9e
 EBUILD corefonts-1-r4.ebuild 1383 SHA256 d89c078a89f975af14dd9629358b63142b9172dd23289b6a996704fcdeebd410 SHA512 22cf6a2370495653cdc09729e1e115718d7ad6086f41da6d2f627129a4399b93f08a3eed2e36816077320e6ce216b07b28517531020fc2645c0f7617a4e910f8 WHIRLPOOL e713d5644775a9c94382452dd29a64b75d0abe4bf1c95f2b9c35f57ea47f2a15857cc63830c049dcee886049ca7e132c174da61c65f4199609821c87fa920ea4
-EBUILD corefonts-1-r5.ebuild 1723 SHA256 7c09cd09466b23ddbe8c3bf5f3e7228f42655978091faa0ba2ed6e07922922e4 SHA512 a4beab13a481df1d08d8d5b958060194dc3c546a876c27e8bddfe065c5f42d12567f3bceb0edab35c14ad4a1168bed0cd85f73486714677aa17d229ad4d67bd7 WHIRLPOOL cf4d62cf41d17206b1b0c19e94385942bc4b03e6e529d910bfdfddb888efe7da84ea1d0d9fa1573f01d74f0c37a273f2bf3892d4383e740800af0c8bb2f92c38
-EBUILD corefonts-1-r6.ebuild 1587 SHA256 0f2f64482ca0cb099800dbcc2276f8bd266e0278d78f64fc0c5ba6143ab606db SHA512 c6b3c39a9daf7e0c526a585fe39a641188dae1b92c895a0bd96f7059afdcd5effe6553c7998e8ddf7cce77a60cba7fe61bf027ca0d7e244621692dac0bfc883f WHIRLPOOL 908cce141dacc3f44dce40276114b23d4c8dbe1f4cbf4af4aa56c100b964546d0a6b9ba68b3fe7da9b6b38637ab31bbbe30fc58a48be126409b8ae1137b11e09
-MISC ChangeLog 5017 SHA256 5b3fdf1efd73b095149b6761f3599861df43c7325eb78222cdd99162e1636537 SHA512 c8ad675860cbe341ee68feec94511dd36b919e076ca2576602edd0407597a351a7cea3244e5d6f2d42348b9c4ba2a928e17f4a148f99860a2c684d96f83fb56d WHIRLPOOL 8dabaeda490b230e6156f1f9a0e557d3b3265c03c6a0a02e3762e67804a2f201a0c09ab3904b4c7479a98b28b561d7f293e8ca70c24f3705dd6c3b36f079b668
-MISC metadata.xml 158 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 SHA512 85198c032986edd4ade5556bb408cc4e73b1a377f46dac190838a66c6fdbe486a1eac94a7ca5ef95ece572780900d84fd291b2aa75927b512cf0f88178767549 WHIRLPOOL 63fffbd1add60039949d4b0b1c894aeb2bbed90148f63bda3046d9922678a0bd977c29da28f6fa0c65034154d86cf61646620f58385d6641cc8890b2c047a822
+EBUILD corefonts-1-r6.ebuild 1458 SHA256 a922317c5d6ac2af6691e7466798619ae9b8b9ec87575ab5b7f8b4e0d15f052c SHA512 34d0cb12043a1f120e23a2d32e3805eb70e0bc937beac1d1c29eea6e3544f9cad104e2c7e40b845ae7732bd5e66b44a0a78412073e94b05e41ea61e36549811f WHIRLPOOL 69f60852fccee43d2c8399439fb30761eff0e447328ba1be367a8025eb8a57c518596cca1c260747d33a232b906daf39aee8ce06104733e1df904a2f7d8a27cf
+EBUILD corefonts-1-r7.ebuild 1642 SHA256 cf6b235b241b01675310378ea5d27486972892930a2c5131c589b482e403bfaf SHA512 6a37f65d63228887627e40deef77765500984239634556417b17583f2f7b86d65556c3f368dbb3708e944169918e6be07fde9f1740af8004beca30c7501368c6 WHIRLPOOL 35058aa1a760b8c8e6141f5c64b59c9410f22913aff93d56a6b503952ad0280087aec8f0f9314712494148a7a85075997371dad93b9bdbb22f5ab296821f0ecb
+MISC ChangeLog 5245 SHA256 3faba47faada4bb254d73b0aed49dbc35f004df794d293caf868596e99aa58d0 SHA512 1b668660639ae0f16c026d72b0a6f2de641a7fb7b0be9f607a35e09f72db8d4936464d43b4c4f07b8c90d8a81323dc6fa30cf90768e2e201d6a9630a740e6f8d WHIRLPOOL 0ce6d2c98bd40ffa915ffa002fc4fee0e41e31c35e89fdb138502a74a41f282496fd581612e4527543c8195d577f5f6c6a68d32f17e127707e18a3413505b1a5
+MISC metadata.xml 323 SHA256 82f2c986d7ec11901c53822a68001a45b5b361c42fd7c4a16a2756df4d3ffd72 SHA512 3000e7507369ab639d86350adb2efa6a7ddf19e2c5aa7d50af0e94a8ddd10574d76234a859dd81ace41ebbc918d67598e480ceed65b78aaa7c95bd1de3661354 WHIRLPOOL cb53c8bf05fa7db36fabcf12f753f274c84b8bfdc86b0c56744502ee25062ebe44ad8eebdb49ccc6cafce0cd94913b86ad2df0428360b5ee8388fc16a2546a6b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJS2nDJAAoJEPGu1DbS6WIA7dQP/3IpBh+UWdN2CTlv+Z2WbeCD
-4dF4wEU8saf/yTgrIXktvUZ+YnX7kcc4f1EFCE/gInMhObZbHucpAu4YBgqvg9X4
-rjw2AhyL08+xisyRTJ8vNgXGBBYIIMZ6ID1un1sjAmDSBGWvFEh5bd0tUEd9tjlA
-nbQlRwhAmNg9k2CDWS/Wc49/NYsMQtjFsxfIBwuMheaQ3qGAiLaY0tkwZdrTJ6vS
-xgQLj/Sw9UDwuqZj+yrlOesnh0Z4fTsgrQ4GaFVx/xpjwk024BAYFqbP7z0b4m7d
-u047GQ74WuFDCkk6FQj1fpVO9A1HeDos5QSLeOIDk8ZdRfMPOfiNHVtw163kJ0i1
-aIRnAlz0JDfFtuMVnVbpg64uhOt2fmLlH3Mbw9SymA4knA1fTDa6cXTT2yMpkH7b
-VOdaR3rzI27jT+jD2DouLyuLbJZhIhZezIxv2Wz1mZAmHl1nE71tf4eodzCTZ5o0
-T5HyGJS1nt4UJRB+j8Zrl/aLqW3VFdjoc2Kb5HoM4QmR162jYJi9opP01ekkDC3U
-kCAOmfuTc0NHJu7O28hStRfvo2bYmx/HsJMxgO5bihQDJNnnmIIzIow3SkYHmVAE
-ckh8XiSxYDeSDRECtS1Z6CVmMnaeJO6SMvhaWw5J4KuGgikKbLKBmBiV2UglcZ5q
-ufDi7ppYHvMImupUztDo
-=77qf
+iQJ8BAEBCABmBQJVGArDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOkU0QAKWaCIWWYQ2o17rw9fscp4TT
+nE0C1DqSv3r1eWGY5OzKNGJNNyLL1hdH6Qn5pNYwVwWsY5YHToqWbeTkNlzSOM5s
+/jziPSLmYubV/AprV3D9+roxa6pvTcKpcp7Q42a1AFgryCjOiDek1ZY6KZv3vYye
+YBjGSpOBQ7UA9jr0buC6j1/ufOkBMLLe/Fz+k6vW28rE0Dd4NHddPp/nZQKKHDiB
+u7L+upbvMj4c6vakDM1dV8DpWdgSCytH5IcBKoBKDHOU4LPsV2GQfoukNFwpakru
+CkHeSsUOqiLSz70ehzR6SSDmijhe45OWGqK7WpNhcQJEuO7eQIwWVdEZMjLDaZL1
+ip0ZZKx6ohRbZxpy23CnadKFe7M58j7mBFrjpTpBt3EHZR89ZELY48f8TvSWHrQ/
+Yu7NWd7TEJHJtGnJ9a0w2SqQRQ5F/vj2K7ZXIx2O3QCxjDKHAbzkVS+U2AyIfkvX
+pRrltYUt1Eo9stSrCrqFWRi2Hkak56gAFE+KGnQGRXRtr1yv/whsEgvlxlkjEjaW
+mE2/IdqzLdXYvp3EjWN/diMudd+8Mb75j6CIUHrUEz0Pna1lVxEvQsPuyBEBcmS1
+g7OB9Gk4gLMrMsIvCG3NHeO9B82VJ59NDETLyPIVRxQPWgZHqpGaD9iZ6hogikm+
+b3DSWnm66MImNhmLBD3e
+=IP/j
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/corefonts/corefonts-1-r6.ebuild b/media-fonts/corefonts/corefonts-1-r6.ebuild
index 9bf81ee27cef..a1e23fa52536 100644
--- a/media-fonts/corefonts/corefonts-1-r6.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 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/corefonts/corefonts-1-r6.ebuild,v 1.3 2014/01/18 12:17:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/corefonts-1-r6.ebuild,v 1.4 2015/03/29 14:22:51 yngwin Exp $
 
 inherit font
 
@@ -39,7 +39,5 @@ src_install() {
 	font_src_install
 	# The license explicitly states that the license must be distributed with the
 	# fonts. The only way to do that for the binpkg is to include it.
-	# We just have to copy it from the portdir because it's not actually inside
-	# upstream's own files...
-	dodoc "${PORTDIR}"/licenses/"${LICENSE}"
+	dodoc licen.txt
 }
diff --git a/media-fonts/corefonts/corefonts-1-r5.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 08f87f632cb8..1aaf4cb25868 100644
--- a/media-fonts/corefonts/corefonts-1-r5.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2014 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/corefonts/corefonts-1-r5.ebuild,v 1.2 2014/01/18 12:17:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/corefonts-1-r7.ebuild,v 1.1 2015/03/29 14:22:51 yngwin Exp $
 
+EAPI=5
 inherit font
 
 DESCRIPTION="Microsoft's TrueType core fonts"
 HOMEPAGE="http://corefonts.sourceforge.net/"
-SRC_URI="mirror://sourceforge/corefonts/andale32.exe
-	mirror://sourceforge/corefonts/arial32.exe
+SRC_URI="mirror://gentoo/EUupdate.EXE
+	mirror://sourceforge/corefonts/andale32.exe
 	mirror://sourceforge/corefonts/arialb32.exe
 	mirror://sourceforge/corefonts/comic32.exe
 	mirror://sourceforge/corefonts/courie32.exe
 	mirror://sourceforge/corefonts/georgi32.exe
 	mirror://sourceforge/corefonts/impact32.exe
-	mirror://sourceforge/corefonts/times32.exe
-	mirror://sourceforge/corefonts/trebuc32.exe
-	mirror://sourceforge/corefonts/verdan32.exe
-	mirror://sourceforge/corefonts/webdin32.exe"
+	mirror://sourceforge/corefonts/webdin32.exe
+	mirror://sourceforge/corefonts/wd97vwr32.exe"
 
 LICENSE="MSttfEULA"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X tahoma"
 
 DEPEND="app-arch/cabextract"
-RDEPEND=""
 
 S=${WORKDIR}
 FONT_S=${WORKDIR}
@@ -36,13 +34,15 @@ src_unpack() {
 		cabextract --lowercase "${DISTDIR}"/${exe} > /dev/null \
 			|| die "failed to unpack ${exe}"
 	done
+	if use tahoma; then
+		cabextract -F 'tahoma.ttf' "${WORKDIR}/viewer1.cab" > /dev/null \
+			|| die "failed to unpack tahoma.ttf"
+	fi
 }
 
 src_install() {
 	font_src_install
 	# The license explicitly states that the license must be distributed with the
 	# fonts. The only way to do that for the binpkg is to include it.
-	# We just have to copy it from the portdir because it's not actually inside
-	# upstream's own files...
-	dodoc "${PORTDIR}"/licenses/"${LICENSE}"
+	dodoc license.txt
 }
diff --git a/media-fonts/corefonts/metadata.xml b/media-fonts/corefonts/metadata.xml
index 696065edd338..ed5b205b96b7 100644
--- a/media-fonts/corefonts/metadata.xml
+++ b/media-fonts/corefonts/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>fonts</herd>
+  <herd>fonts</herd>
+  <use>
+    <flag name='tahoma'>Also install the Tahoma font. Due to the lack of a free
+      bold variant, this may render badly. See bug 184790.</flag>
+  </use>
 </pkgmetadata>