old

(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)

5 files changed, 6 insertions, 492 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 9f323f7cb40a..11f12ee1615a 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # 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.445 2011/10/10 22:00:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.446 2011/10/10 22:02:18 ssuominen Exp $
+
+  10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -imagemagick-6.6.7.6.ebuild, -imagemagick-6.6.8.5.ebuild,
+  -imagemagick-6.7.2.6.ebuild, -files/imagemagick-6.7.2.6-lfs.patch:
+  old
 
 *imagemagick-6.7.3.0 (10 Oct 2011)
 
diff --git a/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch b/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch
deleted file mode 100644
index 68877c0c5498..000000000000
--- a/media-gfx/imagemagick/files/imagemagick-6.7.2.6-lfs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-the AC_SYS_LARGEFILE macro sets up ac_cv_sys_file_offset_bits, and when
-it uses a value of "no", it means "does not need special lfs behavior".
-so let's not second guess the behavior of it by running our own little
-bit of code which breaks cross-compiling.  instead, only try the run
-test if we get back "unknown".
-
-sent upstream already.  they said they'd integrate it in the next release.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -434,9 +434,11 @@
- AC_FUNC_FSEEKO
- LFS_CPPFLAGS=''
- if test "$enable_largefile" != no; then
--    if test "$ac_cv_sys_file_offset_bits" != 'no'; then
--        LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
--    else
-+    case $ac_cv_sys_file_offset_bits in
-+    no)
-+        # nothing to do here as the host supports LFS fine
-+        ;;
-+    unknown)
-         AC_MSG_CHECKING([for native large file support])
-         AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>
-           main () {
-@@ -445,7 +447,11 @@
-         [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
-          AC_MSG_RESULT([yes])],
-         [AC_MSG_RESULT([no])])
--    fi
-+        ;;
-+    *)
-+        LFS_CPPFLAGS="$LFS_CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-+        ;;
-+    esac
-     if test "$ac_cv_sys_large_files" != 'no'; then
-         LFS_CPPFLAGS="$LFS_CPPFLAGS -D_LARGE_FILES=1"
-     fi
diff --git a/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild b/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild
deleted file mode 100644
index 2708508ad393..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.6.7.6.ebuild
+++ /dev/null
@@ -1,148 +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.7.6.ebuild,v 1.2 2011/06/09 06:06:06 radhermit 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 lzma 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 )
-	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 )
-	lzma? ( app-arch/xz-utils )
-	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 lzma) \
-		$(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.6.8.5.ebuild b/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
deleted file mode 100644
index 7bc896a2e03e..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.6.8.5.ebuild
+++ /dev/null
@@ -1,153 +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.8.5.ebuild,v 1.10 2011/08/09 16:24:57 xarthisius 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 lzma openexr openmp perl png q32 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"
-IUSE="${IUSE} video_cards_nvidia" # opencl support
-
-# 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 )
-	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 )
-	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}
-	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 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 || 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
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild b/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild
deleted file mode 100644
index 8be4683976b7..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.7.2.6.ebuild
+++ /dev/null
@@ -1,152 +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.2.6.ebuild,v 1.2 2011/09/22 02:09:05 vapier Exp $
-
-EAPI=4
-inherit multilib toolchain-funcs versionator eutils autotools
-
-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? ( 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 )
-	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 ) )
-	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_prepare() {
-	epatch "${FILESDIR}"/${P}-lfs.patch
-	eautoreconf
-}
-
-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-corefonts"
-	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:=.*:='':" {} +
-}