Version bump.

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

4 files changed, 162 insertions, 3 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index fd6bfe29f8d6..09b50c4d2864 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # 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.408 2010/07/23 21:28:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.409 2010/07/26 15:10:05 ssuominen Exp $
+
+*imagemagick-6.6.3.0 (26 Jul 2010)
+
+  26 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.6.3.0.ebuild, metadata.xml:
+  Version bump with reintroduced coreutils USE flag wrt #323309 by Dennis
+  Schridde.
 
   23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.6.2.5.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index df4150c467fd..c5c9f8382247 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,8 @@
 DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2caf94c243 SHA1 c57d80607a4a4b90e10e718f95cde380915169a7 SHA256 e510045d6aca949092f696b6b4e2994cf22693408f067e4ae9a00f66c414910a
 DIST ImageMagick-6.6.2-5.tar.xz 6469864 RMD160 4d53b8d20b27147affebfb703e8996ab8b28d8ac SHA1 8a803b5e29901e4aba44d3f6561686926d5a1817 SHA256 4cbf14efa8076717bd7de19dc2db398ec24c28452d0b1f2a8ebfe9876342c838
+DIST ImageMagick-6.6.3-0.tar.xz 6291300 RMD160 64db0749fc0e407fbed1cb0a9bfeca499f8c0618 SHA1 1bb7b98de4b3eebb8c3927d52169b2f773bb40f1 SHA256 f37c15dfd40389788b93898b8f1cdde1e5bcc477dc5e496e8a5f93c56c9bcbba
 EBUILD imagemagick-6.6.1.2.ebuild 3827 RMD160 11df027e97ad49e526b8e7cd472aed446048ffd3 SHA1 bb82c14c190f10923cdbd68aaa3957ee9cfa740f SHA256 8f4fd196f33962b3bc8b1a9c7182228a102187e1b1986c23b8d28c42733cb60e
 EBUILD imagemagick-6.6.2.5.ebuild 3928 RMD160 49826668cbb1148496338f6fcc4a11cf41b6a81e SHA1 8d3efe27805f714e1efbd63f2f77bf6d7156ddbc SHA256 20f36b2fd279830a85f0aa7619ee5e2ef8bacc9999a00e97d4d73517ca3b1892
-MISC ChangeLog 60750 RMD160 ce49e44d3557121b2cf7c3f50ed093bb99276e97 SHA1 6737c6a5fef904ab3327aa1602a8cfc797156060 SHA256 6003e2ae71d66087fd5284e4db84058e5be6a44f85596f27b2522700f9e610a0
-MISC metadata.xml 693 RMD160 3d73c1e6455b55208ac7a4abd4d556295593de54 SHA1 22ea72770cf75bcfc6a81601a6924156e3121eb5 SHA256 c00ef1edb16bf403dadde0e61623797ead912e9ec4d9b6ae2fa71ece47857d09
+EBUILD imagemagick-6.6.3.0.ebuild 4107 RMD160 8faf6a766534639863043b6fc57fdc06d9477513 SHA1 b5e4d1ca4b2f5947492e3fc8abeac82c5a33829a SHA256 b9400009249be30b4cc0dd447f745d4d4bce523d3931e3d44a0fd55d2d9fd9d7
+MISC ChangeLog 60972 RMD160 2f16f34eaf2927c4d78d134e90d487c378d31aea SHA1 8414b0e8a383bb1468e9f3d08c8c1266a66ef7f9 SHA256 87f263aaeef136dbf890b8f534d264831657f2e85bc2cb78942782ffddaaf8f7
+MISC metadata.xml 814 RMD160 0563719e5dfd793fa265434bd366f6d6c784ad37 SHA1 e7a6737a04c43c0d0b9d4b087f661122fe28d578 SHA256 0b2915134cbcdda31fc0b579d661fa9e0afd2354dcf7773b71d54b0f65f33cb9
diff --git a/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild b/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild
new file mode 100644
index 000000000000..253f2cb91d62
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.6.3.0.ebuild
@@ -0,0 +1,146 @@
+# 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.3.0.ebuild,v 1.1 2010/07/26 15:10:06 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="~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 +corefonts 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? ( 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 )
+	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
+
+	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 openexr) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		${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 94f6981802f4..d420154bb5ac 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -7,6 +7,10 @@
 			use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector
 			graphics
 		</flag>
+		<flag name='corefonts'>
+			pull in <pkg>media-fonts/corefonts</pkg>, which is required for some
+			commands
+		</flag> 
 		<flag name='fpx'>
 			enable <pkg>media-libs/libfpx</pkg> support
 		</flag>