fix deps in 7.07.1-r7; add libgs.so to 7.07.1-r8 and remove broken patches

7 files changed, 168 insertions, 20 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 6d9e14465b7c..6b86bb9908d1 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.89 2004/11/06 01:44:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.90 2004/12/05 17:23:53 lanius Exp $
+
+*ghostscript-7.07.1-r8 (05 Dec 2004)
+
+  05 Dec 2004; lanius@gentoo.org +files/gs7.07.1-fontconfig-rh.patch.2.bz2,
+  ghostscript-7.07.1-r7.ebuild, +ghostscript-7.07.1-r8.ebuild:
+  fix deps in 7.07.1-r7; add libgs.so to 7.07.1-r8 and remove broken patches
 
   06 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
   ghostscript-7.07.1-r1.ebuild:
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index e0e89cc708d2..0122307097d3 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,15 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 40cb9de588f9d7b84c71b45be2ff8d69 ghostscript-7.07.1-r5.ebuild 4028
-MD5 8feb7d3a7efa608f8e33429294eced03 ghostscript-7.07.1-r7.ebuild 4172
+MD5 3ea2b5f3804eee68c18c903e66eec27a ghostscript-7.07.1-r7.ebuild 4151
 MD5 2db7df35be7d9e0921a6ab5c72c02f67 ghostscript-7.07.1-r2.ebuild 3295
 MD5 4c43a0cacba1f4a15e9578ed603257fd ghostscript-7.05.6.ebuild 2739
 MD5 a61c4af42b77a20abcd7330f20a70162 ghostscript-7.05.6-r2.ebuild 2806
 MD5 6319ff45453f1d6fb8e71caa8f40556a ghostscript-7.07.1-r4.ebuild 4028
 MD5 1f0374fe43952ae741d0cf174588a5fb ghostscript-7.07.1-r6.ebuild 4076
 MD5 adb8f4a12eb1764922b5e13835ef60dc ghostscript-7.07.1-r1.ebuild 3270
-MD5 d3eaef580b8dc8e7cd0cefe18ec43364 ChangeLog 14462
+MD5 a4a17c2f33a23bf80123793c2db802ac ChangeLog 14717
+MD5 cbf6eb5b2a0a394b9603729919904d0a ghostscript-7.07.1-r8.ebuild 4546
 MD5 0eb21cd33b7646ed6bab341f994c6640 ghostscript-7.05.6-r1.ebuild 2749
 MD5 0d1e785f83f28fcc649afaee1641be97 ghostscript-7.07.1-r3.ebuild 3443
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
@@ -27,9 +25,11 @@ MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r3 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r4 291
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r5 212
 MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r6 212
-MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r7 212
+MD5 71637345f6ce2c83c60b9220cfdf92c3 files/digest-ghostscript-7.07.1-r7 73
+MD5 71637345f6ce2c83c60b9220cfdf92c3 files/digest-ghostscript-7.07.1-r8 73
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 d5cb89763cb93c400f2b0bcdefb69252 files/gs7.07.1-fontconfig-rh.patch.2.bz2 6137
 MD5 d3f26c93b9fb75b509c375cbf841da9a files/gs7.05.6-tempfile.patch 2763
 MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
 MD5 1d5618d793799f7247d624ced0dea493 files/gs7.07.1-tempfile.patch 3123
@@ -38,10 +38,3 @@ MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
 MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
 MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
 MD5 06fe485954243190f4f0f4d8e1542f92 files/gs7.07.1-cjk.diff.bz2 3055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpPifI1lqEGTUzyQRAhjcAKC38Hxb1BdqFbMEjYYHXSD11k7xmwCfSb+/
-1rk4slwktqJlAB6DNrtDzEw=
-=EV1W
------END PGP SIGNATURE-----
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r7 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r7
index 86d2854e2bfc..99f75355383b 100644
--- a/app-text/ghostscript/files/digest-ghostscript-7.07.1-r7
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r7
@@ -1,3 +1 @@
 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/digest-ghostscript-7.07.1-r8 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r8
new file mode 100644
index 000000000000..99f75355383b
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r8
@@ -0,0 +1 @@
+MD5 d30bf5c09f2c7caa8291f6305cf03044 espgs-7.07.1-source.tar.bz2 5400198
diff --git a/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.2.bz2 b/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.2.bz2
new file mode 100644
index 000000000000..378da7c0eb8f
--- /dev/null
+++ b/app-text/ghostscript/files/gs7.07.1-fontconfig-rh.patch.2.bz2
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
index f96c19d54ba8..59a2af5a209b 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r7.ebuild,v 1.16 2004/11/11 23:25:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r7.ebuild,v 1.17 2004/12/05 17:23:53 lanius Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/espgs/espgs-${PV}-source.tar.bz2
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE="X cups cjk emacs truetype"
+IUSE="X cups cjk emacs"
 
 RDEPEND="virtual/libc
 	>=media-libs/jpeg-6b
@@ -29,7 +29,7 @@ RDEPEND="virtual/libc
 	media-fonts/gnu-gs-fonts-std"
 
 DEPEND="${RDEPEND}
-	truetype? ( dev-util/pkgconfig )"
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/espgs-${PV}
 
@@ -46,7 +46,7 @@ src_unpack() {
 	fi
 
 	# add fontconfig support
-	epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.bz2
+	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
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
new file mode 100644
index 000000000000..f0e685d6a0ae
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.07.1-r8.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2004 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-r8.ebuild,v 1.1 2004/12/05 17:23:53 lanius Exp $
+
+inherit flag-o-matic eutils gcc
+
+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 ~s390 ~sparc ~x86"
+IUSE="X cups cjk emacs gtk"
+
+RDEPEND="virtual/libc
+	>=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 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	!virtual/ghostscript
+	media-fonts/gnu-gs-fonts-std"
+#	media-libs/fontconfig"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/espgs-${PV}
+
+PROVIDE="virtual/ghostscript"
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+
+	cd ${S}
+
+	if use cjk ; then
+		epatch ${FILESDIR}/gs7.07.1-cjk.diff.bz2
+		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
+	fi
+
+	# 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
+
+	# 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
+
+	# 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
+
+	# fix dynamic build
+	echo '#include "png.h"' >> src/png_.h
+	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
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --without-gimp-print"
+	use gtk && myconf="${myconf} --with-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
+}