revision bump to fix bug 100808

(Portage version: 2.0.51.22-r2)

6 files changed, 278 insertions, 37 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index dad3415cf33d..0177f000d5f0 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.106 2005/05/16 09:46:09 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.107 2005/09/01 17:20:27 blubb Exp $
+
+*ghostscript-7.07.1-r10 (01 Sep 2005)
+
+  01 Sep 2005; Simon Stelling <blubb@gentoo.org>
+  +files/ghostscript-7.07.1-64bit-cmyk.patch, ghostscript-7.07.1-r9.ebuild,
+  +ghostscript-7.07.1-r10.ebuild:
+  revision bump to fix bug 100808
 
   16 May 2005; Heinrich Wendel <lanius@gentoo.org>
   ghostscript-7.07.1-r7.ebuild, ghostscript-7.07.1-r8.ebuild,
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index 5dd189784151..c0cb02165cf3 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,45 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e5c681abcdd4309829734a5f91ab007b ghostscript-7.07.1-r7.ebuild 4288
-MD5 c55acf0a29bfd852d6f9c3a688edcfef ghostscript-7.07.1-r9.ebuild 5873
+MD5 0e8c11323c3c3f05596c90e356a6d07d ChangeLog 17464
 MD5 ef2f2a5b720a11cdbf3514c1fdfe5d80 ghostscript-7.05.6-r2.ebuild 2939
-MD5 65442794e14eba8896d1ab5e04e7cfb9 ChangeLog 17231
+MD5 e5c681abcdd4309829734a5f91ab007b ghostscript-7.07.1-r7.ebuild 4288
 MD5 0adb31bdf1827f38952f2f0dd249e926 ghostscript-7.07.1-r8.ebuild 5491
+MD5 f6bc1af6c3aaf43291bc1410209eba37 ghostscript-7.07.1-r9.ebuild 5874
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
-MD5 f834d056ca972c457a2ff3b1e839e562 files/ghostscript-7.07-bigposttable.patch 1257
-MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
-MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
-MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
-MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
-MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
+MD5 2fa77d6b487c00c5f57dd0edf3e6a776 ghostscript-7.07.1-r10.ebuild 5927
 MD5 6807c3b6025d5b09e8eb6349769162d1 files/digest-ghostscript-7.05.6-r2 212
-MD5 186fc94fd3208e808026580e7436dbdc files/gs-osx-ijs.patch 1566
-MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
-MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r8 212
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r9 212
-MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
-MD5 16ff6a37a0a334e97f712d8ed530ec6c files/gs7.07.1-cjk.diff 7264
-MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
-MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
-MD5 c73ad916d49df447de59358ffdc495eb files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
-MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
-MD5 55146a1eafc4ad3a26d99121ae0777fe files/ghostscript-7.07-coverage-glyphcount.patch 3100
-MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
-MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
+MD5 f834d056ca972c457a2ff3b1e839e562 files/ghostscript-7.07-bigposttable.patch 1257
+MD5 55146a1eafc4ad3a26d99121ae0777fe files/ghostscript-7.07-coverage-glyphcount.patch 3100
+MD5 c73ad916d49df447de59358ffdc495eb files/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch 6462
 MD5 e0da7576378dc87fa53a16dfd1774789 files/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch 1611
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
 MD5 b37c0dc9f85205da6e8675d4a8bfd21a files/ghostscript-7.07-gsublookuptable.patch 3808
-MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
+MD5 8c6a3d7e8897b4297ef853dbd89e408b files/gs-fix-gc.patch 5627
+MD5 186fc94fd3208e808026580e7436dbdc files/gs-osx-ijs.patch 1566
+MD5 212a5ece7d789ef9d04e15fd7d36eea3 files/gs-osx-unix-dll.patch 1930
+MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
+MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
+MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
+MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
+MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
+MD5 16ff6a37a0a334e97f712d8ed530ec6c files/gs7.07.1-cjk.diff 7264
 MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCkKcaI1lqEGTUzyQRAsnoAKCsRsNLNK2w5Xn0S0ek/fmYk61U5ACgyzUv
-dpCNTAZe23INFpl+FV9yARk=
-=XYDN
------END PGP SIGNATURE-----
+MD5 51736590c7ec64f9029fa9524e1ab50c files/gs7.07.1-destdir.patch 12261
+MD5 0cb94835c5d49c5eeeba6e11b2cd65ed files/gs7.07.1-fontconfig-rh.patch.2.bz2 6113
+MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
+MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
+MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
+MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
+MD5 92fa24960f2c7802749ce6908aeaf60d files/gs7.07.1-nogtk2.patch 1419
+MD5 b2ca914ffcff3e5296d6b5acc7fac182 files/gs7.07.1-ps2ps.patch 244
+MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
+MD5 5b476654e84a9748e3d56d86f264b277 files/ghostscript-7.07.1-64bit-cmyk.patch 1777
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r10 212
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10
new file mode 100644
index 000000000000..86d2854e2bfc
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r10
@@ -0,0 +1,3 @@
+MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
diff --git a/app-text/ghostscript/files/ghostscript-7.07.1-64bit-cmyk.patch b/app-text/ghostscript/files/ghostscript-7.07.1-64bit-cmyk.patch
new file mode 100644
index 000000000000..ac14b91bba83
--- /dev/null
+++ b/app-text/ghostscript/files/ghostscript-7.07.1-64bit-cmyk.patch
@@ -0,0 +1,48 @@
+Index: gs/src/gdevbmp.c
+===================================================================
+RCS file: /cvs/ghostscript/gs/src/gdevbmp.c,v
+retrieving revision 1.10
+diff -b -u -r1.10 gdevbmp.c
+--- gs/src/gdevbmp.c	20 Sep 2004 22:14:59 -0000	1.10
++++ gs/src/gdevbmp.c	2 Aug 2005 12:02:44 -0000
+@@ -147,6 +147,7 @@
+ 
+     if (row == 0)		/* can't allocate row buffer */
+ 	return_error(gs_error_VMerror);
++    memset(row+raster, 0, bmp_raster - raster); /* clear the padding bytes */

+ 
+     /* Write the file header. */
+ 
+@@ -174,7 +175,7 @@
+ bmp_cmyk_print_page(gx_device_printer * pdev, FILE * file)
+ {
+     int plane_depth = pdev->color_info.depth / 4;
+-    uint raster = bitmap_raster(pdev->width * plane_depth);
++    uint raster = (pdev->width * plane_depth + 7) >> 3;
+     /* BMP scan lines are padded to 32 bits. */
+     uint bmp_raster = raster + (-(int)raster & 3);
+     byte *row = gs_alloc_bytes(pdev->memory, bmp_raster, "bmp file buffer");
+@@ -184,6 +185,7 @@
+ 
+     if (row == 0)		/* can't allocate row buffer */
+ 	return_error(gs_error_VMerror);
++    memset(row+raster, 0, bmp_raster - raster); /* clear the padding bytes */
+ 
+     for (plane = 0; plane <= 3; ++plane) {
+ 	gx_render_plane_t render_plane;
+Index: gs/src/gdevbmpc.c
+===================================================================
+RCS file: /cvs/ghostscript/gs/src/gdevbmpc.c,v
+retrieving revision 1.7
+diff -b -u -r1.7 gdevbmpc.c
+--- gs/src/gdevbmpc.c	17 Oct 2002 06:09:33 -0000	1.7
++++ gs/src/gdevbmpc.c	2 Aug 2005 12:02:44 -0000
+@@ -207,7 +207,7 @@
+     }
+     return write_bmp_depth_header(pdev, file, plane_depth,
+ 				  (const byte *)palette,
+-				  bitmap_raster(pdev->width * plane_depth));
++				  (pdev->width*plane_depth + 7) >> 3);
+ }
+ 
+ /* 24-bit color mappers (taken from gdevmem2.c). */
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild
new file mode 100644
index 000000000000..b561d74d3144
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r10.ebuild,v 1.1 2005/09/01 17:20:27 blubb Exp $
+
+inherit flag-o-matic eutils toolchain-funcs libtool
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
+HOMEPAGE="http://www.cups.org/ghostscript.php"
+SRC_URI="mirror://sourceforge/espgs/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 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="X cups cjk emacs gtk"
+
+DEP="virtual/libc
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	cups? ( net-print/cups )
+	!virtual/ghostscript"
+
+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 )"
+
+#	media-libs/fontconfig"
+
+S=${WORKDIR}/espgs-${PV}
+
+PROVIDE="virtual/ghostscript"
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+
+	cd ${S}
+
+	if use ppc-macos; then
+		epatch ${FILESDIR}/gs-osx-unix-dll.patch
+		cp src/unix-gcc.mak Makefile.in
+		sed -i -e "s:SHARE_JPEG=0:SHARE_JPEG=1:" Makefile.in || die
+		sed -i -e "s:SHARE_ZLIB=0:SHARE_ZLIB=1:" Makefile.in || die
+		sed -i -e "s:SHARE_LIBPNG=0:SHARE_LIBPNG=1:" Makefile.in || die
+		sed -i -e "s:usr/local:usr:" Makefile.in || die
+	fi
+
+	if use cjk ; then
+		epatch ${FILESDIR}/gs7.07.1-cjk.diff
+		#this causes gs error; bug #90009
+		#sed -i -e '/;$/s/^%//g' ${S}/lib/CIDFnmap.CJK || die
+
+		epatch ${FILESDIR}/ghostscript-7.07-bigposttable.patch
+		epatch ${FILESDIR}/ghostscript-7.07-gsublookuptable.patch
+		epatch ${FILESDIR}/ghostscript-7.07-coverage-glyphcount.patch
+		epatch ${FILESDIR}/ghostscript-7.07-fix_rename_font_gs_cidfn.ps.patch
+		epatch ${FILESDIR}/ghostscript-7.07-fix_cidfontname_Encoding_CIDToGIDMap_DW_W.patch
+	fi
+
+	# add fontconfig support (this patch is broken)
+	# epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.2.bz2
+	
+	#100808
+	epatch ${FILESDIR}/${P}-64bit-cmyk.patch
+	
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+	epatch ${FILESDIR}/ghostscript-7.05.6.man.patch
+
+	# ijs fPIC patch
+	epatch ${FILESDIR}/gs${PV}-ijs.patch
+
+	# pxl dash patch
+	epatch ${FILESDIR}/gs7.05.6-gdevpx.patch
+
+	# Makefile.in fixes for DESTDIR support in libijs because
+	# einstall borks on multilib systems -- eradicator
+	epatch ${FILESDIR}/gs${PV}-destdir.patch
+	epatch ${FILESDIR}/gs${PV}-ijsdestdir.patch
+
+	use ppc-macos && epatch ${FILESDIR}/gs-osx-ijs.patch
+
+	# search path fix
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.07/$(get_libdir):"\
+	Makefile.in || die "sed failed"
+	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
+	Makefile.in || die "sed failed"
+
+	# insecure tempfile handling
+	epatch ${FILESDIR}/gs${PV}-tempfile.patch
+
+	# krgb support (currently broken)
+	#( cd src; epatch ${FILESDIR}/gs7.07.1-krgb.patch.gz )
+
+	# Fix the garbage collector on ia64 and ppc
+	epatch ${FILESDIR}/gs-fix-gc.patch
+
+	# bug #63435
+	epatch ${FILESDIR}/gs${PV}-ps2ps.patch
+
+	# fix dynamic build
+	echo '#include "png.h"' >> src/png_.h
+
+	# fix for building with gtk2 instead of gtk1
+	if use gtk; then
+		sed -i -e "s:gmodule:gmodule-2.0:" configure.ac
+		sed -i -e "s:glib-config:pkgconfig:" configure.ac
+		sed -i -e "s:gtk-config:pkg-config gtk+-2.0:g" src/unix-dll.mak
+		sed -i -e "s:CFLAGS_SO=-fPIC:CFLAGS_SO=-fPIC -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include:" Makefile.in
+	else
+		epatch ${FILESDIR}/gs${PV}-nogtk2.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --without-gimp-print"
+	use gtk && myconf="${myconf} --with-omni" || myconf="${myconf} --without-omni"
+
+	# bug #56998, only compiled-in fontpath is searched when running 
+	# 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"
+
+	use X && myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	use cups && myconf="${myconf} --enable-cups" \
+		|| myconf="${myconf} --disable-cups"
+
+	# -O3 will make ghostscript fail when compiling with gcc 3.4
+	if [ "`gcc-major-version`" -eq "3" ] && [ "`gcc-minor-version`" -eq "4" ]
+	then
+		strip-flags
+		replace-flags -O? -O2
+	fi
+
+	autoconf
+	econf ${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/7.07/doc || die
+	dodoc doc/README doc/COPYING doc/COPYING.LGPL
+	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
+	dodir /usr/bin /usr/include /usr/$(get_libdir)
+	# This is broken - there are not even a 'install_prefix'
+	# anywhere in ${S}/ijs ...
+	#einstall install_prefix=${D}
+	#einstall
+	#dosed "s:^prefix=.*:prefix=/usr:" /usr/bin/ijs-config
+	make DESTDIR="${D}" install || die
+
+	# bug #83876, collision with gcc
+	rm -f ${D}/usr/share/man/de/man1/ansi2knr.1
+	rm -f ${D}/usr/share/man/man1/ansi2knr.1
+}
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild
index 5a39b7a8f575..b664ce323e7e 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild,v 1.2 2005/05/16 09:46:09 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r9.ebuild,v 1.3 2005/09/01 17:20:27 blubb Exp $
 
 inherit flag-o-matic eutils toolchain-funcs libtool
 
@@ -67,7 +67,7 @@ src_unpack() {
 
 	# add fontconfig support (this patch is broken)
 	# epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.2.bz2
-
+	
 	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
 	epatch ${FILESDIR}/ghostscript-7.05.6.man.patch