Fixed installion of corefonts to depend on x11 and to install the fonts.scale and fonts.dir files. Also added the hints about XF86Config changes. Added ~amd64 keyword.

4 files changed, 86 insertions, 3 deletions

diff --git a/media-fonts/corefonts/ChangeLog b/media-fonts/corefonts/ChangeLog
index 371375c78439..8e8b79c7b819 100644
--- a/media-fonts/corefonts/ChangeLog
+++ b/media-fonts/corefonts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/corefonts
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/ChangeLog,v 1.4 2004/01/25 16:30:24 bazik Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/ChangeLog,v 1.5 2004/02/04 00:03:27 augustus Exp $
+
+*corefonts-1-r1 (03 Feb 2004)
+
+  03 Feb 2004; <augustus@gentoo.org> corefonts-1-r1.ebuild:
+  Fixed installion of corefonts to depend on x11 and to install the fonts.scale
+  and fonts.dir files. Also added the hints about XF86Config changes. Added
+  ~amd64 keyword.
 
   25 Jan 2004; Sven Blumenstein <bazik@gentoo.org> corefonts-1.ebuild:
   Stable on sparc.
diff --git a/media-fonts/corefonts/Manifest b/media-fonts/corefonts/Manifest
index ec7266dae1a8..0711e381306d 100644
--- a/media-fonts/corefonts/Manifest
+++ b/media-fonts/corefonts/Manifest
@@ -1,3 +1,5 @@
+MD5 7f658765efd3bb1fc8d4f68dcc396951 ChangeLog 924
 MD5 36f5871b33c3152b96022b75736f2966 corefonts-1.ebuild 1211
-MD5 cc02e8887db51da03f99a75a90addf09 ChangeLog 658
+MD5 d7b22de00fa39454efe540cfc999b540 corefonts-1-r1.ebuild 1783
 MD5 8c75d66eb050c05f2fc1ae13fb722722 files/digest-corefonts-1 624
+MD5 8c75d66eb050c05f2fc1ae13fb722722 files/digest-corefonts-1-r1 624
diff --git a/media-fonts/corefonts/corefonts-1-r1.ebuild b/media-fonts/corefonts/corefonts-1-r1.ebuild
new file mode 100644
index 000000000000..5de0d3362dee
--- /dev/null
+++ b/media-fonts/corefonts/corefonts-1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/corefonts/corefonts-1-r1.ebuild,v 1.1 2004/02/04 00:03:27 augustus Exp $
+
+DESCRIPTION="Microsoft's TrueType core fonts"
+HOMEPAGE="http://corefonts.sourceforge.net/"
+SRC_URI="mirror://sourceforge/corefonts/andale32.exe
+	mirror://sourceforge/corefonts/arial32.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"
+
+LICENSE="MSttfEULA"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64"
+
+DEPEND="app-arch/cabextract
+	virtual/x11"
+
+S=${WORKDIR}
+FONTDIR="/usr/share/fonts/${PN}"
+
+src_unpack() {
+	for exe in ${A} ; do
+		echo ">>> Unpacking ${exe} to ${WORKDIR}"
+		cabextract --lowercase ${DISTDIR}/${exe} > /dev/null \
+			|| die "failed to unpack ${exe}"
+	done
+}
+
+src_install() {
+	insinto ${FONTDIR}
+	doins *.ttf || die
+
+	/usr/X11R6/bin/mkfontscale ${D}${FONTDIR}
+	/usr/X11R6/bin/mkfontdir ${D}${FONTDIR}
+}
+
+pkg_postinst() {
+
+    einfo
+    einfo "You need to add following line into 'Section \"Files\"' in"
+    einfo "XF86Config and reboot X Window System, to use these fonts."
+    einfo
+    einfo "\t FontPath \"${FONTDIR}\""
+    einfo
+}
+
+pkg_postrm(){
+
+    einfo
+    einfo "You need to remove following line from 'Section \"Files\"' in"
+    einfo "XF86Config, to unmerge this package completely."
+    einfo
+    einfo "\t FontPath \"${FONTDIR}\""
+    einfo
+}
diff --git a/media-fonts/corefonts/files/digest-corefonts-1-r1 b/media-fonts/corefonts/files/digest-corefonts-1-r1
new file mode 100644
index 000000000000..e4fed330b065
--- /dev/null
+++ b/media-fonts/corefonts/files/digest-corefonts-1-r1
@@ -0,0 +1,11 @@
+MD5 cbdc2fdd7d2ed0832795e86a8b9ee19a andale32.exe 198384
+MD5 9637df0e91703179f0723ec095a36cb5 arial32.exe 554208
+MD5 c9089ae0c3b3d0d8c4b0a95979bb9ff0 arialb32.exe 168176
+MD5 2b30de40bb5e803a0452c7715fc835d1 comic32.exe 246008
+MD5 4e412c772294403ab62fb2d247d85c60 courie32.exe 646368
+MD5 4d90016026e2da447593b41a8d8fa8bd georgi32.exe 392440
+MD5 7907c7dd6684e9bade91cff82683d9d7 impact32.exe 173288
+MD5 ed39c8ef91b9fb80f76f702568291bd5 times32.exe 661728
+MD5 0d7ea16cac6261f8513a061fbfcdb2b5 trebuc32.exe 357200
+MD5 12d2a75f8156e10607be1eaa8e8ef120 verdan32.exe 351992
+MD5 230a1d13a365b22815f502eb24d9149b webdin32.exe 185072