Version bump wrt #358251 by Denny Reeh and Arfrever Frehtes Taifersar Arahesis.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 165 insertions, 3 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 18036b4f8ca7..997bdd8585a8 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.425 2011/02/15 17:34:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.426 2011/03/22 15:11:39 ssuominen Exp $
+
+*imagemagick-6.6.8.5 (22 Mar 2011)
+
+  22 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.6.8.5.ebuild, metadata.xml:
+  Version bump wrt #358251 by Denny Reeh and Arfrever Frehtes Taifersar
+  Arahesis.
 
 *imagemagick-6.6.7.6 (15 Feb 2011)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 4fbf1565187a..ebdb5b8dd2fb 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,8 @@
 DIST ImageMagick-6.6.5-6.tar.xz 6314756 RMD160 9c2d96bc1210356305096b27f2d829a8d3445356 SHA1 c129c813bd73deae5ec21491e8121f365bbdd7b3 SHA256 585a8372deb2052906c8fc74e84f96d72b711a08f804a4952cbb4c21fc4538fe
 DIST ImageMagick-6.6.7-6.tar.xz 7579776 RMD160 430a59204360abcc4180c33d99b53e0e352974f3 SHA1 054d1f22d173607cedb6acd7666b80d997ba2f44 SHA256 1b2ae5325847b37656a6486dbce9129b0ae37334d2f971835bbe0cf7c6542ba1
+DIST ImageMagick-6.6.8-5.tar.xz 7637460 RMD160 bc3b8c30ad8bf603106a19cdbd1c7f2908454dfd SHA1 ec80517e020c5800cdcf5bdf2b0c968009e7a439 SHA256 cbbf9f84daf837141b5a0d9bb4ffafb2263f6c23e661c405546deb7be603d919
 EBUILD imagemagick-6.6.5.6.ebuild 4112 RMD160 e1468ad53908a8149c8157a8546e16e70b462b95 SHA1 070fda24f67d9406482fa320e04389d311e8b8d4 SHA256 773f6c3f163647567d649d3fac31fcd53e3d6e1bc18b71d7255d37907912a417
 EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 391c85d3780f097d00b96d9fab54e77c22747979 SHA1 f467db5008048be8d8d983f2d723b5320b5013ff SHA256 68b00107a07f04eaeb1fc10a446f17d9c3f08d6c85602d1f93bae1ffa22b2e4f
-MISC ChangeLog 62936 RMD160 7e728987230e3060b9d53271521bb64b80a1aa33 SHA1 98c184fb66e5862a04d35d917fb8feb1c49d6508 SHA256 096c58b86a7385007f89d44a1074dffd1f1f7db330baa3deabb608929bf8bf3b
-MISC metadata.xml 814 RMD160 0563719e5dfd793fa265434bd366f6d6c784ad37 SHA1 e7a6737a04c43c0d0b9d4b087f661122fe28d578 SHA256 0b2915134cbcdda31fc0b579d661fa9e0afd2354dcf7773b71d54b0f65f33cb9
+EBUILD imagemagick-6.6.8.5.ebuild 4182 RMD160 9befd233d4c660e2183462c9860e68799609350f SHA1 1b21798647cc617e0f237a61b60f33ef0847740f SHA256 88408e26eed869a6edbb96224034a5b5e91fff89b9734f02d725908768555a79
+MISC ChangeLog 63156 RMD160 81bf2d17ca99f48e7713a700dd8e9511b4bee17f SHA1 e3c4d8c6a9af0355022dd3e9bcb30ec95e02239f SHA256 ea7da8dcd09809ce5821759f117f7310618806cb9132015e7e98d50cf0e42ddf
+MISC metadata.xml 881 RMD160 644aaccd14d343a6ff6ed4fc590cf3a41c13503e SHA1 439a612d1ee5359edd173756f6bf08b75cd58687 SHA256 42fcc392603dedd8e1831e5e079a8fe2ef3330ec9edc65fcbfe3f506ebad0c21
diff --git a/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild b/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
new file mode 100644
index 000000000000..5c83abafce28
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild,v 1.1 2011/03/22 15:11:39 ssuominen Exp $
+
+EAPI=3
+inherit multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 +corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma openexr openmp perl png q32 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
+IUSE="${IUSE} video_cards_nvidia" # opencl support
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( app-text/ghostscript-gpl )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( =media-libs/lcms-2* )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 )
+	png? ( >=media-libs/libpng-1.4 )
+	raw? ( media-gfx/ufraw )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2*
+		corefonts? ( media-fonts/corefonts ) )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+	webp? ( media-libs/libwebp )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )
+	!dev-perl/perlmagick
+	!media-gfx/graphicsmagick[imagemagick]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="perl? ( userpriv )"
+
+src_prepare() {
+	sed -i \
+		-e "/^DOCUMENTATION_RELATIVE_PATH/s:=.*:=${PF}:" \
+		configure || die
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	if use openmp && tc-has-openmp; then
+		openmp=enable
+	fi
+
+	local myconf
+	if use truetype; then
+		myconf="$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
+	else
+		myconf="--without-corefonts"
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable video_cards_nvidia opencl) \
+		--with-threads \
+		--without-included-ltdl \
+		--with-ltdl-include="${EPREFIX}/usr/include" \
+		--with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with gs dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k jp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with openexr) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		${myconf} \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P}; then
+		emake -j1 check || die
+	else
+		ewarn "Skipping tests because installed version doesn't match."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+	fi
+}
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index d420154bb5ac..6748376c6ae8 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -29,5 +29,8 @@
 		<flag name='q8'>
 			set quantum depth to 8
 		</flag>
+		<flag name='webp'>
+			enable webp image format support
+		</flag>
 	</use>
 </pkgmetadata>