Port to modular X.

(Portage version: 2.1_pre6-r5)

4 files changed, 12 insertions, 50 deletions

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"
-}