Revbump fixing bug #343447 and bug #383447.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x5270BA51

3 files changed, 242 insertions, 15 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index ed905c70d64f..e79a570b27d5 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.162 2014/02/09 20:39:59 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.163 2014/02/12 19:22:04 tgurr Exp $
+
+*ghostscript-gpl-9.10-r3 (12 Feb 2014)
+
+  12 Feb 2014; Timo Gurr <tgurr@gentoo.org> +ghostscript-gpl-9.10-r3.ebuild:
+  Revbump fixing bug #343447 and bug #383447.
 
 *ghostscript-gpl-9.10-r2 (09 Feb 2014)
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 0917eab593e0..6fa53fdc5c79 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -21,23 +21,24 @@ EBUILD ghostscript-gpl-9.05-r2.ebuild 6645 SHA256 66a6f3e46c5db7c4a70d0862888320
 EBUILD ghostscript-gpl-9.06.ebuild 6546 SHA256 6631ab5c2c8d7e98972b50289ef6a6cbcf1cd557cf7a0b3379d84cca0d1870db SHA512 b965b601b25cee18967bf6f58802bba98cb68a823d301818a11659df68bf92c865696691e620d14ce08f38f1dc652722e8b08da759e3232aec603b84bc1224fe WHIRLPOOL 97dcb2b68c190c48ec2cd5bbefb555cbf38ce48adf3066e885bde7adaceddbfc647583f6b058465faa53f856925be53c0068a8d2b15cc9b1625ff9453af51832
 EBUILD ghostscript-gpl-9.07.ebuild 6593 SHA256 bb7a1350fd1354a79d0ddf1b8b25047bd0c554b590d60eca29625dce0d0da44c SHA512 916a85555db8891b929ec37e388a9430992c52fa540c5d6a9a87bcd6c56086f62b2c9bb5a356f7006f787950b4d31de4594e189d4fb92b7ea35149c2cd9754f8 WHIRLPOOL 426a85ec7e877390e678e66ea1ede1a61bf96b6ab28cc656d9ca20be42651f6f201164dd43ef4829838865dff946f6369ceb55ac037a5d553a326e31de3b58f3
 EBUILD ghostscript-gpl-9.10-r2.ebuild 5966 SHA256 95c66528137c93b47216e171bcb2d9ec7ae9c3b987f76ad874f1afbac5a1bb7a SHA512 cccfc5c89d5f8b9af36698708622d155b8e285ca1006c7bf4ac8d2f1a2f80e905a1daaa066272b00d75c4d2f11d0d75dc081a61b412e491cc6d734f3fe7e1cfd WHIRLPOOL d5cb0fc048fe463a37ce78ad491820942f23a1c74aa25fe7e35978b467a81c7a5117deb4876b79cdaeec213ae48ee24efa09120b24b7459f2b5ef5c407057761
+EBUILD ghostscript-gpl-9.10-r3.ebuild 6058 SHA256 65ec3fd862ea0462d0e164e3dc0f4ec8fc9bfe6cb7981177aaa3a7596d54e93f SHA512 afebe5bdc3f7911cee143a9eca5b4584ad6647cbd9a544c74c6ed74dc0c4b7bd2f38bb3f5f906f4947969b96a0ab99d403b4058a3e5fcec5fa58e70e5a35bc92 WHIRLPOOL a5f56ec0ee32efc71c48d0916a3b2db2aa70cee24dcf3a93e1fe2955d2e229897b8ed43ac5026bd19602a5aa53512a5da767d7615b802b3bf4c62dccd581dc71
 EBUILD ghostscript-gpl-9.10.ebuild 5958 SHA256 7340b9e53d5af7ab1578f5b27370bc4a3bb9ac5bdb130cbbf5f5f471b4e41093 SHA512 7b5eca05844146eaf73d1b4b56dbe56486cef89c80de8274ed4d4535b63562b9e8c27b2a6dd076e21fb76faa6a09d8d35523e946b986a31b49c1a8833004b358 WHIRLPOOL c55170502aa6ecd5231b9545b31f7315e1870b92d206d377b8e8e167b065cf67e2cf51f625525b668437bf78c8944094547b708d48a21ed47fe3b03e6894a0f5
-MISC ChangeLog 28983 SHA256 51d533f58bd41af895923da029308a2c7a30008ac7c0a1f51574fb9e2c7749c4 SHA512 4f4b9d2be276b1756507fa2657036f99229e08ebeb7525da7eb81ae1de9b9b236c8ccd9e8b3624ccc15a405bcbb0959655c62a6d4ab199857140e6b31d14570e WHIRLPOOL 78cf38ff03f6e35265dbc4a00d5831078356654ff9990100291d772db830023aa698cfe663a1c9fc5cf302f2127e5a6b955a3519e99ce592808c462187c46b5f
+MISC ChangeLog 29147 SHA256 355c09aa3b61f48d75a1a77cc439d8c99f2bdb794c12a5b615fddf8fca9dc157 SHA512 5daa6f877bca7352ca5fd117b2e275f2afe8405ea7b8975b35c17a80c0e1b7a111fc0860d6ebd28d88cf444222913b5914ae9515e32bd503aa42a81bd546cec1 WHIRLPOOL 6a683b3a8b2c8244fcf67ce7edcb6d3c3c3472257d5475204a149da7ecc9d78331a5240777424c7d42fbe3e12084dc8e212fbc842930025a80d582e92b675bb0
 MISC metadata.xml 281 SHA256 8f54c529127270fee6cdc9e4db328d9403ff2183d2ce21317932c17fd58ad0d0 SHA512 bef432e957e5d7798630807a1398736811461b1e6b8f622125843e3b818256bc980a77b0e033f267b30ad30282ab4d158ca27433f59df868ef769e258526697b WHIRLPOOL 740da3c76002cb8712cac28a28851d529725ed4a18f486009e2f36f55155afa21103479f7975aa9fba8fe45195a048d3b5d756db7ed3a848e5f60a7b150d1f8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS9+eiAAoJEGm3FC1ScLpR0iIP/0o0w+lcKXuPuL7Yv90hnjgQ
-lVzSMRXS8sJCdcUTGzuQ7etKScHmb35fKuNj/SX5HfSR4nEoqIYM2GCkiaHTzWF4
-MZamdWoSlLOBtU6o64nzf/xhDCLMRqep5JrCND/m5OF1zM8XiPwGJNaNMgQoTrBN
-w26Q+1sjTpgrFnvh2KbzgaeYD4yTq0IEryBbSUycNfbDy8P5OJMjCalW0XDloVC7
-E1ht7kB3sHeRhCAAbaPmIgFgLVo2ibXrTVDsFFDG9ADKKj2LwAxBlbA0cuTqFL4C
-KlTRZ9OajMR6ZbBDNEXs4BkzfWzQPrkZLTY8Ihw8yfJsu0F0hxJ2oZeJw53bB+iR
-8JW4EV1ac6768Jtr/CNyVKmUh5K0DGbqwNLMv9azKcDLFgthl/cMyI/sLM88Cxdq
-DoHaH7s2YQinOBGHXKPTb11FFRYVix2v+q8O3DQG+O7Xovbwh2dh8Bs+GwKKynYU
-ERMlGKID1fUolSdTabrkoKxtpZH/QLl9Y2cd+qaakLVA/MGIdyG+I/h4QkYijhqq
-rGoCMwzQ+SkSHnzq3aInop3LhTGZmJ1TtGbiTGtS8oUv8J0OSwAtIWCxcLNcyv38
-puUXZegPwRlGNzqTpQs9q5bGxGbRvK3c6uolSnRFQbVZYiGiVG8/0ZrDiIQSSGHN
-+mWq8imxaTKPTHpeoxH2
-=CDPK
+iQIcBAEBCAAGBQJS+8nhAAoJEGm3FC1ScLpRF8YP/jRkQCz/GA7zbN2bvETs5G30
+KbYp3Nulmu0XS5//6eY2z3wylTqp9bDDtGlDPkdPJlggLbcUeEO1AJYTPlP/WMax
+2BDt37Pe8RYVNSjZ4nBn59dRZdKnpeTE/WHxyJBlgzfpScFPUkm+dVzU/wnkUZil
+F7ILjyDCsiMijC/vbEJU8ClJdmB1HvCtq4f0tbKP+dUyXK624Of3F4IHYFWd/aGB
+jTjd/ZSVqi74SbLEYgJbRKP/SroBYaFIcXjRZl8Mp0uG24BW5pMOq16gPAeDonXz
+X4/aRBvR2ecwnpvppiWkzDuRYHe1MZrmK40Sh/d4aPUlTJMNER0tmM/eaXvxgzO6
+2s9EmFCN/l49WQ+FeAwYzds+bmoJkKnl3zpY9oAMiMWmz9vv9UOFEwgYbZxHjK5s
+k/hoY7pgIereMsckZmtlO9uEeHQ3E0oQrPzrFmnUub9DLHZ6AH1NsfYStTwqee3F
+fjskh3HHSrL66BYOuTl2c8hc9CvwFqbWVmOXAcjf974yQjITvuiREgst0yARUjRS
+IrljvyPALcD3LqcfjEwaGPFREMl2YvnDTur1OfLHayccNNIUeUkKmf3V3tB+1MeA
+6FnN1nQPnBAib6bsSI27lP03FTjqSsQPsgg/RyufJCPuGNfKXKGc+6/Hb5Wss2Fb
+4hj7jhpDXduOjKmQBk1/
+=e+pN
 -----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild
new file mode 100644
index 000000000000..d16830cd4302
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.10-r3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2014 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.10-r3.ebuild,v 1.1 2014/02/12 19:22:04 tgurr Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib 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.6
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
+	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist cups dbus djvu gtk idn linguas_de static-libs X"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.5:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/tiff-4.0.1:0=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	!bindist? ( djvu? ( app-text/djvu ) )
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=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 )
+	linguas_zh_CN? ( media-fonts/arphicfonts )
+	linguas_zh_TW? ( media-fonts/arphicfonts )
+	!!media-fonts/gnu-gs-fonts-std
+	!!media-fonts/gnu-gs-fonts-other
+	!<net-print/cups-filters-1.0.36-r2
+"
+
+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}"/cups/libs
+	rm -rf "${S}"/expat
+	rm -rf "${S}"/freetype
+	rm -rf "${S}"/jbig2dec
+	rm -rf "${S}"/jpeg{,xr}
+	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 "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
+		grep -q djvusep "${S}"/contrib/contrib.mak || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
+
+		# install ps2utf8.ps, bug #197818
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+			"${S}"/base/unixinst.mak || die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	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' \
+		"${S}"/Makefile.in "${S}"/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 \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		--without-lcms \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with idn libidn) \
+		$(use_with X x)
+
+	if ! use bindist && use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+			"${S}"/Makefile || die "sed failed"
+	fi
+
+	cd "${S}/ijs"
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# workaround: -j1 -> see bug #234378
+	emake -j1 so all
+
+	cd "${S}/ijs"
+	emake
+}
+
+src_install() {
+	# workaround: -j1 -> see bug #356303
+	emake -j1 DESTDIR="${D}" install-so install
+
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu
+	fi
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
+
+	cd "${S}/ijs"
+	emake DESTDIR="${D}" install
+
+	# 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"
+	doins "${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use linguas_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X}"
+		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
+
+	use linguas_de || rm -r "${D}"/usr/share/man/de
+}