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.

(Portage version: 2.1.1)

4 files changed, 121 insertions, 2 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/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
+}