--- /usr/portage/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild	2014-02-12 20:22:04.000000000 +0100
+++ /usr/portage/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild	2014-02-19 11:24:06.101219348 +0100
@@ -13,7 +13,7 @@ 
 GSDJVU_PV=1.6
 PVM=$(get_version_component_range 1-2)
 SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://sourceforge/ghostscript/ghostpdl-${PV}.tar.bz2
 	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
 	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
 
@@ -57,7 +57,7 @@ 
 "
 
 S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/ghostpdl-${PV}/gs"
 
 LANGS="ja ko zh_CN zh_TW"
 for X in ${LANGS} ; do
@@ -134,12 +134,7 @@ 
 	for path in \
 		/usr/share/fonts/urw-fonts \
 		/usr/share/fonts/Type1 \
-		/usr/share/fonts \
-		/usr/share/poppler/cMap/Adobe-CNS1 \
-		/usr/share/poppler/cMap/Adobe-GB1 \
-		/usr/share/poppler/cMap/Adobe-Japan1 \
-		/usr/share/poppler/cMap/Adobe-Japan2 \
-		/usr/share/poppler/cMap/Adobe-Korea1
+		/usr/share/fonts
 	do
 		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 	done
@@ -192,7 +187,7 @@ 
 
 	# move gsc to gs, bug #343447
 	# gsc collides with gambit, bug #253064
-	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
+	mv "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
 
 	cd "${S}/ijs"
 	emake DESTDIR="${D}" install