Add ghostscript-gpl-8.61.ebuild, fixes bug #200383. Remove a vulnerable 8.60 version.

(Portage version: 2.1.4_rc4)

4 files changed, 46 insertions, 34 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 5555b1c2302d..9cb112cdc5e8 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.31 2007/11/10 21:38:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.32 2007/11/30 22:37:50 tgurr Exp $
+
+*ghostscript-gpl-8.61 (30 Nov 2007)
+
+  30 Nov 2007; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-8.60.ebuild,
+  +ghostscript-gpl-8.61.ebuild:
+  Add ghostscript-gpl-8.61.ebuild, fixes bug #200383. Remove a vulnerable 8.60
+  version.
 
   10 Nov 2007; Markus Rothe <corsair@gentoo.org>
   ghostscript-gpl-8.60-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60
deleted file mode 100644
index a6cd5c99e4c8..000000000000
--- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.60
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
-SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
-MD5 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
-RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
-SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
-MD5 89fc0a90e67caf151a9d6855200c68ca ghostscript-8.60.tar.bz2 12942029
-RMD160 208168fcd6bc5fd931d15b288ce9324f59ba07a3 ghostscript-8.60.tar.bz2 12942029
-SHA256 f615f936e38d2e7a6da588de6655f2b23207c0a906df1960b1d7e83c3241982a ghostscript-8.60.tar.bz2 12942029
-MD5 cbb24f8c50b5a94ecf1635048d2f11d6 gsdjvu-1.2.tar.gz 214539
-RMD160 6cf27e95955b5ae0cc15dacc36ce514ff8347ab0 gsdjvu-1.2.tar.gz 214539
-SHA256 ab4a81eddb44241bb71b5ec813242036312effc9eb1b343b3c257fb563fa8a49 gsdjvu-1.2.tar.gz 214539
diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61
new file mode 100644
index 000000000000..1dc21daeb2e6
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.61
@@ -0,0 +1,15 @@
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
+RMD160 c723afc2207157a434988b46bcf0a458281c29a4 acro5-cmaps-2001.tar.gz 631653
+SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4 acro5-cmaps-2001.tar.gz 631653
+MD5 dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz 5001983
+RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 adobe-cmaps-200406.tar.gz 5001983
+SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689 adobe-cmaps-200406.tar.gz 5001983
+MD5 abff0506cd249cba3ad862d8fe4f6474 ghostscript-8.61.tar.bz2 13244754
+RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa ghostscript-8.61.tar.bz2 13244754
+SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33 ghostscript-8.61.tar.bz2 13244754
+MD5 8cf17ab26420b9b43c2fa64672c717e8 ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+RMD160 b7464977dfabeab461439abb93ad38856a7bc27e ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c ghostscript-gpl-8.61-patchset-1.tar.bz2 9620
+MD5 c72d2327708683ffc70151d49fbd6175 gsdjvu-1.3.tar.gz 204330
+RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 gsdjvu-1.3.tar.gz 204330
+SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2 gsdjvu-1.3.tar.gz 204330
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild
index 766346e77e3c..ecba1da550f0 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-8.60.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2007 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.60.ebuild,v 1.8 2007/11/02 23:45:42 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.61.ebuild,v 1.1 2007/11/30 22:37:50 tgurr Exp $
 
 inherit autotools elisp-common eutils versionator flag-o-matic
 
 DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed"
-HOMEPAGE="http://ghostscript.com"
+HOMEPAGE="http://ghostscript.com/"
 
 MY_P=${P/-gpl}
-GSDJVU_PV=1.2
+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://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
 
 LICENSE="GPL-2 CPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bindist cjk cups djvu gtk jpeg2k X"
 
 COMMON_DEPEND="media-libs/fontconfig
@@ -47,8 +48,8 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
 	if use cjk ; then
-		cat "${FILESDIR}/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
-		cat "${FILESDIR}/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
+		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
@@ -59,15 +60,14 @@ src_unpack() {
 
 	# Fedora patches
 	# upstream bug http://bugs.ghostscript.com/show_bug.cgi?id=689393
-	epatch "${FILESDIR}/ghostscript-8.60-ijs-krgb.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-fPIC.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-multilib.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-noopt.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.61-ijs-krgb.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-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"
 
-	# additional Gentoo patches
-	epatch "${FILESDIR}/ghostscript-afpl-8.54-rinkj.patch"
-	epatch "${FILESDIR}/ghostscript-8.60-include.patch"
+	# additional Gentoo patches, compilation fixes
+	epatch "${WORKDIR}/patches/${PN}-8.61-rinkj.patch"
 
 	if use bindist && use djvu ; then
 		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
@@ -78,11 +78,15 @@ src_unpack() {
 		unpack gsdjvu-${GSDJVU_PV}.tar.gz
 		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
 		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/src"
-		epatch "${FILESDIR}/djvu-gs-gpl-8.60.patch"
+		epatch "${WORKDIR}/patches/${PN}-8.61-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"
+
+		# install ps2utf8.ps, bug #197818
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/src/unixinst.mak" \
+		|| die "sed failed"
 	fi
 
 	if ! use gtk ; then
@@ -116,15 +120,13 @@ src_compile() {
 	|| die "econf failed"
 
 	if ! use bindist && use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g'		Makefile
-		sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &}
-		ifelse:' lib/gs_res.ps
+		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"
+	./autogen.sh || die "ijs autogen failed"
 	emake || die "ijs emake failed"
 }
 
@@ -135,7 +137,7 @@ src_install() {
 		dobin gsdjvu || die "dobin gsdjvu install failed"
 	fi
 
-	rm -fr "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
+	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
 	dodoc doc/README || die "dodoc install failed"
 
 	cd "${S}/ijs"