Revision bump, add some patches from gs-esp

(Portage version: 2.1_pre7-r2)

6 files changed, 175 insertions, 123 deletions

diff --git a/app-text/ghostscript-gnu/ChangeLog b/app-text/ghostscript-gnu/ChangeLog
index ef06f69f7a5c..8364701ee12b 100644
--- a/app-text/ghostscript-gnu/ChangeLog
+++ b/app-text/ghostscript-gnu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/ghostscript-gnu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.13 2006/03/12 02:29:31 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ChangeLog,v 1.14 2006/03/29 12:06:33 genstef Exp $
+
+*ghostscript-gnu-8.16-r2 (29 Mar 2006)
+
+  29 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  +ghostscript-gnu-8.16-r2.ebuild:
+  Revision bump, add some patches from gs-esp
 
   12 Mar 2006; Jose Luis Rivero <yoswink@gentoo.org>
   ghostscript-gnu-8.16-r1.ebuild:
diff --git a/app-text/ghostscript-gnu/Manifest b/app-text/ghostscript-gnu/Manifest
index e9ecd51337d7..308800df05db 100644
--- a/app-text/ghostscript-gnu/Manifest
+++ b/app-text/ghostscript-gnu/Manifest
@@ -1,6 +1,18 @@
-MD5 17aafc5bf84700cf20ab5cc8187e18cd ChangeLog 2195
-MD5 56abb8bfe2d4125c64c956dfdaafa5e0 files/digest-ghostscript-gnu-8.16 284
+MD5 6638e543f6ce818311fd9cd54618dc26 ChangeLog 2370
+RMD160 c379a5a2562403181f1ae1a51fa36ae4751d1b07 ChangeLog 2370
+SHA256 10e6d0eee4ae77340c4dd54eb6a5b091f4ed86287f72aec063d99da6e5632f81 ChangeLog 2370
 MD5 1bc8d57179e8617ec05c8338703d1fd4 files/digest-ghostscript-gnu-8.16-r1 284
+RMD160 5c639dc9070e6947c752d6ae01db2a87c19bee63 files/digest-ghostscript-gnu-8.16-r1 284
+SHA256 5bc3905847fecd53881d48cce19368c1ef844d77c59f7347f072e366c4a5376d files/digest-ghostscript-gnu-8.16-r1 284
+MD5 2786598cab8f512dba3e0dee0ad3b9d9 files/digest-ghostscript-gnu-8.16-r2 1036
+RMD160 c931dd938c0a0f29496d3e07b2a1ac4bb4442a9b files/digest-ghostscript-gnu-8.16-r2 1036
+SHA256 bbb57fe48e4249ab2bb7fdec84715265264af8b56b65f3afd208ca473a009532 files/digest-ghostscript-gnu-8.16-r2 1036
 MD5 e12923ddad374edb926fe5a0e1de395d ghostscript-gnu-8.16-r1.ebuild 3446
-MD5 c3a97ad06dfa5ba7df36e4900924444b ghostscript-gnu-8.16.ebuild 3207
+RMD160 fe346c5aadec5b9dcfc7e79594d2401ea4594ce0 ghostscript-gnu-8.16-r1.ebuild 3446
+SHA256 2f1014ba4f8d61c02720163571f02e9d967c28e3290211ea08eab90c95a9c00b ghostscript-gnu-8.16-r1.ebuild 3446
+MD5 4f2c798c918dc364e4a1f049879cba6e ghostscript-gnu-8.16-r2.ebuild 4326
+RMD160 0e92d91be9ba8dcbea7dce43d48fc164944d61e2 ghostscript-gnu-8.16-r2.ebuild 4326
+SHA256 218a6fae0a1556aaab5fe99ebfb4ae14fd358b650f93725958ec3862ab43da2a ghostscript-gnu-8.16-r2.ebuild 4326
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
+SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
diff --git a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16 b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16
deleted file mode 100644
index 4d87187543e0..000000000000
--- a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 c42dfaebc37fe81eab0b5676b124ab63 gnu-ghostscript-8.16.tar.gz 6633085
-MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
-MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
-MD5 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510
diff --git a/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2 b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2
new file mode 100644
index 000000000000..844c0dae75ad
--- /dev/null
+++ b/app-text/ghostscript-gnu/files/digest-ghostscript-gnu-8.16-r2
@@ -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 c42dfaebc37fe81eab0b5676b124ab63 gnu-ghostscript-8.16.tar.gz 6633085
+RMD160 05b1b15c21640b709658a2e0c07d6424705fd9ff gnu-ghostscript-8.16.tar.gz 6633085
+SHA256 417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 gnu-ghostscript-8.16.tar.gz 6633085
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild
new file mode 100644
index 000000000000..a18743c28b97
--- /dev/null
+++ b/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.16-r2.ebuild,v 1.1 2006/03/29 12:06:33 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="GNU Ghostscript"
+HOMEPAGE="http://www.gnu.org/software/ghostscript/"
+
+CUPS_PV=1.1.23
+MY_P=gnu-ghostscript-${PV}
+PVM=${PV%.[0-9]}
+SRC_URI="ftp://ftp.gnu.org/gnu/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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X cups cjk emacs gtk"
+
+
+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 )
+	!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 ${MY_P}.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 pstoraster/gs811-lib.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}/gs-${PV}destdir.patch
+	#epatch ${FILESDIR}/ghostscript-build.patch
+	#epatch ${FILESDIR}/ghostscript-scripts.patch
+	#epatch ${FILESDIR}/ghostscript-ps2epsi.patch
+	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-badc.patch
+	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-pagesize.patch
+	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-noopt.patch
+	epatch ${FILESDIR}/../../ghostscript-esp/files/ghostscript-use-external-freetype.patch
+	#epatch ${FILESDIR}/ghostscript-split-font-configuration.patch
+
+	# not submitted
+	epatch ${FILESDIR}/../../ghostscript-esp/files/ijs-dirinstall.diff
+	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"
+
+	#eautoreconf
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-jbig2dec"
+
+	econf $(use_with X x) \
+		${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
+	libtoolize --copy --force
+	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"
+}
diff --git a/app-text/ghostscript-gnu/ghostscript-gnu-8.16.ebuild b/app-text/ghostscript-gnu/ghostscript-gnu-8.16.ebuild
deleted file mode 100644
index cdb0796d06e7..000000000000
--- a/app-text/ghostscript-gnu/ghostscript-gnu-8.16.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gnu/ghostscript-gnu-8.16.ebuild,v 1.3 2005/08/04 20:09:28 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU Ghostscript"
-HOMEPAGE="http://www.gnu.org/software/ghostscript/"
-
-MY_PN="gnu-ghostscript"
-MY_P=${MY_PN}-${PV}
-CUPS_PV=1.1.20
-
-SRC_URI="ftp://ftp.gnu.org/gnu/ghostscript/${MY_P}.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 )
-	cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc"
-IUSE="X cups cjk gtk"
-
-PROVIDE="virtual/ghostscript"
-
-DEPEND="virtual/libc
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.5
-	>=sys-libs/zlib-1.2.0
-	X? ( virtual/x11 )
-	cjk? ( media-fonts/arphicfonts
-		media-fonts/kochi-substitute
-		media-fonts/baekmuk-fonts )
-	cups? ( >=net-print/cups-1.1.20 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	!virtual/ghostscript
-	media-fonts/gnu-gs-fonts-std"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${MY_P}.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
-		sed -i -e 's:/usr/local:/usr:' pstoraster
-		sed -i -e "s:pstopcl6:pstopxl:" cups.mak
-		cd ..
-		epatch pstoraster/gs811-lib.patch
-	fi
-
-	# enable cfax device
-	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
-}
-
-src_compile() {
-	myconf="--with-ijs"
-
-	use X && myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	# don't build gtk frontend if not in use
-	use gtk || sed -i -e 's:$(INSTALL_PROGRAM) $(GSSOX):#:' src/unix-dll.mak \
-		-e 's:$(GSSOX)::' src/unix-dll.mak
-
-	econf ${myconf} || die "econf failed"
-
-	# build cups driver with cups
-	if use cups; then
-		echo 'include pstoraster/cups.mak' >> Makefile
-		sed -i -e 's:DEVICE_DEVS17=:DEVICE_DEVS17=$(DD)cups.dev:' Makefile
-		sed -i -e 's:EXTRALIBS=\(.*\):EXTRALIBS=\1 -lcups -lcupsimage:' Makefile
-	fi
-
-	# search path fix
-	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' Makefile
-
-	make || die "make failed"
-	make so || die "make so failed"
-
-	# build ijs
-	cd ijs
-	libtoolize --copy --force
-	econf --prefix=${D}/usr || die "econf failed"
-	make || die "make failed"
-	cd ..
-}
-
-src_install() {
-	einstall install_prefix=${D} soinstall
-
-	rm -fr ${D}/usr/share/ghostscript/${PV}/doc || die
-	dodoc doc/README
-	dohtml doc/*.html doc/*.htm
-	insinto /usr/share/emacs/site-lisp
-	doins doc/gsdoc.el || die
-
-	if use cjk ; then
-		dodir /usr/share/ghostscript/${PV}/Resource
-		dodir /usr/share/ghostscript/${PV}/Resource/Font
-		dodir /usr/share/ghostscript/${PV}/Resource/CIDFont
-		cd ${D}/usr/share/ghostscript/${PV}/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}
-}