Version bump.

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

7 files changed, 14 insertions, 541 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 401f9e99bc9a..186694153f42 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.390 2010/03/31 10:02:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.391 2010/04/14 15:05:20 ssuominen Exp $
+
+*imagemagick-6.6.1.2 (14 Apr 2010)
+
+  14 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.6.1.2.ebuild:
+  Version bump.
 
 *imagemagick-6.6.0.10 (31 Mar 2010)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5fac474d963b..e107062e8e0d 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,14 +1,8 @@
 DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c
-DIST ImageMagick-6.5.4-10.tar.bz2 8819304 RMD160 b48f8b8c0c9ec8cc01a38eee45868d540b3845db SHA1 87fd01d4399c8caba2f505c35618117b5296a1cc SHA256 b27117bfafc989ce74214db116a5b3bd1fda0e501839faab09c715c8647cd8eb
-DIST ImageMagick-6.5.7-0.tar.bz2 8709712 RMD160 a15e1aba983c4bac7b73d4b992fe0fc56bf4f665 SHA1 f48b6708b9dc055938219108f77fc4369b962ffc SHA256 ceefefcfe2e670f2f5a52a8f2575ba99e445aaa3204a44736832436adc5eb642
 DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb
-DIST ImageMagick-6.5.9-4.tar.bz2 8746631 RMD160 8e9702f77e4db6f80dd27024e576b721f8d57ef2 SHA1 cc6bd595a1040da8423b7f9eccf68212dc83d9e1 SHA256 bc95ba56ac78e35a42199d3f79c7ac20bdb001ad61f58b81923e6da99d60b517
-DIST ImageMagick-6.6.0-10.tar.xz 6239496 RMD160 84ff7fec294643cad199c09bc8e9f42085c2766a SHA1 1232b5a62f9f6a6c837fd2af76457d891568f064 SHA256 c865568c51b0c6b17adff65aeb650bebd8ec569caca2021c5ad29a30683086c4
-EBUILD imagemagick-6.5.2.9.ebuild 4868 RMD160 daa91a0e2db50e0450f2f6ed4b35910cba9b909e SHA1 00fdd574223265fb8cfe344fe22bdbf591fecce8 SHA256 8092331f339e8b2f3bda2925dab69948b9e32c93a6919e93d7053cc9f6400dfe
-EBUILD imagemagick-6.5.4.10.ebuild 5039 RMD160 e314999828e0c4daaf3f6b6dfda536807d2c732f SHA1 9ddb71dacb9bb31f6f21df18715f13a5fc592181 SHA256 cba7f7d52fb1b40fa45880f73869e6d8f2f32ef0a9acf21a885da373a1257a49
-EBUILD imagemagick-6.5.7.0.ebuild 5028 RMD160 a3fd35073798419167e95475ac99cc72ee8c687d SHA1 7419eca5cc222234725170d887fc710fa83be5bb SHA256 f005cf9628025204926d20059af8252af925d5ffd3878381476e83fbba351a0b
+DIST ImageMagick-6.6.1-2.tar.xz 6231544 RMD160 8c87f76764356640a86dcaf4c5eb9d2caf94c243 SHA1 c57d80607a4a4b90e10e718f95cde380915169a7 SHA256 e510045d6aca949092f696b6b4e2994cf22693408f067e4ae9a00f66c414910a
+EBUILD imagemagick-6.5.2.9.ebuild 4814 RMD160 c85d3a04b6ea69a52e398db17a5fed0a14a1c6d6 SHA1 61045f6caea83d00c5e994b26e9b00549925d596 SHA256 d5c0745e27cd239fd5b1a76662a7721981528eece509dd57b8c9c230da75d669
 EBUILD imagemagick-6.5.8.8.ebuild 5033 RMD160 cd0a072e0dcd2919afaf55914bc1f8cbd8425db0 SHA1 079ca007a664f8fa808a40bc984af18053455d52 SHA256 aefcfb8c162ea10f0d4e79e4a558d1a4a0036375f6ccf7d71ad8885d451166aa
-EBUILD imagemagick-6.5.9.4-r1.ebuild 4968 RMD160 6974d4058515aec2f4e89e3ce39ed4b0a8f1d8bd SHA1 8f6ccd56b1afe00b1631c3320236787c5f10d251 SHA256 9c4669c261a06fed0178bfb4fb42b8c8ffac7b5eda66ee137efa54624be66018
-EBUILD imagemagick-6.6.0.10.ebuild 3833 RMD160 76e0e5b036206e9b3b922119a3ea4384a46c2502 SHA1 66527b137ada92a695efd103d6d345b1f48980e6 SHA256 6018ac10032f71dccfd39e7b7585ec6d78fd63835f91c4b0c99872adb30b29d7
-MISC ChangeLog 58378 RMD160 d4a4e53fb6be6ec6b59f1e6c88776ad59aae7940 SHA1 5ede33d7c6b4cfef3acccbedfb6a3c118c2617eb SHA256 f4ed584f2f181bda2041aaac63156f91ef47705f78848e5bdbb40374d5039274
+EBUILD imagemagick-6.6.1.2.ebuild 3832 RMD160 f16e7cabf30e76bc98661196919ce18e5df295ef SHA1 20960c7d728233d3a3fb037ee79a8bdf71ff112b SHA256 1862dbe3013e4d77ac13bc50fe3a7dbecb431335ae19a640a482f4709eb8a876
+MISC ChangeLog 58516 RMD160 612a7bd1354dd979e0dc69833c6413a3e2d41da2 SHA1 9d138cfdf3c8136af43c723eff0f927d79750aa4 SHA256 b2597573fa6e7217f97c2f74a8a60bb74ec54f00b8d763c8adc495bf43f3b428
 MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
diff --git a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
index 94fbba4697f7..e7b0708dc6a9 100644
--- a/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.15 2009/12/26 17:38:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.9.ebuild,v 1.16 2010/04/14 15:05:20 ssuominen Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
 RESTRICT="perl? ( userpriv )"
 LICENSE="imagemagick"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
 	lcms nocxx openexr openmp perl png q8 q32 raw svg tiff truetype X wmf xml zlib"
 
diff --git a/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild b/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild
deleted file mode 100644
index 937501aae5b2..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.4.10.ebuild,v 1.11 2009/12/26 17:38:06 pva Exp $
-
-EAPI="2"
-
-inherit eutils multilib perl-app toolchain-funcs versionator
-
-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://imagemagick/${MY_P2}.tar.bz2
-		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
-
-# perl tests fail with userpriv
-RESTRICT="perl? ( userpriv )"
-LICENSE="imagemagick"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
-	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff
-	truetype X wmf xml zlib"
-
-RDEPEND="
-	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 )
-	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 !=dev-lang/perl-5.8.7 )
-	png? ( media-libs/libpng )
-	raw? ( media-gfx/ufraw )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
-		corefonts? ( media-fonts/corefonts ) )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-	)
-	!dev-perl/perlmagick
-	!media-gfx/graphicsmagick[imagemagick]
-	!sys-apps/compare
-	>=sys-devel/libtool-1.5.2-r6"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-S="${WORKDIR}/${MY_P2}"
-
-pkg_setup() {
-	# for now, only build svg support when X is enabled, as librsvg
-	# pulls in quite some X dependencies.
-	if use svg && ! use X ; then
-		elog "the svg USE-flag requires the X USE-flag set."
-		elog "disabling svg support for now."
-	fi
-
-	if use corefonts && ! use truetype ; then
-		elog "corefonts USE-flag requires the truetype USE-flag to be set."
-		elog "disabling corefonts support for now."
-	fi
-}
-
-src_prepare() {
-	# fix doc dir, bug #91911
-	sed -i -e \
-		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
-		"${S}"/configure || die
-}
-
-src_configure() {
-	local myconf
-	if use q32 ; then
-		myconf="${myconf} --with-quantum-depth=32"
-	elif use q8 ; then
-		myconf="${myconf} --with-quantum-depth=8"
-	else
-		myconf="${myconf} --with-quantum-depth=16"
-	fi
-
-	if use X && use svg ; then
-		myconf="${myconf} --with-rsvg"
-	else
-		myconf="${myconf} --without-rsvg"
-	fi
-
-	# 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 built_with_use --missing false =sys-devel/gcc-$(gcc-version)* openmp ; then
-			myconf="${myconf} --enable-openmp"
-		else
-			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
-			myconf="${myconf} --disable-openmp"
-		fi
-	else
-		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
-		myconf="${myconf} --disable-openmp"
-	fi
-
-	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
-
-	econf \
-		${myconf} \
-		--without-included-ltdl \
-		--with-ltdl-include=/usr/include \
-		--with-ltdl-lib=/usr/$(get_libdir) \
-		--with-threads \
-		--with-modules \
-		$(use_with perl) \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		$(use_enable hdri) \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with autotrace) \
-		$(use_with bzip2 bzlib) \
-		$(use_with djvu) \
-		$(use_with fftw) \
-		$(use_with fontconfig) \
-		$(use_with fpx) \
-		$(use_with gs dps) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with openexr) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with truetype freetype) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_test() {
-	einfo "please note that the tests will only be run when the installed"
-	einfo "version and current emerging version are the same"
-
-	if has_version ~${CATEGORY}/${P} ; then
-		emake -j1 check || die "make check failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation of files into image failed"
-
-	# dont need these files with runtime plugins
-	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
-
-	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
-	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.5.7.0.ebuild b/media-gfx/imagemagick/imagemagick-6.5.7.0.ebuild
deleted file mode 100644
index 1f73aa3628b3..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.5.7.0.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# 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.5.7.0.ebuild,v 1.11 2010/02/11 20:23:27 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib perl-app toolchain-funcs versionator
-
-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://imagemagick/${MY_P2}.tar.bz2
-		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
-
-# perl tests fail with userpriv
-RESTRICT="perl? ( userpriv )"
-LICENSE="imagemagick"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86"
-IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
-	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff
-	truetype X wmf xml zlib"
-
-RDEPEND="
-	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 )
-	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 !=dev-lang/perl-5.8.7 )
-	png? ( media-libs/libpng )
-	raw? ( media-gfx/ufraw )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
-		corefonts? ( media-fonts/corefonts ) )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-	)
-	!dev-perl/perlmagick
-	!media-gfx/graphicsmagick[imagemagick]
-	!sys-apps/compare
-	>=sys-devel/libtool-1.5.2-r6"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-S="${WORKDIR}/${MY_P2}"
-
-pkg_setup() {
-	# for now, only build svg support when X is enabled, as librsvg
-	# pulls in quite some X dependencies.
-	if use svg && ! use X ; then
-		elog "the svg USE-flag requires the X USE-flag set."
-		elog "disabling svg support for now."
-	fi
-
-	if use corefonts && ! use truetype ; then
-		elog "corefonts USE-flag requires the truetype USE-flag to be set."
-		elog "disabling corefonts support for now."
-	fi
-}
-
-src_prepare() {
-	# fix doc dir, bug #91911
-	sed -i -e \
-		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
-		"${S}"/configure || die
-}
-
-src_configure() {
-	local myconf
-	if use q32 ; then
-		myconf="${myconf} --with-quantum-depth=32"
-	elif use q8 ; then
-		myconf="${myconf} --with-quantum-depth=8"
-	else
-		myconf="${myconf} --with-quantum-depth=16"
-	fi
-
-	if use X && use svg ; then
-		myconf="${myconf} --with-rsvg"
-	else
-		myconf="${myconf} --without-rsvg"
-	fi
-
-	# 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 built_with_use --missing false =sys-devel/gcc-$(gcc-version)* openmp ; then
-			myconf="${myconf} --enable-openmp"
-		else
-			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
-			myconf="${myconf} --disable-openmp"
-		fi
-	else
-		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
-		myconf="${myconf} --disable-openmp"
-	fi
-
-	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
-
-	econf \
-		${myconf} \
-		--without-included-ltdl \
-		--with-ltdl-include=/usr/include \
-		--with-ltdl-lib=/usr/$(get_libdir) \
-		--with-threads \
-		--with-modules \
-		$(use_with perl) \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		$(use_enable hdri) \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with autotrace) \
-		$(use_with bzip2 bzlib) \
-		$(use_with djvu) \
-		$(use_with fftw) \
-		$(use_with fontconfig) \
-		$(use_with fpx) \
-		$(use_with gs dps) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with openexr) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with truetype freetype) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_test() {
-	einfo "please note that the tests will only be run when the installed"
-	einfo "version and current emerging version are the same"
-
-	if has_version ~${CATEGORY}/${P} ; then
-		emake -j1 check || die "make check failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation of files into image failed"
-
-	# dont need these files with runtime plugins
-	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
-
-	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
-	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.5.9.4-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.5.9.4-r1.ebuild
deleted file mode 100644
index c324ac885d36..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.5.9.4-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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.5.9.4-r1.ebuild,v 1.1 2010/02/15 19:04:44 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils multilib perl-app toolchain-funcs versionator
-
-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://imagemagick/${MY_P2}.tar.bz2
-		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
-
-# perl tests fail with userpriv
-RESTRICT="perl? ( userpriv )"
-LICENSE="imagemagick"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
-	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw
-	static-libs svg tiff truetype X wmf xml zlib"
-
-RDEPEND="
-	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 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	truetype? ( =media-libs/freetype-2*
-		corefonts? ( media-fonts/corefonts ) )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xml? ( >=dev-libs/libxml2-2.4.10 )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXext
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-	)
-	!dev-perl/perlmagick
-	!media-gfx/graphicsmagick[imagemagick]
-	!sys-apps/compare
-	>=sys-devel/libtool-1.5.2-r6"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-S="${WORKDIR}/${MY_P2}"
-
-pkg_setup() {
-	# for now, only build svg support when X is enabled, as librsvg
-	# pulls in quite some X dependencies.
-	if use svg && ! use X ; then
-		elog "the svg USE-flag requires the X USE-flag set."
-		elog "disabling svg support for now."
-	fi
-
-	if use corefonts && ! use truetype ; then
-		elog "corefonts USE-flag requires the truetype USE-flag to be set."
-		elog "disabling corefonts support for now."
-	fi
-}
-
-src_prepare() {
-	# fix doc dir, bug #91911
-	sed -i -e \
-		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
-		"${S}"/configure || die
-}
-
-src_configure() {
-	local myconf
-	if use q32 ; then
-		myconf="${myconf} --with-quantum-depth=32"
-	elif use q8 ; then
-		myconf="${myconf} --with-quantum-depth=8"
-	else
-		myconf="${myconf} --with-quantum-depth=16"
-	fi
-
-	if use X && use svg ; then
-		myconf="${myconf} --with-rsvg"
-	else
-		myconf="${myconf} --without-rsvg"
-	fi
-
-	# 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
-			myconf="${myconf} --enable-openmp"
-		else
-			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
-			myconf="${myconf} --disable-openmp"
-		fi
-	else
-		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
-		myconf="${myconf} --disable-openmp"
-	fi
-
-	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
-
-	econf \
-		${myconf} \
-		--without-included-ltdl \
-		--with-ltdl-include=/usr/include \
-		--with-ltdl-lib=/usr/$(get_libdir) \
-		--with-threads \
-		--with-modules \
-		$(use_with perl) \
-		--with-perl-options='INSTALLDIRS=vendor' \
-		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		$(use_enable hdri) \
-		$(use_with !nocxx magick-plus-plus) \
-		$(use_with autotrace) \
-		$(use_with bzip2 bzlib) \
-		$(use_with djvu) \
-		$(use_with fftw) \
-		$(use_with fontconfig) \
-		$(use_with fpx) \
-		$(use_with gs dps) \
-		$(use_with gs gslib) \
-		$(use_with graphviz gvc) \
-		$(use_with jbig) \
-		$(use_with jpeg jpeg) \
-		$(use_with jpeg2k jp2) \
-		$(use_with lcms) \
-		$(use_with openexr) \
-		$(use_with png) \
-		$(use_enable static-libs static) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with truetype freetype) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_test() {
-	einfo "please note that the tests will only be run when the installed"
-	einfo "version and current emerging version are the same"
-
-	if has_version ~${CATEGORY}/${P} ; then
-		emake -j1 check || die "make check failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
-	dodoc NEWS.txt ChangeLog AUTHORS.txt README.txt
-
-	# Fix perllocal.pod file collision
-	use perl && fixlocalpod
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.6.0.10.ebuild b/media-gfx/imagemagick/imagemagick-6.6.1.2.ebuild
index b07e116298a9..9b078d32ed3e 100644
--- a/media-gfx/imagemagick/imagemagick-6.6.0.10.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.6.1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.0.10.ebuild,v 1.1 2010/03/31 10:02:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.2.ebuild,v 1.1 2010/04/14 15:05:20 ssuominen Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator