changelog:P

5 files changed, 146 insertions, 4 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 7dda99fc1e0e..598e921f3a2f 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.39 2003/07/29 13:21:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.40 2003/11/13 13:40:13 lanius Exp $
+
+*ghostscript-7.05.6-r4 (13 Nov 2003)
+
+  13 Nov 2003; Heinrich Wendel <lanius@gentoo.org>
+  ghostscript-7.05.6-r4.ebuild, files/gs-7.05.6-gdevx.patch,
+  files/gs7.05.6-gdevpx.patch:
+  added gdevpx patch, thx to Larry Sanderson <larry@sanderson.net> bug #33139
 
   29 Jul 2003; lanius@gentoo.org ghostscript-7.05.6-r3.ebuild:
   stable bump
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 1e97373e657b..d7ee1ae81367 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,8 +1,8 @@
-MD5 1e84f13291e7391fcce2041390304063 ChangeLog 6996
+MD5 1547bdb05c43ce95f657c47236308729 ChangeLog 7255
 MD5 f395eb5da81c308494a1d12e395317e5 ghostscript-7.05.6-r2.ebuild 2730
 MD5 6320f1b6babe4f1d03724b0966f9ac73 ghostscript-7.05.6-r3.ebuild 3123
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 eb8210736d0a054660794273a335a74e ghostscript-7.05.6-r4.ebuild 3190
+MD5 1d3a0a4b6d472668ce849cc668fb90eb ghostscript-7.05.6-r4.ebuild 3189
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r2 359
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r3 359
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
@@ -13,5 +13,5 @@ MD5 e065254ba9e798e4177ed687b6b5ee2e files/gs7.05.6-random.patch 478
 MD5 f6f3dbd868441cee002e1aeebc830092 files/ijs.patch 303
 MD5 f9c4821dac99d593d62405379f6653ec files/png.diff 426
 MD5 54ca592ef6bd375f6fdd214786962efb files/ps2epsi-security.patch 281
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevx.patch 402
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r4 359
+MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05.6-r4 b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r4
new file mode 100644
index 000000000000..a76e8443ea4a
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r4
@@ -0,0 +1,5 @@
+MD5 991cbd7bafc6917a19abf9df3ecad58e espgs-7.05.6-source.tar.bz2 5410541
+MD5 1521fab85ca3e8ce3ce781d4970e6c79 gnu-gs-fonts-std-6.0.tar.gz 1881193
+MD5 33457d3f37de7ef03d2eea05a9e6aa4f gnu-gs-fonts-other-6.0.tar.gz 796086
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
diff --git a/app-text/ghostscript/files/gs7.05.6-gdevpx.patch b/app-text/ghostscript/files/gs7.05.6-gdevpx.patch
new file mode 100644
index 000000000000..f2addea045c3
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.05.6-gdevpx.patch
@@ -0,0 +1,12 @@
+--- espgs-7.05.6/src/gdevpx.c	2002-04-23 07:58:43.000000000 -0400
++++ espgs-7.05.6/src/gdevpx.c.new	2003-11-09 15:25:16.000000000 -0500
+@@ -851,8 +851,7 @@
+ 	    px_put_s(s, (uint)pattern[i]);
+ 	px_put_a(s, pxaLineDashStyle);
+ 	if (offset != 0) {
+-	    px_put_rl(s, offset);
+-	    px_put_a(s, pxaDashOffset);
++	    px_put_usa(s, (uint)offset, pxaDashOffset);
+ 	}
+     }
+     spputc(s, pxtSetLineDash);
diff --git a/app-text/ghostscript/ghostscript-7.05.6-r4.ebuild b/app-text/ghostscript/ghostscript-7.05.6-r4.ebuild
new file mode 100644
index 000000000000..bf04ab69c3f4
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.05.6-r4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6-r4.ebuild,v 1.1 2003/11/13 13:40:13 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
+HOMEPAGE="http://www.cups.org/ghostscript.php"
+SRC_URI="ftp://ftp.easysw.com/pub/ghostscript/espgs-${PV}-source.tar.bz2
+	ftp://ftp.easysw.com/pub/ghostscript/gnu-gs-fonts-std-6.0.tar.gz
+	ftp://ftp.easysw.com/pub/ghostscript/gnu-gs-fonts-other-6.0.tar.gz
+	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="~ia64 ~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="X cups cjk"
+
+DEPEND="virtual/glibc
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	X? ( virtual/x11 )
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	cups? ( net-print/cups )"
+
+S=${WORKDIR}/espgs-${PV}
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+	unpack gnu-gs-fonts-std-6.0.tar.gz
+	unpack gnu-gs-fonts-other-6.0.tar.gz
+
+	# Brother HL-12XX support
+	cp ${FILESDIR}/gs7.05-gdevhl12.c ${S}/src/gdevhl12.c || die
+	mv ${S}/src/Makefile.in ${S}/src/Makefile.in.orig
+	sed 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
+		${S}/src/Makefile.in.orig > ${S}/src/Makefile.in || die
+
+	cd ${S}
+
+##	patch -p0 < ${FILESDIR}/png.diff || die "patch failed"
+
+	if [ `use cjk` ] ; then
+		epatch ${FILESDIR}/gs${PV}-cjk.diff
+		epatch ${FILESDIR}/gs${PV}-kochi-substitute.patch
+	fi
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+	epatch ${FILESDIR}/${P}.man.patch
+
+	epatch ${FILESDIR}/ps2epsi-security.patch
+
+	# bug 21627
+	epatch ${FILESDIR}/gs${PV}-random.patch
+
+	# ijs fPIC patch
+	epatch ${FILESDIR}/ijs.patch
+
+	# pxl dash patch
+	epatch ${FILESDIR}/gs${PV}-gdevpx.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-omni --without-gimp-print"
+
+	use X && myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	use cups && myconf="${myconf} --enable-cups" \
+		|| myconf="${myconf} --disable-cups"
+
+	econf ${myconf}
+	make || die "make failed"
+
+	cd ijs
+	econf --prefix=${D}/usr
+	make || die "make failed"
+	cd ..
+}
+
+src_install() {
+	einstall install_prefix=${D}
+
+	cd ${WORKDIR}
+	cp -a fonts ${D}/usr/share/ghostscript || die
+	cd ${S}
+
+	rm -fr ${D}/usr/share/ghostscript/7.05/doc || die
+	dodoc doc/README doc/COPYING doc/COPYING.LGPL
+	dohtml doc/*.html doc/*.htm
+	insinto /usr/share/emacs/site-lisp
+	doins doc/gsdoc.el || die
+
+	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
+	dodir /usr/bin /usr/include /usr/lib
+	einstall install_prefix=${D}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Only gimp-print 4.3.18 or higher are compatible with this ghostscript release!"
+	einfo
+}