version bump, adds opencl support via VIDEO_CARDS="nvidia" by Francisco Javier in bug #322161

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 154 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index c924c0c8749d..dc6023f86c78 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.402 2010/05/27 10:47:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.403 2010/06/20 18:24:58 maekke Exp $
+
+*imagemagick-6.6.2.5 (20 Jun 2010)
+
+  20 Jun 2010; Markus Meier <maekke@gentoo.org> +imagemagick-6.6.2.5.ebuild:
+  version bump, adds opencl support via VIDEO_CARDS="nvidia" by Francisco
+  Javier in bug #322161
 
   27 May 2010; Markus Meier <maekke@gentoo.org> -imagemagick-6.5.8.8.ebuild:
   old
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7e1b05923d8b..91288a9ac436 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2caf94c243 SHA1 c57d80607a4a4b90e10e718f95cde380915169a7 SHA256 e510045d6aca949092f696b6b4e2994cf22693408f067e4ae9a00f66c414910a
 DIST ImageMagick-6.6.1-7.tar.xz 6253476 RMD160 4e033f901a939e34e010f3cfa34d7f605813c69b SHA1 294a18dc2d57209dd2e4aff8ad505734df0885e8 SHA256 fd48aa25a1afa1de307ce4376f4aa8b42be9301792d7702bde8651a9a0c893c8
+DIST ImageMagick-6.6.2-5.tar.xz 6469864 RMD160 4d53b8d20b27147affebfb703e8996ab8b28d8ac SHA1 8a803b5e29901e4aba44d3f6561686926d5a1817 SHA256 4cbf14efa8076717bd7de19dc2db398ec24c28452d0b1f2a8ebfe9876342c838
 EBUILD imagemagick-6.6.1.2.ebuild 3827 RMD160 11df027e97ad49e526b8e7cd472aed446048ffd3 SHA1 bb82c14c190f10923cdbd68aaa3957ee9cfa740f SHA256 8f4fd196f33962b3bc8b1a9c7182228a102187e1b1986c23b8d28c42733cb60e
 EBUILD imagemagick-6.6.1.7.ebuild 3791 RMD160 e656b0ea43b8c80602b591c0ffbf1846b47f9df2 SHA1 56bbf594b2fc1a37ca50903f8bc46a3e8729cf55 SHA256 e704ad5fc1972b736ea413878c9db3357bc2589f31651347f0967a9a45a53dc5
-MISC ChangeLog 59918 RMD160 a9c737285875a13863a6a720569c5a4b25e02f85 SHA1 2933e53fb1ebeaefc425f210c01ac732e8595d6f SHA256 1aca8124ee7607547656082c51d51655bba23f7fc22a46de85b7de1ef0faefe6
+EBUILD imagemagick-6.6.2.5.ebuild 3935 RMD160 b7868a17fa65523bf27e5225444f65104eef3929 SHA1 77f86e635463e49752baf5762ec6e5960c9cb1d7 SHA256 558a4c8b4d4346b804d9c6c28778b946fde3096c7a68476d71955eff10578866
+MISC ChangeLog 60130 RMD160 f13cf1ba97873cf2b1b7ddb8cec058664b2c3551 SHA1 76e5f0081810010eae5a7de6a846759d753e0142 SHA256 41a022a8a4e1d44f3a54cc43c2cc95a13779fb9d9ef0ced583754d574ca4b88d
 MISC metadata.xml 693 RMD160 3d73c1e6455b55208ac7a4abd4d556295593de54 SHA1 22ea72770cf75bcfc6a81601a6924156e3121eb5 SHA256 c00ef1edb16bf403dadde0e61623797ead912e9ec4d9b6ae2fa71ece47857d09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv+Te0ACgkQkKaRLQcq0GItmwCgjEXcHqVHhsGj5cW86vjO5hZN
-KFEAnRMOMPaW4JPIhT3biGpHaHx5xMIE
-=hd+U
+iEYEARECAAYFAkweXNoACgkQkKaRLQcq0GLdEQCghVcCPeeTICc5rSEZNaXtVGPC
+OcMAn3SnCYha/Kl7zBz0Oey88WNrWwn8
+=E8y5
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild b/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild
new file mode 100644
index 000000000000..7bf0c55a176d
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.2.5.ebuild,v 1.1 2010/06/20 18:24:58 maekke 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg
+jpeg2k lcms lqr openexr openmp perl png q32 q8 raw static-libs svg tiff
+truetype 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 )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( app-text/ghostscript-gpl )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b:0 )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 )
+	png? ( media-libs/libpng )
+	raw? ( media-gfx/ufraw )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2* )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+	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 )
+	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
+
+	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) \
+		$(use_with lcms) \
+		$(use_with lqr) \
+		$(use_with openexr) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		--with-windows-font-dir="${EPREFIX}/usr/share/fonts/corefonts" \
+		$(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
+}