Minor typos fixes. Version bump

6 files changed, 99 insertions, 8 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 468775879ee5..fc3439589373 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2004/09/16 16:00:44 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.78 2004/09/21 20:47:29 sekretarz Exp $
+
+*imagemagick-6.0.8.3 (21 Sep 2004)
+
+  21 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  imagemagick-6.0.7.1.ebuild, imagemagick-6.0.8.1.ebuild,
+  +imagemagick-6.0.8.3.ebuild:
+  Minor typos fixes. Version bump
 
 *imagemagick-6.0.8.1 (16 Sep 2004)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 52fe98f9b714..771ebd7d56e6 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,15 @@
-MD5 9b9214b2f9039c2db2a2b7e8e1a41f7b imagemagick-6.0.8.1.ebuild 2342
+MD5 0c7dc596011c98b30aee6ba995ed8a0d imagemagick-6.0.8.1.ebuild 2343
+MD5 42f1ad4dafe8d600ea9087c8e1dabf58 imagemagick-6.0.8.3.ebuild 2349
 MD5 b31ff8e2081d0d46eff4fd4f9e1abf8f imagemagick-5.5.6-r1.ebuild 2487
 MD5 dcc27cb8b7f7ef37a9d25507e68ce028 imagemagick-5.5.7.15.ebuild 2549
 MD5 eb4228c8f995ccb390e175158b4ab503 imagemagick-5.5.4.4.ebuild 3194
-MD5 ac4a96c623475c634ea0dfa5cab450c0 ChangeLog 12357
+MD5 d86a8240c6fb93e4e62ffbc67201dc9f ChangeLog 12571
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 b5af258fdf974418423bf3d2445bf326 imagemagick-6.0.7.1.ebuild 2337
+MD5 cee2c15c9dadf7a24eac27f7381ae39c imagemagick-6.0.7.1.ebuild 2338
 MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6-r1 71
 MD5 4909cde902edd90dd3725ba4369e782b files/digest-imagemagick-5.5.7.15 74
 MD5 69be221b82f76ec46d241c5e4bff0f12 files/digest-imagemagick-5.5.4.4 72
 MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
 MD5 95b9bca1e2ef2b6fed9919fcc59b1462 files/digest-imagemagick-6.0.8.1 73
+MD5 ebf998539413c47a71abdd70c78c5896 files/digest-imagemagick-6.0.8.3 73
 MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.3 b/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.3
new file mode 100644
index 000000000000..d218dcb47df8
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.3
@@ -0,0 +1 @@
+MD5 749fb41c731dfece1472cff476b30e70 ImageMagick-6.0.8-3.tar.bz2 4526568
diff --git a/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild b/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild
index 6a5258e99b04..fec9b284bbc2 100644
--- a/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.7.1.ebuild,v 1.10 2004/09/16 16:11:55 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild,v 1.11 2004/09/21 20:47:29 sekretarz Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -63,7 +63,7 @@ src_compile() {
 		--with-threads \
 		--with-bzlib \
 		--without-dot \
-		--with-modles \
+		--with-modules \
 		${myconf} || die
 
 	emake || die "compile problem"
diff --git a/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild b/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild
index b5039062d381..015108c37a82 100644
--- a/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2004/09/16 16:00:44 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild,v 1.2 2004/09/21 20:47:29 sekretarz Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -63,7 +63,7 @@ src_compile() {
 		--with-threads \
 		--with-bzlib \
 		--without-dot \
-		--with-modles \
+		--with-modules \
 		${myconf} || die
 
 	emake || die "compile problem"
diff --git a/media-gfx/imagemagick/imagemagick-6.0.8.3.ebuild b/media-gfx/imagemagick/imagemagick-6.0.8.3.ebuild
new file mode 100644
index 000000000000..b35e24e76ad5
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.0.8.3.ebuild
@@ -0,0 +1,81 @@
+# 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 $
+
+inherit libtool flag-o-matic eutils
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+S=${WORKDIR}/${MY_P}
+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="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"
+
+DEPEND=">=sys-apps/sed-4
+	app-arch/bzip2
+	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 )
+	perl? ( dev-lang/perl )
+	graphviz? ( media-gfx/graphviz )"
+
+src_compile() {
+
+	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"
+
+	# Netscape is still used ?  More people should have Mozilla
+	sed -i 's:netscape:mozilla:g' configure
+
+	econf \
+		--enable-shared \
+		--enable-lzw \
+		--with-fpx \
+		--without-hdf \
+		--with-threads \
+		--with-bzlib \
+		--without-dot \
+		--with-modules \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	mydoc="*.txt www/*"
+
+	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
+
+}