Port to modular X.

(Portage version: 2.1_pre6-r5)

4 files changed, 14 insertions, 34 deletions

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"