Depend on media-fonts/urw-fonts instead of media-fonts/gnu-gs-fonts-std and symlink font dir, wrt bugs 247657 and 256088.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 215 insertions, 2 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 1d3012225852..423ff22d0b96 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.84 2010/03/25 20:48:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.85 2010/03/26 12:47:42 spatz Exp $
+
+*ghostscript-gpl-8.71-r2 (26 Mar 2010)
+
+  26 Mar 2010; Dror Levin <spatz@gentoo.org>
+  +ghostscript-gpl-8.71-r2.ebuild:
+  Depend on media-fonts/urw-fonts instead of media-fonts/gnu-gs-fonts-std
+  and symlink font dir, wrt bugs 247657 and 256088.
 
   25 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   ghostscript-gpl-8.71-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 3264a5776787..5ad9587e09a6 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST acro5-cmaps-2001.tar.gz 631653 RMD160 c723afc2207157a434988b46bcf0a458281c29a4 SHA1 fbc8715eae880f59e2251ae8fa99f79fbcfbd3e5 SHA256 80abec481fd4b5e59ac3d3f5790542dbfabe3c9269a6ac17064160d6dab38ee4
 DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7f57552 SHA1 b846292af4541d907dd9041e397c2f1d8c72a056 SHA256 0f397255506cda4b20e362ab5e3f6cdacba09e0a0cca7f4d93afd980977c5689
 DIST ghostscript-8.64.tar.bz2 16921504 RMD160 565134dcfe1e823b435c3761461c5eb394bd633c SHA1 4c2a6e04145428d35da73fbc4db9c66a75e336e0 SHA256 012f7fec58480c728580836fec6f865588d8a33fe8ada7ae73b1f971440d02bb
@@ -11,5 +14,17 @@ DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SH
 EBUILD ghostscript-gpl-8.64-r3.ebuild 5567 RMD160 b60c7d8aacf28be202909a97578975e817962bed SHA1 d20fbb12defe85fafbf4bb22ae11ceb4ae21ddf1 SHA256 0f1e85db127407d2d7f223c268419b4c1404f4f2dc57afb3c0054326b2dd0e01
 EBUILD ghostscript-gpl-8.70-r1.ebuild 5457 RMD160 88076a489ae14790beca13ee3828dc9b4912330e SHA1 61c7b01dcf96b530f08b7ab556e9de1db05c09d7 SHA256 30c961d0aa04bf87d66e511bdbb274018d5a7b0cb40ea7b67e17d9c11e161992
 EBUILD ghostscript-gpl-8.71-r1.ebuild 5940 RMD160 a9db1567d7dea3fbab44c88070217cfa72be4c1f SHA1 fbb4f1e6d5d4dff2c7bad246a1209605fd595bfd SHA256 734e55eb8521dcc48b8ad8a0922ccff3bc48c249dafcc07f4aa432ae8567d350
-MISC ChangeLog 16405 RMD160 ef9fc3ec0faa2461c3ceaea891eabfa64d99a6a8 SHA1 9e1d8285016e834a7fc2f3eae426033894f41c1d SHA256 9fce8266ca880ab85e878740a9d0b67524d99abc2ebe92df4d7c594b94388981
+EBUILD ghostscript-gpl-8.71-r2.ebuild 6016 RMD160 662b396efe96ec17952663726f1224ace7dffed4 SHA1 2367ceb7da57de71c6f4a8603700de69337e6734 SHA256 dc3ec06e6baf1a9e6212487aa513692ef56414f1a589e2a584505309336746d5
+MISC ChangeLog 16648 RMD160 38261c00c50d728bbc320a50e5346dfa0c80508d SHA1 4417854f8b9898942abfa80c14c46b96511b5278 SHA256 2b5233f7a13f1f209029d25d3bd332fe4b87de2b6eef648667432e02ae24bb80
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLrKz0AAoJEAWF714uGAc6kcsH/iF3w+sicLJYOeZC4Ibzp3qi
+Vg0RTxVaP8EOM/Vv3N+vGa/ijOfoueeIqfVKp3U3yoxI+bSo7eXB/cRez75c7vsN
+PMjoDPEvHAMDWuV4yWS6EqhU8Q3elCqptzQdIQWw9LiOqkJbDKPnQx/FrnYS81iq
+flSoZWChvS9VrDvJaqHP33lfKPwXMo3usrH5dYYlJI85lEQtA5zqxLTYoLdL8Srk
+v/lA0diSzS2zqVjr4dDi/oJ4+XgfFGjQHE4Ovyn0+8rdntCvUf1yBVTUJLYi5tRd
+doFZLS+04TpMyWdO3LKH439H5H7EAdSkiT0CPafr4pI3Dd+LZ33NtemZx5vHymY=
+=7Epn
+-----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r2.ebuild
new file mode 100644
index 000000000000..864d30ac26cf
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.71-r2.ebuild,v 1.1 2010/03/26 12:47:42 spatz Exp $
+
+EAPI=2
+inherit autotools eutils versionator flag-o-matic
+
+DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed."
+HOMEPAGE="http://ghostscript.com/"
+
+MY_P=${P/-gpl}
+GSDJVU_PV=1.4
+PVM=$(get_version_component_range 1-2)
+SRC_URI="!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
+	mirror://sourceforge/ghostscript/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
+
+LICENSE="GPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist cairo cups djvu gtk jpeg2k X"
+
+COMMON_DEPEND="app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.42
+	>=media-libs/tiff-3.9.2
+	>=sys-libs/zlib-1.2.3
+	!bindist? ( djvu? ( app-text/djvu ) )
+	cairo? ( >=x11-libs/cairo-1.2.0 )
+	cups? ( >=net-print/cups-1.3.8 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	jpeg2k? ( media-libs/jasper )
+	X? ( x11-libs/libXt x11-libs/libXext )
+	!app-text/ghostscript-gnu"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	linguas_ja? ( media-fonts/kochi-substitute )
+	linguas_ko? ( media-fonts/baekmuk-fonts )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_zh_TW? ( media-fonts/arphicfonts )
+	>=media-fonts/urw-fonts-2.4.9"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="ja ko zh_CN zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_prepare() {
+	# remove internal copies of expat, jasper, jpeg, libpng and zlib
+	rm -rf "${S}/expat"
+	rm -rf "${S}/jasper"
+	rm -rf "${S}/jpeg"
+	rm -rf "${S}/libpng"
+	rm -rf "${S}/tiff"
+	rm -rf "${S}/zlib"
+	# remove internal urw-fonts
+	rm -rf "${S}/Resource/Font"
+
+	# Fedora patches
+	# http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/
+	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.70-runlibfileifexists.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-CVE-2009-4270.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-gdevcups-y-axis.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-jbig2dec-nullderef.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-ldflags.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-pdf2dsc.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-pdftoraster-exit.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.71-vsnprintf.patch"
+
+	if use bindist && use djvu ; then
+		ewarn "You have bindist in your USE, djvu support will NOT be compiled!"
+		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+	fi
+
+	if ! use bindist && use djvu ; then
+		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
+		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}/base"
+		epatch "${WORKDIR}/patches/${PN}-8.64-gsdjvu-1.3.patch"
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
+		cp "${S}/base/contrib.mak" "${S}/base/contrib.mak.gsdjvu"
+		grep -q djvusep "${S}/base/contrib.mak" || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/base/contrib.mak"
+
+		# install ps2utf8.ps, bug #197818
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/base/unixinst.mak" \
+			|| die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i "s:\$(GSSOX)::" base/*.mak || die "gsx sed failed"
+		sed -i "s:.*\$(GSSOX_XENAME)$::" base/*.mak || die "gsxso sed failed"
+	fi
+
+	# search path fix
+	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
+		-e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \
+		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+		base/Makefile.in base/*.mak || die "sed failed"
+
+	# http://repos.archlinux.org/wsvn/packages/ghostscript/trunk/libpng14.patch
+	sed -i \
+		-e 's:png_check_sig:png_sig_cmp:' \
+		"${S}"/{,base,jbig2dec}/configure.ac || die
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/jbig2dec"
+	eautoreconf
+
+	cd "${S}/ijs"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cairo) \
+		$(use_enable cups) \
+		$(use_enable gtk) \
+		$(use_with jpeg2k jasper) \
+		$(use_with X x) \
+		--disable-compile-inits \
+		--enable-dynamic \
+		--enable-fontconfig \
+		--with-drivers=ALL \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper
+
+	if ! use bindist && use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
+	fi
+
+	cd "${S}/ijs"
+	econf || die "ijs econf failed"
+}
+
+src_compile() {
+	emake -j1 so all || die "emake failed"
+
+	cd "${S}/ijs"
+	emake || die "ijs emake failed"
+}
+
+src_install() {
+	# parallel install is broken, bug #251066
+	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
+
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu || die "dobin gsdjvu install failed"
+	fi
+
+	# remove gsc in favor of gambit, bug #253064
+	rm -rf "${D}/usr/bin/gsc"
+
+	rm -rf "${D}/usr/share/doc/${PF}/html/"{README,PUBLIC}
+	dodoc doc/README || die "dodoc install failed"
+
+	cd "${S}/ijs"
+	emake DESTDIR="${D}" install || die "emake ijs install failed"
+
+	# Rename an original cidfmap to cidfmap.GS
+	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS}
+
+	# Install our own cidfmap to allow the separated cidfmap
+	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
+	doins "${WORKDIR}/fontmaps/CIDFnmap" || die "doins CIDFnmap failed"
+	doins "${WORKDIR}/fontmaps/cidfmap" || die "doins cidfmap failed"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
+		fi
+	done
+
+	dosym /usr/share/fonts/urw-fonts /usr/share/fonts/default/ghostscript || die
+}