From 0b7064b4f1cb244f2ec255a08ed1b6d73b5c4e5c Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Tue, 4 Aug 2009 21:59:54 +0000 Subject: Version bump, also fixing bug #264780. Remove old. (Portage version: 2.2_rc35/cvs/Linux x86_64) --- app-text/ghostscript-gpl/ChangeLog | 8 +- .../ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild | 169 -------------------- .../ghostscript-gpl/ghostscript-gpl-8.70.ebuild | 172 +++++++++++++++++++++ 3 files changed, 179 insertions(+), 170 deletions(-) delete mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild create mode 100644 app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild (limited to 'app-text/ghostscript-gpl') diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog index 9de31ef761b2..be195b599684 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.78 2009/05/26 06:05:25 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.79 2009/08/04 21:59:54 tgurr Exp $ + +*ghostscript-gpl-8.70 (04 Aug 2009) + + 04 Aug 2009; Timo Gurr -ghostscript-gpl-8.64-r2.ebuild, + +ghostscript-gpl-8.70.ebuild: + Version bump, also fixing bug #264780. Remove old. 26 May 2009; Peter Volkov ghostscript-gpl-8.64-r2.ebuild, ghostscript-gpl-8.64-r3.ebuild: diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild deleted file mode 100644 index 039ee4bd7b72..000000000000 --- a/app-text/ghostscript-gpl/ghostscript-gpl-8.64-r2.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2009 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.64-r2.ebuild,v 1.6 2009/05/26 06:05:25 pva Exp $ - -inherit autotools 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-3.tar.bz2" - -LICENSE="GPL-2 CPL-1.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="bindist cairo cjk cups djvu gtk jpeg2k X" - -COMMON_DEPEND="app-text/libpaper - 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 ) ) - cairo? ( >=x11-libs/cairo-1.2.0 ) - cups? ( >=net-print/cups-1.3.8 ) - gtk? ( >=x11-libs/gtk+-2.0 ) - jpeg2k? ( media-libs/jasper ) - X? ( x11-libs/libXt x11-libs/libXext ) - !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, libpng and zlib - rm -rf "${S}/expat" - rm -rf "${S}/jasper" - rm -rf "${S}/jpeg" - rm -rf "${S}/libpng" - rm -rf "${S}/zlib" - # remove internal urw-fonts - rm -rf "${S}/Resource/Font" - - # Fedora patches - # http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/ - epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch" - epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch" - - # Fixes which are already applied in ghostscript trunk - epatch "${WORKDIR}/patches/${PN}-8.64-bitcmyk-regression-r9452.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9461.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-respect-ldflags-r9476.patch" - epatch "${WORKDIR}/patches/${PN}-8.64-respect-gsc-ldflags.patch" #209803 - epatch "${WORKDIR}/patches/${PN}-8.64-CVE-2009-0583.patch" #261087 - - 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}/base" - epatch "${WORKDIR}/patches/${PN}-8.64-gsdjvu-1.3.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:$(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:" \ - base/Makefile.in base/*.mak || die "sed failed" - - cd "${S}" - eautoreconf - - cd "${S}/ijs" - eautoreconf -} - -src_compile() { - econf \ - $(use_enable cairo) \ - $(use_enable cups) \ - $(use_enable gtk) \ - $(use_with jpeg2k jasper) \ - $(use_with X x) \ - --disable-compile-inits \ - --enable-dynamic \ - --enable-fontconfig \ - --with-drivers=ALL \ - --with-ijs \ - --with-jbig2dec \ - --with-libpaper - - 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() { - # parallel install is broken, bug #251066 - emake -j1 DESTDIR="${D}" install-so install || die "emake install failed" - - 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/README || die "dodoc install failed" - - cd "${S}/ijs" - emake DESTDIR="${D}" install || die "emake ijs install failed" -} diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild new file mode 100644 index 000000000000..fd6a493527a3 --- /dev/null +++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.70.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2009 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.70.ebuild,v 1.1 2009/08/04 21:59:54 tgurr Exp $ + +inherit autotools 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.4 +PVM=$(get_version_component_range 1-2) +SRC_URI="!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-3 CPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="bindist cairo cjk cups djvu gtk jpeg2k X" + +COMMON_DEPEND="app-text/libpaper + 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 ) ) + cairo? ( >=x11-libs/cairo-1.2.0 ) + cups? ( >=net-print/cups-1.3.8 ) + gtk? ( >=x11-libs/gtk+-2.0 ) + jpeg2k? ( media-libs/jasper ) + X? ( x11-libs/libXt x11-libs/libXext ) + !app-text/ghostscript-gnu" + +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +RDEPEND="${COMMON_DEPEND} + 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" + +S="${WORKDIR}/${MY_P}" + +LANGS="ja ko zh_CN zh_TW" +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +src_unpack() { + unpack ${A} + cd "${S}" + + # remove internal copies of expat, jasper, jpeg, libpng and zlib + rm -rf "${S}/expat" + rm -rf "${S}/jasper" + rm -rf "${S}/jpeg" + rm -rf "${S}/libpng" + rm -rf "${S}/zlib" + # remove internal urw-fonts + rm -rf "${S}/Resource/Font" + + # Fedora patches + # http://cvs.fedora.redhat.com/viewcvs/devel/ghostscript/ + epatch "${WORKDIR}/patches/${PN}-8.61-multilib.patch" + epatch "${WORKDIR}/patches/${PN}-8.64-scripts.patch" + epatch "${WORKDIR}/patches/${PN}-8.64-noopt.patch" + epatch "${WORKDIR}/patches/${PN}-8.64-fPIC.patch" + epatch "${WORKDIR}/patches/${PN}-8.70-runlibfileifexists.patch" + epatch "${WORKDIR}/patches/${PN}-8.64-system-jasper.patch" + epatch "${WORKDIR}/patches/${PN}-8.64-pksmraw.patch" + epatch "${WORKDIR}/patches/${PN}-8.70-jbig2dec-nullderef.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}/base" + epatch "${WORKDIR}/patches/${PN}-8.64-gsdjvu-1.3.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:$(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:" \ + base/Makefile.in base/*.mak || die "sed failed" + + cd "${S}" + eautoreconf + + cd "${S}/ijs" + eautoreconf +} + +src_compile() { + econf \ + $(use_enable cairo) \ + $(use_enable cups) \ + $(use_enable gtk) \ + $(use_with jpeg2k jasper) \ + $(use_with X x) \ + --disable-compile-inits \ + --enable-dynamic \ + --enable-fontconfig \ + --with-drivers=ALL \ + --with-ijs \ + --with-jbig2dec \ + --with-libpaper + + 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() { + # parallel install is broken, bug #251066 + emake -j1 DESTDIR="${D}" install-so install || die "emake install failed" + + 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/README || die "dodoc install failed" + + cd "${S}/ijs" + emake DESTDIR="${D}" install || die "emake ijs install failed" + + # Rename an original cidfmap to cidfmap.GS + mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} + + # Install our own cidfmap to allow the separated cidfmap + 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 +} -- cgit v1.2.3-65-gdbad