Fix segfaults, bug #410575 thanks to Marcus Spading. Add Fedora icc patch. Remove old.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 14 insertions, 217 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 45ee662b3033..a250d4692908 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.140 2012/05/06 12:21:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.141 2012/05/09 19:48:38 tgurr Exp $
+
+*ghostscript-gpl-9.05-r2 (09 May 2012)
+
+  09 May 2012; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-9.04-r5.ebuild,
+  -ghostscript-gpl-9.05.ebuild, +ghostscript-gpl-9.05-r2.ebuild:
+  Fix segfaults, bug #410575 thanks to Marcus Spading. Add Fedora icc patch.
+  Remove old.
 
   06 May 2012; Agostino Sarubbo <ago@gentoo.org>
   ghostscript-gpl-9.05-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild
deleted file mode 100644
index 605a716c583c..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r5.ebuild,v 1.4 2012/05/04 03:33:15 jdhore Exp $
-
-EAPI=3
-
-inherit autotools eutils versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.5
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-4.tar.bz2
-	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
-
-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 cups dbus djvu gtk idn jpeg2k static-libs X"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.2:2
-	media-libs/lcms:0
-	media-libs/libpng:0
-	media-libs/tiff:0
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	!bindist? ( djvu? ( app-text/djvu ) )
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
-	idn? ( net-dns/libidn )
-	jpeg2k? ( media-libs/jasper )
-	X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.4
-	>=media-fonts/urw-fonts-2.4.9
-	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/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	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
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jasper
-	rm -rf "${S}"/jpeg
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/tiff
-	rm -rf "${S}"/zlib
-	# remove internal urw-fonts
-	rm -rf "${S}"/Resource/Font
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -rf "${S}"/Resource/CMap
-
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	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-gsdjvu/gsdjvu-1.3-${PN}-8.64.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: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:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		base/Makefile.in base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		/usr/share/fonts/urw-fonts \
-		/usr/share/fonts/Type1 \
-		/usr/share/fonts \
-		/usr/share/poppler/cMap/Adobe-CNS1 \
-		/usr/share/poppler/cMap/Adobe-GB1 \
-		/usr/share/poppler/cMap/Adobe-Japan1 \
-		/usr/share/poppler/cMap/Adobe-Japan2 \
-		/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
-	done
-
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups install-cups) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with jpeg2k jasper) \
-		$(use_with X x)
-
-	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 \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 so all || die "emake failed"
-
-	cd "${S}/ijs"
-	emake || die "ijs emake failed"
-}
-
-src_install() {
-	# -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install || die "emake install failed"
-
-	# some printer drivers still require pstoraster, bug #383831
-	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
-
-	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/GS9_Color_Management.pdf || die "dodoc install failed"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install || die "emake ijs install failed"
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	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
-
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild
index c1b8e676d97a..023de075fa99 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.05.ebuild,v 1.5 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.05-r2.ebuild,v 1.1 2012/05/09 19:48:38 tgurr Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ GSDJVU_PV=1.5
 PVM=$(get_version_component_range 1-2)
 SRC_URI="
 	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-patchset-1.tar.bz2
+	mirror://gentoo/${P}-patchset-2.tar.bz2
 	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
 
 LICENSE="GPL-3 CPL-1.0"
@@ -44,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.4
+	>=app-text/poppler-data-0.4.5-r1
 	>=media-fonts/urw-fonts-2.4.9
 	linguas_ja? ( media-fonts/kochi-substitute )
 	linguas_ko? ( media-fonts/baekmuk-fonts )
@@ -216,5 +216,8 @@ src_install() {
 		fi
 	done
 
+	# install the CMaps from poppler-data properly, bug 409361
+	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
+
 	use static-libs || find "${D}" -name '*.la' -delete
 }