summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-10-15 18:09:56 +0000
committerMarkus Meier <maekke@gentoo.org>2008-10-15 18:09:56 +0000
commit258bc13588541f03071c41ecdbd60cc5904bc760 (patch)
tree6ad0d3a1110893d0c903509fe97435588819ac08 /media-gfx/imagemagick
parentStable on ppc (diff)
downloadhistorical-258bc13588541f03071c41ecdbd60cc5904bc760.tar.gz
historical-258bc13588541f03071c41ecdbd60cc5904bc760.tar.bz2
historical-258bc13588541f03071c41ecdbd60cc5904bc760.zip
bump to 6.4.4.6 (bug #237174), add raw USE-flag (which pulls in media-gfx/ufraw, that's why some keywords are dropped) for bug #237174 and corefonts USE-flag for bug #239765. add support for the test-suite, but only run it if the same ${PV} is installed
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27 i686
Diffstat (limited to 'media-gfx/imagemagick')
-rw-r--r--media-gfx/imagemagick/ChangeLog14
-rw-r--r--media-gfx/imagemagick/Manifest13
-rw-r--r--media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild166
-rw-r--r--media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild173
-rw-r--r--media-gfx/imagemagick/metadata.xml4
5 files changed, 361 insertions, 9 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 911086e24a15..289aff88fe45 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,10 +1,16 @@
# 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.302 2008/09/22 16:58:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.303 2008/10/15 18:09:56 maekke Exp $
- 22 Sep 2008; Markus Meier <maekke@gentoo.org>
- +files/imagemagick-6.4.3.5-svg-dep.patch, imagemagick-6.4.3.5.ebuild:
- fix bug #236643
+*imagemagick-6.4.4.6-r1 (15 Oct 2008)
+*imagemagick-6.4.4.6 (15 Oct 2008)
+
+ 15 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml,
+ +imagemagick-6.4.4.6.ebuild, +imagemagick-6.4.4.6-r1.ebuild:
+ bump to 6.4.4.6 (bug #237174), add raw USE-flag (which pulls in
+ media-gfx/ufraw, that's why some keywords are dropped) for bug #237174 and
+ corefonts USE-flag for bug #239765. add support for the test-suite, but
+ only run it if the same ${PV} is installed
*imagemagick-6.4.3.5 (29 Aug 2008)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2bf4150f5cdd..91272d284962 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -20,6 +20,7 @@ DIST ImageMagick-6.4.0-6.tar.bz2 8826474 RMD160 19abac0458df07c5b90a131e3ca011f0
DIST ImageMagick-6.4.2-0.tar.bz2 8842016 RMD160 a0b074ec66c4d6149b3aa392cf4b0cbc6a6ea35e SHA1 a8fcb4839b124e2a900db6babdc307bf6695b8f1 SHA256 b427d83c223243760b7d9ccb1d926a9ce9a4e38d5eec262a713da7986a80cf91
DIST ImageMagick-6.4.2-9.tar.bz2 8854437 RMD160 05fe1b04be7969d8531c4e2aecddc7606a28f43a SHA1 e68b6969c1cb2d455a705f80f1a4e94a2f6a6434 SHA256 fed24b4ea21af103624538211860ccd222eb6572cbbde3753ad1c6e8d3a0f6ea
DIST ImageMagick-6.4.3-5.tar.bz2 8858249 RMD160 a8e8c0582994e43cfe39cffce417c7237a5a4eb9 SHA1 035ed34f32a56b45b48262e3cdbb49d0aaaaf892 SHA256 8c20b5282af6469375b401f7104635a8a11bc73e67e331199627b61fa7d8bae1
+DIST ImageMagick-6.4.4-6.tar.bz2 8856594 RMD160 e64f485d54118d6c99df392001645da213e2756b SHA1 703b0e5017fcffd4f6dca4f607862e984d8b5d1a SHA256 9c85e5c43adce21588fc0eaa526fa514797d985760cd302b904e27112e01da91
EBUILD imagemagick-6.3.3.ebuild 2690 RMD160 78f27e2aea0e06ff092328d4082b6a6d0857270e SHA1 769b0d4df8008cf2992e5d2daa53b67db67af6d9 SHA256 a993f97c6064baf130c3183c60a26de325ab10ba409b5dff0af4203275103822
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
@@ -28,12 +29,14 @@ EBUILD imagemagick-6.4.0.6.ebuild 3919 RMD160 6a493d4c07357433a518c78fbd853130a9
EBUILD imagemagick-6.4.2.0.ebuild 4012 RMD160 d3ece0e1fc711f2db697a92404f43a9569271a10 SHA1 eeac6d941851735528d8e4d264e6b188357ccf92 SHA256 ebb34fb5553ebe0c0b430c159f1506d7e26f02fae0a645e249453fce58bf478d
EBUILD imagemagick-6.4.2.9.ebuild 4497 RMD160 2d2c910c9ce20a90279d26f48a2666fc7c3b4142 SHA1 cd1b763bb9c0201c1e1321ccdf5da724daee16e7 SHA256 707da8d66bfa5d58c668b9eb7d6d61ea80669d2f2fe0a09a65193399e9006312
EBUILD imagemagick-6.4.3.5.ebuild 4461 RMD160 14417ca19bd27b3c2fd8e2f5219c25a11b141ea2 SHA1 c4a191214be5dfcca90e095218822d364c4f6da5 SHA256 4044d39cf555b202a02f9d46063adad1cd504e4b380db12b723ce83a3eb0d34a
-MISC ChangeLog 45399 RMD160 1f5f9f102ee652598e6d92496b77d418f24e6217 SHA1 0b641ddd82e7b956bd4afb5d368d6912526136e9 SHA256 94b3098f48554d6f89bd55ed3321829890e58c89393194462e7f173260d0c235
-MISC metadata.xml 660 RMD160 2627f5184f9f6c97783a9fa561cb82a6c5d52c3c SHA1 7e1487825756530fc7294e9e93cd297de66e1add SHA256 cd412dbd3f7b776a4d587099c805836a60ab430be941282064551e2810a7dc48
+EBUILD imagemagick-6.4.4.6-r1.ebuild 4606 RMD160 d638373643efb05e1742b1d1e22793cdbd7fb3d2 SHA1 93d9311dba2bd6531e615ceb857bd28dc7e87812 SHA256 2913cd3dbd1830614e300c4bbee09a979cbca78d2bf29453c089db05acee3c7e
+EBUILD imagemagick-6.4.4.6.ebuild 4814 RMD160 76205a9af77bbf9b2fbe565a7e9d11b4560e3877 SHA1 d9cb761dd2d9f67125066ced3ff98f896770fb5f SHA256 a56971455617222edee504cb354272b6e341fb380c305265db537f956dcb6797
+MISC ChangeLog 45722 RMD160 21b66fd83766518ca8b65ca01fa2254d2979a38b SHA1 da72f01a3b30fc60587d4aad23ef205b65db21af SHA256 7be3b2fdf5a33144c0270022ae658284c9c5bc3efa8bf15326e7499b198c4652
+MISC metadata.xml 780 RMD160 cc863f6e054cb3050e6495a3b3d91fb92c2bd0fd SHA1 433e3ce5f1c8d4032b5c112e72784777cdba310d SHA256 d1321e9689fb47245c7a8e19160e002b34ca1dfbff608f9395cf4143e897bfb2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkjXzvYACgkQkKaRLQcq0GIyMACdEASrGKN3AiQdUsDMclf0rpw5
-LnUAnikV1PBfBJCqth0qi1VLB8pqC/Cf
-=zjmO
+iEYEARECAAYFAkj2MlMACgkQkKaRLQcq0GJMbgCdEE11obaKK/dkvE4gE0jeUU7g
+AooAnA9ApenyQR3ew2OwHxrNwp6b2dNm
+=sEMg
-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild
new file mode 100644
index 000000000000..ac058fcef0d5
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild
@@ -0,0 +1,166 @@
+# 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.4.4.6-r1.ebuild,v 1.1 2008/10/15 18:09:56 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib perl-app toolchain-funcs
+
+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="~amd64 ~ppc ~x86"
+IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
+ lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+ djvu? ( app-text/djvu[threads] )
+ 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 )
+ raw? ( media-gfx/ufraw )
+ tiff? ( >=media-libs/tiff-3.5.5 )
+ truetype? ( =media-libs/freetype-2*
+ corefonts? ( media-fonts/corefonts ) )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xml? ( >=dev-libs/libxml2-2.4.10 )
+ 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
+ >=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ # 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
+
+ if use corefonts && ! use truetype ; then
+ elog "corefonts USE-flag requires the truetype USE-flag to be set."
+ elog "disabling corefonts support for now"
+ fi
+}
+
+src_prepare() {
+ # 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
+}
+
+src_configure() {
+ 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
+
+ #openmp support only works with >=sys-devel/gcc-4.3
+ # see bug #223825
+ if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
+ if [[ $(gcc-version) != "4.3" ]] ; then
+ ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
+ myconf="${myconf} --disable-openmp"
+ else
+ myconf="${myconf} --enable-openmp"
+ fi
+ else
+ elog "disabling openmp support"
+ myconf="${myconf} --disable-openmp"
+ fi
+
+ use truetype && myconf="${myconf} $(use_with truetype windows-font-dir /usr/share/fonts/corefonts)"
+
+ econf \
+ ${myconf} \
+ --without-included-ltdl \
+ --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 !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 openexr) \
+ $(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) \
+ || die "econf failed"
+}
+
+src_test() {
+ # make check only works after make install,
+ # --> only run if this version is already installed
+ if has_version ~${CATEGORY}/${P} ; then
+ emake -j1 check || die "make check failed"
+ fi
+}
+
+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.txt ChangeLog AUTHORS.txt README.txt
+
+ # Fix perllocal.pod file collision
+ use perl && fixlocalpod
+}
diff --git a/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild b/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
new file mode 100644
index 000000000000..9a61425b33bd
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
@@ -0,0 +1,173 @@
+# 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.4.4.6.ebuild,v 1.1 2008/10/15 18:09:56 maekke Exp $
+
+EAPI="1"
+
+inherit eutils multilib perl-app toolchain-funcs
+
+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="~amd64 ~ppc ~x86"
+IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
+ lcms nocxx openexr openmp perl png q8 q32 raw 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 )
+ raw? ( media-gfx/ufraw )
+ tiff? ( >=media-libs/tiff-3.5.5 )
+ truetype? ( =media-libs/freetype-2*
+ corefonts? ( media-fonts/corefonts ) )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
+ xml? ( >=dev-libs/libxml2-2.4.10 )
+ 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
+ >=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ 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
+
+ if use corefonts && ! use truetype ; then
+ elog "corefonts USE-flag requires the truetype USE-flag to be set."
+ elog "disabling corefonts 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
+}
+
+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
+
+ #openmp support only works with >=sys-devel/gcc-4.3
+ # see bug #223825
+ if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
+ if [[ $(gcc-version) != "4.3" ]] ; then
+ ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
+ myconf="${myconf} --disable-openmp"
+ else
+ myconf="${myconf} --enable-openmp"
+ fi
+ else
+ elog "disabling openmp support"
+ myconf="${myconf} --disable-openmp"
+ fi
+
+ use truetype && myconf="${myconf} $(use_with truetype windows-font-dir /usr/share/fonts/corefonts)"
+
+ econf \
+ ${myconf} \
+ --without-included-ltdl \
+ --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 !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 openexr) \
+ $(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) \
+ || die "econf failed"
+ emake || die "compile problem"
+}
+
+src_test() {
+ # make check only works after make install,
+ # --> only run if this version is already installed
+ if has_version ~${CATEGORY}/${P} ; then
+ emake -j1 check || die "make check failed"
+ fi
+}
+
+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.txt ChangeLog AUTHORS.txt README.txt
+
+ # Fix perllocal.pod file collision
+ use perl && fixlocalpod
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index 7ca5a49ecf9e..173d646ea2eb 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -3,6 +3,10 @@
<pkgmetadata>
<herd>graphics</herd>
<use>
+ <flag name='corefonts'>
+ pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
+ commands
+ </flag>
<flag name='fpx'>
enable <pkg>media-libs/libfpx</pkg> support
</flag>