remove this version, as MagickWand is broken (fixed in upstream version 6.3.8-9), reported in bug #217655

Package-Manager: portage-2.1.5_rc4

3 files changed, 16 insertions, 148 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index dc420a993778..26caf114b4cf 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # 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.282 2008/04/13 13:01:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.283 2008/04/18 22:43:42 maekke Exp $
+
+  18 Apr 2008; Markus Meier <maekke@gentoo.org> -imagemagick-6.3.9.7.ebuild:
+  remove this version, as MagickWand is broken (fixed in upstream version
+  6.3.8-9), reported in bug #217655
 
 *imagemagick-6.4.0.6 (13 Apr 2008)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b318b8c94c68..2ed8c10a6817 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
@@ -11,13 +14,18 @@ DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f0
 DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579fa4b7789 SHA1 117fd8552961149992c78c045d7de191f7692bb8 SHA256 bcaac2d9d416c055642b4f92b2c8057e5fed4f8d70703e423ad19b3662b096c3
 DIST ImageMagick-6.3.5-10.tar.bz2 7571418 RMD160 b8436a7a5ada2793177f47621d031c89753b770c SHA1 f2fb1b73895a335c553c40b705af7ea179700316 SHA256 a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
 DIST ImageMagick-6.3.8-3.tar.bz2 8792547 RMD160 31e8c34c654f207d8f1a216ed6184530aad8c96d SHA1 6a9ff40bf6f8812216298b2fad79c55d8900479b SHA256 d5df4328a660c94613a9587fd7386e13a00d5c4e115fd86b94205d21bdc33f8b
-DIST ImageMagick-6.3.9-7.tar.bz2 8832367 RMD160 a7d97f80dab96bcd99bfe32bcc030ffd2c97047e SHA1 226da45f0a5d82b296c34ab03d6342de5e46cf87 SHA256 cff91d93027472054df07253541c850caaa691fd58bc10433baff2644a6208fe
 DIST ImageMagick-6.4.0-6.tar.bz2 8826474 RMD160 19abac0458df07c5b90a131e3ca011f05104f8f4 SHA1 891128e03ea4d024d77794c91f6a1bcfa855058c SHA256 fa3763f1df89ef9be7416f9cd08f85d02a0240abb3f0bf21122d04e8b87d5bb1
 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
 EBUILD imagemagick-6.3.8.3-r1.ebuild 3941 RMD160 39c44253826f6e1ba33be5d9770360fb88199e1e SHA1 1cca98a78ad875454005d6e6c5c391bed6e7cd00 SHA256 4f63862b953a7735edcf7275bcb7f6edb8d79ec6f482d00f26dbc70c2034627a
-EBUILD imagemagick-6.3.9.7.ebuild 3991 RMD160 b1a931188b482295f7069cccf5d52f4b4e7ea038 SHA1 9b9c55a1c36f6dfd7d19e14f25a81a7366c1cee5 SHA256 443cb2abcb6957e9728c4b530c46df873595f577888a69fecef56ec3bf8b127d
 EBUILD imagemagick-6.4.0.6.ebuild 3929 RMD160 5568b1e5a0010eb8a2055e6b5db51b1f24de8b84 SHA1 cd172df5243c6512e0ec07727314639a7802a391 SHA256 50b48efb290277279273f0400d7317a3e8797ebeb30d4f122a15777c3bb7c91a
-MISC ChangeLog 42490 RMD160 b94522c8fde2b1d317a96869ce930313ac2f5cda SHA1 1b1210996ac03ee30d3f9e7ce7693711ec739ed4 SHA256 ef71c080e0c4715febdc4e7afb0ca6c0eb09251999c55fefaace09d5362efc31
+MISC ChangeLog 42679 RMD160 6a42a1bcd6f6e548aaaa5cdfb157138bc4b975bc SHA1 4ef740db8ba37d032fa1e3051610ea7f2e24acf5 SHA256 8406edf3ab7a1f3976117ad0a4de0d0c90f3ebf6d5bb1d416e73c939dcd35e1d
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgJJFAACgkQkKaRLQcq0GIoCACghCU//iHtZLQo8FYRVugC2y+2
+ZzoAn0ROR6DsmRhYx+TBbTXYkoinL1fr
+=dNtN
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.3.9.7.ebuild b/media-gfx/imagemagick/imagemagick-6.3.9.7.ebuild
deleted file mode 100644
index ec346cc1c495..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.3.9.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.9.7.ebuild,v 1.1 2008/03/17 20:51:42 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}"/${PN}-6.3.9.8-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} \
-		--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 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.txt ChangeLog AUTHORS.txt README.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}