Port to modular X.

Package-Manager: portage-2.1_pre6-r5

24 files changed, 126 insertions, 157 deletions

diff --git a/media-fonts/jisx0213-fonts/ChangeLog b/media-fonts/jisx0213-fonts/ChangeLog
index 9e2dae2366f5..ecf6b711c478 100644
--- a/media-fonts/jisx0213-fonts/ChangeLog
+++ b/media-fonts/jisx0213-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/jisx0213-fonts
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/jisx0213-fonts/ChangeLog,v 1.8 2006/01/12 04:43:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/jisx0213-fonts/ChangeLog,v 1.9 2006/03/23 20:56:55 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  jisx0213-fonts-20040425.ebuild:
+  Port to modular X.
 
 *jisx0213-fonts-20040425-r2 (12 Jan 2006)
 
diff --git a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild
index 507f634bb3a5..4e231613c7c6 100644
--- a/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild
+++ b/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild,v 1.2 2005/07/15 17:10:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/jisx0213-fonts/jisx0213-fonts-20040425.ebuild,v 1.3 2006/03/23 20:56:55 spyderous Exp $
 
-IUSE="X"
+IUSE=""
 
 DESCRIPTION="Japanese fixed fonts that cover JIS0213 charset"
 
@@ -27,8 +27,11 @@ SLOT="0"
 
 KEYWORDS="alpha amd64 ppc ~sparc x86"
 
-DEPEND="virtual/x11"
-RDEPEND="X? ( virtual/x11 )"
+DEPEND="|| ( ( x11-apps/bdftopcf
+			x11-apps/mkfontdir
+		)
+		virtual/x11
+	)"
 
 S=${WORKDIR}
 FONTDIR="/usr/share/fonts/jisx0213"
diff --git a/media-fonts/kochi-substitute/ChangeLog b/media-fonts/kochi-substitute/ChangeLog
index a8d7319868c7..0ee90a65f346 100644
--- a/media-fonts/kochi-substitute/ChangeLog
+++ b/media-fonts/kochi-substitute/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/kochi-substitute
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/ChangeLog,v 1.22 2004/10/24 12:23:32 usata Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/ChangeLog,v 1.23 2006/03/23 21:00:40 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  kochi-substitute-20030809.ebuild, kochi-substitute-20030809-r2.ebuild:
+  Port to modular X.
 
   24 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
   kochi-substitute-20030809-r3.ebuild:
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild
index 50e87d464965..33d47812a211 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild,v 1.4 2004/10/05 03:23:11 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809-r2.ebuild,v 1.5 2006/03/23 21:00:40 spyderous Exp $
 
 IUSE="X"
 
@@ -14,7 +14,13 @@ SLOT="0"
 KEYWORDS="~ia64 ~x86 ~alpha ~sparc ~ppc ~hppa ~amd64 ~mips ppc64"
 
 DEPEND="virtual/libc
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-apps/mkfontdir
+				x11-apps/ttmkfdir
+				media-libs/fontconfig
+			)
+			virtual/x11
+		)
+	)"
 
 S=${WORKDIR}/${PN}-${PV:0:8}
 FONTPATH="/usr/share/fonts/${PN}"
diff --git a/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild b/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild
index 91cfe03e8651..1f4c72e171f1 100644
--- a/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild
+++ b/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild,v 1.9 2004/07/01 10:48:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/kochi-substitute/kochi-substitute-20030809.ebuild,v 1.10 2006/03/23 21:00:40 spyderous Exp $
 
 IUSE="X"
 
@@ -15,7 +15,13 @@ SLOT="0"
 KEYWORDS="ia64 x86 alpha sparc ppc hppa amd64 mips"
 
 DEPEND="virtual/libc
-	X? ( virtual/x11 )"
+	X? ( || ( ( x11-apps/mkfontdir
+				x11-apps/ttmkfdir
+				media-libs/fontconfig
+			)
+			virtual/x11
+		)
+	)"
 
 S=${WORKDIR}/${PN}-${PV:0:8}
 
diff --git a/media-fonts/monafont/ChangeLog b/media-fonts/monafont/ChangeLog
index 3416c3fa021a..bfa096301da5 100644
--- a/media-fonts/monafont/ChangeLog
+++ b/media-fonts/monafont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/monafont
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.20 2006/01/11 21:48:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.21 2006/03/23 21:04:19 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  monafont-2.90-r1.ebuild:
+  Port to modular X.
 
 *monafont-2.90-r2 (11 Jan 2006)
 
diff --git a/media-fonts/monafont/monafont-2.90-r1.ebuild b/media-fonts/monafont/monafont-2.90-r1.ebuild
index 002519cda6ad..ef69d33523bd 100644
--- a/media-fonts/monafont/monafont-2.90-r1.ebuild
+++ b/media-fonts/monafont/monafont-2.90-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r1.ebuild,v 1.9 2005/01/27 06:53:09 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r1.ebuild,v 1.10 2006/03/23 21:04:19 spyderous Exp $
 
 inherit font
 
@@ -16,11 +16,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="X truetype"
 
-DEPEND="virtual/x11
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( x11-apps/bdftopcf virtual/x11 )
 	dev-lang/perl
 	>=sys-apps/sed-4
 	app-arch/unzip"
-RDEPEND="X? ( virtual/x11 )"
 
 S="${WORKDIR}/${MY_P}"
 FONT_S="${WORKDIR}"
diff --git a/media-fonts/mplus-fonts/ChangeLog b/media-fonts/mplus-fonts/ChangeLog
index 1a40e9384159..97ad4840be06 100644
--- a/media-fonts/mplus-fonts/ChangeLog
+++ b/media-fonts/mplus-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/mplus-fonts
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/ChangeLog,v 1.45 2006/01/12 04:37:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/ChangeLog,v 1.46 2006/03/23 21:07:45 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -mplus-fonts-2.2.2.ebuild, mplus-fonts-2.2.3.ebuild:
+  Port to modular X.
 
   12 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   mplus-fonts-2.2.4.ebuild:
diff --git a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.2.2 b/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.2.2
deleted file mode 100644
index dc3e0e0119fe..000000000000
--- a/media-fonts/mplus-fonts/files/digest-mplus-fonts-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd5bbfcce00bc5dca42e36731bffd771 mplus_bitmap_fonts-2.2.2.tar.gz 382462
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.2.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.2.ebuild
deleted file mode 100644
index 354e50ad3c09..000000000000
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.2.2.ebuild,v 1.6 2005/03/14 09:43:43 nigoro Exp $
-
-IUSE="X"
-
-MY_P="mplus_bitmap_fonts-${PV}"
-
-DESCRIPTION="M+ Japanese bitmap fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/${PN}/5030/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 alpha ppc sparc hppa ~mips ~amd64 ia64"
-
-DEPEND="virtual/x11
-	dev-lang/perl"
-RDEPEND="X? ( virtual/x11 )"
-
-S="${WORKDIR}/${MY_P}"
-FONTPATH="/usr/share/fonts/mplus"
-
-src_install(){
-
-	DESTDIR="${D}${FONTPATH}" ./install_mplus_fonts || die
-	dodoc README* INSTALL*
-}
diff --git a/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild b/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild
index 995f7af2d42c..ed092db04be9 100644
--- a/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild
+++ b/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild,v 1.8 2005/07/15 17:12:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-fonts/mplus-fonts-2.2.3.ebuild,v 1.9 2006/03/23 21:07:45 spyderous Exp $
 
 IUSE="X"
 
@@ -14,9 +14,14 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
-DEPEND="virtual/x11
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( ( x11-apps/bdftopcf
+			x11-apps/mkfontdir
+		)
+		virtual/x11
+	)
 	dev-lang/perl"
-RDEPEND="X? ( virtual/x11 )"
 
 S="${WORKDIR}/${MY_P}"
 FONTPATH="/usr/share/fonts/mplus"
diff --git a/media-fonts/shinonome/ChangeLog b/media-fonts/shinonome/ChangeLog
index 98050f513c10..f2831b94e8cf 100644
--- a/media-fonts/shinonome/ChangeLog
+++ b/media-fonts/shinonome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/shinonome
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/shinonome/ChangeLog,v 1.14 2006/01/11 22:40:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/shinonome/ChangeLog,v 1.15 2006/03/23 21:11:04 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  -shinonome-0.9.8.ebuild, shinonome-0.9.10.ebuild:
+  Port to modular X.
 
   11 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   shinonome-0.9.11.ebuild:
diff --git a/media-fonts/shinonome/files/digest-shinonome-0.9.8 b/media-fonts/shinonome/files/digest-shinonome-0.9.8
deleted file mode 100644
index dc43b0ee0d7b..000000000000
--- a/media-fonts/shinonome/files/digest-shinonome-0.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5364b36ce3292e0e01a9b6677bd40a38 shinonome-0.9.8-src.tar.bz2 748849
diff --git a/media-fonts/shinonome/shinonome-0.9.10.ebuild b/media-fonts/shinonome/shinonome-0.9.10.ebuild
index b3084b37ffc5..532d7aead63b 100644
--- a/media-fonts/shinonome/shinonome-0.9.10.ebuild
+++ b/media-fonts/shinonome/shinonome-0.9.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/shinonome/shinonome-0.9.10.ebuild,v 1.8 2005/07/15 17:14:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/shinonome/shinonome-0.9.10.ebuild,v 1.9 2006/03/23 21:11:04 spyderous Exp $
 
 IUSE=""
 
@@ -13,7 +13,11 @@ SLOT=0
 KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND="virtual/libc
-	virtual/x11
+	|| ( ( x11-apps/bdftopcf
+			x11-apps/mkfontdir
+		)
+		virtual/x11
+	)
 	dev-lang/perl
 	sys-apps/gawk"
 RDEPEND=""
diff --git a/media-fonts/shinonome/shinonome-0.9.8.ebuild b/media-fonts/shinonome/shinonome-0.9.8.ebuild
deleted file mode 100644
index b3e52deb4759..000000000000
--- a/media-fonts/shinonome/shinonome-0.9.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/shinonome/shinonome-0.9.8.ebuild,v 1.6 2005/02/12 14:32:51 nigoro Exp $
-
-DESCRIPTION="Japanese bitmap fonts for X"
-SRC_URI="http://openlab.jp/efont/dist/shinonome/old/${P}-src.tar.bz2"
-HOMEPAGE="http://openlab.jp/efont/shinonome/"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	dev-lang/perl
-	sys-apps/gawk"
-RDEPEND=""
-
-S="${WORKDIR}/${P}-src"
-
-src_compile(){
-	# Install to /usr/X11R6/lib/X11/fonts/shinonome
-	./configure \
-		--with-fontdir=${D}/usr/X11R6/lib/X11/fonts/shinonome || die
-
-	emake || die
-}
-
-src_install(){
-
-	emake install       || die
-	emake install-alias || die
-}
-
-pkg_postinst(){
-	einfo "You need you add following line into 'Section \"Files\"' in"
-	einfo "XF86Config and reboot X Window System, to use these fonts."
-	echo -e "\n\t FontPath \"/usr/X11R6/lib/X11/fonts/shinonome\"\n\n"
-}
-
-pkg_postrm(){
-	einfo "You need you remove following line in 'Section \"Files\"' in"
-	einfo "XF86Config, to unmerge this package completely."
-	echo -e "\n\t FontPath \"/usr/X11R6/lib/X11/fonts/shinonome\"\n\n"
-}
diff --git a/media-fonts/twmoefonts/Manifest b/media-fonts/twmoefonts/Manifest
index bc774b3d7ecd..feb06c06e053 100644
--- a/media-fonts/twmoefonts/Manifest
+++ b/media-fonts/twmoefonts/Manifest
@@ -1,7 +1,21 @@
-MD5 16e4778d2e9b6eaef430bdb7b11c15ca ChangeLog 1821
+MD5 de0869ef9b457b2cd8d18ae311882532 ChangeLog 1967
+RMD160 61a3456f518f849915faaaeb98c5b1930bf77a1f ChangeLog 1967
+SHA256 0fbdb4bf85c8bf34506478f4a7ca4fe032173d59c64f49dcd3a417677b7e2ab4 ChangeLog 1967
 MD5 8b3a21830f52cad5dc7d0dcec619b8b6 files/TW-fonts.scale 506
+RMD160 469a9361e1a813cc476a4edb72f2c9c43e7d30a1 files/TW-fonts.scale 506
+SHA256 779c1f0fec1df08b42093a37fabe992b7767d842177eae9bd783da8f46654cd3 files/TW-fonts.scale 506
 MD5 540b5aec6f287a68fed032654d533ad7 files/digest-twmoefonts-0.1 115
+RMD160 6012ccaef77dc9b7e6181f345001228661d85418 files/digest-twmoefonts-0.1 115
+SHA256 a72b79ce2e54e8a23c567b7742f7d1fcb6f1b6b035e58901fb2cb6b91308a9eb files/digest-twmoefonts-0.1 115
 MD5 540b5aec6f287a68fed032654d533ad7 files/digest-twmoefonts-0.1-r1 115
+RMD160 6012ccaef77dc9b7e6181f345001228661d85418 files/digest-twmoefonts-0.1-r1 115
+SHA256 a72b79ce2e54e8a23c567b7742f7d1fcb6f1b6b035e58901fb2cb6b91308a9eb files/digest-twmoefonts-0.1-r1 115
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
-MD5 b672a8950d4323e9a364177922add59c twmoefonts-0.1-r1.ebuild 774
-MD5 13217400a166e7578988807d9c60cc19 twmoefonts-0.1.ebuild 1837
+RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e metadata.xml 175
+SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8 metadata.xml 175
+MD5 c9f26788c3c28dcc8ee268ddf674d972 twmoefonts-0.1-r1.ebuild 779
+RMD160 7a7b83b365763ace6b31c3c2ff66f7a12854e3f4 twmoefonts-0.1-r1.ebuild 779
+SHA256 bd0ffd9c4f7e6e563f7f043fc553107277b44216917f1acbb8eaec954ae51da8 twmoefonts-0.1-r1.ebuild 779
+MD5 8e23bf23eba8c11d338cdebd74db5711 twmoefonts-0.1.ebuild 1837
+RMD160 1d252468a810bda424dbaea05365e8c2497066ce twmoefonts-0.1.ebuild 1837
+SHA256 691cc1ca2b15d17cd280308cf42d1070527a4f2e8e8b2c209d1d712b829bd4d8 twmoefonts-0.1.ebuild 1837
diff --git a/media-fonts/unifont/ChangeLog b/media-fonts/unifont/ChangeLog
index 4645c8c830e4..018d404af674 100644
--- a/media-fonts/unifont/ChangeLog
+++ b/media-fonts/unifont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/unifont
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.15 2006/01/11 22:59:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.16 2006/03/23 21:13:47 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  unifont-1.0-r2.ebuild:
+  Port to modular X.
 
 *unifont-1.0-r3 (11 Jan 2006)
 
diff --git a/media-fonts/unifont/unifont-1.0-r2.ebuild b/media-fonts/unifont/unifont-1.0-r2.ebuild
index 5601180caaf7..55cad899a86f 100644
--- a/media-fonts/unifont/unifont-1.0-r2.ebuild
+++ b/media-fonts/unifont/unifont-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-1.0-r2.ebuild,v 1.12 2005/09/23 15:48:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-1.0-r2.ebuild,v 1.13 2006/03/23 21:13:47 spyderous Exp $
 
 inherit eutils
 
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/perl
-	virtual/x11"
+	|| ( ( x11-apps/bdftopcf
+			X? ( x11-apps/mkfontdir )
+		)
+		virtual/x11
+	)"
 RDEPEND=""
 
 FONTPATH="/usr/share/fonts/${PN}"
diff --git a/media-fonts/vc-fonts/ChangeLog b/media-fonts/vc-fonts/ChangeLog
index c0d2ac39ae0e..2d753f09e5d9 100644
--- a/media-fonts/vc-fonts/ChangeLog
+++ b/media-fonts/vc-fonts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/vc-fonts
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.8 2006/01/11 21:04:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/ChangeLog,v 1.9 2006/03/23 21:15:30 spyderous Exp $
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  vc-fonts-20020207.ebuild:
+  Port to modular X.
 
 *vc-fonts-20020207-r1 (11 Jan 2006)
 
diff --git a/media-fonts/vc-fonts/vc-fonts-20020207.ebuild b/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
index 1cdb1071b355..b7b226cfdf81 100644
--- a/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
+++ b/media-fonts/vc-fonts/vc-fonts-20020207.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207.ebuild,v 1.7 2005/09/23 15:51:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/vc-fonts/vc-fonts-20020207.ebuild,v 1.8 2006/03/23 21:15:30 spyderous Exp $
 
 S=${WORKDIR}/vc
 DESCRIPTION="Vico bitmap Fonts"
@@ -11,9 +11,10 @@ SLOT=0
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
-DEPEND="virtual/x11"
-RDEPEND="X? ( virtual/x11 )"
-IUSE="X"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	|| ( x11-apps/mkfontdir virtual/x11 )"
+IUSE=""
 
 src_install() {
 
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..
-}