# ChangeLog for media-gfx/imagemagick
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.85 2004/10/20 01:57:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.86 2004/11/02 00:50:25 sekretarz Exp $
+
+*imagemagick-6.1.3.2 (02 Nov 2004)
+
+ 02 Nov 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+ -imagemagick-5.5.4.4.ebuild, -imagemagick-5.5.6-r1.ebuild,
+ -imagemagick-5.5.7.15.ebuild, -imagemagick-6.0.8.3.ebuild,
+ +imagemagick-6.1.3.2.ebuild:
+ Ebuild clean up, version bump - closing bugs #69705, #25357, #65970, #67078
19 Oct 2004; Jason Wever <weeve@gentoo.org> imagemagick-6.1.0.1.ebuild:
Stable on sparc wrt bug #67553.
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 97666a09536200d4101acff5b09b87b7 ChangeLog 13335
MD5 0c7dc596011c98b30aee6ba995ed8a0d imagemagick-6.0.8.1.ebuild 2343
-MD5 eb4228c8f995ccb390e175158b4ab503 imagemagick-5.5.4.4.ebuild 3194
-MD5 b31ff8e2081d0d46eff4fd4f9e1abf8f imagemagick-5.5.6-r1.ebuild 2487
-MD5 42f1ad4dafe8d600ea9087c8e1dabf58 imagemagick-6.0.8.3.ebuild 2349
MD5 1b3ce0db2f5b1e6a5d3a93abf1c40620 imagemagick-6.1.0.1.ebuild 2334
-MD5 dcc27cb8b7f7ef37a9d25507e68ce028 imagemagick-5.5.7.15.ebuild 2549
+MD5 554ca35a03074cbc19b909e17e62fcec imagemagick-6.1.3.2.ebuild 2072
+MD5 e907baaff114d3874761105591ecc2e6 ChangeLog 13664
MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
MD5 5914cd7a6eea4d5b40ad38f1ad7d4434 imagemagick-6.0.7.1.ebuild 2334
+MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
MD5 95b9bca1e2ef2b6fed9919fcc59b1462 files/digest-imagemagick-6.0.8.1 73
-MD5 69be221b82f76ec46d241c5e4bff0f12 files/digest-imagemagick-5.5.4.4 72
-MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6-r1 71
-MD5 ebf998539413c47a71abdd70c78c5896 files/digest-imagemagick-6.0.8.3 73
MD5 a4a32e0f76d7fe0b204a2d408fc52158 files/digest-imagemagick-6.1.0.1 73
-MD5 4909cde902edd90dd3725ba4369e782b files/digest-imagemagick-5.5.7.15 74
+MD5 2dd9ba895922b7d6bb513572bb851254 files/digest-imagemagick-6.1.3.2 73
MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
-MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhHuYHTu7gpaalycRAuyIAJ9dlG9LMnR/vKkjyh1tkL+GvTmPEgCePQe+
-zOBZ82uCNDeH67Ke8eyZjM0=
-=8zY6
------END PGP SIGNATURE-----
+++ /dev/null
-MD5 1624c3cc940446c54743fc3ea71fcb6a ImageMagick-5.5.4-4.tar.gz 4341776
+++ /dev/null
-MD5 eac3971f0704059dcf2f7a5737b7daa8 ImageMagick-5.5.6.tar.bz2 3526303
+++ /dev/null
-MD5 80144cc67bb9888b26f9704362269487 ImageMagick-5.5.7-15.tar.bz2 4218283
+++ /dev/null
-MD5 749fb41c731dfece1472cff476b30e70 ImageMagick-6.0.8-3.tar.bz2 4526568
--- /dev/null
+MD5 e6d170ff728618853856d4ea3c93143d ImageMagick-6.1.3-2.tar.bz2 4564596
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild,v 1.16 2004/06/24 22:42:45 agriffis Exp $
-
-inherit libtool eutils perl-module flag-o-matic
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X cups jpeg lcms mpeg perl png truetype tiff xml2"
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-MY_P2=${MY_PN}-${PV%.*}
-S=${WORKDIR}/${MY_P2}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc alpha ~mips ~hppa"
-
-DEPEND=">=sys-apps/sed-4
- media-libs/jbigkit
- >=app-arch/bzip2-1
- sys-libs/zlib
- X? ( virtual/x11
- >=app-text/dgs-0.5.9.1 )
- cups? ( virtual/ghostscript )
- jpeg? ( >=media-libs/jpeg-6b )
- lcms? ( >=media-libs/lcms-1.06 )
- mpeg? ( media-video/mpeg2vidcodec )
- perl? ( >=dev-lang/perl-5 )
- png? ( media-libs/libpng )
- tiff? ( >=media-libs/tiff-3.5.5 )
- xml2? ( >=dev-libs/libxml2-2.4.10 )
- truetype? ( =media-libs/freetype-2* )"
-
-src_compile() {
- elibtoolize
-
- local myconf=""
- use X || myconf="${myconf} --with-x=no"
- use cups || myconf="${myconf} --without-gslib"
- use jpeg || myconf="${myconf} --without-jpeg --without-jp2"
- use lcms || myconf="${myconf} --without-lcms"
- use mpeg || myconf="${myconf} --without-mpeg2"
- use perl || myconf="${myconf} --without-perl"
- use tiff || myconf="${myconf} --without-tiff"
- use xml2 || myconf="${myconf} --without-xml"
- use truetype || myconf="${myconf} --without-ttf"
-
- # Netscape is still used ? More people should have Mozilla
- sed -i 's:netscape:mozilla:g' configure
-
- #patch to allow building by perl
- epatch ${FILESDIR}/perlpatch.diff
-
- econf \
- --enable-shared \
- --enable-static \
- --enable-lzw \
- --with-fpx \
- --with-jbig \
- --without-hdf \
- --with-wmf \
- --with-threads \
- --with-bzlib \
- ${myconf} || die "econf failed"
- emake || die "compile problem"
-
- # More perl stuff
- cd PerlMagick
- make clean
- perl-module_src_prep
-}
-
-src_install() {
-# myinst="prefix=${D}/usr PREFIX=${D}/usr"
-# myinst="${myinst} MagickSharePath=${D}/usr/share/ImageMagick/"
-# myinst="${myinst} pkgdocdir=${D}/usr/share/doc/${PF}/html/"
-# myinst="${myinst} mandir=${D}/usr/share/man"
-# myinst="${myinst} datadir=${D}/usr/share"
-# myinst="${myinst} libdir=${D}/usr/lib"
-# myinst="${myinst} MagickLibPath=${D}/usr/lib/${MY_P2}"
-# myinst="${myinst} MagickModulesPath=${D}/usr/lib/${MY_P2}/modules/coders"
-# myinst="${myinst} MagickSharePath=${D}/usr/share/${MY_PN}"
- myinst="DESTDIR=${D}"
-
- # sandbox violation hack
-# cp coders/Makefile coders/Makefile.bak
-# sed \
-# -e "s:^pkglibdir = :pkglibdir = ${D}:" \
-# -e "s:^MagickLibPath = :MagickLibPath = ${D}:" \
-# -e "s:^MagickModulesPath = :MagickModulesPath = ${D}:" \
-# -e "s:^MagickSharePath = :MagickSharePath = ${D}:" \
-# coders/Makefile.bak coders/Makefile
-
- mydoc="*.txt"
- perl-module_src_install
-
- rm -f ${D}/usr/share/ImageMagick/*.txt
-
- dosed "s:-I/usr/include ::" /usr/bin/Magick-config
- dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild,v 1.16 2004/06/24 22:42:45 agriffis Exp $
-
-inherit libtool flag-o-matic eutils
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf"
-
-MY_PN=ImageMagick
-
-### no PV hacks needed as we don't have a patchlevel with this release
-#MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-#MY_P2=${MY_PN}-${PV%.*}
-MY_P=${MY_PN}-${PV}
-MY_P2=${MY_PN}-${PV}
-
-S=${WORKDIR}/${MY_P2}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc ~alpha ~mips hppa amd64"
-
-DEPEND=">=sys-apps/sed-4
- media-libs/jbigkit
- >=app-arch/bzip2-1
- sys-libs/zlib
- X? ( virtual/x11
- >=app-text/dgs-0.5.9.1 )
- cups? ( virtual/ghostscript )
- jpeg? ( >=media-libs/jpeg-6b )
- lcms? ( >=media-libs/lcms-1.06 )
- mpeg? ( media-video/mpeg2vidcodec )
- png? ( media-libs/libpng )
- tiff? ( >=media-libs/tiff-3.5.5 )
- xml2? ( >=dev-libs/libxml2-2.4.10 )
- truetype? ( =media-libs/freetype-2* )
- wmf? ( media-libs/libwmf )"
-
-src_compile() {
- elibtoolize
- if [ "${ARCH}" = "amd64" ]
- then
- append-flags -fPIC
- fi
-
- local myconf=""
- use X || myconf="${myconf} --with-x=no"
- use cups || myconf="${myconf} --without-gslib"
- use jpeg || myconf="${myconf} --without-jpeg --without-jp2"
- use lcms || myconf="${myconf} --without-lcms"
- use mpeg || myconf="${myconf} --without-mpeg2"
- use tiff || myconf="${myconf} --without-tiff"
- use xml2 || myconf="${myconf} --without-xml"
- use truetype || myconf="${myconf} --without-ttf"
- use wmf || myconf="${myconf} --without-wmf"
- # Netscape is still used ? More people should have Mozilla
- sed -i 's:netscape:mozilla:g' configure
-
- #patch to allow building by perl
- epatch ${FILESDIR}/perlpatch.diff
-
- econf \
- --enable-shared \
- --enable-lzw \
- --with-fpx \
- --with-jbig \
- --without-hdf \
- --with-threads \
- --with-bzlib \
- ${myconf} || die
- #--enable-static
- \
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR=${D} install
- mydoc="*.txt"
-
- rm -f ${D}/usr/share/ImageMagick/*.txt
-
- dosed "s:-I/usr/include ::" /usr/bin/Magick-config
- dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
-
- dosym /usr/lib/libMagick-5.5.6-Q16.so.0.0.0 /usr/lib/libMagick.so.5
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.7.15.ebuild,v 1.10 2004/09/08 00:11:37 vapier Exp $
-
-inherit libtool flag-o-matic eutils
-
-MY_PN=ImageMagick
-
-### uncomment the right variables depending on if we have a patchlevel or not
-MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-MY_P2=${MY_PN}-${PV%.*}
-#MY_P=${MY_PN}-${PV}
-#MY_P2=${MY_PN}-${PV}
-
-S=${WORKDIR}/${MY_P2}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.imagemagick.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 mips ppc64 ia64"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig"
-
-DEPEND=">=sys-apps/sed-4
- >=app-arch/bzip2-1
- sys-libs/zlib
- X? ( virtual/x11
- >=app-text/dgs-0.5.9.1 )
- cups? ( virtual/ghostscript )
- jpeg? ( >=media-libs/jpeg-6b )
- lcms? ( >=media-libs/lcms-1.06 )
- mpeg? ( media-video/mpeg2vidcodec )
- png? ( media-libs/libpng )
- tiff? ( >=media-libs/tiff-3.5.5 )
- xml2? ( >=dev-libs/libxml2-2.4.10 )
- truetype? ( =media-libs/freetype-2* )
- wmf? ( media-libs/libwmf )
- jbig? ( media-libs/jbigkit )"
-
-src_compile() {
- replace-flags k6-3 i586
- replace-flags k6-2 i586
- replace-flags k6 i586
-
- elibtoolize
-
- local myconf=""
- use X || myconf="${myconf} --with-x=no"
- use cups || myconf="${myconf} --without-gslib"
- use jpeg || myconf="${myconf} --without-jpeg --without-jp2"
- use lcms || myconf="${myconf} --without-lcms"
- use mpeg || myconf="${myconf} --without-mpeg2"
- use tiff || myconf="${myconf} --without-tiff"
- use xml2 || myconf="${myconf} --without-xml"
- use truetype || myconf="${myconf} --without-ttf"
- use wmf || myconf="${myconf} --without-wmf"
- use jbig || myconf="${myconf} --without-jbig"
- use ppc64 && replace-flags "-O[2-9]" "-O1"
-
- # Netscape is still used ? More people should have Mozilla
- sed -i 's:netscape:mozilla:g' configure
-
- #patch to allow building by perl
- epatch ${FILESDIR}/perlpatch.diff
-
- econf \
- --enable-shared \
- --enable-lzw \
- --with-fpx \
- --with-jbig \
- --without-hdf \
- --with-threads \
- --with-bzlib \
- ${myconf} || die
- #--enable-static \
-
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR=${D} install
- mydoc="*.txt"
-
- rm -f ${D}/usr/share/ImageMagick/*.txt
-
- dosed "s:-I/usr/include ::" /usr/bin/Magick-config
- dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
-
- dosym /usr/lib/libMagick.so /usr/lib/libMagick-5.5.7-Q16.so.0.0.0
-}
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.0.8.3.ebuild,v 1.1 2004/09/21 20:47:29 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.3.2.ebuild,v 1.1 2004/11/02 00:50:25 sekretarz Exp $
inherit libtool flag-o-matic eutils
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64 ia64"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64 ~ia64"
+IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
DEPEND=">=sys-apps/sed-4
app-arch/bzip2
X? ( virtual/x11
>=app-text/dgs-0.5.9.1 )
cups? ( virtual/ghostscript )
- jpeg? ( >=media-libs/jpeg-6b )
lcms? ( >=media-libs/lcms-1.06 )
- mpeg? ( media-video/mpeg2vidcodec )
+ mpeg? ( >=media-video/mpeg2vidcodec-12 )
png? ( media-libs/libpng )
tiff? ( >=media-libs/tiff-3.5.5 )
xml2? ( >=dev-libs/libxml2-2.4.10 )
truetype? ( =media-libs/freetype-2* )
- wmf? ( media-libs/libwmf )
+ wmf? ( >=media-libs/libwmf-0.2.8 )
jbig? ( media-libs/jbigkit )
+ jpeg? ( >=media-libs/jpeg-6b )
perl? ( dev-lang/perl )
- graphviz? ( media-gfx/graphviz )"
-
-src_compile() {
+ graphviz? ( media-gfx/graphviz )
+ fpx? ( media-libs/libfpx )"
- local myconf=""
- use X || myconf="${myconf} --with-x=no"
- use cups || myconf="${myconf} --with-gslib"
- use jpeg || myconf="${myconf} --without-jpeg --without-jp2"
- use lcms || myconf="${myconf} --without-lcms"
- use mpeg || myconf="${myconf} --without-mpeg2"
- use tiff || myconf="${myconf} --without-tiff"
- use xml2 || myconf="${myconf} --without-xml"
- use truetype || myconf="${myconf} --without-ttf"
- use wmf || myconf="${myconf} --without-wmf"
- use jbig || myconf="${myconf} --without-jbig"
- use perl || myconf="${myconf} --without-perl"
- use graphviz || myconf="${myconf} --without-dot"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
- # Netscape is still used ? More people should have Mozilla
- sed -i 's:netscape:mozilla:g' configure
+ chmod +x config.sub
+}
+src_compile() {
econf \
--enable-shared \
--enable-lzw \
- --with-fpx \
--without-hdf \
--with-threads \
--with-bzlib \
--without-dot \
--with-modules \
- ${myconf} || die
+ --with-zlib \
+ $(use_with X x) \
+ $(use_with wmf) \
+ $(use_with fpx) \
+ $(use_with perl) \
+ $(use_with jbig) \
+ $(use_with tiff) \
+ $(use_with lcms) \
+ $(use_with xml2 xml) \
+ $(use_with jpeg jp2) \
+ $(use_with jpeg jpeg) \
+ $(use_with mpeg mpeg2) \
+ $(use_with cups gslib) \
+ $(use_with graphviz dot) \
+ $(use_with truetype ttf) || die "econf failed"
emake || die "compile problem"
}
src_install() {
make DESTDIR=${D} install
- mydoc="*.txt www/*"
- rm -f ${D}/usr/share/ImageMagick/*.txt
+ #bug 69705
+ rm -f ${D}/usr/lib/libltdl*
dosed "s:-I/usr/include ::" /usr/bin/Magick-config
dosed "s:-I/usr/include ::" /usr/bin/Magick++-config