Revbump for CVE-2010-1628, add upstream libpng patch and remove old versions.

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

5 files changed, 21 insertions, 375 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 3d08ed8db708..1d6b692c3c4d 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,14 @@
 # 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.97 2010/07/11 17:34:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.98 2010/07/30 22:09:04 tgurr Exp $
+
+*ghostscript-gpl-8.71-r5 (30 Jul 2010)
+
+  30 Jul 2010; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.64-r3.ebuild,
+  -ghostscript-gpl-8.70-r1.ebuild, -ghostscript-gpl-8.71-r4.ebuild,
+  +ghostscript-gpl-8.71-r5.ebuild:
+  Revbump for CVE-2010-1628, add upstream libpng patch and remove old
+  versions.
 
   11 Jul 2010; Raúl Porcel <armin76@gentoo.org>
   ghostscript-gpl-8.71-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 48da213b8cba..9fe3f880c524 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,17 +1,9 @@
-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.64.tar.bz2 16921504 RMD160 565134dcfe1e823b435c3761461c5eb394bd633c SHA1 4c2a6e04145428d35da73fbc4db9c66a75e336e0 SHA256 012f7fec58480c728580836fec6f865588d8a33fe8ada7ae73b1f971440d02bb
-DIST ghostscript-8.70.tar.bz2 17019673 RMD160 88f7d380d1075c57829aa7f34334542fd2bbd6ce SHA1 4e4132713258c680a4fbec577e6dfc82b980ec01 SHA256 c889f2a3a27a4dbd3519197ffc0170d66f398da6a8252b2ebe0548d250f4acc8
 DIST ghostscript-8.71.tar.gz 25240801 RMD160 efce74cf22cf99b2b1a145df466e79a86e3dfefb SHA1 629299140f612fac32f6289be0904107dfd1b555 SHA256 2a22e61b0172f271ebb270a9f127bde501eb661c67c8b4943eafbad57d855aae
-DIST ghostscript-gpl-8.64-patchset-4.tar.bz2 12171 RMD160 5649eb8e2782c8cb147312917d3f8e4f283567d2 SHA1 36b229a1071116b05be3e17c04b521ded922919a SHA256 58f37993e52ec8182586effa1760e49369dfc8977895f2f0ef13d57263ef8954
-DIST ghostscript-gpl-8.70-patchset-2.tar.bz2 5477 RMD160 c3488084bd5010d96d8c30170f271451666b1724 SHA1 ca8ddadb993a21747c4b58826d908d864d7b02ce SHA256 6b59dfe8c26a4efd6200c36ef114114027042049f9b10a4177997435ec3165c7
+DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73
 DIST ghostscript-gpl-8.71-patchset-1.tar.bz2 10581 RMD160 fb422b5037513e1c5400cb6134984d6c89046b81 SHA1 06329e5bfdc7bf0c2b590d50bc677095267d0427 SHA256 ec106afa0abb431ea74a452ff65863e686479bf1d8517b48402a71f8c33e3f91
-DIST ghostscript-gpl-8.71-patchset-2.tar.bz2 8600 RMD160 9646f4eb6da128d30dbffadfd8f068ccb74926d0 SHA1 09c10396bb5359c6274a1350a8de6839686399db SHA256 3b5bf99add3dac5a253d0ede12fd3fec4bbac6cce3bd1a0a674571f320853a57
-DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
+DIST ghostscript-gpl-8.71-patchset-3.tar.bz2 10399 RMD160 623aead9322c6600ed3175d182238476d3255fba SHA1 c18ea916205c16a86160ac3c0156162ffc711409 SHA256 48e50e75d785d8da9dd65c7ae9a9f0daa97624b869b2b3d4878d72f6f483a363
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
-EBUILD ghostscript-gpl-8.64-r3.ebuild 5567 RMD160 b60c7d8aacf28be202909a97578975e817962bed SHA1 d20fbb12defe85fafbf4bb22ae11ceb4ae21ddf1 SHA256 0f1e85db127407d2d7f223c268419b4c1404f4f2dc57afb3c0054326b2dd0e01
-EBUILD ghostscript-gpl-8.70-r1.ebuild 5457 RMD160 88076a489ae14790beca13ee3828dc9b4912330e SHA1 61c7b01dcf96b530f08b7ab556e9de1db05c09d7 SHA256 30c961d0aa04bf87d66e511bdbb274018d5a7b0cb40ea7b67e17d9c11e161992
 EBUILD ghostscript-gpl-8.71-r1.ebuild 5928 RMD160 2abd9e20144a515580a9f4f20cb093bd52717f55 SHA1 9848cbb00de9926364e4b11e15864ece23ff7660 SHA256 839dd1bd041fe218c00b2088783cd9044bec5c3dfb7592d3bcab6542c99d2dfb
-EBUILD ghostscript-gpl-8.71-r4.ebuild 6041 RMD160 22f9c55358191a7886e7eec5f5c91fca69439222 SHA1 40fff962f5e3f76a49cbf2d2347f699764ef636b SHA256 e69e1bc626509184ceadae143634f38e96c9e22f0208c7571057fa6d1e6821e6
-MISC ChangeLog 18165 RMD160 b15278556b1cbd520248aee76a2146aaf13af9b7 SHA1 8d479dfe03197980ab7057289fd59488a39a3df4 SHA256 8f550894d825feb9311ed5908596e9fe6dfdbe462286bd2568557078e3a3c01f
+EBUILD ghostscript-gpl-8.71-r5.ebuild 5895 RMD160 b45683fbc57c4bedd184c161313b381682c2a8aa SHA1 04a6fb5cccaa21606af0cdae390228716ec4823b SHA256 e4e31ae2194c097f9007e1dcdda9701b57b88794341d3cb4a8df676991a6f72b
+MISC ChangeLog 18466 RMD160 701b3f97a2eaf88dae6fb51361f18879ff5629be SHA1 954bc61a2987f2e7c5caf00bc101dff6ec04ec4c SHA256 0956ca520d518473c2c99c4660c4e4451bc821df2d4d3f9cf225fe226e4a7f88
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r3.ebuild
deleted file mode 100644
index fa74fa2283a9..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.64-r3.ebuild,v 1.7 2009/05/26 06:05:25 pva Exp $
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.3
-PVM=$(get_version_component_range 1-2)
-SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
-		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-4.tar.bz2"
-
-LICENSE="GPL-2 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="bindist cairo cjk cups djvu gtk jpeg2k X"
-
-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 ) )
-	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 )
-	!app-text/ghostscript-gnu"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	media-fonts/gnu-gs-fonts-std"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
-	if use cjk ; then
-		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
-		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
-		cd "${S}/Resource"
-		unpack adobe-cmaps-200406.tar.gz
-		unpack acro5-cmaps-2001.tar.gz
-		cd "${WORKDIR}"
-	fi
-
-	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
-	# 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.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"
-
-	# Fixes which are already applied in ghostscript trunk
-	epatch "${WORKDIR}/patches/${PN}-8.64-bitcmyk-regression-r9452.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9461.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9476.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-gsc-ldflags.patch" #209803
-
-	# Security fixes
-	epatch "${WORKDIR}/patches/${PN}-8.64-CVE-2009-0583.patch" #261087
-	epatch "${WORKDIR}/patches/${PN}-8.64-CVE-2009-0792.patch" #264594
-	epatch "${WORKDIR}/patches/${PN}-8.64-CVE-2009-0196.patch" #264594
-
-	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
-
-	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"
-		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:$(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"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	econf || die "ijs econf failed"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# 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"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.70-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.70-r1.ebuild
deleted file mode 100644
index 2ffa0832d42b..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.70-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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.70-r1.ebuild,v 1.1 2009/08/07 02:22:05 tgurr Exp $
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
-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.bz2
-	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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bindist cairo cups djvu gtk jpeg2k X"
-
-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 ) )
-	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 )
-	!app-text/ghostscript-gnu"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	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"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
-	unpack ${A}
-	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
-	# 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.70-jbig2dec-nullderef.patch"
-
-	# Gentoo patches
-	# respect LDFLAGS, bug #209803
-	epatch "${WORKDIR}/patches/${PN}-8.64-respect-gsc-ldflags.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
-
-	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"
-		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:$(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"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-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 \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper
-
-	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
-	fi
-
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	econf || die "ijs econf failed"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# 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"
-
-	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}
-
-	# Install our own cidfmap to allow the separated cidfmap
-	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
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r5.ebuild
index db99eec99dc1..94bba4920206 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r5.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2010 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-r4.ebuild,v 1.4 2010/06/08 10:37:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r5.ebuild,v 1.1 2010/07/30 22:09:04 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-2.tar.bz2"
+	mirror://sourceforge/ghostscript/${MY_P}.tar.xz
+	mirror://gentoo/${P}-patchset-3.tar.bz2"
 
 LICENSE="GPL-3 CPL-1.0"
 SLOT="0"
@@ -31,10 +31,10 @@ COMMON_DEPEND="app-text/libpaper
 	cups? ( >=net-print/cups-1.3.8 )
 	gtk? ( >=x11-libs/gtk+-2.0 )
 	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}
@@ -85,7 +85,7 @@ src_prepare() {
 	# remove internal urw-fonts
 	rm -rf "${S}/Resource/Font"
 
-	# Fedora patches
+	# Apply various patches, many borrowed from Fedora
 	# http://cvs.fedoraproject.org/viewvc/devel/ghostscript/
 	EPATCH_EXCLUDE="${PN}-8.64-gsdjvu-1.3.patch"
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
@@ -120,11 +120,6 @@ src_prepare() {
 		-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