Port to modular X.

(Portage version: 2.1_pre6-r5)

4 files changed, 13 insertions, 41 deletions

diff --git a/media-fonts/zh-kcfonts/ChangeLog b/media-fonts/zh-kcfonts/ChangeLog
index 311af0c1f6a8..ae1fbcbcbdab 100644
--- a/media-fonts/zh-kcfonts/ChangeLog
+++ b/media-fonts/zh-kcfonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/zh-kcfonts
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.11 2006/01/12 00:42:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/ChangeLog,v 1.12 2006/03/23 21:18:51 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -zh-kcfonts-1.05.ebuild, zh-kcfonts-1.05-r1.ebuild:
+  Port to modular X.
 
   12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   zh-kcfonts-1.05.ebuild, zh-kcfonts-1.05-r1.ebuild:
diff --git a/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05 b/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05
deleted file mode 100644
index 71a78de486ef..000000000000
--- a/media-fonts/zh-kcfonts/files/digest-zh-kcfonts-1.05
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aab839f8c4c8afbd1f02ce6ed3a6373a zh-kcfonts-1.05.tgz 1175700
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
index 69e6facadf38..3ad367b883c1 100644
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
+++ b/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild,v 1.9 2006/01/12 00:42:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05-r1.ebuild,v 1.10 2006/03/23 21:18:51 spyderous Exp $
 
 KCFONTS="${P}.tgz"
 
@@ -14,7 +14,13 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( ( x11-apps/bdftopcf
+			x11-apps/mkfontdir
+		)
+		virtual/x11
+	)"
 S=${WORKDIR}
 FONTPATH=/usr/share/fonts/${PN}
 
diff --git a/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild b/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild
deleted file mode 100644
index d04d6e68898e..000000000000
--- a/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/zh-kcfonts/zh-kcfonts-1.05.ebuild,v 1.9 2006/01/12 00:42:06 robbat2 Exp $
-
-DESCRIPTION="Kuo Chauo Chinese Fonts collection in BIG5 encoding"
-SRC_URI="ftp://ftp.freebsd.org.tw/pub/releases/i386/4.9-RELEASE/packages/x11-fonts/${P}.tgz"
-HOMEPAGE="http://freebsd.sinica.edu.tw/"
-# no real homepage exists, but this was written by Taiwanese FreeBSD devs
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/x11"
-S=${WORKDIR}/${PN}
-CFONTDIR=/usr/X11R6/lib/X11/fonts/misc/
-
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-}
-
-src_install() {
-	dodir ${CFONTDIR}
-	insinto ${CFONTDIR}
-	doins ${S}/lib/X11/fonts/local/*
-}
-
-pkg_postinst() {
-	mkfontdir ${CFONTDIR}
-	cd ${CFONTDIR}
-	cat kc_fonts.alias >> fonts.alias ;
-	cp fonts.alias ..fonts.alias.. ;
-	sort ..fonts.alias.. | uniq > fonts.alias ; rm ..fonts.alias..
-}