Revbump with upstream fixes, attempt to fix bug #223433. Remove old.

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

3 files changed, 69 insertions, 57 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 851f1c26ed3e..acc575bf1c6a 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.107 2010/11/07 19:17:54 anarchy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.108 2011/02/01 19:02:39 tgurr Exp $
+
+*ghostscript-gpl-9.00-r1 (01 Feb 2011)
+
+  01 Feb 2011; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.71-r1.ebuild,
+  +ghostscript-gpl-9.00-r1.ebuild:
+  Revbump with upstream fixes, attempt to fix bug #223433. Remove old.
 
   07 Nov 2010; Jory A. Pratt <anarchy@gentoo.org>
   ghostscript-gpl-8.71-r1.ebuild, ghostscript-gpl-8.71-r6.ebuild,
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 7de820a50725..d4dd997a9852 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,12 +1,11 @@
-DIST ghostscript-8.71.tar.gz 25240801 RMD160 efce74cf22cf99b2b1a145df466e79a86e3dfefb SHA1 629299140f612fac32f6289be0904107dfd1b555 SHA256 2a22e61b0172f271ebb270a9f127bde501eb661c67c8b4943eafbad57d855aae
 DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73
 DIST ghostscript-9.00.tar.xz 17377160 RMD160 4dd9bf15ccc3e23e11fdebc1d23155e1b9d8993b SHA1 873fbeedecc472ec804943bc5ded131fa8342251 SHA256 2d3afcf30873c8bf8619beeeb6d4c3370fc2944fd1bd47423461b6778daa8248
-DIST ghostscript-gpl-8.71-patchset-1.tar.bz2 10581 RMD160 fb422b5037513e1c5400cb6134984d6c89046b81 SHA1 06329e5bfdc7bf0c2b590d50bc677095267d0427 SHA256 ec106afa0abb431ea74a452ff65863e686479bf1d8517b48402a71f8c33e3f91
 DIST ghostscript-gpl-8.71-patchset-4.tar.bz2 12089 RMD160 67406d2fa03144981cadaee9570313a16b549715 SHA1 f80a8d5a4df18df3eb5183d71040ebcc713fca33 SHA256 4244d34114457ec281115c5a3a37b9b1ec2a091fff6f665896a21cf07d927a38
 DIST ghostscript-gpl-9.00-patchset-1.tar.bz2 6909 RMD160 ab61892898c7ef072eb8655934df22cce31ddfff SHA1 5ff5be00599d43972188ca02a7a9932a650ee681 SHA256 bd036a3e545485cc229397b896f2ca1b3f1c91d108b91fb612ebcd09f64569b7
+DIST ghostscript-gpl-9.00-patchset-2.tar.bz2 12996 RMD160 b3ef870d4e690a4cd6984066f9846d5ec19879ee SHA1 fe6c48949f29b6a5d6bab7b8b3e588373e195b3f SHA256 842f073369414981467bd6264a6f2f77ef4ef53864a2ddd2ee8872d966b0ff41
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
-EBUILD ghostscript-gpl-8.71-r1.ebuild 5920 RMD160 d4cd5d8c21bd4d06174cd8b500b547188f1aa326 SHA1 84b73178c6e4d5dffd9685b101f47d9e7c09c839 SHA256 c582c2e34c52f5db7738c5eb4046476bcc0b98f23450fced49935278822eb855
 EBUILD ghostscript-gpl-8.71-r6.ebuild 5879 RMD160 fc4dca5b02e79929e7c5fc3f9b219a2472ed63a1 SHA1 f425fd02f57c67807d44aca6fa5dd4e6a4154063 SHA256 06174a4527b148916e5926610e8c8dc6d6793f1e97cfd9c757f0ae3335005c95
+EBUILD ghostscript-gpl-9.00-r1.ebuild 5650 RMD160 b441545669c08bc2be6cd1e323570659a0e871f8 SHA1 3703891749b4fcf976d370d7ce1bca957e234862 SHA256 5aaffd93173770d8aaa0b68d7c2888569d78124fb629ecdb89ffff6e65570751
 EBUILD ghostscript-gpl-9.00.ebuild 6021 RMD160 b7ae3d85fd23787c3c25cd761239ce63c43b8360 SHA1 f719717afae68ff60fadd2022113a5170de2b2fa SHA256 661c4bdaf6aa1188daf9862912bbccb0c8fb05ac8632c2fd4804cce4662c281f
-MISC ChangeLog 19768 RMD160 2018f509fb0b23e63bbfd100162a5f5415bfbefa SHA1 29cb7be9f8d0d8c622a782d80a40f4e931653e11 SHA256 01fa08cf00e0fba58c0894390f69f2be270b6490cabb3db4e593fddae495758c
+MISC ChangeLog 19990 RMD160 a87ce0bb8a3c66b74223e4ba3be7776674e3d844 SHA1 76e652b23faddb66d8c0b0981950c9ba88afc671 SHA256 6d8183787a2082da7c57f7f1f242b922b5d804e9079a7b88aba874744dbace60
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
index ed6f37596f4e..b8b7d3bf3a30 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
@@ -1,48 +1,50 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-8.71-r1.ebuild,v 1.12 2010/11/07 19:17:54 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild,v 1.1 2011/02/01 19:02:39 tgurr Exp $
 
-EAPI=2
+EAPI=3
 inherit autotools eutils versionator flag-o-matic
 
-DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
 HOMEPAGE="http://ghostscript.com/"
 
 MY_P=${P/-gpl}
 GSDJVU_PV=1.4
 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.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
+	mirror://sourceforge/ghostscript/${MY_P}.tar.xz
+	mirror://gentoo/${P}-patchset-2.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 cairo cups djvu gtk jpeg2k X"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist cups djvu gtk idn jpeg2k X"
 
 COMMON_DEPEND="app-text/libpaper
+	media-libs/freetype:2
 	media-libs/fontconfig
 	virtual/jpeg
 	>=media-libs/libpng-1.2.42
 	>=media-libs/tiff-3.9.2
 	>=sys-libs/zlib-1.2.3
 	!bindist? ( djvu? ( app-text/djvu ) )
-	cairo? ( >=x11-libs/cairo-1.2.0 )
 	cups? ( >=net-print/cups-1.3.8 )
 	gtk? ( >=x11-libs/gtk+-2.0 )
+	idn? ( net-dns/libidn )
 	jpeg2k? ( media-libs/jasper )
-	X? ( x11-libs/libXt x11-libs/libXext )
-	!app-text/ghostscript-gnu"
+	X? ( x11-libs/libXt x11-libs/libXext )"
 
 DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
 	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 )
-	media-fonts/gnu-gs-fonts-std"
+	linguas_zh_TW? ( media-fonts/arphicfonts )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -51,8 +53,15 @@ 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 expat, jasper, jpeg, libpng and zlib
+	# remove internal copies of various libraries
 	rm -rf "${S}/expat"
 	rm -rf "${S}/jasper"
 	rm -rf "${S}/jpeg"
@@ -61,34 +70,21 @@ src_prepare() {
 	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"
 
-	# Fedora patches
-	# http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/
-	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.70-runlibfileifexists.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-CVE-2009-4270.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-gdevcups-y-axis.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-jbig2dec-nullderef.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-ldflags.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-pdf2dsc.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-pdftoraster-exit.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-vsnprintf.patch"
-
-	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
+	# 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/${PN}-8.64-gsdjvu-1.3.patch"
+		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch"
+		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-${PN}-9.00-upstream-buildfixes.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" || \
@@ -106,17 +102,11 @@ src_prepare() {
 
 	# search path fix
 	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
 		-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:" \
 		base/Makefile.in base/*.mak || die "sed failed"
 
-	# http://repos.archlinux.org/wsvn/packages/ghostscript/trunk/libpng14.patch
-	sed -i \
-		-e 's:png_check_sig:png_sig_cmp:' \
-		"${S}"/{,base,jbig2dec}/configure.ac || die
-
 	cd "${S}"
 	eautoreconf
 
@@ -128,26 +118,44 @@ src_prepare() {
 }
 
 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 \
-		$(use_enable cairo) \
 		$(use_enable cups) \
 		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
 		$(use_with jpeg2k jasper) \
 		$(use_with X x) \
 		--disable-compile-inits \
 		--enable-dynamic \
+		--enable-freetype \
 		--enable-fontconfig \
 		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
 		--with-ijs \
 		--with-jbig2dec \
-		--with-libpaper
+		--with-libpaper \
+		--with-system-libtiff
 
 	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 || die "ijs econf failed"
+	econf
 }
 
 src_compile() {
@@ -158,8 +166,7 @@ src_compile() {
 }
 
 src_install() {
-	# parallel install is broken, bug #251066
-	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
+	emake DESTDIR="${D}" install-so install || die "emake install failed"
 
 	if ! use bindist && use djvu ; then
 		dobin gsdjvu || die "dobin gsdjvu install failed"
@@ -169,15 +176,15 @@ src_install() {
 	rm -rf "${D}/usr/bin/gsc"
 
 	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
-	dodoc doc/README || die "dodoc install failed"
+	dodoc doc/GS9_Color_Management.pdf || die "dodoc install failed"
 
 	cd "${S}/ijs"
 	emake DESTDIR="${D}" install || die "emake ijs install failed"
 
-	# Rename an original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS}
+	# rename the original cidfmap to cidfmap.GS
+	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
 
-	# Install our own cidfmap to allow the separated cidfmap
+	# 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"