From: Stefan Schweizer Date: Tue, 12 Dec 2006 23:36:44 +0000 (+0000) Subject: Add djvu support, fix emake -j1 bug 147998 for phreak X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18eb63458bb404cda72e685a8629cba7f992d7b6;p=gentoo.git Add djvu support, fix emake -j1 bug 147998 for phreak Package-Manager: portage-2.1.2_rc3-r4 --- diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog index 6301dd70667e..5f3cb7568c4d 100644 --- a/app-text/ghostscript-gpl/ChangeLog +++ b/app-text/ghostscript-gpl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/ghostscript-gpl # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.7 2006/11/04 00:31:17 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.8 2006/12/12 23:36:44 genstef Exp $ + + 12 Dec 2006; Stefan Schweizer + ghostscript-gpl-8.54.ebuild: + Add djvu support, fix emake -j1 bug 147998 for phreak 04 Nov 2006; Stefan Schweizer ghostscript-gpl-8.54.ebuild: diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest index 593e00a4a731..291b5af1b465 100644 --- a/app-text/ghostscript-gpl/Manifest +++ b/app-text/ghostscript-gpl/Manifest @@ -51,18 +51,19 @@ DIST adobe-cmaps-200406.tar.gz 5001983 RMD160 284b943b3476f6f7e2bc49842fd027c6f7 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e DIST gdevhl12.c.gz 7613 RMD160 3adffbf7df824abd02242dadf847b09246f411bb SHA1 b5ac9ebe654b0ace453f1aec501dd363311efeed SHA256 3905677ab494a1b82ee2a6cc78975a5fdc08d81a65c12af35746bb3d2889b3e2 DIST ghostscript-8.54-gpl.tar.bz2 12365361 RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 SHA1 5da69b04ddc8a4660a2c40b0e561a358c737c310 SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b -EBUILD ghostscript-gpl-8.54.ebuild 5020 RMD160 df19df811425a1404338ede7cc5f0a9a0ba3e255 SHA1 df90eee59c2ce0f24c4ab807e906f19e3a81b2df SHA256 d77833c52ed7887a6cd60841b2b03d0425646dfc7631eedd84fdf71e30bce0b7 -MD5 762470790a4433d5e01a8606ad07d707 ghostscript-gpl-8.54.ebuild 5020 -RMD160 df19df811425a1404338ede7cc5f0a9a0ba3e255 ghostscript-gpl-8.54.ebuild 5020 -SHA256 d77833c52ed7887a6cd60841b2b03d0425646dfc7631eedd84fdf71e30bce0b7 ghostscript-gpl-8.54.ebuild 5020 -MISC ChangeLog 1817 RMD160 b19e581d0061540d10d779854e610e3e76e89e63 SHA1 314f689ff5f89daf12eb25d6c5585f19f52c78d6 SHA256 6f0296bf67a6d14b31f03144c222085124cebc2095ff5c74f9504edbed8538af -MD5 4ebe8cd21dd0f698577fc43669399775 ChangeLog 1817 -RMD160 b19e581d0061540d10d779854e610e3e76e89e63 ChangeLog 1817 -SHA256 6f0296bf67a6d14b31f03144c222085124cebc2095ff5c74f9504edbed8538af ChangeLog 1817 +DIST gsdjvu-1.1.tar.gz 214364 RMD160 aa1ff4a80b02b16e43bf8e14719613f98bdf13c6 SHA1 cc33916f86a0f826159e5afed43d7fae722b3133 SHA256 39f32b9946a65cbe8d5b7c2882ef0e82d5858e78e04b568bb525d2c4e2d6ce78 +EBUILD ghostscript-gpl-8.54.ebuild 5561 RMD160 4efc944472cad380174a93ef8d75adfbe783ec93 SHA1 1c13842b33eabeaa6ccba677cc8a636d25c58181 SHA256 4a54d2fa0dbd19cbf0b8df48f258be5bf4b5016567a110f8ff3629543e7ba737 +MD5 9f692766acc42da2f69694d59ff1ed6c ghostscript-gpl-8.54.ebuild 5561 +RMD160 4efc944472cad380174a93ef8d75adfbe783ec93 ghostscript-gpl-8.54.ebuild 5561 +SHA256 4a54d2fa0dbd19cbf0b8df48f258be5bf4b5016567a110f8ff3629543e7ba737 ghostscript-gpl-8.54.ebuild 5561 +MISC ChangeLog 1958 RMD160 e2d7fc60d493b0c16612238d25a25bd31114132a SHA1 bd4cbeb948d89d2aad05ff1eb36e3d0e5740d6bf SHA256 15804bab63a624f84c1b193834936ae08dc5602f6d8a2d858911780015b2e8c8 +MD5 b4cb1c70197da03c5c9c38083402ce47 ChangeLog 1958 +RMD160 e2d7fc60d493b0c16612238d25a25bd31114132a ChangeLog 1958 +SHA256 15804bab63a624f84c1b193834936ae08dc5602f6d8a2d858911780015b2e8c8 ChangeLog 1958 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161 -MD5 f413f662af5f87988a599dc33e91d034 files/digest-ghostscript-gpl-8.54 1256 -RMD160 791369f9e6660f57a5ea66017149ebfd9681d38f files/digest-ghostscript-gpl-8.54 1256 -SHA256 54f7d51625c2e99b3c3b66ea76109a8168805dd3b4314f35a749837c3dad5762 files/digest-ghostscript-gpl-8.54 1256 +MD5 72fa7407fadfed6cddb7ba1e3699e1e8 files/digest-ghostscript-gpl-8.54 1488 +RMD160 46ca437705ffcb2a1489ad1b541222493b273c34 files/digest-ghostscript-gpl-8.54 1488 +SHA256 0c2f61b7b0575c76d83fbfd9ddddb87b151118444609d0f3ae55fba35587f7c4 files/digest-ghostscript-gpl-8.54 1488 diff --git a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54 b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54 index a3388250d133..f7be16b158b0 100644 --- a/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54 +++ b/app-text/ghostscript-gpl/files/digest-ghostscript-gpl-8.54 @@ -13,3 +13,6 @@ SHA256 3905677ab494a1b82ee2a6cc78975a5fdc08d81a65c12af35746bb3d2889b3e2 gdevhl12 MD5 5d0ad0da8297fe459a788200f0eaeeba ghostscript-8.54-gpl.tar.bz2 12365361 RMD160 f61f6da568ffe440a466cd0d7b5871a3d87d1116 ghostscript-8.54-gpl.tar.bz2 12365361 SHA256 64f43553223390a3e519efed2b3dfee8a4c79df5a373a0e96861483565957e1b ghostscript-8.54-gpl.tar.bz2 12365361 +MD5 46bce036ad0b9b284f4c8f3530f7c684 gsdjvu-1.1.tar.gz 214364 +RMD160 aa1ff4a80b02b16e43bf8e14719613f98bdf13c6 gsdjvu-1.1.tar.gz 214364 +SHA256 39f32b9946a65cbe8d5b7c2882ef0e82d5858e78e04b568bb525d2c4e2d6ce78 gsdjvu-1.1.tar.gz 214364 diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild index bbb3d6d4632a..da5f893da842 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild @@ -1,18 +1,21 @@ # Copyright 1999-2006 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.54.ebuild,v 1.7 2006/11/04 00:31:17 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-8.54.ebuild,v 1.8 2006/12/12 23:36:44 genstef Exp $ WANT_AUTOMAKE=1.6 + inherit autotools elisp-common eutils versionator flag-o-matic DESCRIPTION="GPL Ghostscript - the most current Ghostscript, AFPL, relicensed" HOMEPAGE="http://www.cs.wisc.edu/~ghost/" +GSDJVU_PV=1.1 CUPS_PV=1.1.23 MY_P=ghostscript-${PV}-gpl 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 ) + djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz ) cups? ( mirror://gentoo/cups-${CUPS_PV}-source.tar.bz2 ) mirror://sourceforge/ghostscript/${MY_P}.tar.bz2 mirror://gentoo/gdevhl12.c.gz" @@ -20,7 +23,7 @@ SRC_URI="cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200406.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="X cups cjk emacs gtk jpeg2k" +IUSE="X cups cjk emacs gtk djvu jpeg2k" DEP="virtual/libc >=media-libs/jpeg-6b @@ -28,6 +31,7 @@ DEP="virtual/libc >=sys-libs/zlib-1.1.4 >=media-libs/tiff-3.7 X? ( x11-libs/libXt x11-libs/libXext ) + djvu? ( app-text/djvu ) gtk? ( >=x11-libs/gtk+-2.0 ) cups? ( >=net-print/cups-1.1.20 ) jpeg2k? ( media-libs/jasper ) @@ -41,7 +45,7 @@ RDEPEND="${DEP} media-fonts/gnu-gs-fonts-std" DEPEND="${DEP} - gtk? ( dev-util/pkgconfig )" + dev-util/pkgconfig" S=${WORKDIR}/${MY_P} @@ -75,6 +79,17 @@ src_unpack() { sed -i -e 's:EXTRALIBS=.*:\0 -lcups -lcupsimage:' src/Makefile.in || die "sed failed" fi cd ${S} + + if use djvu; then + unpack gsdjvu-${GSDJVU_PV}.tar.gz + cp gsdjvu-${GSDJVU_PV}/gsdjvu ${S} + cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c ${S}/src + 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 + fi + epatch ${FILESDIR}/ghostscript-afpl-8.54-cups-lib.patch epatch ${FILESDIR}/ghostscript-afpl-8.54-big-cmap-post.patch @@ -106,24 +121,26 @@ src_unpack() { # search path fix sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \ - src/Makefile.in || die "sed failed" - sed -i -e 's:$(gsdir)/fonts:/usr/share/fonts/default/ghostscript/:' \ - src/Makefile.in || die "sed failed" - sed -i -e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \ - src/Makefile.in || die "sed failed" - sed -i -e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \ + -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" } src_compile() { - econf \ - $(use_with X x) \ + econf $(use_with X x) \ $(use_with jpeg2k jasper) \ --with-ijs \ - --with-jbig2dec \ - || die "econf failed" - emake STDDIRS || die "emake failed" + --with-jbig2dec || die "econf failed" + + if use djvu; then + sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' Makefile + sed -i -e 's:(/\(Resource/[a-zA-Z/]*\)):(\1) findlibfile {pop} {pop &} + ifelse:' lib/gs_res.ps + fi + + emake -j1 so all || die "emake failed" cd ijs econf || die "ijs econf failed" @@ -133,6 +150,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" install soinstall || die "emake install failed" + use djvu && dobin gsdjvu + rm -fr ${D}/usr/share/doc/${PF}/html/{README,PUBLIC} dodoc doc/README use emacs && elisp-site-file-install doc/gsdoc.el