version bump

6 files changed, 23 insertions, 103 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 243e5a3573d3..5dd5cc54b241 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.19 2002/10/17 13:26:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.20 2002/10/22 09:21:53 seemant Exp $
+
+*imagemagick-5.4.9.1 (22 Oct 2002)
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
+  imagemagick-5.4.9.1.ebuild files/digest-imagemagick-5.4.9.1 :
+
+  Version bump.  In this release, the versioning has been made smarter, so
+  that the last digit maps to the -number from the upstream version number.
 
 *imagemagick-5.4.7-r2 (24 Sep 2002)
   
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7
deleted file mode 100644
index 693df6a4434d..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2059a2dad90a797cd6bb26734b37bb45 ImageMagick-5.4.7-1.tar.bz2 2897178
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r1 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r1
deleted file mode 100644
index 693df6a4434d..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2059a2dad90a797cd6bb26734b37bb45 ImageMagick-5.4.7-1.tar.bz2 2897178
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1
new file mode 100644
index 000000000000..e2f63d377344
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-5.4.9.1
@@ -0,0 +1 @@
+MD5 4b256152936893abe2944cf3e50867a7 ImageMagick-5.4.9-1.tar.bz2 3292934
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7.ebuild
deleted file mode 100644
index 7af24ce8136b..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.4.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7.ebuild,v 1.11 2002/10/20 18:48:56 vapier Exp $
-
-IUSE="perl X cups xml2 lcms"
-
-inherit libtool
-inherit perl-module
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV}-1
-S=${WORKDIR}/${MY_PN}-${PV}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc"
-
-DEPEND="media-libs/libpng
-	>=sys-apps/bzip2-1
-	>=sys-libs/zlib-1.1.3
-	>=media-libs/freetype-2.0
-	>=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	X? ( virtual/x11 
-		>=app-text/dgs-0.5.9.1 )
-	cups?   ( >=app-text/ghostscript-6.50 )
-	lcms? ( >=media-libs/lcms-1.06 )
-	perl? ( >=sys-devel/perl-5 )
-	xml2? ( >=dev-libs/libxml2-2.4.10 )"
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-	use perl || myconf="--without-perl"
-	use lcms || myconf="${myconf} --without-lcms"
-	use xml2 || myconf="${myconf} --without-xml"
-	use X    || myconf="${myconf} --with-x=no"
-
-	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
-
-	econf \
-		--enable-shared \
-		--enable-static \
-		--enable-lzw \
-		--with-ttf \
-		--without-fpx \
-		--without-gslib \
-		--without-hdf \
-		--without-jbig \
-		--without-wmf \
-		--with-threads \
-		--without-perl \
-		${myconf} || die "bad configure"
-
-	emake || die "compile problem"
-
-	cd ${S}/PerlMagick
-	make clean
-	perl-module_src_prep
-	cd ${S}
-}
-
-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"
-
-	mydoc="*.txt"
-
-	cd ${S}
-	make ${myinst} install || die
-	cd ${S}
-	cd ${S}/PerlMagick
-	perl-module_src_install
-	
-	rm -f ${D}/usr/share/ImageMagick/*.txt
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild
index edf44df86560..bca2f2a9e6f2 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7-r1.ebuild,v 1.6 2002/10/20 18:48:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.9.1.ebuild,v 1.1 2002/10/22 09:21:53 seemant Exp $
 
 IUSE="perl X cups xml2 lcms"
 
@@ -8,15 +8,15 @@ inherit libtool
 inherit perl-module
 
 MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV}-1
-S=${WORKDIR}/${MY_PN}-${PV}
+MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+S=${WORKDIR}/${MY_PN}-${PV%.*}
 DESCRIPTION="A collection of tools and libraries for many image formats"
 SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.imagemagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc ~sparc64"
 
 DEPEND="media-libs/libpng
 	>=sys-apps/bzip2-1
@@ -44,25 +44,28 @@ src_compile() {
 	cp configure configure.orig
 	sed -e 's:netscape:mozilla:g' configure.orig > configure
 
+	#patch to allow building by perl
+	patch -p0 < ${FILESDIR}/perlpatch.diff
+
 	econf \
 		--enable-shared \
 		--enable-static \
 		--enable-lzw \
 		--with-ttf \
-		--without-fpx \
+		--with-fpx \
 		--without-gslib \
 		--without-hdf \
-		--without-jbig \
-		--without-wmf \
+		--with-jbig \
+		--with-wmf \
 		--with-threads \
 		${myconf} || die "bad configure"
-
 	emake || die "compile problem"
 
-	cd ${S}/PerlMagick
+	# More perl stuff 
+	cd PerlMagick
 	make clean
 	perl-module_src_prep
-	cd ${S}
+	cd ..
 }
 
 src_install() {
@@ -73,11 +76,6 @@ src_install() {
 	myinst="${myinst} datadir=${D}/usr/share"
 
 	mydoc="*.txt"
-
-	cd ${S}
-	make ${myinst} install || die
-	cd ${S}
-	cd ${S}/PerlMagick
 	perl-module_src_install
 	
 	rm -f ${D}/usr/share/ImageMagick/*.txt