Update ebuild epatch logic to be more sane.

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

3 files changed, 19 insertions, 28 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 1c76631fba9c..9d96e27e44fc 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # 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.89 2010/06/05 09:55:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.90 2010/06/07 10:15:07 scarabeus Exp $
+
+  07 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  ghostscript-gpl-8.71-r4.ebuild:
+  Update ebuild epatch logic to be more sane.
 
   05 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   ghostscript-gpl-8.71-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index bdb5ca4ed23e..c29ae7e4ffbe 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -12,6 +12,6 @@ DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SH
 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 5940 RMD160 027932592c87025b54008397af0d14c9d58c3af3 SHA1 df291afe0388d8d84dfac61214e36387a3c20fa7 SHA256 5db686000b3d9053489aec5e1e55ed6e6177217350987c74f41716febec812c9
-EBUILD ghostscript-gpl-8.71-r4.ebuild 6927 RMD160 94587a22d5788e932edcf8562fc87af5cd3b8899 SHA1 1ebb4e90c3e3bb6e952b0e1aaef791f88b1807c0 SHA256 940429298ff7fefb8cc8471b4e1264c883a0d6b9cb70acfcd0176a86510ebedc
-MISC ChangeLog 17357 RMD160 da95ba34d03ce35d3f85327f143ef8e7237e5951 SHA1 607d08aece9d836ce49fb4e89e0e54e3f923b05d SHA256 f9bfa0cd07a305f87c0f91604688ffae528b6f5bbd9c754c111db9404525b2c0
+EBUILD ghostscript-gpl-8.71-r4.ebuild 6041 RMD160 3229f046c92c9c252d67a647a80406896c9d7d7d SHA1 17390ef999b83a490dd48838243a809bf1a402b2 SHA256 aad72b1ecbd7c6fa218a4dfe2ff9674cf3014b3279d6ac4f971f0dca1152859c
+MISC ChangeLog 17492 RMD160 ffe4551507a4d4bc91cfc6b721c921e7e352b067 SHA1 e2f247e4a3c6fd37c191ccd6e59c6c332a173d96 SHA256 44fc0f5d6d0b845196eeda6e83cc9dafd152de5f9774c923344c4ab1fb43d30d
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild
index 233d29fb1610..62d980572bb5 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2010/04/15 12:43:56 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r4.ebuild,v 1.2 2010/06/07 10:15:07 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils versionator flag-o-matic
@@ -67,6 +67,11 @@ pkg_setup() {
 		eerror
 		die "Path ${p} is not a symlink"
 	fi
+
+	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() {
@@ -82,28 +87,10 @@ src_prepare() {
 
 	# Fedora patches
 	# http://cvs.fedoraproject.org/viewvc/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-jbig2dec-nullderef.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-CVE-2009-4270.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-vsnprintf.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-pdftoraster-exit.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-ldflags.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-pdf2dsc.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-cups-realloc-color-depth.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-tiff-fail-close.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-tiff-default-strip-size.patch"
-	epatch "${WORKDIR}/patches/${PN}-8.71-tiff-fixes.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
+	EPATCH_EXCLUDE="${PN}-8.64-gsdjvu-1.3.patch"
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
+	EPATCH_SOURCE="${WORKDIR}/patches/"
+	epatch
 
 	if ! use bindist && use djvu ; then
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
@@ -168,7 +155,7 @@ src_configure() {
 	fi
 
 	cd "${S}/ijs"
-	econf || die "ijs econf failed"
+	econf
 }
 
 src_compile() {
@@ -196,7 +183,7 @@ src_install() {
 	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}
+	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
 
 	# Install our own cidfmap to allow the separated cidfmap
 	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"