version bump

5 files changed, 38 insertions, 100 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 9fd958ecf466..9c83b8456e47 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2002/05/06 17:27:21 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.12 2002/06/29 14:38:04 seemant Exp $
+
+*imagemagick-5.4.6 (29 Jun 2002)
+
+  29 Jun 2002; Seemant Kulleen <seemant@gentoo.org> imagemagick-5.4.6.ebuild
+  files/digest-imagemagick-5.4.6 :
+
+  Version bump.
 
 *imagemagick-5.4.5 (6 May 2002)
 
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r1 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r1
deleted file mode 100644
index 46ca16165f40..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70536bc4f3c77a931dee7deab9b7b5a1 ImageMagick-5.4.4-4.tar.gz 3897914
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r2 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r2
deleted file mode 100644
index 46ca16165f40..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70536bc4f3c77a931dee7deab9b7b5a1 ImageMagick-5.4.4-4.tar.gz 3897914
diff --git a/media-gfx/imagemagick/imagemagick-5.4.4-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.4-r1.ebuild
deleted file mode 100644
index 66797dcbf602..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.4.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.4-r1.ebuild,v 1.2 2002/04/11 13:52:35 seemant Exp $
-
-MY_P=ImageMagick-${PV}-4
-S=${WORKDIR}/ImageMagick-${PV}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.gz"
-HOMEPAGE="http://www.imagemagick.org/"
-
-
-DEPEND="X? ( virtual/x11 )
-	>=app-text/dgs-0.5.9.1
-	>=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
-	>=media-libs/libpng-1.0.7
-	gs?   ( >=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() {
-
-	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
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-static \
-		--enable-lzw \
-		--with-ttf \
-		--without-fpx \
-		--without-gslib \
-		--without-hdf \
-		--without-jbig \
-		--without-wmf \
-		--with-threads \
-		--build=${CHOST} \
-		${myconf} || die "bad configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		PREFIX=${D}/usr \
-		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		INSTALLSCRIPT=${D}/usr/bin \
-		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		INSTALLBIN=${D}/usr/bin \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1  \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		mandir=${D}/usr/share/man \
-		MagickSharePath=${D}/usr/share/ImageMagick/ \
-		pkgdocdir=${D}/usr/share/doc/${PF}/html \
-		install || die "install problem"
-
-	rm -f ${D}/usr/share/ImageMagick/*.txt
-
-	dodoc Copyright.txt PLATFORMS.txt QuickStart.txt README.txt TODO.txt
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.4.4-r2.ebuild b/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
index 171a6ad07eed..6f288d6489b0 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.4-r2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.6.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.4-r2.ebuild,v 1.4 2002/04/29 08:47:19 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.6.ebuild,v 1.1 2002/06/29 14:38:14 seemant Exp $
+
+inherit perl-module
 
 MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV}-4
+MY_P=${MY_PN}-${PV}-3
 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.gz"
+SRC_URI="http://imagemagick.sourceforge.net/http/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.imagemagick.org/"
-
+SLOT="0"
+LICENSE="as-is"
 
 DEPEND="X? ( virtual/x11
-	    >=app-text/dgs-0.5.9.1 )
+	>=app-text/dgs-0.5.9.1 )
 	>=sys-apps/bzip2-1
 	>=sys-libs/zlib-1.1.3
 	>=media-libs/freetype-2.0
@@ -38,8 +40,7 @@ src_compile() {
 	cp configure configure.orig
 	sed -e 's:netscape:mozilla:g' configure.orig > configure
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
 		--enable-shared \
 		--enable-static \
 		--enable-lzw \
@@ -50,28 +51,35 @@ src_compile() {
 		--without-jbig \
 		--without-wmf \
 		--with-threads \
-		--build=${CHOST} \
 		${myconf} || die "bad configure"
 
 	emake || die "compile problem"
 }
 
 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"
 
-	make prefix=${D}/usr \
-		PREFIX=${D}/usr \
-		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		INSTALLSCRIPT=${D}/usr/bin \
-		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		INSTALLBIN=${D}/usr/bin \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1  \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		mandir=${D}/usr/share/man \
-		MagickSharePath=${D}/usr/share/ImageMagick/ \
-		pkgdocdir=${D}/usr/share/doc/${PF}/html \
-		install || die "install problem"
+	mydoc="*.txt"
+#	make prefix=${D}/usr \
+#		PREFIX=${D}/usr \
+#		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
+#		INSTALLSCRIPT=${D}/usr/bin \
+#		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
+#		INSTALLBIN=${D}/usr/bin \
+#		INSTALLMAN1DIR=${D}/usr/share/man/man1  \
+#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
+#		mandir=${D}/usr/share/man \
+#		MagickSharePath=${D}/usr/share/ImageMagick/ \
+#		pkgdocdir=${D}/usr/share/doc/${PF}/html \
+#		install || die "install problem"
 
+	base_src_install
+	
 	rm -f ${D}/usr/share/ImageMagick/*.txt
 
-	dodoc Copyright.txt PLATFORMS.txt QuickStart.txt README.txt TODO.txt
 }