[gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/

[Benda XU]

commit:     1f867ecfb16ed696750b15c732217120b211ae65
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 05:46:06 2016 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 05:57:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f867ecf

app-text/ghostscript-gpl: Prefix support.

Bug: 550926

Package-Manager: portage-2.3.0

 app-text/ghostscript-gpl/ghostscript-gpl-9.19.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.19.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.19.ebuild
index 5105d48..41a1950 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.19.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.19.ebuild
@@ -132,14 +132,16 @@ src_prepare() {
 
 	# search path fix
 	# put LDFLAGS after BINDIR, bug #383447
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
 		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
 		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
 
 	cd "${S}" || die
+	# remove incorrect symlink, bug 590384
+	rm -f ijs/ltmain.sh || die
 	eautoreconf
 
 	cd "${S}/ijs" || die
@@ -158,7 +160,7 @@ src_configure() {
 		/usr/share/poppler/cMap/Adobe-Japan2 \
 		/usr/share/poppler/cMap/Adobe-Korea1
 	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
 	done
 
 	# We force the endian configure flags until this is fixed: