old

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

4 files changed, 13 insertions, 309 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 9760a9a7ab49..28a37c64ac8e 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.451 2011/12/11 06:31:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.452 2011/12/11 06:32:21 ssuominen Exp $
+
+  11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -imagemagick-6.6.5.6.ebuild, -imagemagick-6.7.3.0.ebuild:
+  old
 
   11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.7.1.0.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b149ca8ca391..ffe6e700ed7a 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ImageMagick-6.6.5-6.tar.xz 6314756 RMD160 9c2d96bc1210356305096b27f2d829a8d3445356 SHA1 c129c813bd73deae5ec21491e8121f365bbdd7b3 SHA256 585a8372deb2052906c8fc74e84f96d72b711a08f804a4952cbb4c21fc4538fe
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
-DIST ImageMagick-6.7.3-0.tar.xz 7946508 RMD160 628626e7eff38148339851f41f9804bb3dafa763 SHA1 bbcdb092f6c4cc4c1d29163bef1199e86dd5ab05 SHA256 8159b3c3fa2c121b30a020df5ae87ec345a79608379413a8fa38fe3000d0607b
 DIST ImageMagick-6.7.4-0.tar.xz 7583560 RMD160 3f2f96844653e45ab53be62db8b6f3bfce729254 SHA1 f0310885972341b74670925b503ad8a8b05ad75d SHA256 7a23a77707efdac2686ca09ef4a1fb83f1f21385a6410a30a1c003180da37ca4
-EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 b2a6f33ce79f0c1ee7b42116cad5fe9b24c0508a SHA1 fffc57251b9d5cd5119f2b0878d65103af8aaf9b SHA256 7cca9de66dc5e7d795d4eb417e4d697dcb7fc1a7cecea0b40df302eff63b93c2
 EBUILD imagemagick-6.7.1.0.ebuild 4214 RMD160 6d4b96db0be65ca3bd14397f7d7c28f3a91b76fa SHA1 2b5b31635d00461e8dadc114905340fa35277869 SHA256 cc0b380d59379d5e8b06762f2d0842ff619419ae61fdc913e53a0116be825c53
-EBUILD imagemagick-6.7.3.0.ebuild 4335 RMD160 9e9b89bc896e15f0769e2c138a33444056635f46 SHA1 51c1d955045d749d8642faa7fb33adcf9125e77e SHA256 7017ff50925d87ea35ffe53f726aef28d763a1dad14eca1d10a3069ede83b000
 EBUILD imagemagick-6.7.4.0.ebuild 4338 RMD160 0da0420fbf07611aa66c7694e2d067dd1fcfccf1 SHA1 9a6680407ee5e82ad88e28f60300d0e1cd724df4 SHA256 efdd347b100da4e2f625f6e37fbfa481f530160ee7ed7b2cf3a15fac16986a97
-MISC ChangeLog 66897 RMD160 2183401ae5754327bc9b3b25d2e69ec4f6a9c6c7 SHA1 95271b89c484408bfd5a161c1ca0e5eb7ac22d62 SHA256 071d9b0da6b3d73ddd3138573aaf92e6a62e18dad1964a8f10f2578b9064d146
+MISC ChangeLog 67018 RMD160 b7f1691ee1fa4a690e7a1d4a44ae422a6df77862 SHA1 68d1fd5a3212fbf46a04623317ec2b671f461840 SHA256 8cdf181d9d1827c1b6e1fe1d89401f99faea1e4d8c6c7643e7eb77e800477fe2
 MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO5E44AAoJEEdUh39IaPFN+aQH/3hK5UsR8+ZGhpS4ix0JXMoZ
-P3oo4NL9ofZ32LWzuJWPiJjNL4ywE+lkyVrZWyxdOPUWC4Axl1DXMHsqFdmJIEbe
-Jx/lE29y2DY2V2pUFtdEQiamHk8LvOB2HyvWHmVM9cmRyAPQrYZBHKf7IENS3zrK
-0l16KsEldIG1gz3xT+HRiAiOk2ooHo6KyBMp/XHXzP6ldmQG+p+og+FYXfPt8gp1
-qS90O6kZBtA/R8BYc6O/SJDye6pKYrpijJd/ueo5UeN491IJlWnMEu8u1jnLY5Is
-GEveKe0qoIyvOEIsfyOu+GRkqCBOY3ZN1wcF7GN8Q93t7bUIA/rbhXAXUKGwerI=
-=7XI4
+iQEcBAEBAgAGBQJO5E56AAoJEEdUh39IaPFNstMH/0ZGZ7h6KvXBaC5bJFQWxFPU
+qiKMdFWxF1muwWfQpyuuCbsbDxNYe58fMZkHO5V2PpmCPwPeQITP6MqXuyWoKB7s
+bSa9EbqokQ9Csk7SIWTbZIhJVyuYSSAUJPv/s9jmp/CnrZ/D5ulOGGM07HDmKrGl
+tYhGTw/hWnhPuWjmMx11+9vArrEyQUc/XvY3eOU8tC2fD2Q/GakgvW6tuPcslN6T
+4jI7WRBbRO7RVFiFSSJuwQMs+GKlZyI5xY93I7K9yq4+TGDnnoYXhBCaOZsKLA6+
+NpvhC8I9bB4qLlmW1BGu9vBLy91jWYXX+q3F+UWTRj12HRllrAsiL8I2CeQu63c=
+=9Ro+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild b/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild
deleted file mode 100644
index f9b93cc952f3..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.5.6.ebuild,v 1.10 2011/11/16 10:21:34 jlec 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 ~mips 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: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 )
-	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 ) )
-	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/imagemagick-6.7.3.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild
deleted file mode 100644
index 942d4d8e7aa2..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild,v 1.2 2011/11/16 10:21:34 jlec 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 video_cards_nvidia 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? ( video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 ) )
-	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 opencl=disable
-	if use opencl && use video_cards_nvidia; then
-		opencl=enable
-	fi
-
-	local openmp=disable
-	if use openmp && tc-has-openmp; then
-		openmp=enable
-	fi
-
-	local myconf="--without-windows-font-dir"
-	if use truetype; then
-		myconf="$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
-	fi
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable static-libs static) \
-		$(use_enable hdri) \
-		--${opencl}-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:=.*:='':" {} +
-}