Added cjk support.

Fixed bug about patch of man page.
Removed 'gnome' from IUSE because it isn't used.

4 files changed, 584 insertions, 7 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 927d98a0e0b1..377958194207 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.27 2003/03/09 19:50:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.28 2003/04/03 12:08:46 nakano Exp $
 
 *ghostscript-7.05.6 (05 Mar 2003)
 
+  03 Apr 2003; Masatomo Nakano <nakano@gentoo.org> ghostscript-7.05.6.ebuild,
+  gs7.05.6-cjk.diff,ghostscript-7.05.6.man.patch:
+
+  Added cjk support.
+  Fixed bug about a patch of man page.
+  Removed 'gnome' from IUSE because it isn't used.
+
   09 Mar 2003; Aron Griffis <agriffis@gentoo.org> ghostscript-7.05.6.ebuild:
   Mark stable on alpha
 
diff --git a/app-text/ghostscript/files/ghostscript-7.05.6.man.patch b/app-text/ghostscript/files/ghostscript-7.05.6.man.patch
new file mode 100644
index 000000000000..285e871acdae
--- /dev/null
+++ b/app-text/ghostscript/files/ghostscript-7.05.6.man.patch
@@ -0,0 +1,32 @@
+--- espgs-7.05.5/man/gs.1	2002-04-23 07:58:37.000000000 -0400
++++ espgs-7.05.5/man/gs.1.new	2003-01-18 14:22:46.000000000 -0500
+@@ -257,7 +257,7 @@
+ the directories specified by the \fBGS_LIB_DEFAULT\fR macro in the
+ Ghostscript makefile when the executable was built.  When \fBgs\fR is built
+ on Unix, \fBGS_LIB_DEFAULT\fR is usually
+-"/usr/local/share/ghostscript/#.##:/usr/local/share/ghostscript/fonts"
++"/usr/share/ghostscript/#.##:/usr/share/ghostscript/fonts"
+ where "#.##" represents the Ghostscript version number.
+ .PP
+ Each of these (\fBGS_LIB_DEFAULT\fR, \fBGS_LIB\fR, and \fB\-I\fR parameter)
+@@ -432,16 +432,16 @@
+ location of Ghostscript documentation on your system, from which you can
+ get more details.
+ .TP
+-.B /usr/local/share/ghostscript/#.##/*
++.B /usr/share/ghostscript/#.##/*
+ Startup files, utilities, and basic font definitions
+ .TP
+-.B /usr/local/share/ghostscript/fonts/*
++.B /usr/share/ghostscript/#.##/fonts/*
+ More font definitions
+ .TP
+-.B /usr/local/share/ghostscript/#.##/examples/*
++.B /usr/share/ghostscript-#.##/examples/*
+ Ghostscript demonstration files
+ .TP
+-.B /usr/local/share/ghostscript/#.##/doc/*
++.B /usr/share/doc/ghostscript-#.##/html/*
+ Diverse document files
+ .SH ENVIRONMENT
+ .TP
diff --git a/app-text/ghostscript/files/gs7.05.6-cjk.diff b/app-text/ghostscript/files/gs7.05.6-cjk.diff
new file mode 100644
index 000000000000..e8b2e1fade41
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.05.6-cjk.diff
@@ -0,0 +1,539 @@
+diff -Naur espgs-7.05.6.orig/lib/CIDFnmap espgs-7.05.6/lib/CIDFnmap
+--- espgs-7.05.6.orig/lib/CIDFnmap	2002-04-23 20:58:33.000000000 +0900
++++ espgs-7.05.6/lib/CIDFnmap	2003-01-09 03:09:00.000000000 +0900
+@@ -135,14 +135,14 @@
+ % in particular, you must leave at least one space or tab between each
+ % field in the entry.  
+ 
+-%(CIDFnmap.Ore) .runlibfile
+-%(CIDFnmap.ARP) .runlibfile
+-%(CIDFnmap.Bae) .runlibfile
+-%(CIDFnmap.Koc) .runlibfile
++(CIDFnmap.Ore) .runlibfile
++(CIDFnmap.ARP) .runlibfile
++(CIDFnmap.Bae) .runlibfile
++(CIDFnmap.Koc) .runlibfile
+ %(CIDFnmap.Sol) .runlibfile
+ %(CIDFnmap.Win) .runlibfile
+ 
+-%(CIDFnmap.CJK) .runlibfile
++(CIDFnmap.CJK) .runlibfile
+ 
+ % native CIDFontName (BIG5) in traditional Chinese
+ %(CIDFnmap.b5) .runlibfile
+diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.ARP espgs-7.05.6/lib/CIDFnmap.ARP
+--- espgs-7.05.6.orig/lib/CIDFnmap.ARP	2002-04-23 20:58:33.000000000 +0900
++++ espgs-7.05.6/lib/CIDFnmap.ARP	2003-01-09 02:26:43.000000000 +0900
+@@ -25,10 +25,10 @@
+ 
+ % Adobe-CNS1
+ 
+-/ZenKai-Medium		(bkai00mp.ttf)		;
+-/ShanHeiSun-Light	(bsmi00lp.ttf)		;
++/ZenKai-Medium		(/usr/share/fonts/ttf/zh_TW/bkai00mp.ttf)	;
++/ShanHeiSun-Light	(/usr/share/fonts/ttf/zh_TW/bsmi00lp.ttf)	;
+ 
+ % Adobe-GB1
+ 
+-/BousungEG-Light-GB	(gbsn00lp.ttf)		;
+-/GBZenKai-Medium	(gkai00mp.ttf)		;
++/BousungEG-Light-GB	(/usr/share/fonts/ttf/zh_CN/gbsn00lp.ttf)	;
++/GBZenKai-Medium	(/usr/share/fonts/ttf/zh_CN/gkai00mp.ttf)	;
+diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.Bae espgs-7.05.6/lib/CIDFnmap.Bae
+--- espgs-7.05.6.orig/lib/CIDFnmap.Bae	2002-04-23 20:58:33.000000000 +0900
++++ espgs-7.05.6/lib/CIDFnmap.Bae	2003-01-09 02:29:32.000000000 +0900
+@@ -25,7 +25,7 @@
+ 
+ % Adobe-Korea1
+ 
+-/Baekmuk-Batang		(batang.ttf)		;
+-/Baekmuk-Dotum		(dotum.ttf)		;
+-/Baekmuk-Gulim		(gulim.ttf)		;
+-/Baekmuk-Headline	(hline.ttf)		;
++/Baekmuk-Batang		(/usr/share/fonts/ttf/korean/baekmuk/batang.ttf);
++/Baekmuk-Dotum		(/usr/share/fonts/ttf/korean/baekmuk/dotum.ttf)	;
++/Baekmuk-Gulim		(/usr/share/fonts/ttf/korean/baekmuk/gulim.ttf)	;
++/Baekmuk-Headline	(/usr/share/fonts/ttf/korean/baekmuk/hline.ttf)	;
+diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.CJK espgs-7.05.6/lib/CIDFnmap.CJK
+--- espgs-7.05.6.orig/lib/CIDFnmap.CJK	2002-04-23 20:58:33.000000000 +0900
++++ espgs-7.05.6/lib/CIDFnmap.CJK	2003-01-09 03:10:19.000000000 +0900
+@@ -24,51 +24,51 @@
+ % Fallback aliases for CJK PDF files
+ %
+ %/Adobe-CNS1		/MOESung-Regular	; % CIDFnmap.Ore
+-%/Adobe-CNS1		/ShanHeiSun-Light	; % CIDFnmap.ARP
++/Adobe-CNS1		/ShanHeiSun-Light	; % CIDFnmap.ARP
+ %/Adobe-CNS1		/ming			; % CIDFnmap.Sol
+ %/Adobe-CNS1		/MingLiU		; % CIDFnmap.Win
+ %/Adobe-CNS1		/SimSun-18030-Adobe-CNS1	; % CIDFnmap.Win
+ 
+-%/Adobe-GB1		/BousungEG-Light-GB	; % CIDFnmap.ARP
++/Adobe-GB1		/BousungEG-Light-GB	; % CIDFnmap.ARP
+ %/Adobe-GB1		/zycjksun		; % CIDFnmap.Sol
+ %/Adobe-GB1		/SimSun			; % CIDFnmap.Win
+ 
+ %/Adobe-Japan1		/WadaMin-Regular	; % CIDFnmap.Ore
+ %/Adobe-Japan1		/HG-MinchoL		; % CIDFnmap.Sol
+-%/Adobe-Japan1		/Kochi-Mincho		; % CIDFnmap.Koc
++/Adobe-Japan1		/Kochi-Mincho		; % CIDFnmap.Koc
+ %/Adobe-Japan1		/MS-Mincho		; % CIDFnmap.Win
+ 
+-%/Adobe-Japan2		/WadaMin-RegularH	; % CIDFnmap.Ore
++/Adobe-Japan2		/WadaMin-RegularH	; % CIDFnmap.Ore
+ %/Adobe-Japan2		/HeiseiMin-W3H		; % CIDFnmap.Sol
+ %/Adobe-Japan2		/MS-Mincho-Adobe-Japan2		; % CIDFnmap.Win
+ 
+ %/Adobe-Korea1		/Munhwa-Regular		; % CIDFnmap.Ore
+-%/Adobe-Korea1		/Baekmuk-Batang		; % CIDFnmap.Bae
++/Adobe-Korea1		/Baekmuk-Batang		; % CIDFnmap.Bae
+ %/Adobe-Korea1		/Myeongjo		; % CIDFnmap.Sol
+ %/Adobe-Korea1		/Batang			; % CIDFnmap.Win
+ 
+ %
+ % Convenient aliases for PS files on Traditional Chinese PostScript printer
+ %
+-%/MSung-Light		/MOESung-Regular	; % CIDFnmap.Ore
++/MSung-Light		/MOESung-Regular	; % CIDFnmap.Ore
+ %/MSung-Light		/SimSun-18030-Adobe-CNS1	; % CIDFnmap.Win
+-%/MSung-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
+-%/MHei-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
++/MSung-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
++/MHei-Medium		/ShanHeiSun-Light	; % CIDFnmap.ARP
+ %/MHei-Medium		/hei			; % CIDFnmap.Sol
+-%/MKai-Medium		/ZenKai-Medium		; % CIDFnmap.ARP
++/MKai-Medium		/ZenKai-Medium		; % CIDFnmap.ARP
+ %/MKai-Medium		/kai			; % CIDFnmap.Sol
+ 
+ %
+ % Convenient aliases for PS files on Simplified Chinese PostScript printer
+ %
+-%/STSong-Light		/BousungEG-Light-GB	; % CIDFnmap.ARP
++/STSong-Light		/BousungEG-Light-GB	; % CIDFnmap.ARP
+ %/STSong-Light		/zycjksun		; % CIDFnmap.Sol
+ %/STSong-Light		/SimSun			; % CIDFnmap.Win
+ %/STFangsong-Light	/zycjkfangs		; % CIDFnmap.Sol
+ %/STFangsong-Light	/SimSun			; % CIDFnmap.Win
+ %/STHeiti-Regular	/zycjkhei		; % CIDFnmap.Sol
+ %/STHeiti-Regular	/SimHei			; % CIDFnmap.Win
+-%/STKaiti-Regular	/GBZenKai-Medium	; % CIDFnmap.ARP
++/STKaiti-Regular	/GBZenKai-Medium	; % CIDFnmap.ARP
+ %/STKaiti-Regular	/zycjkkai		; % CIDFnmap.Sol
+ 
+ %
+@@ -76,18 +76,18 @@
+ %
+ %/Ryumin-Light		/WadaMin-Regular	; % CIDFnmap.Ore
+ %/Ryumin-Light		/HG-MinchoL		; % CIDFnmap.Sol
+-%/Ryumin-Light		/Kochi-Mincho		; % CIDFnmap.Koc
++/Ryumin-Light		/Kochi-Mincho		; % CIDFnmap.Koc
+ %/Ryumin-Light		/MS-Mincho		; % CIDFnmap.Win
+ %/GothicBBB-Medium	/WadaGo-Bold		; % CIDFnmap.Ore
+ %/GothicBBB-Medium	/HG-GothicB		; % CIDFnmap.Sol
+-%/GothicBBB-Medium	/Kochi-Gothic		; % CIDFnmap.Koc
++/GothicBBB-Medium	/Kochi-Gothic		; % CIDFnmap.Koc
+ %/GothicBBB-Medium	/MS-Gothic		; % CIDFnmap.Win
+ %/HeiseiMin-W3		/MS-Mincho		; % CIDFnmap.Win
+ %/HeiseiKakuGo-W5	/MS-Gothic		; % CIDFnmap.Win
+ 
+-%/HeiseiMin-W3H		/WadaMin-RegularH	; % CIDFnmap.Ore
++/HeiseiMin-W3H		/WadaMin-RegularH	; % CIDFnmap.Ore
+ %/HeiseiMin-W3H		/MS-Mincho-Adobe-Japan2	; % CIDFnmap.Win
+-%/HeiseiKakuGo-W5H	/WadaMaruGo-RegularH	; % CIDFnmap.Ore
++/HeiseiKakuGo-W5H	/WadaMaruGo-RegularH	; % CIDFnmap.Ore
+ %/HeiseiKakuGo-W5H	/MS-Gothic-Adobe-Japan2	; % CIDFnmap.Win
+ 
+ %/KozMin-Regular	/MS-Mincho		; % CIDFnmap.Win
+@@ -97,193 +97,193 @@
+ % Convenient aliases for PS files on Korean PostScript printer
+ %
+ %/HYGoThic-Medium	/MunhwaGothic-Regular	; % CIDFnmap.Ore
+-%/HYGoThic-Medium	/Baekmuk-Dotum		; % CIDFnmap.Bae
++/HYGoThic-Medium	/Baekmuk-Dotum		; % CIDFnmap.Bae
+ %/HYGoThic-Medium	/Gothic			; % CIDFnmap.Sol
+ %/HYGoThic-Medium	/Dotum			; % CIDFnmap.Win
+ %/HYGungSo-Bold		/Gungsuh		; % CIDFnmap.Win
+-%/HYKHeadLine-Bold	/Baekmuk-Headline	; % CIDFnmap.Bae
+-%/HYKHeadLine-Medium	/Baekmuk-Headline	; % CIDFnmap.Bae
++/HYKHeadLine-Bold	/Baekmuk-Headline	; % CIDFnmap.Bae
++/HYKHeadLine-Medium	/Baekmuk-Headline	; % CIDFnmap.Bae
+ %/HYSMyeongJo-Medium	/Munhwa-Regular		; % CIDFnmap.Ore
+-%/HYSMyeongJo-Medium	/Baekmuk-Batang		; % CIDFnmap.Bae
++/HYSMyeongJo-Medium	/Baekmuk-Batang		; % CIDFnmap.Bae
+ %/HYSMyeongJo-Medium	/Myeongjo		; % CIDFnmap.Sol
+ %/HYSMyeongJo-Medium	/Batang			; % CIDFnmap.Win
+-%/HYRGoThic-Medium	/Baekmuk-Gulim		; % CIDFnmap.Bae
++/HYRGoThic-Medium	/Baekmuk-Gulim		; % CIDFnmap.Bae
+ %/HYRGoThic-Medium	/RoundedGothic		; % CIDFnmap.Sol
+ %/HYRGoThic-Medium	/Gulim			; % CIDFnmap.Win
+ 
+ %
+ % Convenient aliases for PS files on Traditional Chinese Acrobat Distiller
+ %
+-%/DFKaiShu-SB-Estd-BF	/MKai-Medium		;
+-%/LiGothicMed		/MKai-Medium		;
+-%/LiSungLight		/MSung-Light		;
+-%/Taipei		/Adobe-CNS1		;
++/DFKaiShu-SB-Estd-BF	/MKai-Medium		;
++/LiGothicMed		/MKai-Medium		;
++/LiSungLight		/MSung-Light		;
++/Taipei			/Adobe-CNS1		;
+ 
+ %
+ % Convenient aliases for PS files on Simplified Chinese Acrobat Distiller
+ %
+-%/Beijing		/Adobe-GB1		;
+-%/SIL-FangSong-		/STFangsong-Light	;
+-%/SIL-FangSong-Reg-Jian	/STFangsong-Light	;
+-%/SIL-Hei-Med-Jian	/STHeiti-Regular	;
+-%/SIL-Kai-		/STKaiti-Regular	;
+-%/SIL-Kai-Reg-Jian	/STKaiti-Regular	;
+-%/SIL-Song-Reg-Jian	/STSong-Light		;
++/Beijing		/Adobe-GB1		;
++/SIL-FangSong-		/STFangsong-Light	;
++/SIL-FangSong-Reg-Jian	/STFangsong-Light	;
++/SIL-Hei-Med-Jian	/STHeiti-Regular	;
++/SIL-Kai-		/STKaiti-Regular	;
++/SIL-Kai-Reg-Jian	/STKaiti-Regular	;
++/SIL-Song-Reg-Jian	/STSong-Light		;
+ 
+ %
+ % Convenient aliases for PS files on Japanese Acrobat Distiller
+ %
+-%/ChuGothicBBB-Medium	/GothicBBB-Medium	;
++/ChuGothicBBB-Medium	/GothicBBB-Medium	;
+ %/ChuGothicBBB-Medium-Mono	/MS-Gothic	; % CIDFnmap.Win
+-%/FutoGoB101-Bold	/GothicBBB-Medium	;
+-%/FutoMinA101-Bold	/Ryumin-Light		;
+-%/GothicMB101-Bold	/GothicBBB-Medium	;
+-%/GothicMB101-hea	/GothicBBB-Medium	;
+-%/GothicMB101-Ult	/GothicBBB-Medium	;
+-%/HeiseiKakuGo-W3	/HeiseiKakuGo-W5	;
+-%/HeiseiKakuGo-W7	/HeiseiKakuGo-W5	;
+-%/HeiseiKakuGo-W9	/HeiseiKakuGo-W5	;
+-%/HeiseiKakuGothic-W5	/HeiseiKakuGo-W5	;
+-%/HeiseiMaruGo-W4	/HeiseiKakuGo-W5	;
+-%/HeiseiMin-W5		/HeiseiMin-W3		;
+-%/HeiseiMin-W7		/HeiseiMin-W3		;
+-%/HeiseiMin-W9		/HeiseiMin-W3		;
+-%/HeiseiMincho-W3	/HeiseiMin-W3		;
+-%/HonMincho-M		/Ryumin-Light		;
+-%/Jun34-Medium		/Ryumin-Light		;
+-%/Jun101-Light		/Ryumin-Light		;
+-%/Jun501-Bold		/Ryumin-Light		;
+-%/KozMin-Bold		/GothicBBB-Medium	;
+-%/KozMin-ExtraLight	/Ryumin-Light		;
+-%/KozMin-Heavy		/GothicBBB-Medium	;
+-%/KozMin-Light		/Ryumin-Light		;
+-%/KozMin-Medium		/Ryumin-Light		;
+-%/KyokaICA-Light	/Adobe-Japan1		;
+-%/KyokaICA-Medium	/Adobe-Japan1		;
+-%/KyokaICA-regular	/Adobe-Japan1		;
+-%/LogoArl-Bold		/Adobe-Japan1		;
+-%/LogoArl-Light		/Adobe-Japan1		;
+-%/LogoArl-Medium	/Adobe-Japan1		;
+-%/LogoArl-Ultra		/Adobe-Japan1		;
+-%/LogoCut-Bold		/Adobe-Japan1		;
+-%/LogoCut-Light		/Adobe-Japan1		;
+-%/LogoCut-Medium	/Adobe-Japan1		;
+-%/LogoCut-Ultra		/Adobe-Japan1		;
+-%/LogoLine-Bold		/Adobe-Japan1		;
+-%/LogoLine-Light	/Adobe-Japan1		;
+-%/LogoLine-Medium	/Adobe-Japan1		;
+-%/LogoLine-Ultra	/Adobe-Japan1		;
+-%/MaruGothic-M		/GothicBBB-Medium	;
+-%/MidashiGo-MB31	/GothicBBB-Medium	;
+-%/MidashiMin-MA31	/Ryumin-Light		;
+-%/Osaka			/Ryumin-Light		;
++/FutoGoB101-Bold	/GothicBBB-Medium	;
++/FutoMinA101-Bold	/Ryumin-Light		;
++/GothicMB101-Bold	/GothicBBB-Medium	;
++/GothicMB101-hea	/GothicBBB-Medium	;
++/GothicMB101-Ult	/GothicBBB-Medium	;
++/HeiseiKakuGo-W3	/HeiseiKakuGo-W5	;
++/HeiseiKakuGo-W7	/HeiseiKakuGo-W5	;
++/HeiseiKakuGo-W9	/HeiseiKakuGo-W5	;
++/HeiseiKakuGothic-W5	/HeiseiKakuGo-W5	;
++/HeiseiMaruGo-W4	/HeiseiKakuGo-W5	;
++/HeiseiMin-W5		/HeiseiMin-W3		;
++/HeiseiMin-W7		/HeiseiMin-W3		;
++/HeiseiMin-W9		/HeiseiMin-W3		;
++/HeiseiMincho-W3	/HeiseiMin-W3		;
++/HonMincho-M		/Ryumin-Light		;
++/Jun34-Medium		/Ryumin-Light		;
++/Jun101-Light		/Ryumin-Light		;
++/Jun501-Bold		/Ryumin-Light		;
++/KozMin-Bold		/GothicBBB-Medium	;
++/KozMin-ExtraLight	/Ryumin-Light		;
++/KozMin-Heavy		/GothicBBB-Medium	;
++/KozMin-Light		/Ryumin-Light		;
++/KozMin-Medium		/Ryumin-Light		;
++/KyokaICA-Light		/Adobe-Japan1		;
++/KyokaICA-Medium	/Adobe-Japan1		;
++/KyokaICA-regular	/Adobe-Japan1		;
++/LogoArl-Bold		/Adobe-Japan1		;
++/LogoArl-Light		/Adobe-Japan1		;
++/LogoArl-Medium		/Adobe-Japan1		;
++/LogoArl-Ultra		/Adobe-Japan1		;
++/LogoCut-Bold		/Adobe-Japan1		;
++/LogoCut-Light		/Adobe-Japan1		;
++/LogoCut-Medium		/Adobe-Japan1		;
++/LogoCut-Ultra		/Adobe-Japan1		;
++/LogoLine-Bold		/Adobe-Japan1		;
++/LogoLine-Light		/Adobe-Japan1		;
++/LogoLine-Medium	/Adobe-Japan1		;
++/LogoLine-Ultra		/Adobe-Japan1		;
++/MaruGothic-M		/GothicBBB-Medium	;
++/MidashiGo-MB31		/GothicBBB-Medium	;
++/MidashiMin-MA31	/Ryumin-Light		;
++/Osaka			/Ryumin-Light		;
+ %/Osaka-Mono		/MS-Mincho		; % CIDFnmap.Win
+-%/Ryumin-Bold		/Ryumin-Light		;
+-%/Ryumin-heavy		/Ryumin-Light		;
+-%/Ryumin-Light-KL	/Ryumin-Light		;
++/Ryumin-Bold		/Ryumin-Light		;
++/Ryumin-heavy		/Ryumin-Light		;
++/Ryumin-Light-KL	/Ryumin-Light		;
+ %/Ryumin-Light-KL-Mono	/MS-Mincho		; % CIDFnmap.Win
+-%/Ryumin-Medium		/Ryumin-Light		;
+-%/Ryumin-regular	/Ryumin-Light		;
+-%/Ryumin-Ultra		/Ryumin-Light		;
+-%/ShinGo-Bold		/GothicBBB-Medium	;
+-%/ShinGo-Light		/GothicBBB-Medium	;
+-%/ShinGo-Medium		/GothicBBB-Medium	;
+-%/ShinGo-regular	/GothicBBB-Medium	;
+-%/ShinGo-Ultra		/GothicBBB-Medium	;
+-%/ShinseiKai-CBSK1	/Ryumin-Light		;
+-%/TBKomachiG-B		/Adobe-Japan1		;
+-%/TBKomachiG-DB		/Adobe-Japan1		;
+-%/TBKomachiG-E		/Adobe-Japan1		;
+-%/TBKomachiG-hv		/Adobe-Japan1		;
+-%/TBKomachiG-M		/Adobe-Japan1		;
+-%/TBKomachiG-R		/Adobe-Japan1		;
+-%/TBKomachiM-DE		/Adobe-Japan1		;
+-%/TBKomachiM-E		/Adobe-Japan1		;
+-%/TBKomachiM-hv		/Adobe-Japan1		;
+-%/TBKomachiM-M		/Adobe-Japan1		;
+-%/TBKoudoukenG-B	/Adobe-Japan1		;
+-%/TBKoudoukenG-DB	/Adobe-Japan1		;
+-%/TBKoudoukenG-E	/Adobe-Japan1		;
+-%/TBKoudoukenG-hv	/Adobe-Japan1		;
+-%/TBKoudoukenG-M	/Adobe-Japan1		;
+-%/TBKoudoukenG-R	/Adobe-Japan1		;
+-%/TBKoudoukenM-DE	/Adobe-Japan1		;
+-%/TBKoudoukenM-E	/Adobe-Japan1		;
+-%/TBKoudoukenM-hv	/Adobe-Japan1		;
+-%/TBKoudoukenM-M	/Adobe-Japan1		;
+-%/TBRyokanG-B		/Adobe-Japan1		;
+-%/TBRyokanG-DB		/Adobe-Japan1		;
+-%/TBRyokanG-E		/Adobe-Japan1		;
+-%/TBRyokanG-hv		/Adobe-Japan1		;
+-%/TBRyokanG-M		/Adobe-Japan1		;
+-%/TBRyokanG-R		/Adobe-Japan1		;
+-%/TBRyokanM-DE		/Adobe-Japan1		;
+-%/TBRyokanM-E		/Adobe-Japan1		;
+-%/TBRyokanM-hv		/Adobe-Japan1		;
+-%/TBRyokanM-M		/Adobe-Japan1		;
+-%/TBTsukijiG-B		/Adobe-Japan1		;
+-%/TBTsukijiG-DB		/Adobe-Japan1		;
+-%/TBTsukijiG-E		/Adobe-Japan1		;
+-%/TBTsukijiG-hv		/Adobe-Japan1		;
+-%/TBTsukijiG-M		/Adobe-Japan1		;
+-%/TBTsukijiG-R		/Adobe-Japan1		;
+-%/TBTsukijiM-DE		/Adobe-Japan1		;
+-%/TBTsukijiM-E		/Adobe-Japan1		;
+-%/TBTsukijiM-hv		/Adobe-Japan1		;
+-%/TBTsukijiM-M		/Adobe-Japan1		;
+-%/TBYukinariG-B		/Adobe-Japan1		;
+-%/TBYukinariG-DB	/Adobe-Japan1		;
+-%/TBYukinariG-E		/Adobe-Japan1		;
+-%/TBYukinariG-hv	/Adobe-Japan1		;
+-%/TBYukinariG-M		/Adobe-Japan1		;
+-%/TBYukinariG-R		/Adobe-Japan1		;
+-%/TBYukinariM-DE	/Adobe-Japan1		;
+-%/TBYukinariM-E		/Adobe-Japan1		;
+-%/TBYukinariM-hv	/Adobe-Japan1		;
+-%/TBYukinariM-M		/Adobe-Japan1		;
+-%/TypeBankG-B		/Adobe-Japan1		;
+-%/TypeBankG-DB		/Adobe-Japan1		;
+-%/TypeBankG-E		/Adobe-Japan1		;
+-%/TypeBankG-hv		/Adobe-Japan1		;
+-%/TypeBankG-M		/Adobe-Japan1		;
+-%/TypeBankG-R		/Adobe-Japan1		;
+-%/TypeBankM-DE		/Adobe-Japan1		;
+-%/TypeBankM-E		/Adobe-Japan1		;
+-%/TypeBankM-hv		/Adobe-Japan1		;
+-%/TypeBankM-M		/Adobe-Japan1		;
++/Ryumin-Medium		/Ryumin-Light		;
++/Ryumin-regular		/Ryumin-Light		;
++/Ryumin-Ultra		/Ryumin-Light		;
++/ShinGo-Bold		/GothicBBB-Medium	;
++/ShinGo-Light		/GothicBBB-Medium	;
++/ShinGo-Medium		/GothicBBB-Medium	;
++/ShinGo-regular		/GothicBBB-Medium	;
++/ShinGo-Ultra		/GothicBBB-Medium	;
++/ShinseiKai-CBSK1	/Ryumin-Light		;
++/TBKomachiG-B		/Adobe-Japan1		;
++/TBKomachiG-DB		/Adobe-Japan1		;
++/TBKomachiG-E		/Adobe-Japan1		;
++/TBKomachiG-hv		/Adobe-Japan1		;
++/TBKomachiG-M		/Adobe-Japan1		;
++/TBKomachiG-R		/Adobe-Japan1		;
++/TBKomachiM-DE		/Adobe-Japan1		;
++/TBKomachiM-E		/Adobe-Japan1		;
++/TBKomachiM-hv		/Adobe-Japan1		;
++/TBKomachiM-M		/Adobe-Japan1		;
++/TBKoudoukenG-B		/Adobe-Japan1		;
++/TBKoudoukenG-DB	/Adobe-Japan1		;
++/TBKoudoukenG-E		/Adobe-Japan1		;
++/TBKoudoukenG-hv	/Adobe-Japan1		;
++/TBKoudoukenG-M		/Adobe-Japan1		;
++/TBKoudoukenG-R		/Adobe-Japan1		;
++/TBKoudoukenM-DE	/Adobe-Japan1		;
++/TBKoudoukenM-E		/Adobe-Japan1		;
++/TBKoudoukenM-hv	/Adobe-Japan1		;
++/TBKoudoukenM-M		/Adobe-Japan1		;
++/TBRyokanG-B		/Adobe-Japan1		;
++/TBRyokanG-DB		/Adobe-Japan1		;
++/TBRyokanG-E		/Adobe-Japan1		;
++/TBRyokanG-hv		/Adobe-Japan1		;
++/TBRyokanG-M		/Adobe-Japan1		;
++/TBRyokanG-R		/Adobe-Japan1		;
++/TBRyokanM-DE		/Adobe-Japan1		;
++/TBRyokanM-E		/Adobe-Japan1		;
++/TBRyokanM-hv		/Adobe-Japan1		;
++/TBRyokanM-M		/Adobe-Japan1		;
++/TBTsukijiG-B		/Adobe-Japan1		;
++/TBTsukijiG-DB		/Adobe-Japan1		;
++/TBTsukijiG-E		/Adobe-Japan1		;
++/TBTsukijiG-hv		/Adobe-Japan1		;
++/TBTsukijiG-M		/Adobe-Japan1		;
++/TBTsukijiG-R		/Adobe-Japan1		;
++/TBTsukijiM-DE		/Adobe-Japan1		;
++/TBTsukijiM-E		/Adobe-Japan1		;
++/TBTsukijiM-hv		/Adobe-Japan1		;
++/TBTsukijiM-M		/Adobe-Japan1		;
++/TBYukinariG-B		/Adobe-Japan1		;
++/TBYukinariG-DB		/Adobe-Japan1		;
++/TBYukinariG-E		/Adobe-Japan1		;
++/TBYukinariG-hv		/Adobe-Japan1		;
++/TBYukinariG-M		/Adobe-Japan1		;
++/TBYukinariG-R		/Adobe-Japan1		;
++/TBYukinariM-DE		/Adobe-Japan1		;
++/TBYukinariM-E		/Adobe-Japan1		;
++/TBYukinariM-hv		/Adobe-Japan1		;
++/TBYukinariM-M		/Adobe-Japan1		;
++/TypeBankG-B		/Adobe-Japan1		;
++/TypeBankG-DB		/Adobe-Japan1		;
++/TypeBankG-E		/Adobe-Japan1		;
++/TypeBankG-hv		/Adobe-Japan1		;
++/TypeBankG-M		/Adobe-Japan1		;
++/TypeBankG-R		/Adobe-Japan1		;
++/TypeBankM-DE		/Adobe-Japan1		;
++/TypeBankM-E		/Adobe-Japan1		;
++/TypeBankM-hv		/Adobe-Japan1		;
++/TypeBankM-M		/Adobe-Japan1		;
+ 
+ %
+ % Convenient aliases for PS files on Korean Acrobat Distiller
+ %
+-%/AppleGothic		/HYGoThic-Medium	;
+-%/AppleMyungjo		/HYSMyeongJo-Medium	;
+-%/HYSinMyeongJo-Medium	/HYSMyeongJo-Medium	;
+-%/JCfg			/Adobe-Korea1		;
+-%/JCkg			/Adobe-Korea1		;
+-%/Munhwa-Regular	/HYSMyeongJo-Medium	;
+-%/MunhwaGothic-Regular	/HYGoThic-Medium	;
+-%/SMAgoJ		/HYGoThic-Medium	;
+-%/SMAgoK		/HYGoThic-Medium	;
+-%/SMAgoSE		/HYGoThic-Medium	;
+-%/SMAgoT		/HYGoThic-Medium	;
+-%/SMAmu			/HYSMyeongJo-Medium	;
+-%/SMAmuK		/HYSMyeongJo-Medium	;
+-%/SMAmuSE		/HYSMyeongJo-Medium	;
+-%/SMAmuT		/HYSMyeongJo-Medium	;
+-%/SMGothic-Bold		/HYGoThic-Medium	;
+-%/SMGothic-DemiBold	/HYGoThic-Medium	;
+-%/SMGothic-Light	/HYGoThic-Medium	;
+-%/SMGothic-Medium	/HYGoThic-Medium	;
+-%/SMMyungjo-Bold	/HYSMyeongJo-Medium	;
+-%/SMMyungjo-DemiBold	/HYSMyeongJo-Medium	;
+-%/SMMyungjo-Light	/HYSMyeongJo-Medium	;
+-%/SMMyungjo-Medium	/HYSMyeongJo-Medium	;
+-%/SMgoJ			/HYGoThic-Medium	;
+-%/SMgoK			/HYGoThic-Medium	;
+-%/SMgoSE		/HYGoThic-Medium	;
+-%/SMgoT			/HYGoThic-Medium	;
+-%/SMmu			/HYSMyeongJo-Medium	;
+-%/SMmuK			/HYSMyeongJo-Medium	;
+-%/SMmuSE		/HYSMyeongJo-Medium	;
+-%/SMmuT			/HYSMyeongJo-Medium	;
+-%/Seoul			/Adobe-Korea1		;
++/AppleGothic		/HYGoThic-Medium	;
++/AppleMyungjo		/HYSMyeongJo-Medium	;
++/HYSinMyeongJo-Medium	/HYSMyeongJo-Medium	;
++/JCfg			/Adobe-Korea1		;
++/JCkg			/Adobe-Korea1		;
++/Munhwa-Regular		/HYSMyeongJo-Medium	;
++/MunhwaGothic-Regular	/HYGoThic-Medium	;
++/SMAgoJ			/HYGoThic-Medium	;
++/SMAgoK			/HYGoThic-Medium	;
++/SMAgoSE		/HYGoThic-Medium	;
++/SMAgoT			/HYGoThic-Medium	;
++/SMAmu			/HYSMyeongJo-Medium	;
++/SMAmuK			/HYSMyeongJo-Medium	;
++/SMAmuSE		/HYSMyeongJo-Medium	;
++/SMAmuT			/HYSMyeongJo-Medium	;
++/SMGothic-Bold		/HYGoThic-Medium	;
++/SMGothic-DemiBold	/HYGoThic-Medium	;
++/SMGothic-Light		/HYGoThic-Medium	;
++/SMGothic-Medium	/HYGoThic-Medium	;
++/SMMyungjo-Bold		/HYSMyeongJo-Medium	;
++/SMMyungjo-DemiBold	/HYSMyeongJo-Medium	;
++/SMMyungjo-Light	/HYSMyeongJo-Medium	;
++/SMMyungjo-Medium	/HYSMyeongJo-Medium	;
++/SMgoJ			/HYGoThic-Medium	;
++/SMgoK			/HYGoThic-Medium	;
++/SMgoSE			/HYGoThic-Medium	;
++/SMgoT			/HYGoThic-Medium	;
++/SMmu			/HYSMyeongJo-Medium	;
++/SMmuK			/HYSMyeongJo-Medium	;
++/SMmuSE			/HYSMyeongJo-Medium	;
++/SMmuT			/HYSMyeongJo-Medium	;
++/Seoul			/Adobe-Korea1		;
+diff -Naur espgs-7.05.6.orig/lib/CIDFnmap.Koc espgs-7.05.6/lib/CIDFnmap.Koc
+--- espgs-7.05.6.orig/lib/CIDFnmap.Koc	2002-04-23 20:58:33.000000000 +0900
++++ espgs-7.05.6/lib/CIDFnmap.Koc	2003-01-09 02:27:55.000000000 +0900
+@@ -30,8 +30,8 @@
+ %	Kochi-Mincho: Public domain, except for NAGA10 bitmap data
+ %	Kochi-Gothic: Wada Lab's font license, except for NAGA10 bitmap data
+ %
+-%/Kochi-Mincho	(kochi-mincho.ttf)	;
+-%/Kochi-Gothic	(kochi-gothic.ttf)	;
++/Kochi-Mincho	(/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho.ttf)	;
++/Kochi-Gothic	(/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic.ttf)	;
+ %
+ % Notice: In CID-keyed space of Kochi-Mincho, although you may find that
+ % CIDs 7611,7613-7625,7629,7630,11847,12041-12043 are incorrectly
+@@ -45,6 +45,6 @@
+ %	Kochi-Mincho: Public domain. Designed by Yasuyuki Furukawa.
+ %	Kochi-Gothic: Wada Lab's font license.
+ %
+-/Kochi-Mincho	(Kochi-Mincho)	;
+-/Kochi-Gothic	(Kochi-Gothic)	;
++%/Kochi-Mincho	(Kochi-Mincho)	;
++%/Kochi-Gothic	(Kochi-Gothic)	;
+
+diff -Naur espgs-7.05.6.orig/lib/gs_res.ps.in espgs-7.05.6/lib/gs_res.ps.in
+--- espgs-7.05.6.orig/lib/gs_res.ps.in	2002-12-28 07:01:36.000000000 +0900
++++ espgs-7.05.6/lib/gs_res.ps.in	2002-12-28 07:03:20.000000000 +0900
+@@ -245,8 +245,8 @@
+   /pssystemparams 10 dict readonly def
+ } if
+ pssystemparams begin
+-  /FontResourceDir (@datadir@/ghostscript/fonts/) readonly .forcedef	% pssys'params is r-o
+-  /GenericResourceDir (@datadir@/ghostscript/) readonly .forcedef	% pssys'params is r-o
++  /FontResourceDir (@datadir@/ghostscript/Resource/Font/) readonly .forcedef	% pssys'params is r-o
++  /GenericResourceDir (@datadir@/ghostscript/Resource/) readonly .forcedef	% pssys'params is r-o
+   /GenericResourcePathSep (/) readonly .forcedef	% pssys'params is r-o
+ end
+ end
diff --git a/app-text/ghostscript/ghostscript-7.05.6.ebuild b/app-text/ghostscript/ghostscript-7.05.6.ebuild
index 42d15203dc3e..998624206717 100644
--- a/app-text/ghostscript/ghostscript-7.05.6.ebuild
+++ b/app-text/ghostscript/ghostscript-7.05.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6.ebuild,v 1.2 2003/03/09 19:50:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6.ebuild,v 1.3 2003/04/03 12:08:46 nakano Exp $
 
 DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
 SRC_URI="ftp://ftp.easysw.com/pub/ghostscript/espgs-${PV}-source.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.easysw.com/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~x86 ~ppc ~sparc alpha"
-IUSE="X cups gnome cjk"
+IUSE="X cups cjk"
 
 DEPEND="virtual/glibc
 	>=media-libs/jpeg-6b 
@@ -39,11 +39,10 @@ src_unpack() {
 
 ##	patch -p0 < ${FILESDIR}/png.diff || die "patch failed"
 
-##	if [ -n `use cjk` ] ; then
-##		patch -p0 < ${FILESDIR}/gs7.05-cjk.diff || die "patch failed"
-##	fi
+	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff
+
 	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
-	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch
+	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch || die
 }
 
 src_compile() {