--- ghostscript-gpl-8.54.ebuild	2007-04-07 13:35:34.000000000 +0200
+++ ghostscript-gpl-8.56.ebuild	2007-04-08 11:14:14.000000000 +0200
@@ -11,19 +11,18 @@
 
 GSDJVU_PV=1.1
 CUPS_PV=1.1.23
-MY_P=ghostscript-${PV}-gpl
 PVM=$(get_version_component_range 1-2)
 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 )
-		djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )
+	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
 	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://sourceforge/ghostscript/${P/-gpl}.tar.bz2
 	mirror://gentoo/gdevhl12.c.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sh x86 ~x86-fbsd"
-IUSE="X cups cjk emacs gtk djvu jpeg2k"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86 ~x86-fbsd"
+IUSE="X bindist cups cjk djvu emacs gtk jpeg2k"
 
 DEP="virtual/libc
 	>=media-libs/jpeg-6b
@@ -31,7 +30,7 @@
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7
 	X? ( x11-libs/libXt x11-libs/libXext )
-	djvu? ( app-text/djvu )
+	!bindist? ( djvu? ( app-text/djvu ) )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
 	jpeg2k? ( media-libs/jasper )
@@ -47,14 +46,14 @@
 DEPEND="${DEP}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P/-gpl}
 
 src_unpack() {
 	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
 	if use cjk; then
-		cat ${FILESDIR}/ghostscript-esp-8.15.2-cidfmap.cjk >> ${S}/lib/cidfmap
-		cat ${FILESDIR}/ghostscript-esp-8.15.2-FAPIcidfmap.cjk >> ${S}/lib/FAPIcidfmap
-		cd ${S}/Resource
+		cat "${FILESDIR}"/ghostscript-esp-8.15.2-cidfmap.cjk >> ${S}/lib/cidfmap
+		cat "${FILESDIR}"/ghostscript-esp-8.15.2-FAPIcidfmap.cjk >> ${S}/lib/FAPIcidfmap
+		cd "${S}"/Resource
 		unpack adobe-cmaps-200406.tar.gz
 		unpack acro5-cmaps-2001.tar.gz
 		cd ${WORKDIR}
@@ -62,8 +61,8 @@
 
 	# cups support
 	if use cups; then
-		cp -r cups-${CUPS_PV}/pstoraster ${S}
-		cd ${S}/pstoraster
+		cp -r cups-${CUPS_PV}/pstoraster "${S}"
+		cd "${S}"/pstoraster
 		sed -e 's:@prefix@:/usr:' -e 's:@exec_prefix@:${prefix}:' -e \
 			's:@bindir@:${exec_prefix}/bin:' -e 's:@GS@:gs:' \
 			pstopxl.in > pstopxl || die "pstopxlsed failed"
@@ -71,54 +70,60 @@
 			-e 's:/usr/local:/usr:' pstoraster || die "pstorastersed failed"
 		sed -i -e "s:pstopcl6:pstopxl:" cups.mak || die "cupssed failed"
 		cd ..
-		epatch ${FILESDIR}/gdevcups.patch
-		epatch ${FILESDIR}/ghostscript-afpl-8.54-cups-destdir.diff
+		epatch "${FILESDIR}"/gdevcups.patch
+		epatch "${FILESDIR}"/ghostscript-afpl-8.54-cups-destdir.diff
 
 		echo 'include pstoraster/cups.mak' >> src/Makefile.in
 		sed -i -e 's:DEVICE_DEVS17=:\0$(DD)cups.dev:' src/Makefile.in || die "sed failed"
 		sed -i -e 's:EXTRALIBS=.*:\0 -lcups -lcupsimage:' src/Makefile.in || die "sed failed"
 	fi
-	cd ${S}
+	cd "${S}"
 
-	if use djvu; then
+	if use bindist && use djvu ; then
+		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+
+	if ! use bindist && use djvu; then
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu ${S}
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c ${S}/src
-		epatch ${FILESDIR}/djvu-gs-gpl.patch
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps ${S}/lib
-		cp ${S}/src/contrib.mak ${S}/src/contrib.mak.gsdjvu
-		grep -q djvusep ${S}/src/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> ${S}/src/contrib.mak
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/src
+		epatch "${FILESDIR}"/djvu-gs-gpl.patch
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
+		cp "${S}"/src/contrib.mak "${S}"/src/contrib.mak.gsdjvu
+		grep -q djvusep "${S}"/src/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/src/contrib.mak
 	fi
 
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-cups-lib.patch
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-big-cmap-post.patch
+	epatch "${FILESDIR}"/ghostscript-afpl-8.56-cups-lib.patch
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-big-cmap-post.patch
 
 	# enable cfax device (bug #56704) and rinkj device
-	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:\0 $(DD)cfax.dev $(DD)rinkj.dev:' ${S}/src/Makefile.in || die "sed failed"
+	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:\0 $(DD)cfax.dev $(DD)rinkj.dev:' \
+		"${S}"/src/Makefile.in || die "sed failed"
 
 	# http://www.linuxprinting.org/download/printing/ghostscript-8.x/drivers/hl1250
 	# http://bugs.ghostscript.com/show_bug.cgi?id=687484
-	cp ${WORKDIR}/gdevhl12.c ${S}/src/gdevhl12.c || die
-	cat ${FILESDIR}/gdevhl12-hl1250.mak >> ${S}/src/contrib.mak || die
+	cp ${WORKDIR}/gdevhl12.c "${S}"/src/gdevhl12.c || die
+	cat "${FILESDIR}"/gdevhl12-hl1250.mak >> "${S}"/src/contrib.mak || die
 	sed -e 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
 		-i "${S}"/src/Makefile.in  || die
 	sed -i -e "s:#if 1:#if 0:" "${S}"/src/gdevhl12.c || die
 
 	# #128650, #128645, http://bugs.ghostscript.com/show_bug.cgi?id=688703
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-ps2epsi-afpl.diff
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-destdir.diff
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-ps2epsi-afpl.diff
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-rinkj.patch
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-destdir.diff
 
 	# already fixed inSVN, http://bugs.ghostscript.com/show_bug.cgi?id=688702
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-gtk2.patch
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-gtk2.patch
 	if ! use gtk; then
 		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
 		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.mak || die "gsxso sed failed"
 	fi
 
 	# fixed inSVN http://bugs.ghostscript.com/show_bug.cgi?id=688721
-	epatch ${FILESDIR}/ghostscript-afpl-8.54-segfault.patch
+	epatch "${FILESDIR}"/ghostscript-afpl-8.54-segfault.patch
 
 	# search path fix
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
@@ -135,7 +140,7 @@
 		--with-ijs \
 		--with-jbig2dec || die "econf failed"
 
-	if use djvu; then
+	if ! use bindist && use djvu; then
 		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g'		Makefile
 		sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &}
 		ifelse:' lib/gs_res.ps
@@ -151,9 +156,11 @@
 src_install() {
 	emake DESTDIR="${D}" install soinstall || die "emake install failed"
 
-	use djvu && dobin gsdjvu
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu
+	fi
 
-	rm -fr ${D}/usr/share/doc/${PF}/html/{README,PUBLIC}
+	rm -fr "${D}"/usr/share/doc/${PF}/html/{README,PUBLIC}
 	dodoc doc/README
 	use emacs && elisp-site-file-install doc/gsdoc.el