From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0B78B13888F for ; Fri, 23 Oct 2015 08:46:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEF3BE0848; Fri, 23 Oct 2015 08:46:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13079E0848 for ; Fri, 23 Oct 2015 08:46:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5867340634 for ; Fri, 23 Oct 2015 08:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9817F162E for ; Fri, 23 Oct 2015 08:46:05 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1445589955.0f54b4e96ff851e0f8b5788386b4b7514ef646ea.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/ghostscript-gpl/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild X-VCS-Directories: app-text/ghostscript-gpl/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0f54b4e96ff851e0f8b5788386b4b7514ef646ea X-VCS-Branch: master Date: Fri, 23 Oct 2015 08:46:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5b48b088-8b2c-4df4-b818-b354a0d8fdc6 X-Archives-Hash: 078f8683405048ee77ea07c63fef73d0 commit: 0f54b4e96ff851e0f8b5788386b4b7514ef646ea Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 23 08:43:13 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Oct 23 08:45:55 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f54b4e9 app-text/ghostscript-gpl: QA fixes * add missing die * use eclass functions instead of calling system tools directly * Prefix support Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher gentoo.org> .../ghostscript-gpl/ghostscript-gpl-9.18.ebuild | 61 +++++++++++----------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild index 6e7e502..4cf5c85 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild @@ -73,17 +73,17 @@ pkg_setup() { src_prepare() { # remove internal copies of various libraries - rm -rf "${S}"/cups/libs - rm -rf "${S}"/expat - rm -rf "${S}"/freetype - rm -rf "${S}"/jbig2dec - rm -rf "${S}"/jpeg{,xr} - rm -rf "${S}"/lcms{,2} - rm -rf "${S}"/libpng - rm -rf "${S}"/tiff - rm -rf "${S}"/zlib + rm -rf "${S}"/cups/libs || die + rm -rf "${S}"/expat || die + rm -rf "${S}"/freetype || die + rm -rf "${S}"/jbig2dec || die + rm -rf "${S}"/jpeg{,xr} || die + rm -rf "${S}"/lcms{,2} || die + rm -rf "${S}"/libpng || die + rm -rf "${S}"/tiff || die + rm -rf "${S}"/zlib || die # remove internal CMaps (CMaps from poppler-data are used instead) - rm -rf "${S}"/Resource/CMap + rm -rf "${S}"/Resource/CMap || die # apply various patches, many borrowed from Fedora # http://pkgs.fedoraproject.org/cgit/ghostscript.git @@ -96,15 +96,15 @@ src_prepare() { if use djvu ; then unpack gsdjvu-${GSDJVU_PV}.tar.gz - cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" - cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base + cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" || die + cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base || die epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch - cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu + cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu || die grep -q djvusep "${S}"/contrib/contrib.mak || \ - cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak + cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak || die # install ps2utf8.ps, bug #197818 - cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib + cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib || die sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \ "${S}"/base/unixinst.mak || die "sed failed" fi @@ -124,10 +124,10 @@ src_prepare() { -e 's:-L$(BINDIR):& $(LDFLAGS):g' \ "${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed" - cd "${S}" + cd "${S}" || die eautoreconf - cd "${S}/ijs" + cd "${S}/ijs" || die eautoreconf } @@ -171,7 +171,7 @@ src_configure() { "${S}"/Makefile || die "sed failed" fi - cd "${S}/ijs" + cd "${S}/ijs" || die econf \ --enable-shared \ $(use_enable static-libs static) @@ -181,31 +181,30 @@ src_compile() { # -j1 needed because of bug #550926 emake -j1 so all - cd "${S}/ijs" + cd "${S}/ijs" || die emake } src_install() { emake -j1 DESTDIR="${D}" install-so install - if use djvu ; then - dobin gsdjvu - fi + use djvu && dobin gsdjvu # move gsc to gs, bug #343447 # gsc collides with gambit, bug #253064 - mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die + mv -f "${ED}"/usr/bin/{gsc,gs} || die - cd "${S}/ijs" + cd "${S}/ijs" || die emake -j1 DESTDIR="${D}" install # rename the original cidfmap to cidfmap.GS - mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die + mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die # install our own cidfmap to handle CJK fonts - insinto "/usr/share/ghostscript/${PVM}/Resource/Init" - doins "${WORKDIR}/fontmaps/CIDFnmap" - doins "${WORKDIR}/fontmaps/cidfmap" + insinto /usr/share/ghostscript/${PVM}/Resource/Init + doins \ + "${WORKDIR}/fontmaps/CIDFnmap" \ + "${WORKDIR}/fontmaps/cidfmap" for X in ${LANGS} ; do if use linguas_${X} ; then doins "${WORKDIR}/fontmaps/cidfmap.${X}" @@ -215,7 +214,9 @@ src_install() { # install the CMaps from poppler-data properly, bug #409361 dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap - use static-libs || find "${D}" -name '*.la' -delete + use static-libs || prune_libtool_files --all - use linguas_de || rm -r "${D}"/usr/share/man/de + if ! use linguas_de; then + rm -r "${ED}"/usr/share/man/de || die + fi }