--- /usr/portage/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild	2006-06-27 17:13:40.000000000 +0900
+++ /usr/local/overlays/portage/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild	2006-07-03 14:46:36.938411500 +0900
@@ -19,13 +19,13 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="X cups cjk emacs gtk jpeg2k"
+IUSE="X cups cjk emacs gtk jpeg2k jbig png zlib"
 
 DEP="virtual/libc
 	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7
+	png? ( >=media-libs/libpng-1.2.5 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	jbig? ( >=media-libs/tiff-3.7 )
 	X? ( || ( x11-libs/libXt virtual/x11 ) )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
@@ -44,6 +44,19 @@
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if use png && ! use zlib; then
+		einfo "You must add USE=zlib to get png support."
+		die "setup failed"
+	fi
+
+	if ! built_with_use media-libs/tiff jbig; then
+		einfo "You must build media-libs/tiff with USE=jbig"
+		einfo "or you won't have jbig support for ${PN}"
+		die "setup failed"
+	fi
+}
+
 src_unpack() {
 	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
 	if use cjk; then
@@ -113,13 +126,25 @@
 	sed -i -e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
 		src/Makefile.in src/*.mak || die "sed failed"
+
+	epatch ${FILESDIR}/ghostscript-gpl-8.54-configure.patch
+
+	# force use of external libs
+	use jpeg2k && rm -rf jasper
+	use zlib && rm -rf zlib
+	use png && rm -rf libpng
+	use jbig && rm -rf jbig2dec
+
+	eautoconf
 }
 
 src_compile() {
 	econf $(use_with X x) \
 		$(use_with jpeg2k jasper) \
 		--with-ijs \
-		--with-jbig2dec || die "econf failed"
+		$(use_with jbig jbig2dec) \
+		$(use_with png) \
+		$(use_with zlib) || die "econf failed"
 	emake so all || die "emake failed"
 
 	cd ijs