Version bump, fixing bug 173186.

Package-Manager: portage-2.1.2.4

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 7fcc8e31913037208ab89635cfc8b392be844916..4fa6a40d87bee1f81cc6fc4662f25052ea51c926 100644 (file)
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.215 2007/03/10 11:09:58 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.216 2007/04/17 11:43:45 kloeri Exp $
+
+*imagemagick-6.3.3 (17 Apr 2007)
+
+  17 Apr 2007; Bryan Østergaard <kloeri@gentoo.org>
+  +files/imagemagick-6.3.3-docs.patch, +imagemagick-6.3.3.ebuild:
+  Version bump, fixing bug 173186.
 
   10 Mar 2007; Alexander H. Færøy <eroyf@gentoo.org>
   imagemagick-6.3.0.5.ebuild:

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 9912d69c9535b593fcb4a70721e3e7f1c879b6e9..81e913a76d50a110a417fa35906ae9a6bff0a328 100644 (file)
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -17,11 +17,16 @@ AUX imagemagick-6.3.0.5-parallel-build.patch 436 RMD160 68ede460a0aee676fa6f3a0d
 MD5 52e5d5817f8c4815f4cd851f8239ab5f files/imagemagick-6.3.0.5-parallel-build.patch 436
 RMD160 68ede460a0aee676fa6f3a0dd7f90235bcf09f6a files/imagemagick-6.3.0.5-parallel-build.patch 436
 SHA256 95958bf107327f7f1d598f4ca9357a2f0bb31464754865e611c4b754e2b72990 files/imagemagick-6.3.0.5-parallel-build.patch 436
+AUX imagemagick-6.3.3-docs.patch 605 RMD160 5efee8976d9bab8308fdb7d167ab85f5e9247026 SHA1 5b989f21e4b2295541b64abb86869761b4a41b67 SHA256 e08792995e61887cdbac5b1ab9f31500840d5be6e73164be02e1ad5412bce602
+MD5 5ef05f8f60cc10b701cfeadb6dade096 files/imagemagick-6.3.3-docs.patch 605
+RMD160 5efee8976d9bab8308fdb7d167ab85f5e9247026 files/imagemagick-6.3.3-docs.patch 605
+SHA256 e08792995e61887cdbac5b1ab9f31500840d5be6e73164be02e1ad5412bce602 files/imagemagick-6.3.3-docs.patch 605
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 MD5 d4ff8f64c60d78f04bac78748164f3fb files/imagemagick-perl.patch 1864
 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 files/imagemagick-perl.patch 1864
 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad files/imagemagick-perl.patch 1864
 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30
+DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e
 EBUILD imagemagick-6.3.0.5-r1.ebuild 2917 RMD160 578779ef200c2bee134a452f5943f8f530d34e0c SHA1 453e9d5f28d70cd9f3725bcf930f0f1eb1fd0181 SHA256 f805ad9ba8cded46a987332f43e003bb93f248e844d7f3de1c6a38601217d589
 MD5 cc0c29c4eeb692f8ef66f4b30b934f32 imagemagick-6.3.0.5-r1.ebuild 2917
 RMD160 578779ef200c2bee134a452f5943f8f530d34e0c imagemagick-6.3.0.5-r1.ebuild 2917
@@ -30,10 +35,14 @@ EBUILD imagemagick-6.3.0.5.ebuild 2887 RMD160 b0445e32b8452439e903614dd155f2838f
 MD5 d4fc9d238597bb54406712bff95556ea imagemagick-6.3.0.5.ebuild 2887
 RMD160 b0445e32b8452439e903614dd155f2838f8e8e95 imagemagick-6.3.0.5.ebuild 2887
 SHA256 57a31e4ce8492ea9322d327cc188be2508967bc8c1327750f5b25f4073a15641 imagemagick-6.3.0.5.ebuild 2887
-MISC ChangeLog 32422 RMD160 ea6090a43d9f49c398ef857a7eb9a29477917573 SHA1 4b34f00e84769c2ae3cc78007e4e6bc68712d519 SHA256 70b427342ab8794eaf82eabbceb515ea12a399947a3ba5afe2db689de1e8189e
-MD5 0f52e6bc558582e9787b19cf94a3c473 ChangeLog 32422
-RMD160 ea6090a43d9f49c398ef857a7eb9a29477917573 ChangeLog 32422
-SHA256 70b427342ab8794eaf82eabbceb515ea12a399947a3ba5afe2db689de1e8189e ChangeLog 32422
+EBUILD imagemagick-6.3.3.ebuild 2717 RMD160 7d10ade4521886b3bd1773c1e4b120815b03f4bf SHA1 836cd0a88274d84d3476d66221bd98ec3fee11bb SHA256 297a28c4fa903ffdcea305ce6a12cac53705e8383c1e41d56a9f7460260cf60c
+MD5 feaedca31b69f4fc45b1e98ec7b3a0de imagemagick-6.3.3.ebuild 2717
+RMD160 7d10ade4521886b3bd1773c1e4b120815b03f4bf imagemagick-6.3.3.ebuild 2717
+SHA256 297a28c4fa903ffdcea305ce6a12cac53705e8383c1e41d56a9f7460260cf60c imagemagick-6.3.3.ebuild 2717
+MISC ChangeLog 32612 RMD160 38e13605e57a82c8c48faa47721b9719161bd828 SHA1 d55d35fcc4347df8b76002e84b561a9d9ad51af4 SHA256 af54e9abba5e492893cb3533b86bc0beed5693714008e5ee101d79594b7ac402
+MD5 2d95a637f2d1d25e6c34bb96f11f2f2c ChangeLog 32612
+RMD160 38e13605e57a82c8c48faa47721b9719161bd828 ChangeLog 32612
+SHA256 af54e9abba5e492893cb3533b86bc0beed5693714008e5ee101d79594b7ac402 ChangeLog 32612
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -44,10 +53,13 @@ SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/di
 MD5 0d12f992e50e9939892f4d4681d0b4a5 files/digest-imagemagick-6.3.0.5-r1 265
 RMD160 3b12a2962e36cf4831ec9bc578749a2a8d76fc64 files/digest-imagemagick-6.3.0.5-r1 265
 SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/digest-imagemagick-6.3.0.5-r1 265
+MD5 299d222f09f88d7493ca5620d706f239 files/digest-imagemagick-6.3.3 265
+RMD160 18ca77e1eb632845c347cbb4e7fd91a79433aaf5 files/digest-imagemagick-6.3.3 265
+SHA256 94dd43b9f80cd8b4c71a830732a39f141593e2a9fe693722744f94cd2e9dea59 files/digest-imagemagick-6.3.3 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF8pHL6Xxn2nLwtdQRAv5iAKCXT2zvEqrR5r7w+gxu3Ftj663oPQCdEoM4
-IAEqx3S1aNt0P9mjlWBUXwM=
-=C6ZI
+iD8DBQFGJLLpugEuf3OQ0akRAiLEAJsHpFXLqaP5WqubY4NVQd/Wlf8hDQCeIQSy
+dKzjWPijIjk2WuRLVmk4qbg=
+=twZu
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.3.3 b/media-gfx/imagemagick/files/digest-imagemagick-6.3.3
new file mode 100644 (file)
index 0000000..0ee4813
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.3.3
@@ -0,0 +1,3 @@
+MD5 dccbcf2f9e9fc1c550c9173baad8654b ImageMagick-6.3.3-8.tar.bz2 5633820
+RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 ImageMagick-6.3.3-8.tar.bz2 5633820
+SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e ImageMagick-6.3.3-8.tar.bz2 5633820

diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.3-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.3.3-docs.patch
new file mode 100644 (file)
index 0000000..7fb863c
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.3-docs.patch
@@ -0,0 +1,16 @@
+--- configure.orig     2007-04-17 11:15:51.000000000 +0200
++++ configure  2007-04-17 11:17:25.000000000 +0200
+@@ -39254,8 +39254,12 @@
+ 
+ #
+ # Path to ImageMagick document files
++if test "x${PF}" = "x" ; then
+ MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+-MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
++else
++MagickDocumentSubdir="${PF}"
++fi
++MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html"
+ MagickDocumentPathDefine="${MagickDocumentPath}/"
+ if test "$native_win32_build" = 'yes'; then
+     MagickDocumentPathDefine=`$WinPathScript "$MagickDocumentPathDefine" 1`

diff --git a/media-gfx/imagemagick/imagemagick-6.3.3.ebuild b/media-gfx/imagemagick/imagemagick-6.3.3.ebuild
new file mode 100644 (file)
index 0000000..19f796a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.3.3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.3.ebuild,v 1.1 2007/04/17 11:43:45 kloeri Exp $
+
+#WANT_AUTOCONF=2.59
+#WANT_AUTOMAKE=1.8
+
+inherit eutils multilib perl-app
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${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_P}-8.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+       zlib? ( sys-libs/zlib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXt
+               x11-libs/libICE
+               x11-libs/libSM
+       )
+       gs? ( virtual/ghostscript )
+       lcms? ( >=media-libs/lcms-1.06 )
+       mpeg? ( >=media-video/mpeg2vidcodec-12 )
+       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 )
+       jbig? ( media-libs/jbigkit )
+       jpeg? ( >=media-libs/jpeg-6b )
+       jpeg2k? ( media-libs/jasper )
+       perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+       !dev-perl/perlmagick
+       !sys-apps/compare
+       graphviz? ( media-gfx/graphviz )
+       fpx? ( media-libs/libfpx )"
+DEPEND="${RDEPEND}
+       >=sys-apps/sed-4
+       >=sys-devel/libtool-1.5.2-r6
+       X? ( x11-proto/xextproto )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${PN}-${PV}-docs.patch
+
+}
+
+src_compile() {
+       econf \
+               --with-threads \
+               --with-modules \
+               $(use_with perl) \
+               --with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+               $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \
+               $(use_with !nocxx magick-plus-plus) \
+               $(use_with bzip2 bzlib) \
+               $(use_with fpx) \
+               $(use_with gs gslib) \
+               $(use_with graphviz gvc) \
+               $(use_with jbig) \
+               $(use_with jpeg jpeg) \
+               $(use_with jpeg2k jp2) \
+               $(use_with lcms) \
+               $(use_with mpeg mpeg2) \
+               $(use_with png) \
+               $(use_with tiff) \
+               $(use_with truetype ttf) \
+               $(use_with wmf) \
+               $(use_with xml) \
+               $(use_with zlib) \
+               $(use_with X x) \
+               || die "econf failed"
+       emake || die "compile problem"
+
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die
+       dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config
+
+       # 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 QuickStart.txt Install-unix.txt
+
+       # Fix perllocal.pod file collision
+       use perl && fixlocalpod
+
+}