From: Timo Gurr Date: Wed, 19 Oct 2011 19:29:49 +0000 (+0000) Subject: Revbump fixing bug #383831 which affects stable users. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=992ff29ba5c580fa3d56d4712df744b24228d7c1;p=gentoo.git Revbump fixing bug #383831 which affects stable users. Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64 RepoMan-Options: --force --- diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog index 8a298bfcaab3..22d3aa0f1f98 100644 --- a/app-text/ghostscript-gpl/ChangeLog +++ b/app-text/ghostscript-gpl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/ghostscript-gpl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.124 2011/10/12 16:26:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.125 2011/10/19 19:29:49 tgurr Exp $ + +*ghostscript-gpl-9.04-r4 (19 Oct 2011) + + 19 Oct 2011; Timo Gurr +ghostscript-gpl-9.04-r4.ebuild: + Revbump fixing bug #383831 which affects stable users. 12 Oct 2011; Samuli Suominen ghostscript-gpl-9.04-r3.ebuild: diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index dd279f1e4f00..574b139ba1dc 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73 DIST ghostscript-9.04.tar.bz2 29869900 RMD160 916bcacac247241fcf6ba02e90dc7e28040ba65e SHA1 df9c9e1924038da071d0ffbaddf42a75ecbc1e83 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4 DIST ghostscript-gpl-8.71-patchset-4.tar.bz2 12089 RMD160 67406d2fa03144981cadaee9570313a16b549715 SHA1 f80a8d5a4df18df3eb5183d71040ebcc713fca33 SHA256 4244d34114457ec281115c5a3a37b9b1ec2a091fff6f665896a21cf07d927a38 @@ -9,16 +6,6 @@ DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SH DIST gsdjvu-1.5.tar.gz 207583 RMD160 010be2cd791d5e2814c1f6554150bfd7c34222c0 SHA1 c7d0677dae5fe644cf3d714c04b3c2c343906342 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4 EBUILD ghostscript-gpl-8.71-r6.ebuild 5876 RMD160 dbaa3c0e021a74450fd74b61b41d7db66f9422fc SHA1 de65280243721459350be37a1b386df233b44f9a SHA256 3e87dec029c5c77d5930a7026cae9b917189790d50c06ebce445d27d25905484 EBUILD ghostscript-gpl-9.04-r3.ebuild 5909 RMD160 754e708c0abaf5f2f24e7bf0eb00cdc4207dc3d2 SHA1 c8f537c25b3a053ff1fb3c84c2e243e80454c36e SHA256 ed070627b729488595ecb9a743f5402512b11c15ead16206936c6cc7c5fc6c4f -MISC ChangeLog 22761 RMD160 74342d4c434761610ef27f0b7f2d0e291f9d126b SHA1 f721f4ad19bc417a36835019c897092c0259deb0 SHA256 7c53ecb5696be42150827c0df0999163d35432a7592d2966d309f78c0addbd29 +EBUILD ghostscript-gpl-9.04-r4.ebuild 6059 RMD160 562f1dcb5e7414370889e4302c096d2d548d6145 SHA1 ecb1527f5efec3463b0c0ac0b801c7101c0b1375 SHA256 0b5680eca3549b521ccbf7651ff9cb9feba7ff386c047e2c58eed15f9c5354d0 +MISC ChangeLog 22932 RMD160 96d841b1ba9a77f1a30860c56f9b1d7f21466de1 SHA1 85e4099805cb607ab28dd7dadf8fd1c3b27727f5 SHA256 aa092a42fc47e6199be6f00459f2273227304a205e32dad63cc3bc40a94d2caf MISC metadata.xml 284 RMD160 df1ccfc8195a57d367d5cb80ae86d4d95084234e SHA1 c6afd0be31143d4bab2720ac199d10cc1bafedef SHA256 48aa4ca7adac201df7ab07ee8d590d13aa5c6d8684487d2bbbf1433f268e90e1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQEcBAEBAgAGBQJOlb/UAAoJEEdUh39IaPFNX8cH/RjKl3ltnqAIFHG/ebq9Wboo -++DVSY+3/U7GWkfOvJx+1+CZF46gqYvSVutzN9WxzYE7n1iPaE8niTAYrQPKSFgW -iKQLWnA57x0lec2rkahIg0aul1o6XE6XdxmkrvoKA+ODxPKIuAiqXTK2x5ZVzXgr -z8ZZF78ALD0d9pwmYGvC3jhgX9xB6HNVFHWSvCLhWUlE1mOUbiTMRoeSD/YaMivP -QjGsAk2tNj+aMr1tPSFIvIum2qSBilTBAW/jPtojpUFLzrNwYLGjddLAmyGEC6n9 -5zzBE4xyRZsZmnMPs2+GWxcH4GypV1+LI4yksZkv46sGl0erbuhhKI+A+0CIu7g= -=KWd6 ------END PGP SIGNATURE----- diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild new file mode 100644 index 000000000000..58c91d6f73d4 --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r4.ebuild,v 1.1 2011/10/19 19:29:49 tgurr Exp $ + +EAPI=3 +inherit autotools eutils versionator flag-o-matic + +DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF" +HOMEPAGE="http://ghostscript.com/" + +MY_P=${P/-gpl} +GSDJVU_PV=1.5 +PVM=$(get_version_component_range 1-2) +SRC_URI="!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) ) + mirror://sourceforge/ghostscript/${MY_P}.tar.bz2 + mirror://gentoo/${P}-patchset-3.tar.bz2" + +LICENSE="GPL-3 CPL-1.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X" + +COMMON_DEPEND="app-text/libpaper + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:0 + >=media-libs/libpng-1.2.42 + >=media-libs/tiff-3.9.2 + >=sys-libs/zlib-1.2.3 + virtual/jpeg + !bindist? ( djvu? ( app-text/djvu ) ) + cups? ( >=net-print/cups-1.3.8 ) + dbus? ( sys-apps/dbus ) + gtk? ( x11-libs/gtk+:2 ) + idn? ( net-dns/libidn ) + jpeg2k? ( media-libs/jasper ) + X? ( x11-libs/libXt x11-libs/libXext )" + +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +RDEPEND="${COMMON_DEPEND} + >=app-text/poppler-data-0.4.4 + >=media-fonts/urw-fonts-2.4.9 + linguas_ja? ( media-fonts/kochi-substitute ) + linguas_ko? ( media-fonts/baekmuk-fonts ) + linguas_zh_CN? ( media-fonts/arphicfonts ) + linguas_zh_TW? ( media-fonts/arphicfonts )" + +S="${WORKDIR}/${MY_P}" + +LANGS="ja ko zh_CN zh_TW" +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +pkg_setup() { + if use bindist && use djvu; then + ewarn "You have bindist in your USE, djvu support will NOT be compiled!" + ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues." + fi +} + +src_prepare() { + # remove internal copies of various libraries + rm -rf "${S}"/expat + rm -rf "${S}"/freetype + rm -rf "${S}"/jasper + rm -rf "${S}"/jpeg + rm -rf "${S}"/lcms{,2} + rm -rf "${S}"/libpng + rm -rf "${S}"/tiff + rm -rf "${S}"/zlib + # remove internal urw-fonts + rm -rf "${S}"/Resource/Font + # remove internal CMaps (CMaps from poppler-data are used instead) + rm -rf "${S}"/Resource/CMap + + # apply various patches, many borrowed from Fedora + # http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git + EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" + EPATCH_SOURCE="${WORKDIR}/patches/" + epatch + + if ! use bindist && use djvu ; then + unpack gsdjvu-${GSDJVU_PV}.tar.gz + cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" + cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base" + epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch" + cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib" + cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu" + grep -q djvusep "${S}/base/contrib.mak" || \ + cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak" + + # install ps2utf8.ps, bug #197818 + sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \ + || die "sed failed" + fi + + if ! use gtk ; then + sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed" + sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed" + fi + + # search path fix + 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:" \ + -e 's:-L$(BINDIR):$(LDFLAGS) &:g' \ + base/Makefile.in base/*.mak || die "sed failed" + + cd "${S}" + eautoreconf + + cd "${S}/jbig2dec" + eautoreconf + + cd "${S}/ijs" + eautoreconf +} + +src_configure() { + local FONTPATH + 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 + do + FONTPATH="$FONTPATH${FONTPATH:+:}$path" + done + + econf \ + --enable-dynamic \ + --enable-freetype \ + --enable-fontconfig \ + --disable-compile-inits \ + --with-drivers=ALL \ + --with-fontpath="$FONTPATH" \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper \ + --with-system-libtiff \ + --without-luratech \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable gtk) \ + $(use_with cups install-cups) \ + $(use_with cups pdftoraster) \ + $(use_with idn libidn) \ + $(use_with jpeg2k jasper) \ + $(use_with X x) + + if ! use bindist && use djvu ; then + sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile + fi + + cd "${S}/ijs" + econf \ + --enable-shared \ + $(use_enable static-libs static) +} + +src_compile() { + emake -j1 so all || die "emake failed" + + cd "${S}/ijs" + emake || die "ijs emake failed" +} + +src_install() { + # -j1 -> see bug #356303 + emake -j1 DESTDIR="${D}" install-so install || die "emake install failed" + + # some printer drivers still require pstoraster, bug #383831 + use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster + + if ! use bindist && use djvu ; then + dobin gsdjvu || die "dobin gsdjvu install failed" + fi + + # remove gsc in favor of gambit, bug #253064 + rm -rf "${D}/usr/bin/gsc" + + rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC} + dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed" + + cd "${S}/ijs" + emake DESTDIR="${D}" install || die "emake ijs install failed" + + # rename the original cidfmap to cidfmap.GS + mv "${D}/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" || die "doins CIDFnmap failed" + doins "${WORKDIR}/fontmaps/cidfmap" || die "doins cidfmap failed" + for X in ${LANGS} ; do + if use linguas_${X} ; then + doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed" + fi + done + + use static-libs || find "${D}" -name '*.la' -delete +}