--- ghostscript-esp-8.15.1_p20060430.ebuild	2006-05-16 01:00:50.000000000 +0900
+++ ghostscript-esp-8.15.1_p20060430-r1.ebuild	2006-05-20 11:56:12.000000000 +0900
@@ -9,8 +9,8 @@
 
 MY_P=espgs-${PV}
 PVM=$(get_version_component_range 1-2)
-SRC_URI="cjk? ( http://www.matsusaka-u.ac.jp/mirror/gs-cjk/adobe-cmaps-200204.tar.gz
-		http://www.matsusaka-u.ac.jp/mirror/gs-cjk/acro5-cmaps-2001.tar.gz )
+SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
+		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
 	http://dev.gentoo.org/~genstef/files/dist/${MY_P}-source.tar.bz2
 	http://dev.gentoo.org/~genstef/files/dist/${P/_p*}-ubuntu4.patch.bz2"
 
@@ -44,7 +44,7 @@
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
-	unpack ${A/adobe-cmaps-200204.tar.gz acro5-cmaps-2001.tar.gz}
+	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
 	cd ${S}
 
 	# not submitted
@@ -68,6 +68,16 @@
 	epatch ${FILESDIR}/${P}-ps2epsi-esp.diff
 	epatch ${FILESDIR}/${P}-build.patch
 
+	if use cjk; then
+		epatch ${FILESDIR}/${P}-big-cmap-post-table.patch
+		cat ${FILESDIR}/cidfmap.cjk >> ${S}/lib/cidfmap
+		cat ${FILESDIR}/FAPIcidfmap.cjk >> ${S}/lib/FAPIcidfmap
+		cd ${S}/Resource
+		unpack adobe-cmaps-200406.tar.gz
+		unpack acro5-cmaps-2001.tar.gz
+		cd ${S}
+	fi
+
 	# gentoo specific
 	if ! use gtk; then
 		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
@@ -128,15 +138,6 @@
 		doins doc/gsdoc.el
 	fi
 
-	if use cjk; then
-		dodir /usr/share/ghostscript/Resource
-		dodir /usr/share/ghostscript/Resource/Font
-		dodir /usr/share/ghostscript/Resource/CIDFont
-		cd ${D}/usr/share/ghostscript/Resource
-		unpack adobe-cmaps-200204.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-	fi
-
 	# install ijs
 	cd ${S}/ijs
 	make DESTDIR="${D}" install || die "ijs install failed"