many bug fixes

5 files changed, 143 insertions, 3 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 1d6b92d6f424..95e7d538c375 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,21 @@
 # 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.34 2003/07/04 16:11:26 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.35 2003/07/16 14:04:05 lanius Exp $
+
+*ghostscript-7.05.6-r3 (16 Jul 2003)
+
+  16 Jul 2003; Heinrich Wendel <lanius@gentoo.org>
+  ghostscript-7.05.6-r3.ebuild, files/gs7.05.6-random.patch:
+  fixed several bugs:
+  - #19937 (gimp-print dep)
+  - #22869 (gimp-print dep)
+  - #22904 (X dep)
+  - #19038 (X dep)
+  - #18731 (gimp-print dep)
+  - #17050 (gimp-print dep)
+  - #16007 (ijs-config)
+  - #14143 (X dep)
+  - #21627 (urandom patch)
 
   27 Jun 2003; YAMAKURA Makoto <yakina@gentoo.org> ghostscript-7.05.5-r1.ebuild,
   ghostscript-7.05.5-r2.ebuild, ghostscript-7.05.6-r1.ebuild,
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 96fe8de71d7f..9a8d7590b2c9 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,4 +1,4 @@
-MD5 ae96d809fd03acafbfe3da3202fc037d ChangeLog 6127
+MD5 b97dbdc769af2392bc7e1b7be9bd6d5e ChangeLog 6520
 MD5 5969230b95c1114627460bc012999274 ghostscript-7.05.3-r1.ebuild 1964
 MD5 02e2e18900fd6c21bfacfc834a8cc5d5 ghostscript-7.05.5-r1.ebuild 2481
 MD5 3b965d457685aacc4e1ae4e0bba087e8 ghostscript-7.05.5-r2.ebuild 2603
@@ -6,7 +6,7 @@ MD5 b109fca2c805d2bea14c0261a373616f ghostscript-7.05.5.ebuild 1886
 MD5 96922ead39294ea771bcc47b5d4b7a2b ghostscript-7.05.6-r1.ebuild 2605
 MD5 5775b11c48d3699b400fe9d518682f0c ghostscript-7.05.6-r2.ebuild 2712
 MD5 5fd0e465470e0c28630425b8aa19f06a ghostscript-7.05.6.ebuild 2592
-MD5 c8563213c40627b530bfeea7d80ec0e1 ghostscript-7.05.6-r3.ebuild 2923
+MD5 369f4b196922538d27af762d313c177d ghostscript-7.05.6-r3.ebuild 3040
 MD5 cd47befad950c27337bdc21511f89050 files/digest-ghostscript-7.05.3-r1 295
 MD5 ac5b31ed5b19e7d882fc094159e35e8d files/digest-ghostscript-7.05.5 220
 MD5 3cdc3dc3a080a9e1e29ba2ddf05debd4 files/digest-ghostscript-7.05.5-r1 359
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05.6-r3 b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r3
new file mode 100644
index 000000000000..cc0715bcb271
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r3
@@ -0,0 +1,3 @@
+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
diff --git a/app-text/ghostscript/files/gs7.05.6-random.patch b/app-text/ghostscript/files/gs7.05.6-random.patch
new file mode 100644
index 000000000000..208d883ae9f1
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.05.6-random.patch
@@ -0,0 +1,11 @@
+--- espgs-7.05.5/src/gdevpdf.c-orig	2003-05-24 14:19:35.000000000 -0400
++++ espgs-7.05.5/src/gdevpdf.c	2003-05-24 14:19:57.000000000 -0400
+@@ -504,7 +504,7 @@
+ 	 * If we're on a system that provides /dev/random, that's the best
+ 	 * source of good random bits.
+ 	 */
+-	FILE *rfile = fopen("/dev/random", "rb");
++	FILE *rfile = fopen("/dev/urandom", "rb");
+ 
+ 	if (rfile && fread(&pdev->random_offset, sizeof(pdev->random_offset),
+ 			   1, rfile) == sizeof(pdev->random_offset)
diff --git a/app-text/ghostscript/ghostscript-7.05.6-r3.ebuild b/app-text/ghostscript/ghostscript-7.05.6-r3.ebuild
new file mode 100644
index 000000000000..9cdf27b80a8f
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.05.6-r3.ebuild
@@ -0,0 +1,111 @@
+# 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-r3.ebuild,v 1.1 2003/07/16 14:04:05 lanius Exp $
+
+inherit eutils
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
+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? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200204.tar.gz
+		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz)"
+HOMEPAGE="http://www.easysw.com/"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+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"
+
+	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+#	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch || die
+	epatch ${FILESDIR}/ghostscript-7.05.5.man.patch
+
+	epatch ${FILESDIR}/ps2epsi-security.patch
+
+	# bug 21627
+	epatch ${FILESDIR}/gs${PV}-random.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"
+
+	# Compile ijs
+	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 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
+}