--- ghostscript-gnu-8.60.0.ebuild	2007-09-21 16:04:38.000000000 +0200
+++ ghostscript-gnu-8.60.0.ebuild-new	2007-09-21 17:08:50.000000000 +0200
@@ -3,6 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gnu-8.55.ebuild,v 1.6 2006/09/23 02:37:18 vapier Exp $
 
 WANT_AUTOMAKE=1.9
+
 inherit autotools elisp-common eutils versionator flag-o-matic
 
 DESCRIPTION="GNU Ghostscript - patched GPL Ghostscript"
@@ -17,14 +18,14 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X cups cjk emacs gtk jpeg2k"
+IUSE="X cups cjk gtk jpeg2k"
 
 DEP="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.5
 	>=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7
-	X? ( || ( x11-libs/libXt virtual/x11 ) )
+	X? ( x11-libs/libXt x11-libs/libXext )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	cups? ( >=net-print/cups-1.1.20 )
 	jpeg2k? ( media-libs/jasper )
@@ -42,14 +43,13 @@
 
 S=${WORKDIR}/${MY_P}
 
-MAKEOPTS="${MAKEOPTS} -j1"
 
 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}
@@ -67,31 +67,28 @@
 }
 
 src_compile() {
-	econf \
-		$(use_with X x) \
-		$(use_enable gtk) \
+	econf $(use_with X x) \
 		$(use_with jpeg2k jasper) \
+		$(use_enable cups) \
+		$(use_enable gtk) \
 		--with-ijs \
 		--with-jbig2dec \
 		--disable-compile-inits \
 		--enable-dynamic \
 		|| die "econf failed"
-	cd ${S}/ijs
-	econf || die "ijs econf failed"
 	
-	cd ${S}
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
-	cd ${S}/ijs
+	cd ijs
+	econf || die "ijs econf failed"
 	emake || die "ijs emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	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
 
 	cd ${S}/ijs
 	emake DESTDIR="${D}" install || die "emake ijs install failed"