Revbump adding upstream fixes, resolves bug #389309 thanks to László Szalma. Also fixing bug #391749.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 220 insertions, 12 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 8bee090ebf57..7cb660afd206 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.129 2011/11/12 10:23:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.130 2011/12/21 21:13:34 tgurr Exp $
+
+*ghostscript-gpl-9.04-r5 (21 Dec 2011)
+
+  21 Dec 2011; Timo Gurr <tgurr@gentoo.org> +ghostscript-gpl-9.04-r5.ebuild:
+  Revbump adding upstream fixes, resolves bug #389309 thanks to László
+  Szalma. Also fixing bug #391749.
 
   12 Nov 2011; Justin Lecher <jlec@gentoo.org> ghostscript-gpl-9.04-r4.ebuild:
   Fixed slotting for media-libs/libpng
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index f182395113a5..03750465422d 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST ghostscript-9.04.tar.bz2 29869900 RMD160 916bcacac247241fcf6ba02e90dc7e28040ba65e SHA1 df9c9e1924038da071d0ffbaddf42a75ecbc1e83 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4
 DIST ghostscript-gpl-9.04-patchset-3.tar.bz2 7760 RMD160 43a38afd1e8de506db70a58d0fa3168dba3c3a6e SHA1 03b27dad2e4cbec045f2264885bf366526e2db00 SHA256 b3c20adc111b8ddf3bc7d60a01fa1b31eadb9d6d9eb8ac474d9aa1604bd51b6f
+DIST ghostscript-gpl-9.04-patchset-4.tar.bz2 10850 RMD160 6e5b7bfd791c075bed15efa5255fbcf943d07837 SHA1 a0688d44141f5a3b174ebf4773f967c48919bbfe SHA256 7e0e89b7f87fc6b5f082a073115d36a7d5632ddbb91fa01d5beea15689800441
 DIST gsdjvu-1.5.tar.gz 207583 RMD160 010be2cd791d5e2814c1f6554150bfd7c34222c0 SHA1 c7d0677dae5fe644cf3d714c04b3c2c343906342 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4
 EBUILD ghostscript-gpl-9.04-r4.ebuild 6045 RMD160 a04bbc9729d98e89409bf2e4e05fa070f5759de2 SHA1 0f601b580c0d536d21352a656f8854eeab93a134 SHA256 a8f1cef6bdd0528993b9344b27370903e08a7019442453718bff7986bdb6bb2a
-MISC ChangeLog 23478 RMD160 563970bf0ea7c32774238f1bf0c9659bc8685c24 SHA1 509a5d5fbda9ba33a018d611b036b8b95a879c1c SHA256 21858d96ada493a48e3a05b00d37decf0c41079e2e20c85fedb4fcd391d3d1b1
+EBUILD ghostscript-gpl-9.04-r5.ebuild 6023 RMD160 b46cabd1038abaefe3007b7ecb15e8868d3bee00 SHA1 8bad3d245be1be0929ea5c202b4c22ffbb401b0a SHA256 0d1036f72f02fdd087b15f6ff80a9e315ee7d15bb956f09f698683dc41e5c067
+MISC ChangeLog 23705 RMD160 d9c13c97db515730128c8f4639b3c1a7ea683d48 SHA1 fff69077983f5e1913daff87453bd1375d3ce8ed SHA256 f8af15fb7a6cd3d7a3d4ea14e4dce28b955b00074307ff853e3ebcee6780a89f
 MISC metadata.xml 281 RMD160 021f72140851af4f6b5fd892d1c5ab485ebce970 SHA1 4b5de22d7f9078ea8935cb5616c73540f8ef4aab SHA256 8f54c529127270fee6cdc9e4db328d9403ff2183d2ce21317932c17fd58ad0d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEAREKAAYFAk6+STAACgkQgAnW8HDreRaIcQCfUfSTebop041utVCZn7q6QOA4
-BfgAoJy5xCoaWxDpMwH0u9YUDJC3W4R7
-=b1zu
------END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild
new file mode 100644
index 000000000000..d19eef1ca45e
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.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-r5.ebuild,v 1.1 2011/12/21 21:13:34 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="
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-patchset-4.tar.bz2
+	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
+
+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:0
+	media-libs/tiff:0
+	>=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}/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
+}