diff options
author | 2008-12-23 17:49:18 +0000 | |
---|---|---|
committer | 2008-12-23 17:49:18 +0000 | |
commit | 761e812ad101cf2b974b0b672db4e1a938ce29e0 (patch) | |
tree | 69faba51268a8e71f9bd6804e6591ec353806807 /media-gfx | |
parent | Patch version to builds with gcc43 and work wrt bug #251116 and bug #198121. (diff) | |
download | gentoo-2-761e812ad101cf2b974b0b672db4e1a938ce29e0.tar.gz gentoo-2-761e812ad101cf2b974b0b672db4e1a938ce29e0.tar.bz2 gentoo-2-761e812ad101cf2b974b0b672db4e1a938ce29e0.zip |
old
(Portage version: 2.1.6.2/cvs/Linux 2.6.28-rc9 i686)
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/imagemagick/ChangeLog | 7 | ||||
-rw-r--r-- | media-gfx/imagemagick/imagemagick-6.3.5.10.ebuild | 113 | ||||
-rw-r--r-- | media-gfx/imagemagick/imagemagick-6.4.0.6.ebuild | 142 | ||||
-rw-r--r-- | media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild | 166 |
4 files changed, 6 insertions, 422 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index 222483de425f..c940e51b206e 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.322 2008/12/23 17:03:39 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.323 2008/12/23 17:49:18 maekke Exp $ + + 23 Dec 2008; Markus Meier <maekke@gentoo.org> + -imagemagick-6.3.5.10.ebuild, -imagemagick-6.4.0.6.ebuild, + -imagemagick-6.4.4.6-r1.ebuild: + old 23 Dec 2008; Brent Baude <ranger@gentoo.org> imagemagick-6.4.4.6-r1.ebuild: diff --git a/media-gfx/imagemagick/imagemagick-6.3.5.10.ebuild b/media-gfx/imagemagick/imagemagick-6.3.5.10.ebuild deleted file mode 100644 index 5962986330be..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.3.5.10.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.5.10.ebuild,v 1.9 2007/12/07 22:48:58 maekke Exp $ - -inherit eutils multilib perl-app - -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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="bzip2 doc fpx graphviz gs jbig jpeg jpeg2k lcms mpeg nocxx perl png q8 q32 tiff truetype X wmf xml zlib openexr hdri" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - X? ( - x11-libs/libXext - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM - ) - gs? ( virtual/ghostscript ) - lcms? ( >=media-libs/lcms-1.06 ) - mpeg? ( >=media-video/mpeg2vidcodec-12 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - !dev-perl/perlmagick - !sys-apps/compare - graphviz? ( >=media-gfx/graphviz-2.6 ) - fpx? ( media-libs/libfpx ) - openexr? ( media-libs/openexr )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - >=sys-devel/libtool-1.5.2-r6 - X? ( x11-proto/xextproto )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-6.3.3-docs.patch -} - -src_compile() { - local quantum - if use q32 ; then - quantum="${quantum} --with-quantum-depth=32" - elif use q8 ; then - quantum="${quantum} --with-quantum-depth=8" - else - quantum="${quantum} --with-quantum-depth=16" - fi - - econf \ - --with-threads \ - --with-modules \ - $(use_with perl) \ - --with-gs-font-dir=/usr/share/fonts/default/ghostscript \ - ${quantum} \ - $(use_enable hdri) \ - $(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with fpx) \ - $(use_with gs gslib) \ - $(use_with graphviz gvc) \ - $(use_with jbig) \ - $(use_with jpeg jpeg) \ - $(use_with jpeg2k jp2) \ - $(use_with lcms) \ - $(use_with mpeg mpeg2) \ - $(use_with png) \ - $(use_with tiff) \ - $(use_with truetype ttf) \ - $(use_with wmf) \ - $(use_with xml) \ - $(use_with zlib) \ - $(use_with X x) \ - $(use_with openexr) \ - || die "econf failed" - emake || die "compile problem" - -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation of files into image failed" - dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config - - # dont need these files with runtime plugins - rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a} - - ! use doc && rm -r "${D}"/usr/share/doc/${PF}/html - dodoc NEWS ChangeLog AUTHORS README.txt - - # Fix perllocal.pod file collision - use perl && fixlocalpod - -} diff --git a/media-gfx/imagemagick/imagemagick-6.4.0.6.ebuild b/media-gfx/imagemagick/imagemagick-6.4.0.6.ebuild deleted file mode 100644 index 5d6421bea992..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.4.0.6.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.0.6.ebuild,v 1.6 2008/07/04 15:13:33 jer Exp $ - -inherit eutils multilib perl-app - -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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx - openexr perl png q8 q32 svg tiff truetype X wmf xml zlib" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - openexr? ( media-libs/openexr ) - perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 ) - png? ( media-libs/libpng ) - tiff? ( >=media-libs/tiff-3.5.5 ) - xml? ( >=dev-libs/libxml2-2.4.10 ) - truetype? ( =media-libs/freetype-2* media-fonts/corefonts ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - 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 - !sys-apps/compare" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - >=sys-devel/libtool-1.5.2-r6 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use djvu && ! built_with_use app-text/djvu threads; then - eerror "app-text/djvu has to be built with threads support." - die "build app-text/djvu with USE=\"threads\"" - fi - # 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 -} - -src_unpack() { - unpack ${A} - - # 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_compile() { - 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 - - 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 truetype windows-font-dir /usr/share/fonts/corefonts) \ - $(use_with !nocxx magick-plus-plus) \ - $(use_with bzip2 bzlib) \ - $(use_with djvu) \ - $(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 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) \ - $(use_with openexr) \ - || die "econf failed" - emake || die "compile problem" -} - -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.4.4.6-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild deleted file mode 100644 index df6d107331eb..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6-r1.ebuild,v 1.10 2008/12/23 17:03:39 ranger Exp $ - -EAPI="2" - -inherit eutils multilib perl-app toolchain-funcs - -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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" - -LICENSE="imagemagick" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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" - -RDEPEND="bzip2? ( app-arch/bzip2 ) - djvu? ( app-text/djvu[threads] ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( media-libs/libfpx ) - graphviz? ( >=media-gfx/graphviz-2.6 ) - gs? ( virtual/ghostscript ) - jbig? ( media-libs/jbigkit ) - jpeg? ( >=media-libs/jpeg-6b ) - jpeg2k? ( media-libs/jasper ) - lcms? ( >=media-libs/lcms-1.06 ) - 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 - !sys-apps/compare - >=sys-devel/libtool-1.5.2-r6" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4 - X? ( x11-proto/xextproto )" - -S="${WORKDIR}/${MY_P}" - -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 - # see bug #223825 - if use openmp && built_with_use --missing false sys-devel/gcc openmp; then - if [[ $(gcc-version) != "4.3" ]] ; then - ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling." - myconf="${myconf} --disable-openmp" - else - myconf="${myconf} --enable-openmp" - fi - else - elog "disabling openmp support" - 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 bzip2 bzlib) \ - $(use_with djvu) \ - $(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) \ - || die "econf failed" -} - -src_test() { - # make check only works after make install, - # --> only run if this version is already installed - 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 -} |