Added --with-fontpath and --with-fontconfig. Thanks to Georgi Georgiev <chutz@gg3.net>, see bug #56998.

7 files changed, 58 insertions, 33 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index a334454e0f14..ff0cabe50022 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.81 2004/10/10 02:58:59 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.82 2004/10/10 16:30:40 usata Exp $
+
+  11 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/gs7.07.1-cjk.diff.bz2, ghostscript-7.07.1-r4.ebuild,
+  ghostscript-7.07.1-r5.ebuild, ghostscript-7.07.1-r6.ebuild,
+  ghostscript-7.07.1-r7.ebuild:
+  Added --with-fontconfig and --with-fontpath.
+  Thanks to Georgi Georgiev <chutz@gg3.net>, see bug #56998.
 
   09 Oct 2004; Tom Gall <tgall@gentoo.org> ghostscript-7.07.1-r7.ebuild:
   stable on ppc64, bug #66357
@@ -11,7 +18,7 @@
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> ghostscript-7.07.1-r7.ebuild:
   Marked stable on hppa.
 
-  07 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  07 Oct 2004; Bryan ƒŠstergaard <kloeri@gentoo.org>
   ghostscript-7.07.1-r7.ebuild:
   Stable on alpha, bug 66357.
 
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 47f4ae927c0b..e1a793b07203 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,33 +1,33 @@
-MD5 0ef69e12d5541410a56f22b7b5171068 ChangeLog 13228
-MD5 4c43a0cacba1f4a15e9578ed603257fd ghostscript-7.05.6.ebuild 2739
+MD5 59bcfaf993928ea507606cc59ee5ec84 ChangeLog 13542
 MD5 e5f37353cc211a2f71cc8841bb8cc1ba ghostscript-7.07.1-r1.ebuild 3187
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 2db7df35be7d9e0921a6ab5c72c02f67 ghostscript-7.07.1-r2.ebuild 3295
+MD5 4c43a0cacba1f4a15e9578ed603257fd ghostscript-7.05.6.ebuild 2739
 MD5 0d1e785f83f28fcc649afaee1641be97 ghostscript-7.07.1-r3.ebuild 3443
-MD5 d26ced8d0d60522b769bed4ebf49308a ghostscript-7.07.1-r4.ebuild 3644
-MD5 6a3949a845d79b6f29d62e2e91f27f94 ghostscript-7.07.1-r5.ebuild 3671
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 6319ff45453f1d6fb8e71caa8f40556a ghostscript-7.07.1-r4.ebuild 4028
+MD5 40cb9de588f9d7b84c71b45be2ff8d69 ghostscript-7.07.1-r5.ebuild 4028
+MD5 9d84410bc800a7892958613fc396d97e ghostscript-7.07.1-r7.ebuild 4001
 MD5 0eb21cd33b7646ed6bab341f994c6640 ghostscript-7.05.6-r1.ebuild 2749
-MD5 9f74fede7b7da8a816f509902fda30df ghostscript-7.07.1-r6.ebuild 3720
-MD5 6743743df4eb948a0cfcf9d6e297f032 ghostscript-7.07.1-r7.ebuild 3615
-MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 1f0374fe43952ae741d0cf174588a5fb ghostscript-7.07.1-r6.ebuild 4076
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r1 291
+MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
+MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
+MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
+MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
+MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
+MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
+MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r3 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r4 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r5 291
-MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
 MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
 MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
-MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
 MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
-MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
-MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
+MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
 MD5 6807c3b6025d5b09e8eb6349769162d1 files/digest-ghostscript-7.05.6-r1 212
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r6 212
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
-MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
-MD5 4d11b45e0a5dd9ee77d7757d76814fd9 files/gs7.07.1-cjk.diff.bz2 3264
 MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
diff --git a/app-text/ghostscript/files/gs7.07.1-cjk.diff.bz2 b/app-text/ghostscript/files/gs7.07.1-cjk.diff.bz2
index 5e01095ac40f..0b0f74a73792 100644
--- a/app-text/ghostscript/files/gs7.07.1-cjk.diff.bz2
+++ b/app-text/ghostscript/files/gs7.07.1-cjk.diff.bz2
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild
index d95c3e20e81d..1483cd480588 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild,v 1.5 2004/10/05 06:43:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r4.ebuild,v 1.6 2004/10/10 16:30:40 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -21,9 +21,9 @@ RDEPEND="virtual/libc
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
 	X? ( virtual/x11 )
-	cjk? ( <=media-fonts/arphicfonts-0.1-r1
-		<=media-fonts/kochi-substitute-20030809-r2
-		<=media-fonts/baekmuk-fonts-2.1-r1 )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
 	cups? ( net-print/cups )
 	!virtual/ghostscript
 	truetype? ( media-libs/fontconfig )"
@@ -42,7 +42,7 @@ src_unpack() {
 	cd ${S}
 
 	if use cjk ; then
-		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
+		epatch ${FILESDIR}/gs${PV}-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi
 
@@ -76,6 +76,12 @@ src_compile() {
 	local myconf
 	myconf="--with-ijs --with-omni --without-gimp-print"
 
+	if use truetype ; then
+		# bug #56998, only compiled-in fontpath is searched when running 
+		# gs -DPARANOIDSAFER out.ps
+		myconf="${myconf} --with-fontconfig --with-fontpath=/usr/share/fonts:/usr/share/fonts/ttf/zh_TW:/usr/share/fonts/ttf/zh_CN:/usr/share/fonts/arphicfonts:/usr/share/fonts/ttf/korean/baekmuk:/usr/share/fonts/baekmuk-fonts:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute"
+	fi
+
 	use X && myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
index 6907e5cfafa0..c58bb32025eb 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild,v 1.7 2004/10/05 06:43:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild,v 1.8 2004/10/10 16:30:40 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -20,9 +20,9 @@ RDEPEND="virtual/libc
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
 	X? ( virtual/x11 )
-	cjk? ( >=media-fonts/arphicfonts-0.1-r2
-		>=media-fonts/kochi-substitute-20030809-r2
-		>=media-fonts/baekmuk-fonts-2.2 )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
 	cups? ( net-print/cups )
 	!virtual/ghostscript
 	media-libs/fontconfig
@@ -80,6 +80,10 @@ src_compile() {
 	local myconf
 	myconf="--with-ijs --with-omni --without-gimp-print"
 
+	# bug #56998, only compiled-in fontpath is searched when running 
+	# gs -DPARANOIDSAFER out.ps
+	myconf="${myconf} --with-fontconfig --with-fontpath=/usr/share/fonts:/usr/share/fonts/ttf/zh_TW:/usr/share/fonts/ttf/zh_CN:/usr/share/fonts/arphicfonts:/usr/share/fonts/ttf/korean/baekmuk:/usr/share/fonts/baekmuk-fonts:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute"
+
 	use X && myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild
index 819c84ace76a..af867a1f1d80 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild,v 1.5 2004/10/07 15:14:44 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild,v 1.6 2004/10/10 16:30:40 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -20,9 +20,9 @@ RDEPEND="virtual/libc
 	>=media-libs/libpng-1.2.1
 	>=sys-libs/zlib-1.1.4
 	X? ( virtual/x11 )
-	cjk? ( >=media-fonts/arphicfonts-0.1-r2
-		>=media-fonts/kochi-substitute-20030809-r2
-		>=media-fonts/baekmuk-fonts-2.2 )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
 	cups? ( net-print/cups )
 	!virtual/ghostscript
 	media-libs/fontconfig
@@ -82,6 +82,10 @@ src_compile() {
 	local myconf
 	myconf="--with-ijs --with-omni --without-gimp-print"
 
+	# bug #56998, only compiled-in fontpath is searched when running 
+	# gs -DPARANOIDSAFER out.ps
+	myconf="${myconf} --with-fontconfig --with-fontpath=/usr/share/fonts:/usr/share/fonts/ttf/zh_TW:/usr/share/fonts/ttf/zh_CN:/usr/share/fonts/arphicfonts:/usr/share/fonts/ttf/korean/baekmuk:/usr/share/fonts/baekmuk-fonts:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute"
+
 	use X && myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"
 
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
index 56017f8fc787..31f7e076b652 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild,v 1.8 2004/10/10 02:58:59 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild,v 1.9 2004/10/10 16:30:40 usata Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -41,7 +41,7 @@ src_unpack() {
 	cd ${S}
 
 	if use cjk ; then
-		epatch ${FILESDIR}/gs7.05.6-cjk.diff.bz2
+		epatch ${FILESDIR}/gs7.07.1-cjk.diff.bz2
 		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
 	fi
 
@@ -79,6 +79,10 @@ src_compile() {
 	local myconf
 	myconf="--with-ijs --with-omni --without-gimp-print"
 
+	# bug #56998, only compiled-in fontpath is searched when running 
+	# gs -DPARANOIDSAFER out.ps
+	myconf="${myconf} --with-fontconfig --with-fontpath=/usr/share/fonts:/usr/share/fonts/ttf/zh_TW:/usr/share/fonts/ttf/zh_CN:/usr/share/fonts/arphicfonts:/usr/share/fonts/ttf/korean/baekmuk:/usr/share/fonts/baekmuk-fonts:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute"
+
 	use X && myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"