old

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

8 files changed, 15 insertions, 878 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 0c42130f5234..7c40393d8f97 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.479 2012/05/10 14:07:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.480 2012/05/10 14:15:39 ssuominen Exp $
+
+  10 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -imagemagick-6.7.1.0.ebuild, -imagemagick-6.7.4.8.ebuild,
+  -imagemagick-6.7.4.10.ebuild, -imagemagick-6.7.5.0.ebuild,
+  -imagemagick-6.7.5.3.ebuild, -imagemagick-6.7.5.3-r1.ebuild:
+  old
 
 *imagemagick-6.7.6.9 (10 May 2012)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index e011d99908ce..464a97b56987 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,31 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
-DIST ImageMagick-6.7.4-10.tar.xz 7548912 RMD160 443acda654a1c50cea4c94073506ccd270b6be1a SHA1 4aa576cbbe65866e68c974cf585867e3f0940e41 SHA256 4ae0e62777983e6464ff96108cfe9c893e667d526b1b177796c2e2883c3feb15
-DIST ImageMagick-6.7.4-8.tar.xz 7551180 RMD160 2bb25014e3c35f05af5796b9e2e0558582dfb1ac SHA1 71028edada3ac1f9e3f7b34082809cf7daf270b6 SHA256 796dd615cf372bd08b74cc96b0c0036a57c63f5cccbe6233073ccd2fc109dfd4
-DIST ImageMagick-6.7.5-0.tar.xz 7559196 RMD160 f39c8be18983b0d89b9d4c3a0ed51d85503d7ea2 SHA1 c4a8df2b067a33ea2ef3bf4c609cd463d139f5bf SHA256 19c9fd0269b0cd764bfb66de1557e464e2f0b3587902c9961a6701e3139e6cbe
-DIST ImageMagick-6.7.5-3.tar.xz 7566460 RMD160 8dcd95279e90b87805d5bc35c9c64d98c8ede191 SHA1 b6cee59cb380f38572ec40769c438901dcc7500e SHA256 9a0526a0e7de50115c94e63b5a82a4a18d80ffa27f6e6793bba86edd25511a54
 DIST ImageMagick-6.7.6-4.tar.xz 7576636 RMD160 f8f75421e62ae9808bf8b1b549b1ec4ee92f40a7 SHA1 e349c0976d87d8897f9d6fc3d9efee6062ec0f4d SHA256 612910aca97c345e21901cb3b2b45b485029f196d02c3c42fc3354fc824b811e
 DIST ImageMagick-6.7.6-9.tar.xz 7653436 RMD160 0762ef3b40a7fda5c42ff2a2727ff74104cceae6 SHA1 4577fcabab5e754a777db874692587e26e6a2696 SHA256 4ce906ce36622a864746cf808fd14f9deba0eb6b6890c00e5832323e8c868e5c
-EBUILD imagemagick-6.7.1.0.ebuild 4167 RMD160 d0ad4695afd96f80ddfbf7c3f5348ec0cf06e09d SHA1 71ab2a670bb0e586840e6c39bfa677edd1b6ddf8 SHA256 358c30c7aa2e737c7b9bb536442c1f5f9231cc77e5bbede18e0f61316fd7beb9
-EBUILD imagemagick-6.7.4.10.ebuild 4084 RMD160 25d535864c47b1c858b5c79163a80f493cc92bc3 SHA1 2ebfa279bfc19095a08211e6801d8b2167a8dc11 SHA256 1e5491118c34d1e344c4a580ddd6fc30be704d4a5c8a408fa068027735fa4c52
-EBUILD imagemagick-6.7.4.8.ebuild 4139 RMD160 a174e73bf0908f5f407f69a60177abf82dca4c34 SHA1 941258223ae516d45216e5d4062ae72d54ee75dd SHA256 fa07d9d7352927e2c5588274a4957278c72a254e1cbc5c154755a31375263650
-EBUILD imagemagick-6.7.5.0.ebuild 4083 RMD160 a6b460ea116f5c8920e39987382e8b14ef33a31b SHA1 33d2cc1126233d8f6987f46b129b03198b58ae79 SHA256 f91de7c4f4511266d7cd7299af602329237775ffe670a3c6799426c70c9e832e
-EBUILD imagemagick-6.7.5.3-r1.ebuild 4103 RMD160 6b223a0527fde92ac71e298280ca7ff16f3b73b2 SHA1 7bd14ea7d4a9933593c935fe49b9138e47e7e909 SHA256 bdc0a4a6781bd09df59bc98610544321c3895e2a566e9f84b48c6c66e65f1ae5
-EBUILD imagemagick-6.7.5.3.ebuild 4072 RMD160 101ac6f7742094fa03023056458fbb42241c2da8 SHA1 64be0e06b1f6184e6da10e562142306bc8a2567b SHA256 bd1cfb9b0f1f678de24f47bad72bdcc9a448162961e4e5f72a4712d8c80aa34c
 EBUILD imagemagick-6.7.6.4.ebuild 4188 RMD160 c8a14f4d5c6b091b9c320e48e0d51b5033f27bc4 SHA1 5120e6e90a54fea0c69d97f9288d1903f0f7cc78 SHA256 e11eb8cda888c670a42396b993c2df7b1a0208c51c6f0d72b6126fb17cc5e148
 EBUILD imagemagick-6.7.6.9.ebuild 4222 RMD160 a0a90a4fd20cc2afd54dfcfac50c016e96267834 SHA1 5268d4a99e56a4955b168d5439be3465ae14f74b SHA256 56f34e6d1b3dc9c399d1b2546b0b4a1b7f99609283c1c9be5238aaebf210ac58
-MISC ChangeLog 70862 RMD160 c098ea7d6d7538a3307edf340992fdee16968ebd SHA1 617f407a8d7c77ebec1c43c67b8cb7aece352918 SHA256 686b557a20e3d3d03ef4b9c029ae5236869845af9598b71db899d8d1b9ef516c
+MISC ChangeLog 71107 RMD160 62e05d1a74c009b97234a7f1a078e872013ec35d SHA1 8026c535d80929b19fe9c475e5287a206e79f388 SHA256 f759f155396c69a7b191f5c590a6a99420c232c8af323748eedad9e412514260
 MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPq8rsAAoJEEdUh39IaPFNEosIAJ9unXcbclNdyAkqTd+emiGb
-1qvrbSkWIvrphVZCfLjfA5au5ctHlkahQxGTO5H23BEimMsGfLBYp71oQX/w9E0S
-E3cJWzHpZpThRhNIZbwsPBcKt5Z+Db60kvgwDFE5+KqU4MmW37WREhfGH7suVav8
-NLTg7moH5/18s4wgpAgGOt7bijtjMhZVb8iXkGLbQ+gaHwjKqvRCaav+/yFRWJqL
-MUzgSo7hKogm6JxhZNAT3mSRirCyQw2ptj+zWQgbRkeFD5vnt/G18Kve+bTUHAqX
-C39IPeG7/5oLMncd4/k4ZjULEIMaTuu7W8zFKbh56PXAzvDeiEDm0Hl63sZPL2U=
-=CeRH
+iQEcBAEBAgAGBQJPq8zbAAoJEEdUh39IaPFNfe8H/jRnjrIGqD5Rsw7ZzUUgCUJT
+1mBkQVlRvGPrnshkbzzKOiS88L/goEznHna9YHgX6zJjtsQn1Zfage8EFcwQBCZ9
+wlfzWdLgJitncof5buphtnoz27ZVg3QZYwOeUg6MWqpQHoHtirA17uj3Q2Jvt5W2
+IWqJFScct5VHhJ4O02iHtcrmAYxzHwbUcUZiJB6iZf8nTSk+k8kLKg7up+CxHr6V
+WtgYi6xqaPtWi2y/3LHy1cC14dgAFRHz6fXoDzs/pU5d7jVZaVPb+OsFedam+MH3
+Zz+jFiXG7qIKIEb1Z9o7Xfiyy0ZP7A8Dx3pqpHAfM7RN97XEvquqzB2b03MfUiY=
+=ytJf
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
deleted file mode 100644
index 8ab2075b894e..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.14 2012/01/23 22:54:00 ssuominen Exp $
-
-EAPI=4
-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 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp perl png q32 q64 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
-
-# libtool is required for loading plugins
-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:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	truetype? ( media-libs/freetype:2
-		corefonts? ( media-fonts/corefonts ) )
-	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}
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS=( AUTHORS.txt ChangeLog NEWS.txt README.txt )
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	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-windows-font-dir"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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
-	else
-		ewarn "Skipping tests because installed version doesn't match."
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild b/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild
deleted file mode 100644
index 17a0b1875003..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.4.10.ebuild,v 1.3 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI=4
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	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 )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS="AUTHORS.txt ChangeLog NEWS.txt README.txt"
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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 pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	has_version media-gfx/imagemagick || emake -j1 check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild b/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild
deleted file mode 100644
index d7b2b977165d..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild,v 1.2 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI=4
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	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 )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS=( AUTHORS.txt ChangeLog NEWS.txt README.txt )
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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 pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P}; then
-		emake -j1 check
-	else
-		ewarn "Skipping tests because installed version doesn't match."
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild
deleted file mode 100644
index 348634402e87..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.5.0.ebuild,v 1.2 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI=4
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	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 )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS="AUTHORS.txt ChangeLog NEWS.txt README.txt"
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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 pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	has_version media-gfx/imagemagick || emake -j1 check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.5.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.7.5.3-r1.ebuild
deleted file mode 100644
index 5be2d9c2d20d..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.5.3-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.5.3-r1.ebuild,v 1.2 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI=4
-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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? (
-		media-libs/freetype:2
-		media-fonts/urw-fonts
-	)
-	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 )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS="AUTHORS.txt ChangeLog NEWS.txt README.txt"
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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/urw-fonts" \
-		$(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 pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	has_version media-gfx/imagemagick || emake -j1 check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.5.3.ebuild b/media-gfx/imagemagick/imagemagick-6.7.5.3.ebuild
deleted file mode 100644
index 16caebe889e2..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.5.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.5.3.ebuild,v 1.9 2012/05/05 07:00:21 jdhore Exp $
-
-EAPI=4
-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 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-RDEPEND=">=sys-devel/libtool-2.2.6b
-	autotrace? ( >=media-gfx/autotrace-0.31.1 )
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	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 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.6-r6 )
-	png? ( media-libs/libpng:0 )
-	raw? ( media-gfx/ufraw )
-	svg? ( >=gnome-base/librsvg-2.9.0 )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( media-libs/freetype:2 )
-	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 )"
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-apps/sed-4
-	X? ( x11-proto/xextproto )"
-
-REQUIRED_USE="corefonts? ( truetype )
-	test? ( corefonts )"
-
-S=${WORKDIR}/${MY_P}
-
-RESTRICT="perl? ( userpriv )"
-
-DOCS="AUTHORS.txt ChangeLog NEWS.txt README.txt"
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-	use q64 && depth=64
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		$(use_enable 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 pango) \
-		$(use_with png) \
-		$(use_with svg rsvg) \
-		$(use_with tiff) \
-		$(use_with webp) \
-		$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts) \
-		$(use_with wmf) \
-		$(use_with xml) \
-		--${openmp}-openmp
-}
-
-src_test() {
-	has_version media-gfx/imagemagick || emake -j1 check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}