Version bump. Adds support for libpaper. Don't install gsc anymore in favor of gambit (bug #253064).

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 58 insertions, 32 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 98c842e9810f..8e6e02f12a96 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.62 2009/01/16 20:49:04 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.63 2009/02/06 00:06:30 tgurr Exp $
+
+*ghostscript-gpl-8.64 (06 Feb 2009)
+
+  06 Feb 2009; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.61-r1.ebuild,
+  +ghostscript-gpl-8.64.ebuild:
+  Version bump. Adds support for libpaper. Don't install gsc anymore in
+  favor of gambit (bug #253064).
 
 *ghostscript-gpl-8.63-r1 (16 Jan 2009)
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index e1499b3b5b97..73e26e949842 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,16 +1,16 @@
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA1 fbc8715eae880f59e2251ae8fa99f79fbcfbd3e5 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4
 DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 SHA1 b846292af4541d907dd9041e397c2f1d8c72a056 SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689
-DIST ghostscript-8.61.tar.bz2 13244754 RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa SHA1 b05ac61885c0370e432531ffb79de349c6e8b896 SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
 DIST ghostscript-8.62.tar.bz2 15063641 RMD160 6f129fc679f4532729c07c018e82d162343f95ba SHA1 a254a3bc4ca824ac90624090d175d17c0a22fed1 SHA256 09671c76237c7b1df905697d30278a4f2cb9da238f9659f8fd1e8b2ae43ace4d
 DIST ghostscript-8.63.tar.bz2 15017410 RMD160 817d5c1539d88be979c42f67a9246f690328da33 SHA1 c97159d3cccb0b1b5fc409715c6321a7256717ec SHA256 0801ec174fa8ee67679c9ae42af547f5cbc2cc98faab6268187f69c22b86b0a1
-DIST ghostscript-gpl-8.61-patchset-1.tar.bz2 9620 RMD160 b7464977dfabeab461439abb93ad38856a7bc27e SHA1 2e3f246d4da0956c712be4312319606cdd45593f SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c
+DIST ghostscript-8.64.tar.bz2 16921504 RMD160 565134dcfe1e823b435c3761461c5eb394bd633c SHA1 4c2a6e04145428d35da73fbc4db9c66a75e336e0 SHA256 012f7fec58480c728580836fec6f865588d8a33fe8ada7ae73b1f971440d02bb
 DIST ghostscript-gpl-8.62-patchset-1.tar.bz2 3916 RMD160 54bf5a8ec0d7dd0d52132d448ad11096c50cf86f SHA1 fb6920bf1efcfb23f1264995429c62d6195501e1 SHA256 5dead8f52cff53bb8e7793742e5d18bad78d9a1f100b9588d2825ee953df9971
 DIST ghostscript-gpl-8.63-patchset-2.tar.bz2 4134 RMD160 a64e327392188b4e9cdfb7c94cbc6dc82f792c28 SHA1 08d2f279bdebe03c1889cd0b7998f4514248bef6 SHA256 dc7a4033e887109a334307bb886bed0366b649a26a308a7ae79d43c55c59a618
 DIST ghostscript-gpl-8.63-patchset-3.tar.bz2 4393 RMD160 16e137c66e08693cfd182a42d6e3ad41fec67af9 SHA1 209115d801276be7c247173f92265599b2a1c5b6 SHA256 ba62b733565bc527213f8d19ef40613a84d6b9791d6b4063521dff2039e2e475
+DIST ghostscript-gpl-8.64-patchset-1.tar.bz2 4009 RMD160 6b87d20650cf27662f791c4a6646cd0a6c5ed217 SHA1 8606a9e83530fdd8217087b5538a636d66af47a2 SHA256 f1150ff1b78b8ded58b675acd7d6be9893f07f5e3fc16a98752628d3759fbf2f
 DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
-EBUILD ghostscript-gpl-8.61-r1.ebuild 4612 RMD160 dd7c9160597b23dcb5b5ad6fcfe8d5a95ffb0527 SHA1 fd2b67a667a849bcadffe217bc99cc5855c5de2f SHA256 d2ac586614299b05a2f16214c46bd1b649b6ec8641c9ad42ab6c0042e0c48051
 EBUILD ghostscript-gpl-8.62.ebuild 4837 RMD160 25ba3ffac719c1a2f39c20d5c6137a92edccf366 SHA1 458c0bf970105dcacf791907d82b4ad685b1c033 SHA256 c7cccec82a1561a8476f1a32f8e7df469b34ba3ea649caeeea86c222672039f5
 EBUILD ghostscript-gpl-8.63-r1.ebuild 5145 RMD160 0a7fa8bdc12e7839fa945d8a24aedf7f924e1617 SHA1 3cb8fdace67b1a294648d5947f2da9a8104c1d48 SHA256 44457a2e7151ac85edfbe0585ee5471475c4eda9b4746846fbeadc74ea68d98b
 EBUILD ghostscript-gpl-8.63.ebuild 5018 RMD160 3f5e8ecb518da5f0e17afbdcea9d7d5625daee05 SHA1 cb69676ec88336fc53c8be808278703991cd0718 SHA256 f93fa716a8dc3f79f85d90d9c2a362467bbd601dbd62c1a5331428d0f713662e
-MISC ChangeLog 12615 RMD160 4ddbee52dbdc01bff4aa163f2437c76a1cf617ba SHA1 cc8d2de8fbaae524dad931b809d7209a7b7da5c1 SHA256 338124c2dd69a72169ca3f2485942412207c8daf4ba29c68927bac0e7b484814
+EBUILD ghostscript-gpl-8.64.ebuild 5150 RMD160 27154ed8df64f46341d199bc9a7e0403c12a1e70 SHA1 b1b3876e9a1444a25944795b2520ced0f9661dc2 SHA256 bcd0d987499054f75acd552dd5c2781b20f6f7bb8fbeaa08b7cdc1a6e78e18d7
+MISC ChangeLog 12867 RMD160 43da4941628e3793aa83444a94df726d3dcd2de8 SHA1 9df011a4f0b802209d93182ac1de48f39543ed76 SHA256 e12b09e89ea1becca25c26e5d3b65b68708c8d97f1085385b9661f969e41b302
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.64.ebuild
index 7b86728fe308..e8b8ece72607 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.61-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.64.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.61-r1.ebuild,v 1.10 2008/10/31 20:13:08 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.64.ebuild,v 1.1 2009/02/06 00:06:30 tgurr Exp $
 
 inherit autotools eutils versionator flag-o-matic
 
-DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
+DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
 HOMEPAGE="http://ghostscript.com/"
 
 MY_P=${P/-gpl}
@@ -18,16 +18,18 @@ SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
 
 LICENSE="GPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bindist cjk cups djvu gtk jpeg2k X"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bindist cairo cjk cups djvu gtk jpeg2k X"
 
-COMMON_DEPEND="media-libs/fontconfig
+COMMON_DEPEND="app-text/libpaper
+	media-libs/fontconfig
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.5
 	>=media-libs/tiff-3.7
 	>=sys-libs/zlib-1.1.4
 	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.1.20 )
+	cairo? ( >=x11-libs/cairo-1.2.0 )
+	cups? ( >=net-print/cups-1.3.8 )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	jpeg2k? ( media-libs/jasper )
 	X? ( x11-libs/libXt x11-libs/libXext )
@@ -58,16 +60,27 @@ src_unpack() {
 
 	cd "${S}"
 
+	# remove internal copies of expat, jasper, jpeg, libpng and zlib
+	rm -rf "${S}/expat"
+	rm -rf "${S}/jasper"
+	rm -rf "${S}/jpeg"
+	rm -rf "${S}/libpng"
+	rm -rf "${S}/zlib"
+	# remove internal urw-fonts
+	rm -rf "${S}/Resource/Font"
+
 	# Fedora patches
-	# upstream bug http://bugs.ghostscript.com/show_bug.cgi?id=689393
-	epatch "${WORKDIR}/patches/${PN}-8.61-ijs-krgb.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.60-fPIC.patch"
+	# http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/
+	epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch"
 	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.60-noopt.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.60-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch"
 
-	# additional Gentoo patches, compilation fixes
-	epatch "${WORKDIR}/patches/${PN}-8.61-rinkj.patch"
+	# Gentoo patches
+	# respect LDFLAGS, bug #215913
+	epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags.patch"
 
 	if use bindist && use djvu ; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
@@ -77,21 +90,21 @@ src_unpack() {
 	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}/src"
-		epatch "${WORKDIR}/patches/${PN}-8.61-gsdjvu-1.3.patch"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
+		epatch "${WORKDIR}/patches/${PN}-8.64-gsdjvu-1.3.patch"
 		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
-		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
-		grep -q djvusep "${S}/src/contrib.mak" || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
+		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}/src/unixinst.mak" \
-		|| die "sed failed"
+		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)::" src/*.mak || die "gsx sed failed"
-		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.mak || die "gsxso sed failed"
+		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
@@ -100,7 +113,7 @@ src_unpack() {
 		-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:" \
-		src/Makefile.in src/*.mak || die "sed failed"
+		base/Makefile.in base/*.mak || die "sed failed"
 
 	cd "${S}"
 	eautoreconf
@@ -111,16 +124,18 @@ src_unpack() {
 
 src_compile() {
 	econf \
+		$(use_enable cairo) \
 		$(use_enable cups) \
 		$(use_enable gtk) \
 		$(use_with jpeg2k jasper) \
 		$(use_with X x) \
+		--disable-compile-inits \
 		--enable-dynamic \
 		--enable-fontconfig \
-		--with-drivers=ALL,rinkj \
+		--with-drivers=ALL \
 		--with-ijs \
 		--with-jbig2dec \
-	|| die "econf failed"
+		--with-libpaper
 
 	if ! use bindist && use djvu ; then
 		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
@@ -134,12 +149,16 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install-so install || die "emake install failed"
+	# parallel install is broken, bug #251066
+	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
 
 	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/README || die "dodoc install failed"