--- /usr/portage/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild	2005-03-16 13:35:22.000000000 +0100
+++ ghostscript-7.07.1-r8.ebuild	2005-03-26 16:55:08.354127640 +0100
@@ -4,9 +4,13 @@
 
 inherit flag-o-matic eutils gcc
 
+PATCHVER="1"
+PATCHES="ghostscript-patches-${PATCHVER}"
+
 DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
 HOMEPAGE="http://www.cups.org/ghostscript.php"
 SRC_URI="mirror://sourceforge/espgs/espgs-${PV}-source.tar.bz2
+	mirror://gentoo/${PATCHES}.tar.bz2
 	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)"
 
@@ -41,87 +45,63 @@
 
 src_unpack() {
 	unpack espgs-${PV}-source.tar.bz2
+	unpack ${PATCHES}.tar.bz2
 
 	cd ${S}
 
-	if use cjk ; then
-		epatch ${FILESDIR}/gs7.07.1-cjk.diff.bz2
-		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
-	fi
+	EPATCH_SUFFIX="patch"
+	EPATCH_EXCLUDE="01_all_fontconfig-rh-2.patch 09_all_krgb.patch"
+	
+	use cjk && epatch ${WORKDIR}/${PATCHES}/cjk/
+	epatch ${WORKDIR}/${PATCHES}/all/
 
-	# add fontconfig support (this patch is broken)
 	# epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.2.bz2
 
-	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
-	epatch ${FILESDIR}/ghostscript-7.05.6.man.patch
-
-	# ijs fPIC patch
-	epatch ${FILESDIR}/gs${PV}-ijs.patch
-
-	# pxl dash patch
-	epatch ${FILESDIR}/gs7.05.6-gdevpx.patch
-
-	# Makefile.in fixes for DESTDIR support in libijs because
-	# einstall borks on multilib systems -- eradicator
-	epatch ${FILESDIR}/gs${PV}-destdir.patch
-	epatch ${FILESDIR}/gs${PV}-ijsdestdir.patch
-
 	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.07/$(get_libdir):"\
-	Makefile.in || die "sed failed"
-	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
-	Makefile.in || die "sed failed"
-
-	# insecure tempfile handling
-	epatch ${FILESDIR}/gs${PV}-tempfile.patch
-
-	# krgb support (currently broken)
-	#( cd src; epatch ${FILESDIR}/gs7.07.1-krgb.patch.gz )
-
-	# Fix the garbage collector on ia64 and ppc
-	epatch ${FILESDIR}/gs-fix-gc.patch
-
-	# bug #63435
-	epatch ${FILESDIR}/gs${PV}-ps2ps.patch
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.07/$(get_libdir): ;
+		s:$\(gsdir\)/fonts:/usr/share/fonts/default/ghostscript/:" \
+		Makefile.in || die "sed failed"
 
 	# fix dynamic build
 	echo '#include "png.h"' >> src/png_.h
 
 	# fix for building with gtk2 instead of gtk1
 	if use gtk; then
-		sed -i -e "s:gmodule:gmodule-2.0:" configure.ac
-		sed -i -e "s:glib-config:pkgconfig:" configure.ac
+		sed -i -e "s:gmodule:gmodule-2.0: ;
+			s:glib-config:pkgconfig:" configure.ac
+		
 		sed -i -e "s:gtk-config:pkg-config gtk+-2.0:g" src/unix-dll.mak
 		sed -i -e "s:CFLAGS_SO=-fPIC:CFLAGS_SO=-fPIC -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include:" Makefile.in
 	else
-		epatch ${FILESDIR}/gs${PV}-nogtk2.patch
+		epatch ${WORKDIR}/${PATCHES}/gs${PV}-nogtk2.patch
 	fi
+
+	autoconf
 }
 
 src_compile() {
 	local myconf
-	myconf="--with-ijs --without-gimp-print"
-	use gtk && myconf="${myconf} --with-omni" || myconf="${myconf} --without-omni"
-
-	# 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"
-
-	use cups && myconf="${myconf} --enable-cups" \
-		|| myconf="${myconf} --disable-cups"
-
+	local fontpaths
+	
+	fontpaths="/usr/share/fonts:/usr/share/fonts/truetype:/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/share/fonts/kochi-substitute"
+	
 	# -O3 will make ghostscript fail when compiling with gcc 3.4
-	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -eq "4" ]
-	then
+	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -eq "4" ]; then
 		strip-flags
 		replace-flags -O? -O2
 	fi
 
-	autoconf
-	econf ${myconf} || die "econf failed"
+	# bug #56998, only compiled-in fontpath is searched when running 
+	econf \
+		$(use_with X x) \
+		$(use_enable cups) \
+		$(use_with gtk omni) \
+		--with-ijs \
+		--without-gimp-print \
+		--with-fontconfig \
+		--with-fontpath=${fontpaths} \
+		${myconf} || die "econf failed"
+	
 	emake -j1 || die "make failed"
 	emake so -j1 || die "make failed"