Version bump.

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

3 files changed, 151 insertions, 2 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index ae388a13a29a..a76261430298 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.392 2010/04/28 12:25:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.393 2010/05/10 18:51:11 ssuominen Exp $
+
+*imagemagick-6.6.1.7 (10 May 2010)
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.6.1.7.ebuild:
+  Version bump.
 
   28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.6.1.2.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index df40197d868d..1133dac9b70f 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,8 @@
 DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb
 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
 EBUILD imagemagick-6.5.8.8.ebuild 5033 RMD160 cd0a072e0dcd2919afaf55914bc1f8cbd8425db0 SHA1 079ca007a664f8fa808a40bc984af18053455d52 SHA256 aefcfb8c162ea10f0d4e79e4a558d1a4a0036375f6ccf7d71ad8885d451166aa
 EBUILD imagemagick-6.6.1.2.ebuild 3842 RMD160 a196c43503eafbdc19a5f6cf71bc762f08347e62 SHA1 7d27852c65997bfa1a01fad12993757640fe84bd SHA256 f19675a0191f1894225dab6545c4d963eae9b844274a281e98cf418c87eea7e2
-MISC ChangeLog 58691 RMD160 595c2c4237280e71ccf62c794daa1ddf999b9455 SHA1 05712ba755fd7f213418ad4a8454d4fa1ceb5eec SHA256 bce494f5dffe0b330e5fff9532cf3b0c32fdef5c92097464e890f3d5203a7c56
+EBUILD imagemagick-6.6.1.7.ebuild 3842 RMD160 bf3fbaca95b6d6e54d84db4d584761c81f75237f SHA1 85ab1d35a4079baf64724901fe6b211fe6bbef95 SHA256 205dd8e405fca08f7706ea0faaacc9fa11dc593c777ad1ee42df81fca9b39eab
+MISC ChangeLog 58829 RMD160 89b3bc93f481fdb794de0a2e55994b1a9b121595 SHA1 66f955c8c0e8176340e788a39f5031b8e8a22b53 SHA256 d77e214c926e3e1b522d688e644c85b89c12f3c55a8eccf5706554641eb25c37
 MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
diff --git a/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild b/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild
new file mode 100644
index 000000000000..99e50d9795af
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.6.1.7.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.1.7.ebuild,v 1.1 2010/05/10 18:51:11 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 ~x86-fbsd"
+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"
+
+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* )
+	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
+
+	# openmp support only works with >=sys-devel/gcc-4.3, bug #223825
+	if use openmp && version_is_at_least 4.3 $(gcc-version) ; then
+		if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then
+			openmp=enable
+		fi
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		--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 "${D}" -type f -name perllocal.pod -delete
+		find "${D}" -depth -mindepth 1 -type d -empty -delete
+	fi
+}