Add ghostscript-gpl-8.62.ebuild, remove patches which got fixed upstream. Reintroduce jasper dependency and make ghostscript use the system jasper, thanks for the patch goes to Fedora.

Package-Manager: portage-2.1.4.4

3 files changed, 169 insertions, 2 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 82acb9f0574c..8ee2c2a014ed 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.44 2008/03/01 20:21:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.45 2008/03/04 21:02:22 tgurr Exp $
+
+*ghostscript-gpl-8.62 (04 Mar 2008)
+
+  04 Mar 2008; Timo Gurr <tgurr@gentoo.org> +ghostscript-gpl-8.62.ebuild:
+  Add ghostscript-gpl-8.62.ebuild, remove patches which got fixed upstream.
+  Reintroduce jasper dependency and make ghostscript use the system jasper,
+  thanks for the patch goes to Fedora.
 
   01 Mar 2008; Raúl Porcel <armin76@gentoo.org>
   ghostscript-gpl-8.61-r3.ebuild:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index d958fb84f65a..aa6ce8147d30 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,12 +1,15 @@
 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.61.tar.bz2 13244754 RMD160 ec217b05f62f2f268a72c073f85aa95ee6f6c2aa SHA1 b05ac61885c0370e432531ffb79de349c6e8b896 SHA256 8c3f62da38688c02442f9b94ac42c6ecefb01141c8319393e8216d8422f7aa33
+DIST ghostscript-8.62.tar.bz2 15063641 RMD160 6f129fc679f4532729c07c018e82d162343f95ba SHA1 a254a3bc4ca824ac90624090d175d17c0a22fed1 SHA256 09671c76237c7b1df905697d30278a4f2cb9da238f9659f8fd1e8b2ae43ace4d
 DIST ghostscript-gpl-8.61-patchset-1.tar.bz2 9620 RMD160 b7464977dfabeab461439abb93ad38856a7bc27e SHA1 2e3f246d4da0956c712be4312319606cdd45593f SHA256 f2112bcf6e837f47c035646238d255f683e54b2ee6227afe7cef2d0a8ea2705c
 DIST ghostscript-gpl-8.61-patchset-3.tar.bz2 9820 RMD160 a9377dcc84c1d023e3d673adb9edb3583f160022 SHA1 b57e75bd24e05919f993fe0c8bc418073d7d9317 SHA256 6c98dcb5335fe636a07f36546f501ea846de40054b0742cb16bd465510b72380
 DIST ghostscript-gpl-8.61-patchset-4.tar.bz2 10052 RMD160 593e2c9ad12d446d198a2b09e15134f302ff6866 SHA1 b1ea14346bb826da59d0de7b9141ed658ba9df94 SHA256 7ea27451622ad91f33f350f0d1aa9c85620f0972b5742791560098e6c8f68742
+DIST ghostscript-gpl-8.62-patchset-1.tar.bz2 3916 RMD160 54bf5a8ec0d7dd0d52132d448ad11096c50cf86f SHA1 fb6920bf1efcfb23f1264995429c62d6195501e1 SHA256 5dead8f52cff53bb8e7793742e5d18bad78d9a1f100b9588d2825ee953df9971
 DIST gsdjvu-1.3.tar.gz 204330 RMD160 a6d2326ba9098e801000b957ab5508e998e17be8 SHA1 67fcbd72ae229ff68a5d0cc482d4179e3957df61 SHA256 7702fd287cd881a8b1e7911f780c10f98e332b3a6cd93dd35b245d5816b09ca2
 EBUILD ghostscript-gpl-8.61-r1.ebuild 4624 RMD160 32519488a9ecdd93f2bf9796dbdfbb231cbb1488 SHA1 3bd38d98d24fea12a3d4bbdbc10d179313525658 SHA256 653c96b1efc62aee3621f170ec86c03a6dd433985b7f31a244c92690e72ed699
 EBUILD ghostscript-gpl-8.61-r2.ebuild 4860 RMD160 ca0f01085f6a566cb9584bab85fb948c0661e63c SHA1 ca8e1d12af8bf0d049b41b775fb4c39060549c47 SHA256 09c52753321e4ab7091c9613d92e83b65b3a04a9a2baebb8ae9fd592ff1d3772
 EBUILD ghostscript-gpl-8.61-r3.ebuild 4952 RMD160 3c79e41f64ef3e03242797c9f1f60f78c2dcf30f SHA1 a0d384dad7b652a60d32cade3d6147f688a885fd SHA256 a027a1ac64fa9b1f868f219a30c7d9722ab1d3802a59e3da77e4290917a66f31
-MISC ChangeLog 10028 RMD160 a4d36214dad68182838fecbe12c8cc10f31eb1ef SHA1 cd2f5864a60600d3c351452e08508b496bfe0507 SHA256 9ef7aa133c421d81a8a697c8730c7cdb831b9315f13c39fe664ad5404c8036a6
+EBUILD ghostscript-gpl-8.62.ebuild 4860 RMD160 63842607d4879520c1cebf5ecb7e23e8a68b3e86 SHA1 eebfd1c269051e0c5e541e80fe42691cad27cdd1 SHA256 aa68863ba46da5a91b39d1341dca24d4ac8ddd68a1965f11524e943711be62cd
+MISC ChangeLog 10329 RMD160 8af29ddbde2f47d85e3a8c8ca87099b1665f8612 SHA1 fd3b3ba51d284e245291777937c9e9d51de2a8f9 SHA256 08e261a59273d8fa9f5371d103b734633c8ac8323a645702021d1aa88f0727c3
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.62.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.62.ebuild
new file mode 100644
index 000000000000..7242226a4cfa
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.62.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2008 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.62.ebuild,v 1.1 2008/03/04 21:02:22 tgurr Exp $
+
+inherit autotools elisp-common 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.3
+PVM=$(get_version_component_range 1-2)
+SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz
+		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz )
+	!bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) )
+	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
+	mirror://gentoo/${P}-patchset-1.tar.bz2"
+
+LICENSE="GPL-2 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bindist cjk cups djvu gtk jpeg2k X"
+
+COMMON_DEPEND="media-libs/fontconfig
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.5
+	>=media-libs/tiff-3.7
+	>=sys-libs/zlib-1.1.4
+	!bindist? ( djvu? ( app-text/djvu ) )
+	cups? ( >=net-print/cups-1.1.20 )
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	jpeg2k? ( media-libs/jasper )
+	X? ( x11-libs/libXt x11-libs/libXext )
+	!app-text/ghostscript-esp
+	!app-text/ghostscript-gnu"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-substitute
+		media-fonts/baekmuk-fonts )
+	media-fonts/gnu-gs-fonts-std"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A/adobe-cmaps-200406.tar.gz acro5-cmaps-2001.tar.gz}
+	if use cjk ; then
+		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-cidfmap.cjk" >> "${S}/lib/cidfmap"
+		cat "${WORKDIR}/patches/ghostscript-esp-8.15.2-FAPIcidfmap.cjk" >> "${S}/lib/FAPIcidfmap"
+		cd "${S}/Resource"
+		unpack adobe-cmaps-200406.tar.gz
+		unpack acro5-cmaps-2001.tar.gz
+		cd "${WORKDIR}"
+	fi
+
+	cd "${S}"
+
+	# remove internal copies of expat, jasper, jpeg and libpng
+	rm -rf "${S}/expat"
+	rm -rf "${S}/jasper"
+	rm -rf "${S}/jpeg"
+	rm -rf "${S}/libpng"
+	# remove internal urw-fonts
+	rm -rf "${S}/Resource/Font"
+
+	# Fedora patches
+	# upstream bug http://bugs.ghostscript.com/show_bug.cgi?id=689393
+	epatch "${WORKDIR}/patches/${PN}-8.60-fPIC.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-noopt.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.60-scripts.patch"
+	epatch "${WORKDIR}/patches/${PN}-8.62-system-jasper.patch"
+
+	# additional Gentoo patch, compile fix
+	epatch "${WORKDIR}/patches/${PN}-8.61-rinkj.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}/src"
+		epatch "${WORKDIR}/patches/${PN}-8.61-gsdjvu-1.3.patch"
+		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}/lib"
+		cp "${S}/src/contrib.mak" "${S}/src/contrib.mak.gsdjvu"
+		grep -q djvusep "${S}/src/contrib.mak" || \
+			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}/src/contrib.mak"
+
+		# install ps2utf8.ps, bug #197818
+		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' "${S}/src/unixinst.mak" \
+		|| die "sed failed"
+	fi
+
+	if ! use gtk ; then
+		sed -i "s:\$(GSSOX)::" src/*.mak || die "gsx sed failed"
+		sed -i "s:.*\$(GSSOX_XENAME)$::" src/*.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:" \
+		src/Makefile.in src/*.mak || die "sed failed"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/ijs"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable cups) \
+		$(use_enable gtk) \
+		$(use_with jpeg2k jasper) \
+		$(use_with X x) \
+		--disable-compile-inits \
+		--enable-dynamic \
+		--enable-fontconfig \
+		--with-drivers=ALL,rinkj \
+		--with-ijs \
+		--with-jbig2dec \
+	|| die "econf failed"
+
+	if ! use bindist && use djvu ; then
+		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile
+	fi
+
+	emake -j1 so all || die "emake failed"
+
+	cd "${S}/ijs"
+	econf || die "ijs econf failed"
+	emake || die "ijs emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install || die "emake install failed"
+
+	if ! use bindist && use djvu ; then
+		dobin gsdjvu || die "dobin gsdjvu install failed"
+	fi
+
+	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"
+}