bump, this fixes bug #186683 and bug #201278

Package-Manager: portage-2.1.4_rc11

4 files changed, 136 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 64a1e8324bf5..3027607a2b3f 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # 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.256 2007/12/07 22:48:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.257 2007/12/30 13:26:53 maekke Exp $
+
+*imagemagick-6.3.7.8 (30 Dec 2007)
+
+  30 Dec 2007; Markus Meier <maekke@gentoo.org> +imagemagick-6.3.7.8.ebuild:
+  bump, this fixes bug #186683 and bug #201278
 
   07 Dec 2007; Markus Meier <maekke@gentoo.org> imagemagick-6.3.0.5.ebuild,
   imagemagick-6.3.0.5-r1.ebuild, imagemagick-6.3.3.ebuild,
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d3454ecc9134..43e4d491047c 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -31,6 +31,7 @@ DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579
 DIST ImageMagick-6.3.4-9.tar.bz2 5813934 RMD160 cab331e23c1a49ac9db403d823fa807efbf69a40 SHA1 5869d2ee1d63b849b899637c7a39320d96022ab4 SHA256 e25eb510b156750afc099d24ba2d104d7b47fbd7d460e07463ef48b751300dde
 DIST ImageMagick-6.3.5-10.tar.bz2 7571418 RMD160 b8436a7a5ada2793177f47621d031c89753b770c SHA1 f2fb1b73895a335c553c40b705af7ea179700316 SHA256 a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
 DIST ImageMagick-6.3.5-9.tar.bz2 7645732 RMD160 6d2e74a1b8de26a095c2185a8b2c21259e9fb79b SHA1 71de22d770a4cb3de94c1925a03fba6d16e71513 SHA256 60ae398533a48b9edba17f1ede68525fd6aca143aaa8b430bc4c4ece40554596
+DIST ImageMagick-6.3.7-8.tar.bz2 7504033 RMD160 e6db2b7e25110b279c3ef7b24c0e2f9946f1470a SHA1 00236386bdec96809f400f760cb11cba350bad19 SHA256 3a9299cad6b53e7f1ec652b0250a9eb23c48d75590de2ba5fcb791ac9e3bc813
 EBUILD imagemagick-6.3.0.5-r1.ebuild 2926 RMD160 f89c77a293acc34ca2d8082c049fed844d553e1d SHA1 5f204e9013eed6f8bd0a7123f6dfa6a58ed98797 SHA256 4c7175928979c627fbc843eec474e6ec6532fb0b306da6e8c1086fb6c58232c7
 MD5 f42fd6e7a8177b92a7d17ab5b91801e3 imagemagick-6.3.0.5-r1.ebuild 2926
 RMD160 f89c77a293acc34ca2d8082c049fed844d553e1d imagemagick-6.3.0.5-r1.ebuild 2926
@@ -59,10 +60,14 @@ EBUILD imagemagick-6.3.5.9.ebuild 3037 RMD160 71e25a9e117aa9057b019c85bdaf3313c1
 MD5 f504d96a7ed5ade55d0cf362dbf8ae17 imagemagick-6.3.5.9.ebuild 3037
 RMD160 71e25a9e117aa9057b019c85bdaf3313c1b3eb52 imagemagick-6.3.5.9.ebuild 3037
 SHA256 273e62d7437ff287a33ca8d6a6209089158c0d7b14b70b69d2b5a3f60ee38f78 imagemagick-6.3.5.9.ebuild 3037
-MISC ChangeLog 38280 RMD160 453fb5120c9a15e11cb8f5b5fc69fbc057fca523 SHA1 d13860fa6ae17b15fa948fb9c9d63a26957439ed SHA256 d23a91b31ae16332ed41b1735d5b8d674f2aaf0e30b9ea0355712bfb61360f9c
-MD5 74c94c15d1262bea213da3a80bdd40ff ChangeLog 38280
-RMD160 453fb5120c9a15e11cb8f5b5fc69fbc057fca523 ChangeLog 38280
-SHA256 d23a91b31ae16332ed41b1735d5b8d674f2aaf0e30b9ea0355712bfb61360f9c ChangeLog 38280
+EBUILD imagemagick-6.3.7.8.ebuild 3104 RMD160 ebcd2d52818ed029595f277dff19cfd41db90742 SHA1 384e94640bbf04d21a13fdec4569daf2e18ae0c7 SHA256 5ac66df7e1fa0e6c72e7b6d01ed2f422b02d262d9358daf5570e281865235b41
+MD5 e010c730aa6d82ad935661d68b4c12dd imagemagick-6.3.7.8.ebuild 3104
+RMD160 ebcd2d52818ed029595f277dff19cfd41db90742 imagemagick-6.3.7.8.ebuild 3104
+SHA256 5ac66df7e1fa0e6c72e7b6d01ed2f422b02d262d9358daf5570e281865235b41 imagemagick-6.3.7.8.ebuild 3104
+MISC ChangeLog 38441 RMD160 d8f7512a1061ae5d5343f32223ca97dbd848ad55 SHA1 eeb795477b2a702294542f8940e0fc3421fc94d3 SHA256 4b9fa1e7f79f611623dd98afc6c7208f62048f815bb7b6824287a893ef7ae248
+MD5 edcdb56db7569e384f1557d576f2de79 ChangeLog 38441
+RMD160 d8f7512a1061ae5d5343f32223ca97dbd848ad55 ChangeLog 38441
+SHA256 4b9fa1e7f79f611623dd98afc6c7208f62048f815bb7b6824287a893ef7ae248 ChangeLog 38441
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -88,10 +93,13 @@ SHA256 d230e31265f25994faaa2880e88b71d6efe9d4c20811ff2d824b11e9a1d3e53c files/di
 MD5 a029dd80d92dc2c85abc7e85a8b5ed24 files/digest-imagemagick-6.3.5.9 265
 RMD160 de7050d48dfc7d040d6503ec1022863c10f27db7 files/digest-imagemagick-6.3.5.9 265
 SHA256 27a3de21571bbb60f00ce59481c5e15273f5bb6d651640fd7f8987e7d7d3ccf9 files/digest-imagemagick-6.3.5.9 265
+MD5 f82a96dda30e898ca56836f2dfbd64a6 files/digest-imagemagick-6.3.7.8 265
+RMD160 d7f01645ac94c999334b518fea8d0ee90c335632 files/digest-imagemagick-6.3.7.8 265
+SHA256 8532c979b4dbc000db59b48a8e801be9ec126b12976ec920c753cc3d2e65782e files/digest-imagemagick-6.3.7.8 265
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHWc4pkKaRLQcq0GIRAsmnAJ90X7/KMW0iedBoVxtWF/gh40zcRACggCbi
-gIkTTUWIUqyEoyfZ2Ff752Q=
-=vMWi
+iEYEARECAAYFAkd3nOsACgkQkKaRLQcq0GJ2NgCfXu0shav5OY2fLlYC3jgC78dG
+k70AnRjZi/6m1Rj4eA2K4RtJiAazwwpQ
+=LHad
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.3.7.8 b/media-gfx/imagemagick/files/digest-imagemagick-6.3.7.8
new file mode 100644
index 000000000000..f50ae63d2e4b
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.3.7.8
@@ -0,0 +1,3 @@
+MD5 80cf5cb19e81a77a6ea3037c1705acee ImageMagick-6.3.7-8.tar.bz2 7504033
+RMD160 e6db2b7e25110b279c3ef7b24c0e2f9946f1470a ImageMagick-6.3.7-8.tar.bz2 7504033
+SHA256 3a9299cad6b53e7f1ec652b0250a9eb23c48d75590de2ba5fcb791ac9e3bc813 ImageMagick-6.3.7-8.tar.bz2 7504033
diff --git a/media-gfx/imagemagick/imagemagick-6.3.7.8.ebuild b/media-gfx/imagemagick/imagemagick-6.3.7.8.ebuild
new file mode 100644
index 000000000000..278224ca43e0
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.3.7.8.ebuild
@@ -0,0 +1,111 @@
+# 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.7.8.ebuild,v 1.1 2007/12/30 13:26:53 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 fpx graphviz gs hdri jbig jpeg jpeg2k lcms mpeg nocxx openexr
+	perl png q8 q32 svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	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 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	png? ( media-libs/libpng )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	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
+	)
+	!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}"
+
+src_compile() {
+	local quantum
+	if use q32 ; then
+		quantum="${quantum} --with-quantum-depth=32"
+	elif use q8 ; then
+		quantum="${quantum} --with-quantum-depth=8"
+	else
+		quantum="${quantum} --with-quantum-depth=16"
+	fi
+
+	econf \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		${quantum} \
+		$(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 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 mpeg mpeg2) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(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"
+	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
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}