Unbundle media-libs/jbig2dec, bug 206893. Dropped some keywords until jbig2dec is keyworded in bug 401853.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 241 insertions, 15 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index d4e719e2f68c..d75dc15ffc5f 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.131 2012/01/14 22:43:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.132 2012/02/01 21:15:56 dilfridge Exp $
+
+*ghostscript-gpl-9.04-r6 (01 Feb 2012)
+
+  01 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ghostscript-gpl-9.04-r6.ebuild:
+  Unbundle media-libs/jbig2dec, bug 206893. Dropped some keywords until
+  jbig2dec is keyworded in bug 401853.
 
   14 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   ghostscript-gpl-9.04-r4.ebuild, ghostscript-gpl-9.04-r5.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 1f46c5abc592..70dfd6f2546c 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -7,22 +7,23 @@ DIST ghostscript-gpl-9.04-patchset-4.tar.bz2 10850 RMD160 6e5b7bfd791c075bed15ef
 DIST gsdjvu-1.5.tar.gz 207583 RMD160 010be2cd791d5e2814c1f6554150bfd7c34222c0 SHA1 c7d0677dae5fe644cf3d714c04b3c2c343906342 SHA256 d4f01d605ff086835005e79d5fcead2def8aafafc106e170dc5f2dc618593ab4
 EBUILD ghostscript-gpl-9.04-r4.ebuild 6117 RMD160 5c82a9973d8918e5e5e46ea39b690c28951d4979 SHA1 fbbe3d1c1e70443f76caf1a390832a7d37175be1 SHA256 4749b60717f3793e97b343561a4505a32ff16cee5fb0801a3a194f7e81b613a1
 EBUILD ghostscript-gpl-9.04-r5.ebuild 6094 RMD160 08b4c3d8ed61d9a831f0f777b841caf26a72f240 SHA1 c44f6347a778262bff8783c78f252cd865bd817e SHA256 f91c187c086ddb373c15cae118c09dfa9e3d0b9a70f38708b4aa53834b533581
-MISC ChangeLog 23890 RMD160 35c7db1204b92fd5295843f66876000179220520 SHA1 88935fe04ad51f5294e31250765ba286b6fa5703 SHA256 30a1851a07410e22ffd88f44b361829195cb4069f5a67b0ef2749a3955f77ae4
+EBUILD ghostscript-gpl-9.04-r6.ebuild 6177 RMD160 ee9c60ba83f3cd5388414e4249afb74022d41416 SHA1 74fe9f1cdad3d51f4fbfbc41177786d2165b118f SHA256 01ce9e2e1d233b5103b921245417de94dd228ce870f5e749169e29c46af29fb8
+MISC ChangeLog 24134 RMD160 a5ed0d165d28a465e45b1529dd0c2e7bfdf19c38 SHA1 4d6468b020ff366c036520e56ceb5265096d246a SHA256 3d795bd987fdb424bbf63a9ffd69904b82112bb7f47344a703bcba3b8636e9d4
 MISC metadata.xml 281 RMD160 021f72140851af4f6b5fd892d1c5ab485ebce970 SHA1 4b5de22d7f9078ea8935cb5616c73540f8ef4aab SHA256 8f54c529127270fee6cdc9e4db328d9403ff2183d2ce21317932c17fd58ad0d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPEgVYAAoJENwGBM22xffejLQQAKqGEVy83riFn0X+yrQOzswK
-pPR5bS3+aeu65iHzLgRoYa1ctzBueuISyYiVpgA3J1qC44DuOxzc6iO/tkD82kum
-exhKEP2mdUWCuS/RLGxleUbcE4AkIi5pxWTVs4HGR0plKFSvWCdi2Bh7yrm5+bsh
-UacWy/NwmqFLb2vw2EYl05wNF830xtGZaW4WwobTK3WnzgSa0GHrRZa02etIAB0u
-XCDS5LZp/lRHMh267KlSWS+UlYXGpywJ3yzUU4ZOIPmugdML2Qbqna/D7tWSfIA9
-oQAH9Ou1nJMMZUzh299J7KrWo26TLIdFSW9xLUil5PhCFCYBaaVXXRZ4NLXLBk+z
-wjOtYd4H1I3zC9NvYYjrgtl0D0K7NgxXxh3N1U+3l+yOBMHZPUzvdprpIlE198yq
-zJomoca4gkfYOGw+j0CMwP2Y05Y8GNpUSWP5j63R/psXkZv+MTqRtCVZX4bZeFMD
-dJp2gdkmAFgIzTNHuLq93LRzVMNJ34v7OIDJlGMu8eASWTDA8F8CuTZxiCFrixwK
-zAEFw5TNj/jIFsSip9R/u6a/h3/fBJAjHTDwwmcPXWMebGYeeghFjGUQPLHG9VNa
-bmaIMjM/EW6Og0Xqh0aQFUMGuEUJMFgz4a8exU8HWA7bez8SoO/tC/0QWyfvdRL1
-qnZxojwQYFEl4IYsRbt0
-=zeTU
+iQIcBAEBCgAGBQJPKaviAAoJENwGBM22xffepNsP/2yI1RvPtQxxfAY0iPncNGTd
+YDdVkjz8wO0m6wItQ6SkRgHFCT2kukuO2n/scN9oDP2OACZ0mfh3Iad2bOVJYocF
+skxgGDaS/vrysvebWSDToaXbpKjLzlZFjAH+jqfQFEjWLoJbCs8YuBQVC6uyNKrD
+k4gv+uyn9SeLaI92YY+f+zuhhQUdvalyMEzL5UirgY+JaNWwDDAgqXqnDe3kPmI0
+kJLfRNQWyy6C9t5ULiYwbr/r6QUp54d7iIcP4tdHLF8b6UJFnDqe1DvYqtN6Awzy
+tI7JGzWZwO7YiDIBsr+MP8ptNV37C+BykJIHoJDyOKflZZC//ihcz1u9KTh32gyq
+fdXlTL8LDewBXaIDWvPNIH7Z2Hbts7nOmH1S8KTtC403POyDAX3jDllwvkyoxRHB
+QUokG5lXNEsMkHpPK91PluT1liTngag2U+hMzaHDypY/bNVeP5p/ksjXD3ZvwLC6
+lFd2KQhzI3iuuw+XTuy0p0OL9GylSLSNxVVtdwX+5pMoMguL8ILyeJZWzldqch0X
+WS15av3avYt8/M/IYyjxBEl+fA+tR5tjkHxeF4CnFYVvfsx1+BWFxogMqm+4bxn0
+ndCC45H7dy6CroOMkGCYjrOZ6VSF4Xe5aS4ZDpv6kGQPLh+Yz8sgvyC1cFQdVf/v
+l2YohvnELdoI2h+KmKhO
+=ff5V
 -----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild
new file mode 100644
index 000000000000..951bdb628938
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r6.ebuild
@@ -0,0 +1,218 @@
+# 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-r6.ebuild,v 1.1 2012/02/01 21:15:56 dilfridge 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="~amd64 ~mips ~ppc ~s390 ~sh ~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
+	media-libs/jbig2dec
+	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}
+	dev-util/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
+
+	rm -rf "${S}"/jbig2dec
+	rm -f "${WORKDIR}"/patches/ghostscript-gpl-8.71-jbig2dec-nullderef.patch
+
+	# 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
+}