Version bump to fix security issues #143533 and #144091 (and happens to fix #127281). Require corefonts #146713 by Robert Kaufman. Tweak doc path for #125252 by jochen. Block sys-apps/compare for #117739 by Rodrigo Queiro.

Package-Manager: portage-2.1.1

5 files changed, 147 insertions, 10 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 5a1f816c09a5..89af855680eb 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.191 2006/09/04 05:20:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.192 2006/09/14 07:25:28 vapier Exp $
+
+*imagemagick-6.2.9.5 (14 Sep 2006)
+
+  14 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  files/imagemagick-6.2.5.4-docs.patch, +imagemagick-6.2.9.5.ebuild:
+  Version bump to fix security issues #143533 and #144091 (and happens to fix
+  #127281). Require corefonts #146713 by Robert Kaufman. Tweak doc path for
+  #125252 by jochen. Block sys-apps/compare for #117739 by Rodrigo Queiro.
 
   04 Sep 2006; Joshua Kinard <kumba@gentoo.org> imagemagick-6.2.8.0.ebuild:
   Marked stable on mips.
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 694f7d6cdf9b..6304b317f646 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX imagemagick-6.1.8.8-fpx.patch 504 RMD160 7f596496301452b1849e59cda680fe92ca068707 SHA1 53d045cf7c228c720b923873aec4ad4c3a254b1d SHA256 fc7290293e830e4ccf1589f1e45893b1d14bd2cf47734257e8e022898353562c
 MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
 RMD160 7f596496301452b1849e59cda680fe92ca068707 files/imagemagick-6.1.8.8-fpx.patch 504
 SHA256 fc7290293e830e4ccf1589f1e45893b1d14bd2cf47734257e8e022898353562c files/imagemagick-6.1.8.8-fpx.patch 504
-AUX imagemagick-6.2.5.4-docs.patch 958 RMD160 eb817af343cadf9b866bf24f5571e68ef3da7382 SHA1 ecde7c1babe43bc39d6aa8f7a35b64a6d95d4117 SHA256 9d46c16d4700fc11c2c06619586451ed79c9edb5408b7bf192bc8f135ca34da8
-MD5 0437a3eeba135410aca694c2eae65720 files/imagemagick-6.2.5.4-docs.patch 958
-RMD160 eb817af343cadf9b866bf24f5571e68ef3da7382 files/imagemagick-6.2.5.4-docs.patch 958
-SHA256 9d46c16d4700fc11c2c06619586451ed79c9edb5408b7bf192bc8f135ca34da8 files/imagemagick-6.2.5.4-docs.patch 958
+AUX imagemagick-6.2.5.4-docs.patch 1025 RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 SHA1 4f674ebc4554f7edc6c938f14360dc8a50881141 SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2
+MD5 a2ea32f35ad5cd39b86e963c6af87076 files/imagemagick-6.2.5.4-docs.patch 1025
+RMD160 ff4d59b7c7b447fec55f981cd9f94f1f27cf6a06 files/imagemagick-6.2.5.4-docs.patch 1025
+SHA256 c7ee14154f5a26c6b744bef518adcdba3a33797b29fdfa456f96c748886c6db2 files/imagemagick-6.2.5.4-docs.patch 1025
 AUX imagemagick-6.2.6.0-png.patch 875 RMD160 823769a96c888e8b6d4e557e8f277c266ad3528f SHA1 4d0a9744db38933bb58a3a662f4afcd4f40f8d4e SHA256 40ea21cafb7e70b70d3ac8e2c0a50699ef3af879c75f9af4e5816479babc2427
 MD5 3a625c970bf9758e93f8204938de8f50 files/imagemagick-6.2.6.0-png.patch 875
 RMD160 823769a96c888e8b6d4e557e8f277c266ad3528f files/imagemagick-6.2.6.0-png.patch 875
@@ -19,6 +22,7 @@ DIST ImageMagick-6.2.4-2.tar.bz2 4837173 RMD160 88bbea8c5bb68ef2bcee8b9af2c6e678
 DIST ImageMagick-6.2.5-5.tar.bz2 5044679 RMD160 b2882a7cef6ce98ea797ca99cec62a39b026f252 SHA1 ce1289edb35a7d2999bdfc1654b18251939832d5 SHA256 f8a3c192d33f93f0f83c4ead0ec0cbb1c9fbdb8d183e340ea59a7032054dd0d4
 DIST ImageMagick-6.2.6-0.tar.bz2 5139235 RMD160 34d8ea5408439c536ac2c791c7ad2fafa1424671 SHA1 0cf67149e806053a63fdaec70de913a9fd72aaf9 SHA256 385bbf2c07678696796d20f152ab0dc3c81ff73c1ed775cf00beaf46eb3d76c7
 DIST ImageMagick-6.2.8-0.tar.bz2 5282322 RMD160 f5f9592c8f7c8bc67875ea984fed23650ab7224e SHA1 637569bbcb331233c86258f6c681d5a7c849cba0 SHA256 b7e6ca7052c3f8314ed7e34fcaa27428d822d9b6285d855e11c52b8eb3bd5803
+DIST ImageMagick-6.2.9-5.tar.bz2 5378476 RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 SHA1 209337da8021b23d85440913f276ac99ff958b5d SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05
 EBUILD imagemagick-6.2.2.3-r1.ebuild 2777 RMD160 7671de6368fa64347c37bdcd7eb20d0f153ff026 SHA1 d50fbb2720d92e58899209be2430fb2b91393bf9 SHA256 277b30d03270c0d37b011d61219fdd0b68afd30145993c19892dd3b01c7fcb0f
 MD5 a46f41692d78d787af8cf97bbc1a2058 imagemagick-6.2.2.3-r1.ebuild 2777
 RMD160 7671de6368fa64347c37bdcd7eb20d0f153ff026 imagemagick-6.2.2.3-r1.ebuild 2777
@@ -39,10 +43,14 @@ EBUILD imagemagick-6.2.8.0.ebuild 2827 RMD160 f69722fe9eb4cd6963c645ce9279a444af
 MD5 74b8709cd2237115ce6ef263025377ba imagemagick-6.2.8.0.ebuild 2827
 RMD160 f69722fe9eb4cd6963c645ce9279a444afadbef5 imagemagick-6.2.8.0.ebuild 2827
 SHA256 5e92a3c099dd2f547a465f7fee23412ecd506a74065ea158cdff507284523cbb imagemagick-6.2.8.0.ebuild 2827
-MISC ChangeLog 28637 RMD160 529a5b5dc3c22ab2d08e727b0677e041ec1e0ec6 SHA1 50dfd40154542fa90d120c13f8da81498721106c SHA256 42fba3bd9ce7719940de9f00c54843d5a5ebdd5c7a36e68ba4ff19f0a2e4aa29
-MD5 e2d92f9a54a8b6df4b0fbb2ba427474f ChangeLog 28637
-RMD160 529a5b5dc3c22ab2d08e727b0677e041ec1e0ec6 ChangeLog 28637
-SHA256 42fba3bd9ce7719940de9f00c54843d5a5ebdd5c7a36e68ba4ff19f0a2e4aa29 ChangeLog 28637
+EBUILD imagemagick-6.2.9.5.ebuild 2821 RMD160 e724da068c7776e43caaa6dc17a6178ea5cc4dd3 SHA1 f69f41e58842dffe20b0eb8e7a5dbfe2dfbc0336 SHA256 46facef1a79f390a91725b1841423cf028f92425b2029ffdc945b03ef446f830
+MD5 5a1734a94c2cf996e6a9167cb1031679 imagemagick-6.2.9.5.ebuild 2821
+RMD160 e724da068c7776e43caaa6dc17a6178ea5cc4dd3 imagemagick-6.2.9.5.ebuild 2821
+SHA256 46facef1a79f390a91725b1841423cf028f92425b2029ffdc945b03ef446f830 imagemagick-6.2.9.5.ebuild 2821
+MISC ChangeLog 29023 RMD160 f24ee642ea7d455debe625ba27ac1e1eaf62c143 SHA1 6df351cdb1ba38ce30f51fb187ad671594411203 SHA256 6300df828d4b1b0da3fdf541a2c67b18e73aa4eabdfd191adb0a7a604695d0f1
+MD5 730aea09c0fea07f287a356cdae8d153 ChangeLog 29023
+RMD160 f24ee642ea7d455debe625ba27ac1e1eaf62c143 ChangeLog 29023
+SHA256 6300df828d4b1b0da3fdf541a2c67b18e73aa4eabdfd191adb0a7a604695d0f1 ChangeLog 29023
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -62,3 +70,13 @@ SHA256 a00ce11cd01cfeacabd29dae2d35338b286d26e5574e433680eeb0d5f5c4ccc8 files/di
 MD5 2fa221530b5235a0da463e7321ecf944 files/digest-imagemagick-6.2.8.0 265
 RMD160 9d164f3e533d93e98e235907a8cc78b534179f0f files/digest-imagemagick-6.2.8.0 265
 SHA256 853737bfa1e16e55b5b34de4a8990e5a4fa7178582adbe02f8c4885a29100b84 files/digest-imagemagick-6.2.8.0 265
+MD5 cee80301208cab77996ca62352b9189d files/digest-imagemagick-6.2.9.5 265
+RMD160 ac4d6f121492e7e41e22c8b08a95fd8b54d0c250 files/digest-imagemagick-6.2.9.5 265
+SHA256 629523b989b4d82c8858bedb4416832ec397618e345609225dac7ac65587a319 files/digest-imagemagick-6.2.9.5 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFCQP1amhnQswr0vIRAvBgAJ0eP1Maj5Bf8vt6VcuPN4PUC6pXLQCfXlLG
+JAqZrIGKer2riFB4ClAxqow=
+=t3o5
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5
new file mode 100644
index 000000000000..945ff71d74a2
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.9.5
@@ -0,0 +1,3 @@
+MD5 c927f9afcac089e47a166b5c4476a8d8 ImageMagick-6.2.9-5.tar.bz2 5378476
+RMD160 58a199b5af7e62a75471a72885f9c8baed43b248 ImageMagick-6.2.9-5.tar.bz2 5378476
+SHA256 e0f096ec7939ffc9ac5a7750c9cf6eac4854de7dbf9e7bac8ecec9a66da8cc05 ImageMagick-6.2.9-5.tar.bz2 5378476
diff --git a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
index 8953ef0ce664..9a28d80197ca 100644
--- a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
+++ b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
@@ -11,7 +11,8 @@ Better control what doc files we install and where
 +else
 +MagickDocumentSubdir="${PF}"
 +fi
- MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
+-MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
++MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}/html"
  MagickDocumentPathDefine="${MagickDocumentPath}/"
  if test "$native_win32_build" = 'yes'
 --- Makefile.in
diff --git a/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild b/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild
new file mode 100644
index 000000000000..57fe5343c071
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.9.5.ebuild,v 1.1 2006/09/14 07:25:28 vapier Exp $
+
+inherit eutils perl-app multilib
+
+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="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~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 )
+	media-fonts/corefonts
+	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* )
+	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}"
+	chmod +x config.sub
+	epatch "${FILESDIR}"/${PN}-6.2.5.4-docs.patch
+}
+
+src_compile() {
+	econf \
+		--with-threads \
+		--with-modules \
+		--without-perl \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		--with-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"
+
+	if use perl ; then
+		cd PerlMagick
+		perl-app_src_prep
+		perl-app_src_compile
+	fi
+}
+
+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
+
+	if use perl ; then
+		cd PerlMagick
+		perl-module_src_install
+	fi
+}