Add gtk-2 patch and fix hl1250, bug 120029, thanks to Alexander Jenisch <nt-@gmx.de>

Package-Manager: portage-2.1_pre4-r1

5 files changed, 209 insertions, 6 deletions

diff --git a/app-text/ghostscript-afpl/ChangeLog b/app-text/ghostscript-afpl/ChangeLog
index e30662d5c81f..f3de0237de2d 100644
--- a/app-text/ghostscript-afpl/ChangeLog
+++ b/app-text/ghostscript-afpl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript-afpl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ChangeLog,v 1.37 2006/02/03 20:22:12 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ChangeLog,v 1.38 2006/02/18 18:28:36 genstef Exp $
+
+*ghostscript-afpl-8.53-r3 (18 Feb 2006)
+
+  18 Feb 2006; Stefan Schweizer <genstef@gentoo.org>
+  ghostscript-afpl-8.15.ebuild, +ghostscript-afpl-8.53-r3.ebuild:
+  Add gtk-2 patch and fix hl1250, bug 120029, thanks to Alexander Jenisch
+  <nt-@gmx.de>
 
 *ghostscript-afpl-8.53-r2 (03 Feb 2006)
 
diff --git a/app-text/ghostscript-afpl/Manifest b/app-text/ghostscript-afpl/Manifest
index 173706287dfb..fbac89a333bc 100644
--- a/app-text/ghostscript-afpl/Manifest
+++ b/app-text/ghostscript-afpl/Manifest
@@ -1,17 +1,57 @@
-MD5 420dbefeec0f34bd76fc5a044ce392f4 ChangeLog 5122
+MD5 a73c22d28e1e27987eccecd0d389fc39 ChangeLog 5369
+RMD160 f747b6d5e89c6abbe44afabb98cc3c72515b511e ChangeLog 5369
+SHA256 fe16bdba574b5cc6e943e8be3dc1717aa9ae56c06d79a27b308d3019c9a7bb0b ChangeLog 5369
 MD5 e10b8f4566648e7bc09f6b7336d74b2d files/digest-ghostscript-afpl-8.15 280
+RMD160 05b7184d5468f66ccbe0e127067d22be2b22b20d files/digest-ghostscript-afpl-8.15 280
+SHA256 34584ab633595b4cba9ddf34368f56b163d5f3d80cd0ef8296643210c06e8dba files/digest-ghostscript-afpl-8.15 280
 MD5 cc1e3a109091c74903b8607870a89016 files/digest-ghostscript-afpl-8.53 281
+RMD160 f545377f563926262935b16336d38da672d9a570 files/digest-ghostscript-afpl-8.53 281
+SHA256 0af20e6276b94ef138fc8265553e794685c03ffd65c8ecbab883a5088f8c5ce6 files/digest-ghostscript-afpl-8.53 281
 MD5 cc1e3a109091c74903b8607870a89016 files/digest-ghostscript-afpl-8.53-r1 281
+RMD160 f545377f563926262935b16336d38da672d9a570 files/digest-ghostscript-afpl-8.53-r1 281
+SHA256 0af20e6276b94ef138fc8265553e794685c03ffd65c8ecbab883a5088f8c5ce6 files/digest-ghostscript-afpl-8.53-r1 281
 MD5 cc1e3a109091c74903b8607870a89016 files/digest-ghostscript-afpl-8.53-r2 281
+RMD160 f545377f563926262935b16336d38da672d9a570 files/digest-ghostscript-afpl-8.53-r2 281
+SHA256 0af20e6276b94ef138fc8265553e794685c03ffd65c8ecbab883a5088f8c5ce6 files/digest-ghostscript-afpl-8.53-r2 281
+MD5 c17e440fdcfffa2d8437190f2d6a9f36 files/digest-ghostscript-afpl-8.53-r3 1027
+RMD160 b367619a20b3810ab55ee359ccd104bff8caf7a1 files/digest-ghostscript-afpl-8.53-r3 1027
+SHA256 c27af16480e70f944421f405288f053a2c9331f9e19acfc087e97739a1c9dafd files/digest-ghostscript-afpl-8.53-r3 1027
 MD5 8b3c391af1131b4fce97bef3659e57d3 files/gdevcups.patch 14468
+RMD160 957e089ff3c85bec4412fa876570503eeedab167 files/gdevcups.patch 14468
+SHA256 6759754addb447874b682f99058e3f620819814ae51ca24b97c2d70452f98869 files/gdevcups.patch 14468
 MD5 e5838642567ec2da6660ef2d6a602cff files/gdevhl12-hl1250.mak 678
+RMD160 10640a63ece09315186c4567802d1bf21f72c8a4 files/gdevhl12-hl1250.mak 678
+SHA256 1acde11d9ebd11a590e33b76ec3a1ead12ab775e42b0ebb52d685310380ff7a8 files/gdevhl12-hl1250.mak 678
 MD5 d17174c7d427aca8d9efa0ef2650845b files/gdevhl12.c 22002
+RMD160 491b1ce4d5778d4b5931c7ad4948a77dcc610a26 files/gdevhl12.c 22002
+SHA256 f61cefb857b0fe9b0e27b0d69c2c04a237a479b943944803f298e3e286251f94 files/gdevhl12.c 22002
 MD5 8e9a56760f8af0661f77fd57eebddc69 files/ghostscript-afpl-8.53-assertionfailed.patch 9037
+RMD160 85d99ea1e6d4cff3740752e2e0241b78cb605aa9 files/ghostscript-afpl-8.53-assertionfailed.patch 9037
+SHA256 24ec9c482e6623462c91ab524d1680020e3bb5484cd867f463ba831343868554 files/ghostscript-afpl-8.53-assertionfailed.patch 9037
 MD5 dbdb3cd0aea8f9032baa11bc335d181a files/gs-8.11-ijs.patch 757
+RMD160 39257b67cc13666686c1115930c0089b8355d439 files/gs-8.11-ijs.patch 757
+SHA256 1fe3f9a9938ea74113aad2ee9141dc6192d92241d33a7d91cdfae835a1b6a483 files/gs-8.11-ijs.patch 757
 MD5 0a7cbf3d9b9644442d7521969cdb9efd files/gs852-lib.patch 4045
+RMD160 fb03ff2e6fd0ab76692e3203798b9bd7a923b50c files/gs852-lib.patch 4045
+SHA256 12d404e09c94a3244146024051ee0f6bd62d3b26f276cf400f3eb5a53da0226b files/gs852-lib.patch 4045
 MD5 dbaa6966d91fc14f9460882e8686c44e files/rinkj.patch 1353
-MD5 b662c27eb9c0bce8d365d1c081d5af54 ghostscript-afpl-8.15.ebuild 3347
+RMD160 58c33e2bd171d0a633d32030a34e0b2fd33b7cf4 files/rinkj.patch 1353
+SHA256 bc663b593111d9aa10c65e897295e4d625d87efa9e1c0f75937f48de8338e866 files/rinkj.patch 1353
+MD5 49d69a13f2b49c7a502613b571c8ee68 ghostscript-afpl-8.15.ebuild 3368
+RMD160 132ec7e2729f0946854492d319ed1d61024a272b ghostscript-afpl-8.15.ebuild 3368
+SHA256 1ba9dd7e0e563b3073464862ac0f1f1a81a227e9211514792088b6bceb11b154 ghostscript-afpl-8.15.ebuild 3368
 MD5 f73241fc89a26cf83270db3291cd2879 ghostscript-afpl-8.53-r1.ebuild 3927
+RMD160 b4a99f40fa7a2509b11135577d1f943acd056564 ghostscript-afpl-8.53-r1.ebuild 3927
+SHA256 9e29ca257e267b09b925b576cad240cf02c86ed52c6fd37d918d4916135e6c69 ghostscript-afpl-8.53-r1.ebuild 3927
 MD5 b5820e2cbebc2bd4a6ce45ba09649e83 ghostscript-afpl-8.53-r2.ebuild 4057
+RMD160 37644ca1cb7445b4f8870b5e0927a251b3263c72 ghostscript-afpl-8.53-r2.ebuild 4057
+SHA256 3af644950884558d3e6dfd833953af35a652313b9d38f298781ca6e148228788 ghostscript-afpl-8.53-r2.ebuild 4057
+MD5 aa87276465cefa7f8f033cdffe903d48 ghostscript-afpl-8.53-r3.ebuild 4424
+RMD160 eb190a46a63d0739e84519c4e443ba60256ac32a ghostscript-afpl-8.53-r3.ebuild 4424
+SHA256 865be52847c82b67f527fd02de2cc67230a3fa4b6df5b741229b60a9036a263e ghostscript-afpl-8.53-r3.ebuild 4424
 MD5 f7d1dac4064e1cb2c7a59d92b0258667 ghostscript-afpl-8.53.ebuild 3683
+RMD160 005dd5c21eed4dded68ecf6bf4c0ea84d7ab6da2 ghostscript-afpl-8.53.ebuild 3683
+SHA256 64478d0608c71e4e287230af259280bf62be6b7d93c816d1a5b5154a271557fe ghostscript-afpl-8.53.ebuild 3683
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
+SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
diff --git a/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53-r3 b/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53-r3
new file mode 100644
index 000000000000..174012ee0011
--- /dev/null
+++ b/app-text/ghostscript-afpl/files/digest-ghostscript-afpl-8.53-r3
@@ -0,0 +1,12 @@
+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 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
+RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 cups-1.1.23-source.tar.bz2 8705521
+SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e cups-1.1.23-source.tar.bz2 8705521
+MD5 7b2fca7021a093ce593c04332bcbdfb2 ghostscript-8.53.tar.gz 11745494
+RMD160 ee535f9ae570818d1dd9f5750c177d789fbaccc9 ghostscript-8.53.tar.gz 11745494
+SHA256 7b09fdcd8573bdf976cc8319834ee08f65ccf39f63a437dbbbffe6aab4b41f26 ghostscript-8.53.tar.gz 11745494
diff --git a/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild b/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild
index 6e9524610f90..bb1c0f808a40 100644
--- a/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild
+++ b/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild,v 1.7 2005/06/09 13:27:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ghostscript-afpl-8.15.ebuild,v 1.8 2006/02/18 18:28:36 genstef Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND="virtual/libc
 	>=media-libs/jpeg-6b
 	>=media-libs/libpng-1.2.5
 	>=sys-libs/zlib-1.1.4
-	X? ( virtual/x11 )
+	X? ( || ( x11-libs/libXt virtual/x11 ) )
 	cjk? ( media-fonts/arphicfonts
 		media-fonts/kochi-substitute
 		media-fonts/baekmuk-fonts )
diff --git a/app-text/ghostscript-afpl/ghostscript-afpl-8.53-r3.ebuild b/app-text/ghostscript-afpl/ghostscript-afpl-8.53-r3.ebuild
new file mode 100644
index 000000000000..81f4d0638b4d
--- /dev/null
+++ b/app-text/ghostscript-afpl/ghostscript-afpl-8.53-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-afpl/ghostscript-afpl-8.53-r3.ebuild,v 1.1 2006/02/18 18:28:36 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="AFPL Ghostscript"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/"
+
+CUPS_PV=1.1.23
+MY_P=ghostscript-${PV}
+PVM=${PV%.[0-9]}
+SRC_URI="mirror://sourceforge/ghostscript/${MY_P}.tar.gz
+	cups? ( mirror://gentoo/cups-${CUPS_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="Aladdin"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X cups cjk emacs gtk jpeg2k"
+
+
+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 )
+	jpeg2k? ( media-libs/jasper )
+	!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 )"
+PROVIDE="virtual/ghostscript"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ghostscript-${PV}.tar.gz
+
+	# cups support
+	if use cups; then
+		unpack cups-${CUPS_PV}-source.tar.bz2
+		cp -r cups-${CUPS_PV}/pstoraster ${S}
+		cd ${S}/pstoraster
+		sed -e 's:@prefix@:/usr:' -e 's:@exec_prefix@:${prefix}:' -e \
+			's:@bindir@:${exec_prefix}/bin:' -e 's:@GS@:gs:' \
+			pstopxl.in > pstopxl || die "pstopxlsed failed"
+		sed -i -e 's:OUTPUTFILE="%stdout" $profile $6$:\0 -:' \
+			-e 's:/usr/local:/usr:' pstoraster || die "pstorastersed failed"
+		sed -i -e "s:pstopcl6:pstopxl:" cups.mak || die "cupssed failed"
+		cd ..
+		epatch ${FILESDIR}/gdevcups.patch
+	fi
+
+	# enable cfax device (bug #56704)
+	sed -i -e 's:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev:DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev $(DD)cfax.dev:' ${S}/Makefile.in || die "sed failed"
+	cd ${S}
+	epatch "${FILESDIR}"/gs852-lib.patch
+	# see bug #111537
+	use amd64 || epatch "${FILESDIR}"/rinkj.patch
+
+	# http://www.linuxprinting.org/download/printing/ghostscript-8.x/drivers/hl1250
+	cp ${FILESDIR}/gdevhl12.c ${S}/src/gdevhl12.c || die
+	cat ${FILESDIR}/gdevhl12-hl1250.mak >> ${S}/src/contrib.mak || die
+	sed 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
+		-i "${S}"/Makefile.in "${S}"/src/Makefile.in  || die
+	sed -i "s:#if 1:#if 0:" "${S}"/src/gdevhl12.c || die
+
+	# bug 121383 - gxccman.c assertion failed
+	epatch ${FILESDIR}/${PN}-8.53-assertionfailed.patch
+
+	epatch ${FILESDIR}/../../ghostscript-esp/files/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"
+	sed -i -e "s:\$(gsdatadir)/Resource:/usr/share/ghostscript/${PVM}/Resource:" \
+		Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-jbig2dec"
+
+	econf $(use_with X x) \
+		$(use_with jpeg2k jasper) \
+		${myconf} || die "econf failed"
+
+	if use cups; then
+		echo 'include pstoraster/cups.mak' >> Makefile
+		sed -i -e 's:DEVICE_DEVS17=:DEVICE_DEVS17=$(DD)cups.dev:' Makefile || die "sed failed"
+		sed -i -e 's:EXTRALIBS=\(.*\):EXTRALIBS=\1 -lcups -lcupsimage:' Makefile || die "sed failed"
+	fi
+	emake -j1 || die "make failed"
+	emake so -j1 || die "make failed"
+
+	cd ijs
+	./autogen.sh
+	econf || die "econf failed"
+	emake -j1 || die "make failed"
+	cd ..
+}
+
+src_install() {
+	einstall D=/ install_prefix=${D} soinstall
+
+	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"
+}