Version bump. EAPI4. Switch to using openjpeg. Test upstream parallel make fixes.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 237 insertions, 12 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index d8945041e64f..6e324220b992 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.150 2012/07/08 17:24:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.151 2012/08/10 15:44:27 tgurr Exp $
+
+*ghostscript-gpl-9.06 (10 Aug 2012)
+
+  10 Aug 2012; Timo Gurr <tgurr@gentoo.org> +ghostscript-gpl-9.06.ebuild:
+  Version bump. EAPI4. Switch to using openjpeg. Test upstream parallel make
+  fixes.
 
   08 Jul 2012; Raúl Porcel <armin76@gentoo.org>
   ghostscript-gpl-9.05-r1.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 490d64684d3f..2b3b469240c7 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST ghostscript-9.04.tar.bz2 29869900 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4 SHA512 f4fd2b5d82a1f9aa918f21a85571f3684778be5b6fe868ae19165717b212aac99b515bb94e3589c3a01b7f836829a283da2162583d4d2dc3c7c267b1926a17ed WHIRLPOOL fdbff23bcbcab63877e9b6e3056af8c47d121103b41dc4774392b90ce7775737d31dfb80dd4e5a26a5caeeab7dbbfd2fb096cc928e8ecfa5feab81ff715dd9fc
 DIST ghostscript-9.05.tar.bz2 28279634 SHA256 0f41212af3a5a552ab2302cd90606dc8245be34490a699726dc95ed3cd89ceac SHA512 4a83c42a73fdb5139f02d1b9c8364d0b0f24e8d2952a622f94a8398d71ced8839ee868562d0bf3be048e34cae5ab0adc5eb43d2fb50f5154fe186e8329257913 WHIRLPOOL b5eb32c3551a82bd740674288471c0f050e612ecb709e38339e5eb6d7691f11af760dbc37f6002cf99e969b9ecc2fa296e7a35d97f3e647f86e4e194a91e29e8
+DIST ghostscript-9.06.tar.bz2 29246039 SHA256 05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04 SHA512 99f7a56316bf96d55c0cd7b07c0791ad4e6ee0d3a8f3bfa04ea28890ea9ed822ebcd7084cc8118cc38dc5def27c91c24eebc08a20a630463a9bf9d0193d0923b WHIRLPOOL a44e19c15440b3fa43233f05b3236ea6834a9f6ac2e7be5174685e6a377ad4a4e7a7cc58fa3df7072ed893d0d76e4bb83b0e890a2d8c45f496c753cb958c7b32
 DIST ghostscript-gpl-9.04-patchset-3.tar.bz2 7760 SHA256 b3c20adc111b8ddf3bc7d60a01fa1b31eadb9d6d9eb8ac474d9aa1604bd51b6f SHA512 d8565b04cfd90a064d32aaa241d4ab4e477a04458aec1a27f273ae61ed7dd064758d7c77f3926b9baf759855953e4e178ca4d83a25e652a9263b62f5ffb137ae WHIRLPOOL 659ccace6e08bc12b0006281b08b5b63bedbee6ded9efd6055c8c6d56d01ee39f10d1974de1dcc31b4bedbedab4e79cf4a088b05a56de7bed467caf3b0ee1ad7
 DIST ghostscript-gpl-9.05-patchset-1.tar.bz2 4480 SHA256 30e31b11e72a115ee2cd3d01f6a638bc808427bc9579e8c9e1f84b073a19fa9f SHA512 f9613c07c7a67f8dab5b3e67530c9b2686cf5903ed541e659ecb1e0245b2bc85a18eb4a0a6c21e51c0575eaceabd68983c5a605924a53d9e3236c05534d88daf WHIRLPOOL 5fe85b045d0318308d217ed461362a029475bd0c529490aca5b21160bcd8c4cd7eba2807c42114dd42c25e2a01e58b708563547eb8d314e3c4f70b086689ad85
 DIST ghostscript-gpl-9.05-patchset-2.tar.bz2 5525 SHA256 1deadf8ed034353ffc14230b66cd438774bd6def03e6f93943f5200bbd01695b SHA512 c14ee057c7c1769e4bc4b3c52d910172dd45524318d6278f8f62f3f4535160412010ad8d426f96ee6fdf24a662859e3079205b9250496d6d69943f3972065d0c WHIRLPOOL 2de3c1bb38aff30c572a2f8ffffb31029215fcd30e075256cae7fb71044a1a635c20df77ef043f20f5ddf91668b820ddbb8052ea43dc326f2af3ecacffbb9568
+DIST ghostscript-gpl-9.06-patchset-1.tar.bz2 4887 SHA256 ddf952730a6eec7885150faa8cb221d4a8d4a07b9ecb38043a7eb97f61f9c263 SHA512 d49f9b7454c7d4513620736dcd7163c347bc25210ab2b63edaa021d91ea3fa91d0c14fef4bb15e88c516562b0bb67ac0b81826c826daf946ac872d093a5e8ce4 WHIRLPOOL fc223217a662c1d7741e883c120afe0509bf767e3fd9afacc0ae5bca7869cda7b3c2c6f12a56b6a1c408487516fa3a8ffb3554d22f7962f934253cad7dbfd732
 DIST gsdjvu-1.5.tar.gz 207583 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4 SHA512 8b59e38f754b325717b0b299e64479688f31fafb7a40f7d9cc32243c45fcf1de88e6f9367c4f77c17395cebbfbe7865eb21fc9c328b4f9f97e0f398c7cc0aafe WHIRLPOOL 08267e1ada37ef8ea7cc7d6a4f264515b964d8e87bad4320d9c2b5e8117bc89dcb5f4885656d5904c0ced4d91393b875a7e9618b2f6bfd71788aba46d823bcf8
 EBUILD ghostscript-gpl-9.04-r4.ebuild 6131 SHA256 3d22b719489e5d23d8bc93d249cdf2c62afaa0bd59abf6b5d9f53527d25dc2f1 SHA512 f87a51adcc60ca0595559e18eb98771c9869bf4b179cf9e1d87837d48ecc39d22eb8c38b2703115814d228bdee9d1df0531a0bf531911fd83c7ce3aa32c3152a WHIRLPOOL 5e092754bf360f80eb941e412c2e13e1c8cc0b550ec1bfca67e0bce54bfe1aadda273bf0030869fd83f5762f6317fcc0620567c66de07149c46ebd054c38e884
 EBUILD ghostscript-gpl-9.05-r1.ebuild 6569 SHA256 46e5880fa763e81c05fe5a435af0973f53df3951f5eb1c07148543b7a5f80dab SHA512 cf81b259ed654116a6073212f4ea692b2d2b73e59cc4a162dc3fb96e3c825b04ffe1370b9af1da36742c43a20ea470a022a18550de2314e3c11a2f62d7464d2f WHIRLPOOL 58eb99a58d8859031cda4a67bead841c7150d382f28319bb3f87f0cbc332ee808fa71f4d1a44c1145b255067693d44d2457afee11bab4c4bd5359f948a43ad31
 EBUILD ghostscript-gpl-9.05-r2.ebuild 6640 SHA256 8e93eeb41da171d2f38f5ddc391177cffb945e6f4f6e838f5ee4c9c8678d23c7 SHA512 fd0b518528c6cec5d3d4bc81121a4ffbec532fe2957dca59b71f44a971546194bd0206d7192f887ae53803a7011ce91fb745197881f0c155e957aff44a3a5ab3 WHIRLPOOL 036fb39defe7a44904dc1cb004586ae3bfafb267f99cd7d176682a8db8b1340a3607e0d0deb46669a7db83d9504c54694f5ba7244c02b39e553ce93f66cf05a3
-MISC ChangeLog 26973 SHA256 1d0d30033e9a1292b4c0fc32ef4f763756d0d358195c6c3efbcb343ce569d5b5 SHA512 8cd3bfd1fcc64d85b938f098f1a2c0c6e1697bb5a4c47feefcfe403596ae0a5f4e882fafc372d3e1015f569b882980e682b967d4b47efa9e546ecce8703f32f1 WHIRLPOOL 27ef4ed24e1ae63a7cebc3054395e160a80958a4a077968078589944060975f65e62273cca40305dc254c0ca3935661578f3ad8aa1e156eec99e6bf203baadb5
+EBUILD ghostscript-gpl-9.06.ebuild 6411 SHA256 a7488a6571563ad36137282cd98010628300b1afda3d189c7377ca72c5a9d84a SHA512 c1ff32808d6428b05335d2648723129cc4c9f86a30077e975bdeb4dbaf55030b264e130110bfa86194f2139dfda695b39d4ff9b7793d8662343a4bd440ea69e8 WHIRLPOOL 34f4b7b0a089ec23fe7c60913892413e7e2313cafb80d79fcae4e31b1a273ef469014d199eaeb6d014f2c4a4bc40ba12ebc21c176b2b7888bafa8d377b248c37
+MISC ChangeLog 27169 SHA256 fb5f9829eadd0667c747ff3f20dbb6cd8e6883d96556764d44958716152ab18c SHA512 a6d5c37f735e5e20dd2d46606daaf59df0cd3d4f1e235b4640221303b7da49f087ea2b970bb0626f7f0d3c23849c2220dbe954beb50fdcd68fa13d156e8ddd27 WHIRLPOOL cc0e771df72c3b30867ed935cfe632a2c0f15006077ddd3285797c6a4042d947254520598c1da3b465fec87a0d939485d662aa1865c1457b596791d723ea6e8c
 MISC metadata.xml 281 SHA256 8f54c529127270fee6cdc9e4db328d9403ff2183d2ce21317932c17fd58ad0d0 SHA512 bef432e957e5d7798630807a1398736811461b1e6b8f622125843e3b818256bc980a77b0e033f267b30ad30282ab4d158ca27433f59df868ef769e258526697b WHIRLPOOL 740da3c76002cb8712cac28a28851d529725ed4a18f486009e2f36f55155afa21103479f7975aa9fba8fe45195a048d3b5d756db7ed3a848e5f60a7b150d1f8f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk/5wk4ACgkQuQc30/atMkCm7wCeO2OwROYEmwY0hJYXDtK1eyJo
-c40AoLcgEN7BooqhkHG69ZRFkdtEpTcn
-=oyai
------END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild
new file mode 100644
index 000000000000..8c0661a8fce9
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.06.ebuild
@@ -0,0 +1,226 @@
+# 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.06.ebuild,v 1.1 2012/08/10 15:44:27 tgurr Exp $
+
+EAPI=4
+
+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.5
+PVM=$(get_version_component_range 1-2)
+SRC_URI="
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-patchset-1.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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist cups dbus djvu gtk idn jpeg2k linguas_de static-libs X"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.2:2
+	media-libs/jbig2dec
+	media-libs/lcms:2
+	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+:3 x11-libs/gtk+:2 ) )
+	idn? ( net-dns/libidn )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0 )
+	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
+"
+
+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}"/jbig2dec
+	rm -rf "${S}"/jpeg
+	rm -rf "${S}"/lcms{,2}
+	rm -rf "${S}"/libpng
+	rm -rf "${S}"/openjpeg
+	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"
+		epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.5-${PN}-9.05.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-jasper \
+		--without-lcms \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_enable jpeg2k openjpeg ) \
+		$(use_with cups install-cups) \
+		$(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' Makefile
+	fi
+
+	cd "${S}/ijs"
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd "${S}/ijs"
+	emake
+}
+
+src_install() {
+	# workaround: -j1 -> see bug #356303
+	emake -j1 DESTDIR="${D}" install-so install
+
+	# workaround: some printer drivers still require pstoraster, bug #383831
+	use cups && dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	# workaround: do the same for pstopxl as of gs 9.05
+	use cups && dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
+
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu
+	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
+
+	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
+}