--- /usr/portage/app-text/ghostscript-esp/ghostscript-esp-8.15.4.ebuild	2008-02-09 15:05:37.000000000 +0300
+++ ghostscript-esp-8.15.4-r1.ebuild	2008-02-25 11:23:10.000000000 +0300
@@ -22,7 +22,7 @@
 
 LICENSE="GPL-2 LGPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~m68k ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="X cups cjk gtk threads xml djvu"
 
 DEP="virtual/libc
@@ -54,25 +54,27 @@
 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
 	fi
-	cd ${S}
+	cd "${S}"
 
 	# http://cups.org/espgs/str.php?L2000
-	epatch ${FILESDIR}/ghostscript-esp-8.15.1-fPIC.patch
+	epatch "${FILESDIR}"/ghostscript-esp-8.15.1-fPIC.patch
+
+	epatch "${FILESDIR}"/ghostscript-8.60-CVE-2008-0411.diff
 
 	if use djvu; then
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu ${S}
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c ${S}/src
-		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
+		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
 
 	# search path fix
@@ -119,10 +121,10 @@
 
 	use djvu && dobin gsdjvu
 
-	rm -fr ${D}/usr/share/doc/${PF}/html/{README,PUBLIC}
+	rm -fr "${D}"/usr/share/doc/${PF}/html/{README,PUBLIC}
 	dodoc doc/README
 
-	cd ${S}/ijs
+	cd "${S}"/ijs
 	emake DESTDIR="${D}" install || die "emake ijs install failed"
 }