Revbump fixing bug #353454, #379043 and #379203. Remove old.
authorTimo Gurr <tgurr@gentoo.org>
Tue, 16 Aug 2011 18:42:53 +0000 (18:42 +0000)
committerTimo Gurr <tgurr@gentoo.org>
Tue, 16 Aug 2011 18:42:53 +0000 (18:42 +0000)
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64

app-text/ghostscript-gpl/ChangeLog
app-text/ghostscript-gpl/Manifest
app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild [deleted file]
app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild [deleted file]
app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild [deleted file]
app-text/ghostscript-gpl/ghostscript-gpl-9.04-r1.ebuild [moved from app-text/ghostscript-gpl/ghostscript-gpl-9.04.ebuild with 90% similarity]

index b9ef7b490ea0e38391e5ed344d12c842c85e40c2..9b9f22927192b25f655d8e9597325b1645266d3f 100644 (file)
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.116 2011/08/10 02:11:38 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.117 2011/08/16 18:41:44 tgurr Exp $
+
+*ghostscript-gpl-9.04-r1 (16 Aug 2011)
+
+  16 Aug 2011; Timo Gurr <tgurr@gentoo.org> -ghostscript-gpl-9.00-r1.ebuild,
+  -ghostscript-gpl-9.01.ebuild, -ghostscript-gpl-9.02.ebuild,
+  -files/ghostscript-gpl-9.02-byteswap.patch,
+  -files/ghostscript-gpl-9.02-libpng15.patch, -ghostscript-gpl-9.04.ebuild,
+  +ghostscript-gpl-9.04-r1.ebuild:
+  Revbump fixing bug #353454, #379043 and #379203. Remove old.
 
 *ghostscript-gpl-9.04 (10 Aug 2011)
 
index 819d1f3b32d09034a7cc659fa5e7c43929c43547..04b808b187227df99905d77a52690e3d3e3187f9 100644 (file)
@@ -1,20 +1,9 @@
-AUX ghostscript-gpl-9.02-byteswap.patch 3196 RMD160 075efc740fbc678b4862c2319e4a7f32d709e4da SHA1 237d768069601147e769de2e98ae362e0133a2c3 SHA256 237389d9ba4d08eac01a8efe689a03412d173ecd234fd9853198d5b1f0e62cee
-AUX ghostscript-gpl-9.02-libpng15.patch 6699 RMD160 984a970c768a24c4e7eae14bfac8432cb1031129 SHA1 adf2ae55d8d7242f808f852632ed26f7e574858f SHA256 228c65f1ed286122bf8ca96979932989ace83e162f7a894f99474886a41732bc
 DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73
-DIST ghostscript-9.00.tar.xz 17377160 RMD160 4dd9bf15ccc3e23e11fdebc1d23155e1b9d8993b SHA1 873fbeedecc472ec804943bc5ded131fa8342251 SHA256 2d3afcf30873c8bf8619beeeb6d4c3370fc2944fd1bd47423461b6778daa8248
-DIST ghostscript-9.01.tar.bz2 23612084 RMD160 37fb9fa9263ef069e0717f5f6b1cec06d1932350 SHA1 3e8c4b8c9dbcc0458e3be0758f00205929a6b3f4 SHA256 2418895088f12c18639f1876f13f5690be0d6ab6113d4d7f1f2f360d2e2deb7d
-DIST ghostscript-9.02.tar.bz2 23748868 RMD160 180b9393f0a7c894224ca411b446d565b9ae13ef SHA1 66ea94471cd7846cae044d463eedbb4dab80051e SHA256 03ea2cad13a36f8f9160912012b79619a826e7148fada6d3531feb25409ee05a
 DIST ghostscript-9.04.tar.bz2 29869900 RMD160 916bcacac247241fcf6ba02e90dc7e28040ba65e SHA1 df9c9e1924038da071d0ffbaddf42a75ecbc1e83 SHA256 f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4
 DIST ghostscript-gpl-8.71-patchset-4.tar.bz2 12089 RMD160 67406d2fa03144981cadaee9570313a16b549715 SHA1 f80a8d5a4df18df3eb5183d71040ebcc713fca33 SHA256 4244d34114457ec281115c5a3a37b9b1ec2a091fff6f665896a21cf07d927a38
-DIST ghostscript-gpl-9.00-patchset-2.tar.bz2 12996 RMD160 b3ef870d4e690a4cd6984066f9846d5ec19879ee SHA1 fe6c48949f29b6a5d6bab7b8b3e588373e195b3f SHA256 842f073369414981467bd6264a6f2f77ef4ef53864a2ddd2ee8872d966b0ff41
-DIST ghostscript-gpl-9.01-patchset-1.tar.bz2 7062 RMD160 bbb2ad160929a3202f3eb8ed84f1aa13d6fc9959 SHA1 816e0338acfc82b5e1d8dedc807c4cd392ed65cb SHA256 809c3fdac37c58b3145ee718f32c155314e18dc643cac776346cae9e048d1607
-DIST ghostscript-gpl-9.02-patchset-1.tar.bz2 7866 RMD160 b6db4815287b2bedeabddef94b117dd6df604f18 SHA1 f65ca0e92a26327fda6bb727f6dc498aabbbb963 SHA256 a2146539c42cf6eeadae2738f8385e47fb998119da9fb042eee93fc5aa4d0eb6
-DIST ghostscript-gpl-9.04-patchset-1.tar.bz2 6743 RMD160 9075a6dc8eb8e6c554d43985fa936a7d543b4910 SHA1 a90af937bcb5e5ecd4d60796edb07abe3684df9c SHA256 cd944e0a3cb99f8333fe50707a623d6f8b2dffa0938771827c1976f9b818ee20
+DIST ghostscript-gpl-9.04-patchset-2.tar.bz2 8930 RMD160 6ae377f6be0cf8c0c578bf5545e5713d0df370e5 SHA1 41522d8193a67d9b35621b53991655a3f4d739e7 SHA256 e575ae524a3f79cc6eb02d8a40e889edf9164e6b712b3bf84b67bad68933fda1
 DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SHA1 2650c85481de3aef66a4f7970d14a7dd36a1bc96 SHA256 7b5992f5203d662a7e03ce57d4a1b7a97990b0d3e09eb46ef1b4cb66d8d8c57d
 EBUILD ghostscript-gpl-8.71-r6.ebuild 5876 RMD160 dbaa3c0e021a74450fd74b61b41d7db66f9422fc SHA1 de65280243721459350be37a1b386df233b44f9a SHA256 3e87dec029c5c77d5930a7026cae9b917189790d50c06ebce445d27d25905484
-EBUILD ghostscript-gpl-9.00-r1.ebuild 5649 RMD160 305ce2ad24d846cb2865b3f3a2f1ca6eaddfb644 SHA1 781e54cbe977ada507b970fcc0db436185b02473 SHA256 93c3580e9a5b46a57898fef22020021affb98799f69b26709aa7488652dceca6
-EBUILD ghostscript-gpl-9.01.ebuild 5647 RMD160 b2fdaf71d2674cb764c18f8786354dcd7c29c122 SHA1 60a3e3bf58027db657d39ad929ce39c0c09d686e SHA256 f856684d08d6f76226a84718f5b6de57b65e02e3c873cd496d43f78a7c2fbc84
-EBUILD ghostscript-gpl-9.02.ebuild 5945 RMD160 c0565ac9fb31b66120891e468d1a85fd65bce00c SHA1 5108e59cecd5996e9e8f75ea0fdd0675730016a6 SHA256 0746f5b894a36620747b1675a9daa87fa12bdd5dd50b3cd3fda032e372216e78
-EBUILD ghostscript-gpl-9.04.ebuild 5893 RMD160 c52972f5e8539a942bf4a83e6bdabe6223c577f5 SHA1 35103c00dec2010a4839c20447396fc9854b5811 SHA256 1ad92a1b33a416197a337252737664bd916a9d9dac76a034338242e5cb99d571
-MISC ChangeLog 21227 RMD160 ab77226c5ed82500c2f2578259bc18174ea2caa2 SHA1 84d50a678e01a3aa5f00304ffcdf35dcfc063d32 SHA256 c1950d97ec206c28684d5b512eac34cfe72a7e0ace84c86efd9c164a7fb576d2
+EBUILD ghostscript-gpl-9.04-r1.ebuild 6023 RMD160 457829c07a3d0d64e74e630add33072742693c9c SHA1 b02ad4a736314c7f3382d8b7432b90f1f1a0c68f SHA256 b39e4b69a2ee60925a488b52f2aec1adc0eb71a9e12367f907d137206e3055ae
+MISC ChangeLog 21627 RMD160 6dd421313ac42e8e3e09b452593d6531e9d87e7b SHA1 69765e65d2690343c11da361ab12f8dc26ecfc60 SHA256 2e7141cb3c7e8d11d2e7a7e449828708e8192b70b69e85742ed436dd0e8a9e0a
 MISC metadata.xml 284 RMD160 df1ccfc8195a57d367d5cb80ae86d4d95084234e SHA1 c6afd0be31143d4bab2720ac199d10cc1bafedef SHA256 48aa4ca7adac201df7ab07ee8d590d13aa5c6d8684487d2bbbf1433f268e90e1
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.00-r1.ebuild
deleted file mode 100644 (file)
index 841191f..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2011 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.00-r1.ebuild,v 1.2 2011/03/27 12:19:15 nirbheek 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.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.xz
-       mirror://gentoo/${P}-patchset-2.tar.bz2"
-
-LICENSE="GPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups djvu gtk idn jpeg2k X"
-
-COMMON_DEPEND="app-text/libpaper
-       media-libs/freetype:2
-       media-libs/fontconfig
-       virtual/jpeg
-       >=media-libs/libpng-1.2.42
-       >=media-libs/tiff-3.9.2
-       >=sys-libs/zlib-1.2.3
-       !bindist? ( djvu? ( app-text/djvu ) )
-       cups? ( >=net-print/cups-1.3.8 )
-       gtk? ( x11-libs/gtk+:2 )
-       idn? ( net-dns/libidn )
-       jpeg2k? ( media-libs/jasper )
-       X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils
-       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 )"
-
-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}/jasper"
-       rm -rf "${S}/jpeg"
-       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"
-               epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-${PN}-9.00-upstream-buildfixes.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:" \
-               base/Makefile.in base/*.mak || die "sed failed"
-
-       cd "${S}"
-       eautoreconf
-
-       cd "${S}/jbig2dec"
-       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 \
-               $(use_enable cups) \
-               $(use_enable gtk) \
-               $(use_with cups pdftoraster) \
-               $(use_with idn libidn) \
-               $(use_with jpeg2k jasper) \
-               $(use_with X x) \
-               --disable-compile-inits \
-               --enable-dynamic \
-               --enable-freetype \
-               --enable-fontconfig \
-               --with-drivers=ALL \
-               --with-fontpath="$FONTPATH" \
-               --with-ijs \
-               --with-jbig2dec \
-               --with-libpaper \
-               --with-system-libtiff
-
-       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
-}
-
-src_compile() {
-       emake -j1 so all || die "emake failed"
-
-       cd "${S}/ijs"
-       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
-
-       # 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
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.01.ebuild
deleted file mode 100644 (file)
index 537b5ab..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2011 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.01.ebuild,v 1.2 2011/03/27 12:19:15 nirbheek 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.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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups djvu gtk idn jpeg2k X"
-
-COMMON_DEPEND="app-text/libpaper
-       media-libs/freetype:2
-       media-libs/fontconfig
-       virtual/jpeg
-       >=media-libs/libpng-1.2.42
-       >=media-libs/tiff-3.9.2
-       >=sys-libs/zlib-1.2.3
-       !bindist? ( djvu? ( app-text/djvu ) )
-       cups? ( >=net-print/cups-1.3.8 )
-       gtk? ( x11-libs/gtk+:2 )
-       idn? ( net-dns/libidn )
-       jpeg2k? ( media-libs/jasper )
-       X? ( x11-libs/libXt x11-libs/libXext )"
-
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils
-       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 )"
-
-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}/jasper"
-       rm -rf "${S}/jpeg"
-       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"
-               epatch "${WORKDIR}/patches-gsdjvu/gsdjvu-1.4-${PN}-9.00-upstream-buildfixes.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:" \
-               base/Makefile.in base/*.mak || die "sed failed"
-
-       cd "${S}"
-       eautoreconf
-
-       cd "${S}/jbig2dec"
-       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 \
-               $(use_enable cups) \
-               $(use_enable gtk) \
-               $(use_with cups pdftoraster) \
-               $(use_with idn libidn) \
-               $(use_with jpeg2k jasper) \
-               $(use_with X x) \
-               --disable-compile-inits \
-               --enable-dynamic \
-               --enable-freetype \
-               --enable-fontconfig \
-               --with-drivers=ALL \
-               --with-fontpath="$FONTPATH" \
-               --with-ijs \
-               --with-jbig2dec \
-               --with-libpaper \
-               --with-system-libtiff
-
-       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
-}
-
-src_compile() {
-       emake -j1 so all || die "emake failed"
-
-       cd "${S}/ijs"
-       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
-
-       # 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
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild
deleted file mode 100644 (file)
index 3c5794b..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2011 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.02.ebuild,v 1.4 2011/08/07 23:50:17 flameeyes 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.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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k X"
-
-COMMON_DEPEND="app-text/libpaper
-       media-libs/fontconfig
-       media-libs/freetype:2
-       media-libs/lcms:0
-       >=media-libs/libpng-1.2.42
-       >=media-libs/tiff-3.9.2
-       >=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}
-       app-arch/xz-utils
-       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 )"
-
-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"
-       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 libpng-1.5 patch
-       epatch "${FILESDIR}/${PN}-9.02-libpng15.patch"
-
-       # byteswap detection bug 367119
-       epatch "${FILESDIR}"/${P}-byteswap.patch
-
-       # 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.4-${PN}-9.00-upstream-buildfixes.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:" \
-               base/Makefile.in base/*.mak || die "sed failed"
-
-       cd "${S}"
-       eautoreconf
-
-       cd "${S}/jbig2dec"
-       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 \
-               $(use_enable cups) \
-               $(use_enable dbus) \
-               $(use_enable gtk) \
-               $(use_with cups pdftoraster) \
-               $(use_with idn libidn) \
-               $(use_with jpeg2k jasper) \
-               $(use_with X x) \
-               --disable-compile-inits \
-               --enable-dynamic \
-               --enable-freetype \
-               --enable-fontconfig \
-               --with-drivers=ALL \
-               --with-fontpath="$FONTPATH" \
-               --with-ijs \
-               --with-jbig2dec \
-               --with-libpaper \
-               --with-system-libtiff
-
-       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
-}
-
-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"
-
-       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
-}
similarity index 90%
rename from app-text/ghostscript-gpl/ghostscript-gpl-9.04.ebuild
rename to app-text/ghostscript-gpl/ghostscript-gpl-9.04-r1.ebuild
index 8ff67d2137a0491410fbbacc3ad3a877d5b120c4..694243106dbe4c53682a38d449c185d20f12beaa 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.1 2011/08/10 02:11:38 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.04-r1.ebuild,v 1.1 2011/08/16 18:41:44 tgurr Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -13,12 +13,12 @@ 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"
+       mirror://gentoo/${P}-patchset-2.tar.bz2"
 
 LICENSE="GPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist cups dbus djvu gtk idn jpeg2k X"
+IUSE="bindist cups dbus djvu gtk idn jpeg2k static-libs X"
 
 COMMON_DEPEND="app-text/libpaper
        media-libs/fontconfig
@@ -63,18 +63,18 @@ pkg_setup() {
 
 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"
-       rm -rf "${S}/libpng"
-       rm -rf "${S}/tiff"
-       rm -rf "${S}/zlib"
+       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
        # remove internal urw-fonts
-       rm -rf "${S}/Resource/Font"
+       rm -rf "${S}"/Resource/Font
        # remove internal CMaps (CMaps from poppler-data are used instead)
-       rm -rf "${S}/Resource/CMap"
+       rm -rf "${S}"/Resource/CMap
 
        # apply various patches, many borrowed from Fedora
        # http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
@@ -137,14 +137,6 @@ src_configure() {
        done
 
        econf \
-               $(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) \
                --enable-dynamic \
                --enable-freetype \
                --enable-fontconfig \
@@ -155,14 +147,24 @@ src_configure() {
                --with-jbig2dec \
                --with-libpaper \
                --with-system-libtiff \
-               --without-luratech
+               --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
+       econf \
+               --enable-shared \
+               $(use_enable static-libs static)
 }
 
 src_compile() {
@@ -201,4 +203,6 @@ src_install() {
                        doins "${WORKDIR}/fontmaps/cidfmap.${X}" || die "doins cidfmap.${X} failed"
                fi
        done
+
+       use static-libs || find "${D}" -name '*.la' -delete
 }