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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

4 files changed, 30 insertions, 22 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/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>