ps2epsi fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug 128647

(Portage version: 2.1_pre7-r2)

5 files changed, 175 insertions, 4 deletions

diff --git a/app-text/ghostscript-esp/ChangeLog b/app-text/ghostscript-esp/ChangeLog
index af0293508587..b24a2cd95097 100644
--- a/app-text/ghostscript-esp/ChangeLog
+++ b/app-text/ghostscript-esp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/ghostscript-esp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.20 2006/04/02 16:30:44 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ChangeLog,v 1.21 2006/04/03 21:51:57 genstef Exp $
+
+*ghostscript-esp-8.15.1-r1 (03 Apr 2006)
+
+  03 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/ghostscript-esp-8.15.1-ps2epsi-esp.diff,
+  +ghostscript-esp-8.15.1-r1.ebuild:
+  ps2epsi fixes thanks to Martin von Gagern <Martin.vGagern@gmx.net> in bug
+  128647
 
   02 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
   ghostscript-esp-7.07.1-r8.ebuild, ghostscript-esp-7.07.1-r10.ebuild,
diff --git a/app-text/ghostscript-esp/Manifest b/app-text/ghostscript-esp/Manifest
index bcc7a244bccf..9419f5e6a142 100644
--- a/app-text/ghostscript-esp/Manifest
+++ b/app-text/ghostscript-esp/Manifest
@@ -1,6 +1,6 @@
-MD5 89ad738339109a901e0c6c6905652f2c ChangeLog 23477
-RMD160 8a102d346a50fdae4accf61433ef32662a047448 ChangeLog 23477
-SHA256 97d794f469a6c4ba7221234be8d1d5bcbf775b13d143b1191c00d8d416b2131d ChangeLog 23477
+MD5 d5ee3d8058f24a940e8624f8dbaa30e3 ChangeLog 23745
+RMD160 2edf6fa0e79ce6aac360de7ec4b98d66313392a5 ChangeLog 23745
+SHA256 582348bf8f916ff3fe926ad57d331a27c870e79df096b8cd1e21b7f22246fab8 ChangeLog 23745
 MD5 7f21dcf1d3bef969610efcc5f4ec58b4 files/digest-ghostscript-esp-7.07.1-r10 404
 RMD160 ecb3fdfa5f3ae98fe799aa435a530eb905003735 files/digest-ghostscript-esp-7.07.1-r10 404
 SHA256 4fdfa61a4cf88ed4fdb50a1e81fd61d0697f1383610f3d32af0a061341f088b6 files/digest-ghostscript-esp-7.07.1-r10 404
@@ -10,6 +10,9 @@ SHA256 a43e8dfbdd146fde3478b5555ec531265a1b901a7349a75d9fc1075c8e89070b files/di
 MD5 d103f68902b401dd7844a93d16b174c1 files/digest-ghostscript-esp-8.15.1 212
 RMD160 66d3b2260bdf5b6cee1e8123a288fc950e2716fd files/digest-ghostscript-esp-8.15.1 212
 SHA256 78c20372c3500ca3339b6257ffd85f358c730ad7965a156a89a5badf251c0703 files/digest-ghostscript-esp-8.15.1 212
+MD5 ca4ce961ca082765dc3ba80373fe26f6 files/digest-ghostscript-esp-8.15.1-r1 774
+RMD160 2261967d501fd4ebb6265928d44558135476aeaf files/digest-ghostscript-esp-8.15.1-r1 774
+SHA256 3b84f17024f3ac7260957d542d152be10a782942b73fc320c453e60401ff442b files/digest-ghostscript-esp-8.15.1-r1 774
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
 RMD160 8da05491113dfcca77da4e37c01651ff54cc86e0 files/ghostscript-7.05.6.man.patch 1231
 SHA256 4873defc3d4bee0db4cb6b9e34e481f0de5914aef9a4b7cbf58677b6bfb9d528 files/ghostscript-7.05.6.man.patch 1231
@@ -40,6 +43,9 @@ SHA256 6261f97860549cfd27ed5c0c9a2967bf00a58076c38529828ce99e794ab083b1 files/gh
 MD5 64856e99a488d61dfa4af58e24fb24b9 files/ghostscript-esp-8.15.1-fPIC.patch 322
 RMD160 a38646a9529c8b9d52c9b7910880ec54f89886e4 files/ghostscript-esp-8.15.1-fPIC.patch 322
 SHA256 dae3f78af76da535c057276c6b9fbeb70688016b2fc42ac4d318e31d9442fc5a files/ghostscript-esp-8.15.1-fPIC.patch 322
+MD5 c5024218e7e8ad91730b3d3f0ab1fdff files/ghostscript-esp-8.15.1-ps2epsi-esp.diff 380
+RMD160 6386daddfed55a3fc85c0909a7dae4eea14da151 files/ghostscript-esp-8.15.1-ps2epsi-esp.diff 380
+SHA256 ed254c033095de85345f788168551afd1971361e1bb8e66cae9d9682103da36a files/ghostscript-esp-8.15.1-ps2epsi-esp.diff 380
 MD5 e8974faf06541ccb8c271180d87175bd files/ghostscript-gtk2.patch 610
 RMD160 b6f6ff2b5667e698d38c6340fcb027e381e765de files/ghostscript-gtk2.patch 610
 SHA256 5330aedcdccc78af21d87179f93917d0e025a41bcce3b863301bdd0e4f9d23ea files/ghostscript-gtk2.patch 610
@@ -112,6 +118,9 @@ SHA256 4ee53b22ffb749db27f4b667580b8720122dde8e3a75ab70816e37aa7847f015 ghostscr
 MD5 46ca5e0ed613d3812d9d64d3c44ed4b9 ghostscript-esp-7.07.1-r8.ebuild 5597
 RMD160 48c71eb0c46455dfc57cddd37bb3b09bc503e8b8 ghostscript-esp-7.07.1-r8.ebuild 5597
 SHA256 0ebb51a5e91a07e3e1a816a7634cd35650fa9f7d32cc723ed14e28ff02480449 ghostscript-esp-7.07.1-r8.ebuild 5597
+MD5 05b40788cb9a29de9cecfa9c6ee9b3af ghostscript-esp-8.15.1-r1.ebuild 3997
+RMD160 46c48ea9b5e97be3f126c33f60da28472fe04a15 ghostscript-esp-8.15.1-r1.ebuild 3997
+SHA256 a45eea06effb6944504dc82b4e2fdb48cb022b97476dfbf9c5337121808bb97e ghostscript-esp-8.15.1-r1.ebuild 3997
 MD5 d40fb7aaaa18d6c6dfc3e1450c8346c9 ghostscript-esp-8.15.1.ebuild 3845
 RMD160 b8e292d2f8327d17f7990e05b185f769a8072121 ghostscript-esp-8.15.1.ebuild 3845
 SHA256 672abca0f80a23e301bc5f88004ffddab35551acf235ea6ff9d6733095cebe97 ghostscript-esp-8.15.1.ebuild 3845
diff --git a/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1-r1 b/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1-r1
new file mode 100644
index 000000000000..fa1357c2a00e
--- /dev/null
+++ b/app-text/ghostscript-esp/files/digest-ghostscript-esp-8.15.1-r1
@@ -0,0 +1,9 @@
+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 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+RMD160 14f436cb2869788f249c0eaf5dd6a31295c5ada7 adobe-cmaps-200204.tar.gz 4360486
+SHA256 510f29086630db1a581ab77e46c3a6b9b4ee4bf8c7717c209e5125794a59480a adobe-cmaps-200204.tar.gz 4360486
+MD5 2a21136953c3559e6088522753b06b1f espgs-8.15.1-source.tar.bz2 7758723
+RMD160 8c03b9304d098cea7cb1ce0f056820d048b91423 espgs-8.15.1-source.tar.bz2 7758723
+SHA256 510e34f7cc9d9b41cff320168b0fcc43329ba41ba58dd35895cd58e33f63fbfa espgs-8.15.1-source.tar.bz2 7758723
diff --git a/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff
new file mode 100644
index 000000000000..ecf51a060dfd
--- /dev/null
+++ b/app-text/ghostscript-esp/files/ghostscript-esp-8.15.1-ps2epsi-esp.diff
@@ -0,0 +1,14 @@
+--- ghostscript/lib/ps2epsi.orig	2006-04-03 18:19:52.000000000 +0200
++++ ghostscript/lib/ps2epsi	2006-04-03 18:21:17.000000000 +0200
+@@ -6,11 +6,6 @@
+ fi
+ 
+ tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
+-rm -f $tmpfile
+-if test -e $tmpfile; then
+-	echo "$0: Our temporary file $tmpfile already exists." 1>&2
+-	exit 1
+-fi
+ trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
+ 
+ export outfile
diff --git a/app-text/ghostscript-esp/ghostscript-esp-8.15.1-r1.ebuild b/app-text/ghostscript-esp/ghostscript-esp-8.15.1-r1.ebuild
new file mode 100644
index 000000000000..5835093e94ed
--- /dev/null
+++ b/app-text/ghostscript-esp/ghostscript-esp-8.15.1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-esp/ghostscript-esp-8.15.1-r1.ebuild,v 1.1 2006/04/03 21:51:57 genstef Exp $
+
+inherit eutils autotools flag-o-matic
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GPL Ghostscript with better printer support"
+HOMEPAGE="http://www.cups.org/espgs"
+
+MY_P=espgs-${PV}
+PVM=${PV%.[0-9]}
+SRC_URI="http://ftp.easysw.com/pub/ghostscript/${PV}/espgs-${PV}-source.tar.bz2
+	cjk? ( http://www.matsusaka-u.ac.jp/mirror/gs-cjk/adobe-cmaps-200204.tar.gz
+		http://www.matsusaka-u.ac.jp/mirror/gs-cjk/acro5-cmaps-2001.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X cups cjk emacs gtk threads xml"
+
+DEP="virtual/libc
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.5
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/tiff-3.7
+	X? ( || ( x11-libs/libXt virtual/x11 ) )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	cups? ( >=net-print/cups-1.1.20 )
+	xml? ( >=dev-libs/libxml2-2.6.8 )
+	!app-text/ghostscript-gnu
+	!app-text/ghostscript-afpl"
+
+RDEPEND="${DEP}
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	media-fonts/gnu-gs-fonts-std"
+
+DEPEND="${DEP}
+	gtk? ( dev-util/pkgconfig )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A/adobe-cmaps-200204.tar.gz acro5-cmaps-2001.tar.gz}
+	cd ${S}
+
+	epatch ${FILESDIR}/gs-${PV}destdir.patch
+	epatch ${FILESDIR}/ghostscript-build.patch
+	epatch ${FILESDIR}/ghostscript-scripts.patch
+	epatch ${FILESDIR}/ghostscript-ps2epsi.patch
+	epatch ${FILESDIR}/ghostscript-badc.patch
+	epatch ${FILESDIR}/ghostscript-pagesize.patch
+	epatch ${FILESDIR}/ghostscript-noopt.patch
+	epatch ${FILESDIR}/ghostscript-use-external-freetype.patch
+	epatch ${FILESDIR}/ghostscript-split-font-configuration.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+
+	# not submitted
+	epatch ${FILESDIR}/ijs-dirinstall.diff
+	epatch ${FILESDIR}/ghostscript-gtk2.patch
+	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"
+	fi
+
+	# search path fix
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		Makefile.in || die "sed failed"
+	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
+		Makefile.in || die "sed failed"
+
+	# #128647
+	epatch ${FILESDIR}/${P}-ps2epsi-esp.diff
+	sed -i "s/Id:.*//" pstoraster/pstoraster.convs
+
+	eautoreconf
+	cd ijs
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-jbig2dec"
+
+	# gs -DPARANOIDSAFER out.ps
+	myconf="${myconf} --with-fontconfig --with-fontpath=/usr/share/fonts:/usr/share/fonts/ttf/zh_TW:/usr/share/fonts/ttf/zh_CN:/usr/share/fonts/arphicfonts:/usr/share/fonts/ttf/korean/baekmuk:/usr/share/fonts/baekmuk-fonts:/usr/X11R6/lib/X11/fonts/truetype:/usr/share/fonts/kochi-substitute"
+
+	# *-dynmic breaks compiling without X, see bug 121749
+	use X && myconf="${myconf} --enable-dynamic"
+
+	econf $(use_with X x) \
+		$(use_enable cups) \
+		$(use_enable threads) \
+		$(use_with xml omni) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "make failed"
+	emake so -j1 || die "make failed"
+
+	cd ijs
+	econf || die "econf failed"
+	emake -j1 || die "make failed"
+	cd ..
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" soinstall || die "make install failed"
+
+	rm -fr ${D}/usr/share/ghostscript/${PVM}/doc || die
+	dodoc doc/README
+	dohtml doc/*.html doc/*.htm
+
+	if use emacs; then
+		insinto /usr/share/emacs/site-lisp
+		doins doc/gsdoc.el
+	fi
+
+	if use cjk; then
+		dodir /usr/share/ghostscript/Resource
+		dodir /usr/share/ghostscript/Resource/Font
+		dodir /usr/share/ghostscript/Resource/CIDFont
+		cd ${D}/usr/share/ghostscript/Resource
+		unpack adobe-cmaps-200204.tar.gz
+		unpack acro5-cmaps-2001.tar.gz
+	fi
+
+	# install ijs
+	cd ${S}/ijs
+	make DESTDIR="${D}" install || die "ijs install failed"
+}