From f92034bbbd069da7365577185ecf7b8e2b3cf855 Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sat, 16 Feb 2008 16:42:16 +0000 Subject: [PATCH] for now only enable svg support, when X is enabled, as librsvg pulls in quite some X stuff. also fix bug #206937 in version 6.3.7.9 Package-Manager: portage-2.1.4.4 --- media-gfx/imagemagick/ChangeLog | 10 +- media-gfx/imagemagick/Manifest | 14 +- .../imagemagick/imagemagick-6.3.7.9-r1.ebuild | 138 +++++++++++++++++ .../imagemagick/imagemagick-6.3.8.3-r1.ebuild | 143 ++++++++++++++++++ 4 files changed, 303 insertions(+), 2 deletions(-) create mode 100644 media-gfx/imagemagick/imagemagick-6.3.7.9-r1.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index 548932201a35..b921606d1085 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.267 2008/02/10 17:14:24 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.268 2008/02/16 16:42:16 maekke Exp $ + +*imagemagick-6.3.8.3-r1 (16 Feb 2008) +*imagemagick-6.3.7.9-r1 (16 Feb 2008) + + 16 Feb 2008; Markus Meier + +imagemagick-6.3.7.9-r1.ebuild, +imagemagick-6.3.8.3-r1.ebuild: + for now only enable svg support, when X is enabled, as librsvg pulls in + quite some X stuff. also fix bug #206937 in version 6.3.7.9 10 Feb 2008; Raúl Porcel imagemagick-6.3.7.9.ebuild: alpha/ia64 stable wrt #209368 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 6191c7875356..e645181770b2 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX imagemagick-6.3.0.5-configure-windows-fonts.patch 584 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f SHA1 db467ddc0c056425c790eafe5c6a72d6a8a0cd98 SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604 AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 SHA1 4a8c1122849a2362786cc3cbf165e57a123ade4c SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5 AUX imagemagick-6.3.0.5-no-lMagick.patch 685 RMD160 01693f7d6074391848e2a536d077044f9adaef59 SHA1 40b837f853d3853f58949991262c010aa091ecb8 SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a @@ -21,7 +24,16 @@ EBUILD imagemagick-6.3.4-r1.ebuild 2999 RMD160 68ccdf2c20c9668f619e408dea39178f1 EBUILD imagemagick-6.3.4.ebuild 2699 RMD160 ec3ea0cfce3bb848a8bd5663594af3508d3959e9 SHA1 4c41e4cf194da3c3ee3c9c745d8b66cd03064cf1 SHA256 3ace432b149f986a33ec449dbb5f59187190b5d0a22d1192332ed45df3750f36 EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d821f34329 SHA1 9c0c8606abd5438ccaa9f6945870fc190a98f08d SHA256 02e17636b371ef56b3abefa9553b030c77760d29198840c59df7802e5e5be6aa EBUILD imagemagick-6.3.5.9.ebuild 3037 RMD160 71e25a9e117aa9057b019c85bdaf3313c1b3eb52 SHA1 989cc82a0aa14ceffe0012ee402cebb4626abc74 SHA256 273e62d7437ff287a33ca8d6a6209089158c0d7b14b70b69d2b5a3f60ee38f78 +EBUILD imagemagick-6.3.7.9-r1.ebuild 3757 RMD160 3c1f43b0959a9379380b204d7d38c85185e38509 SHA1 6f65cb02f5f3cd7490e0ff6f05363f3102ef129a SHA256 0003a1b09c611b02c9603619fa6adf56cfd1506ffb419e7458c48d2412348783 EBUILD imagemagick-6.3.7.9.ebuild 3339 RMD160 a11e305867601fce79db1be7618c7dc4b9093e58 SHA1 1efb01d9f8f8592e86d07eabfb6f306d332ee5a8 SHA256 8460ab38bcd74f0e16ed60b0c68dffdd5cdb2b983f02e949aa5ca002fd96ad06 +EBUILD imagemagick-6.3.8.3-r1.ebuild 3949 RMD160 95bb685f618b73ae544a575e509cec19db61e659 SHA1 c71d70aee789a40db71fb9e32b8e0cc6b04e0adf SHA256 47c3b549aa7f996bb88930f195c9940e0537532f91be6da8094f5c8f8a476d57 EBUILD imagemagick-6.3.8.3.ebuild 3612 RMD160 8c8486143dd6e39b48b81455436b413ffe261757 SHA1 6593ba7329305874a566e31300a26afeb2fd6853 SHA256 ee1f41dc55c0e35f7429d6caa77b120d2d748aba150294f1f0e17b5c4f6f5c4e -MISC ChangeLog 39961 RMD160 c862fad71d1f322773ece4b3278711437289adf4 SHA1 b683f4c28c9f8a7d5fe847ddd6f2e2383142abaa SHA256 95e3438db7eba181ae5f02518482c31bc0d0e40fac06da0f4757ff2018eae990 +MISC ChangeLog 40288 RMD160 a4eb014a2c7aa7e1ec546a571c152c536b7f60fc SHA1 68959605ea7afb9471291a3105f37882a15b46f6 SHA256 c828f96458a5acfeee402afd7dc922dc0bbdb6c442111ac6fac8c73552d5ce53 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHtxK9kKaRLQcq0GIRAuepAKCZ+08O0lQi95pwjCglU/LxFSMphwCgiS5A +iSsQcBjI7gba94g4XBy4F9M= +=8pmq +-----END PGP SIGNATURE----- diff --git a/media-gfx/imagemagick/imagemagick-6.3.7.9-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.3.7.9-r1.ebuild new file mode 100644 index 000000000000..bbd69d2c867e --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.3.7.9-r1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.7.9-r1.ebuild,v 1.1 2008/02/16 16:42:16 maekke Exp $ + +inherit eutils multilib perl-app + +MY_PN=ImageMagick +MY_P=${MY_PN}-${PV%.*} +MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="http://www.imagemagick.org/" +SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" + +LICENSE="imagemagick" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx + openexr perl png q8 q32 svg tiff truetype X wmf xml zlib" + +RDEPEND="bzip2? ( app-arch/bzip2 ) + djvu? ( app-text/djvu ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( media-libs/libfpx ) + graphviz? ( >=media-gfx/graphviz-2.6 ) + gs? ( virtual/ghostscript ) + jbig? ( media-libs/jbigkit ) + jpeg? ( >=media-libs/jpeg-6b ) + jpeg2k? ( media-libs/jasper ) + lcms? ( >=media-libs/lcms-1.06 ) + openexr? ( media-libs/openexr ) + perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) + png? ( media-libs/libpng ) + tiff? ( >=media-libs/tiff-3.5.5 ) + xml? ( >=dev-libs/libxml2-2.4.10 ) + truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libXext + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + svg? ( >=gnome-base/librsvg-2.9.0 ) + ) + !dev-perl/perlmagick + !sys-apps/compare" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + >=sys-devel/libtool-1.5.2-r6 + X? ( x11-proto/xextproto )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use djvu && ! built_with_use app-text/djvu threads; then + eerror "app-text/djvu has to be built with threads support." + die "build app-text/djvu with USE=\"threads\"" + fi + # for now, only build svg support when X is enabled, as librsvg + # pulls in quite some X dependencies. + if use svg && ! use X ; then + elog "the svg USE-flag requires the X USE-flag set." + elog "disabling svg support for now." + fi +} + +src_unpack() { + unpack ${A} + + # fix doc dir, bug 91911 + epatch "${FILESDIR}"/${P}-doc.patch +} + +src_compile() { + local myconf + if use q32 ; then + myconf="${myconf} --with-quantum-depth=32" + elif use q8 ; then + myconf="${myconf} --with-quantum-depth=8" + else + myconf="${myconf} --with-quantum-depth=16" + fi + + if use X && use svg ; then + myconf="${myconf} --with-rsvg" + else + myconf="${myconf} --without-rsvg" + fi + + econf \ + ${myconf} \ + --with-ltdl-include=/usr/include \ + --with-ltdl-lib=/usr/$(get_libdir) \ + --with-threads \ + --with-modules \ + $(use_with perl) \ + --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ + $(use_enable hdri) \ + $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ + $(use_with !nocxx magick-plus-plus) \ + $(use_with bzip2 bzlib) \ + $(use_with djvu) \ + $(use_with fontconfig) \ + $(use_with fpx) \ + $(use_with gs dps) \ + $(use_with gs gslib) \ + $(use_with graphviz gvc) \ + $(use_with jbig) \ + $(use_with jpeg jpeg) \ + $(use_with jpeg2k jp2) \ + $(use_with lcms) \ + $(use_with png) \ + $(use_with svg rsvg) \ + $(use_with tiff) \ + $(use_with truetype freetype) \ + $(use_with wmf) \ + $(use_with xml) \ + $(use_with zlib) \ + $(use_with X x) \ + $(use_with openexr) \ + || die "econf failed" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation of files into image failed" + + # dont need these files with runtime plugins + rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} + + ! use doc && rm -r "${D}"/usr/share/doc/${PF}/html + dodoc NEWS ChangeLog AUTHORS README.txt + + # Fix perllocal.pod file collision + use perl && fixlocalpod +} diff --git a/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild new file mode 100644 index 000000000000..aa130bd25cb1 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.8.3-r1.ebuild,v 1.1 2008/02/16 16:42:16 maekke Exp $ + +inherit eutils multilib perl-app + +MY_PN=ImageMagick +MY_P=${MY_PN}-${PV%.*} +MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.} + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="http://www.imagemagick.org/" +SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" + +LICENSE="imagemagick" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx + openexr perl png q8 q32 svg tiff truetype X wmf xml zlib" + +RDEPEND="bzip2? ( app-arch/bzip2 ) + djvu? ( app-text/djvu ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( media-libs/libfpx ) + graphviz? ( >=media-gfx/graphviz-2.6 ) + gs? ( virtual/ghostscript ) + jbig? ( media-libs/jbigkit ) + jpeg? ( >=media-libs/jpeg-6b ) + jpeg2k? ( media-libs/jasper ) + lcms? ( >=media-libs/lcms-1.06 ) + openexr? ( media-libs/openexr ) + perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) + png? ( media-libs/libpng ) + tiff? ( >=media-libs/tiff-3.5.5 ) + xml? ( >=dev-libs/libxml2-2.4.10 ) + truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libXext + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + svg? ( >=gnome-base/librsvg-2.9.0 ) + ) + !dev-perl/perlmagick + !sys-apps/compare" + +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + >=sys-devel/libtool-1.5.2-r6 + X? ( x11-proto/xextproto )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use djvu && ! built_with_use app-text/djvu threads; then + eerror "app-text/djvu has to be built with threads support." + die "build app-text/djvu with USE=\"threads\"" + fi + # for now, only build svg support when X is enabled, as librsvg + # pulls in quite some X dependencies. + if use svg && ! use X ; then + elog "the svg USE-flag requires the X USE-flag set." + elog "disabling svg support for now." + fi +} + +src_unpack() { + unpack ${A} + + # fix doc dir, bug 91911 + sed -i -e \ + 's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \ + "${S}"/configure || die + + # bug 206925 + epatch "${FILESDIR}"/${P}-hpgl.patch +} + +src_compile() { + local myconf + if use q32 ; then + myconf="${myconf} --with-quantum-depth=32" + elif use q8 ; then + myconf="${myconf} --with-quantum-depth=8" + else + myconf="${myconf} --with-quantum-depth=16" + fi + + if use X && use svg ; then + myconf="${myconf} --with-rsvg" + else + myconf="${myconf} --without-rsvg" + fi + + econf \ + ${myconf} \ + --with-ltdl-include=/usr/include \ + --with-ltdl-lib=/usr/$(get_libdir) \ + --with-threads \ + --with-modules \ + $(use_with perl) \ + --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ + $(use_enable hdri) \ + $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ + $(use_with !nocxx magick-plus-plus) \ + $(use_with bzip2 bzlib) \ + $(use_with djvu) \ + $(use_with fontconfig) \ + $(use_with fpx) \ + $(use_with gs dps) \ + $(use_with gs gslib) \ + $(use_with graphviz gvc) \ + $(use_with jbig) \ + $(use_with jpeg jpeg) \ + $(use_with jpeg2k jp2) \ + $(use_with lcms) \ + $(use_with png) \ + $(use_with svg rsvg) \ + $(use_with tiff) \ + $(use_with truetype freetype) \ + $(use_with wmf) \ + $(use_with xml) \ + $(use_with zlib) \ + $(use_with X x) \ + $(use_with openexr) \ + || die "econf failed" + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation of files into image failed" + + # dont need these files with runtime plugins + rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} + + use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html} + dodoc NEWS ChangeLog AUTHORS README.txt + + # Fix perllocal.pod file collision + use perl && fixlocalpod +} -- 2.26.2