move fonts to a separate package

7 files changed, 265 insertions, 24 deletions

diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index 9d5667666700..67ce11374555 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,13 @@
 # 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.69 2004/09/19 20:36:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.70 2004/09/29 10:15:49 lanius Exp $
+
+*ghostscript-7.07.1-r6 (29 Sep 2004)
+
+  29 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +ghostscript-7.05.6-r1.ebuild, ghostscript-7.07.1-r5.ebuild,
+  +ghostscript-7.07.1-r6.ebuild:
+  moved fonts to separate package
 
   19 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   +files/gs7.07.1-ijsdestdir.patch:
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index ca2ab003612c..194624b7f517 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,24 +1,27 @@
-MD5 9a045da530da98cb27e79d01ce057bb8 ChangeLog 11182
-MD5 5c8154bc4b0d22262f9b9cd6e8e8381f ghostscript-7.07.1-r1.ebuild 3159
+MD5 8922c1067367ef87d5e0b960b606c4e3 ghostscript-7.07.1-r5.ebuild 3649
 MD5 333468642f939582d640b40d8a241503 ghostscript-7.07.1-r2.ebuild 3267
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 b597ebd00e4193693bb8e668f2bbace5 ghostscript-7.05.6.ebuild 2709
-MD5 f9da560c48806e555dd58c239497ea30 ghostscript-7.07.1-r3.ebuild 3415
 MD5 eb3a70a293200230d06cba8edd75981f ghostscript-7.07.1-r4.ebuild 3616
-MD5 f58d4f3f34c4a44e1a50e9d08f6655b9 ghostscript-7.07.1-r5.ebuild 3819
-MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r1 291
-MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
-MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
-MD5 68fa21d11a860c222c8ba89c39ce578e files/gs7.05.6-gdevpx.patch 402
+MD5 e431834a2bb3a7f6a8b7406488699bb2 ghostscript-7.07.1-r6.ebuild 3615
+MD5 88ef9fc7dd9e5da7d8c3a8dc15be4543 ChangeLog 11402
+MD5 936a462fc67c192a07282aa9f0a9cb44 ghostscript-7.05.6-r1.ebuild 2933
+MD5 f9da560c48806e555dd58c239497ea30 ghostscript-7.07.1-r3.ebuild 3415
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
 MD5 5f1b04ca58928a339b749703e067e2ba files/gs7.05.6-kochi-substitute.patch 3774
-MD5 ac6af6bf67095500ea043aea27062d62 files/gs7.07.1-ijs.patch 401
+MD5 6807c3b6025d5b09e8eb6349769162d1 files/digest-ghostscript-7.05.6-r1 212
 MD5 acda8ddfde1efeaf451cb28a67dcc773 files/gs7.07.1-krgb.patch.gz 5569
-MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
-MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
+MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r1 291
+MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r2 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r3 291
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r4 291
-MD5 291c8895063b8ecee12b68d45a705ab4 files/gs7.05-gdevhl12.c.bz2 7406
-MD5 343b6a60e15e35d0c5f825b4f361fd29 files/gs7.05.6-cjk.diff.bz2 3287
-MD5 3d1cdf07dabc4a05bde9a2dc6f7da2de files/gs7.07.1-fontconfig-rh.patch.bz2 6121
 MD5 71a93bd09748f37be38b726b0530e497 files/digest-ghostscript-7.07.1-r5 291
+MD5 b7ca313a24a8adf4c527c0a097354f60 files/digest-ghostscript-7.07.1-r6 212
 MD5 370d4bcd16d8acd03190ba84e2f61a41 files/gs7.07.1-ijsdestdir.patch 1418
+MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
+MD5 7208aacbb4aa234ce1a6126e8f682c06 files/gs7.07.1-ps2epsi.patch 372
+MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
+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
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05.6-r1 b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r1
new file mode 100644
index 000000000000..641ffce1b288
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r1
@@ -0,0 +1,3 @@
+MD5 991cbd7bafc6917a19abf9df3ecad58e espgs-7.05.6-source.tar.bz2 5410541
+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-r6 b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r6
new file mode 100644
index 000000000000..86d2854e2bfc
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.07.1-r6
@@ -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/ghostscript-7.05.6-r1.ebuild b/app-text/ghostscript/ghostscript-7.05.6-r1.ebuild
new file mode 100644
index 000000000000..7887e4a39ae5
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.05.6-r1.ebuild
@@ -0,0 +1,95 @@
+# 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.05.6-r1.ebuild,v 1.7 2004/09/29 10:15:49 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
+	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/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 )
+	!virtual/ghostscript
+	media-fonts/gnu-gs-fonts-std"
+
+PROVIDE="virtual/ghostscript"
+
+S=${WORKDIR}/espgs-${PV}
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+
+	# Brother HL-12XX support
+	cp ${FILESDIR}/gs7.05-gdevhl12.c.bz2 ${S}/src/gdevhl12.c.bz2 || die
+	bzip2 -df ${S}/src/gdevhl12.c.bz2 || 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
+
+##	patch -p0 < ${FILESDIR}/png.diff || die "patch failed"
+
+	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff.bz2
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch || die
+
+	# 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"
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-omni"
+
+	use X && myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	use cups && myconf="${myconf} --enable-cups --with-gimp-print" \
+		|| myconf="${myconf} --disable-cups --without-gimp-print"
+
+	# search path fix
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/7.05/$(get_libdir):"\
+	Makefile.in || die "sed failed"
+	sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
+	Makefile.in || die "sed failed"
+
+	econf ${myconf} || die "econf failed"
+	make || die "make failed"
+}
+
+src_install() {
+	einstall install_prefix=${D}
+
+	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
+}
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
index 7cb88ddc4ee2..d68c7d4c29f0 100644
--- a/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
+++ b/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild
@@ -1,13 +1,12 @@
 # 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-r5.ebuild,v 1.4 2004/09/19 20:36:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.07.1-r5.ebuild,v 1.5 2004/09/29 10:15:49 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
-	ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/ghostscript-fonts-std-8.11.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)"
 
@@ -26,7 +25,8 @@ RDEPEND="virtual/libc
 		media-fonts/baekmuk-fonts )
 	cups? ( net-print/cups )
 	!virtual/ghostscript
-	media-libs/fontconfig "
+	media-libs/fontconfig 
+	media-fonts/gnu-gs-fonts-std"
 
 DEPEND="${RDEPEND}
 	truetype? ( dev-util/pkgconfig )"
@@ -106,11 +106,6 @@ src_compile() {
 src_install() {
 	einstall install_prefix=${D}
 
-	cd ${WORKDIR}
-	dodir /usr/share/fonts/ghostscript
-	cp -a fonts/* ${D}/usr/share/fonts/ghostscript || die
-	cd ${S}
-
 	rm -fr ${D}/usr/share/ghostscript/7.07/doc || die
 	dodoc doc/README doc/COPYING doc/COPYING.LGPL
 	dohtml doc/*.html doc/*.htm
diff --git a/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild b/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild
new file mode 100644
index 000000000000..0d617df69438
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.07.1-r6.ebuild
@@ -0,0 +1,135 @@
+# 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-r6.ebuild,v 1.1 2004/09/29 10:15:49 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="~ia64 ~x86 -ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64"
+IUSE="X cups cjk emacs truetype"
+
+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 )
+	!virtual/ghostscript
+	media-libs/fontconfig 
+	media-fonts/gnu-gs-fonts-std"
+
+DEPEND="${RDEPEND}
+	truetype? ( 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.05.6-cjk.diff.bz2
+		epatch ${FILESDIR}/gs7.05.6-kochi-substitute.patch
+	fi
+
+	# add fontconfig support
+	epatch ${FILESDIR}/gs7.07.1-fontconfig-rh.patch.bz2
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+	epatch ${FILESDIR}/ghostscript-7.05.6.man.patch
+
+	# pxl dash patch
+	epatch ${FILESDIR}/gs${PV}-ps2epsi.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}-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"
+
+	# krgb support
+	cd src
+	epatch ${FILESDIR}/gs7.07.1-krgb.patch.gz
+}
+
+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"
+
+	# -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"
+	make || die "make failed"
+
+	cd ijs
+	econf || die "econf failed"
+	make || die "make failed"
+	cd ..
+}
+
+src_install() {
+	einstall install_prefix=${D}
+
+	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
+}