small fixes

6 files changed, 38 insertions, 37 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index f91b917a251e..6199941dec63 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,10 +1,10 @@
 MD5 ba2ce7922322d0899ab8f6b4c580c77c imagemagick-5.5.7.ebuild 2438
-MD5 c67ce1f89124b6b1f23e91d488207b11 imagemagick-5.5.3.2.ebuild 3239
-MD5 488cb6f2053d50b21598b38e6b385252 imagemagick-5.5.6.ebuild 2403
-MD5 f8b706f8c545603b9a2412aaee1d3127 imagemagick-5.5.6-r1.ebuild 2469
-MD5 dcc1ee6900d3c84263e05be1f60b2118 imagemagick-5.5.4.4.ebuild 3241
+MD5 f93bb18036355400cf80dc74261e5c09 imagemagick-5.5.3.2.ebuild 3209
+MD5 1128f01aba50db74bf71a10b28916ccc imagemagick-5.5.6.ebuild 2374
+MD5 7a28bab44eb1d7d4e4a66f5516e08d11 imagemagick-5.5.6-r1.ebuild 2441
+MD5 23f08a0095d65f168da7c918651356ff imagemagick-5.5.4.4.ebuild 3204
 MD5 b321deeadf9214b00d0868a10071b7b3 ChangeLog 7985
-MD5 d47fb67acf33d6d3a3be38b851ed39af imagemagick-5.4.7.4-r1.ebuild 2097
+MD5 a3595ee2d7f8379f8f725fd5338ea10a imagemagick-5.4.7.4-r1.ebuild 2063
 MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6-r1 71
 MD5 f9ff3fba47b4d61edd32eea1aee94731 files/digest-imagemagick-5.5.3.2 72
 MD5 69be221b82f76ec46d241c5e4bff0f12 files/digest-imagemagick-5.5.4.4 72
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild
index d952c47fb9c8..1a2f33cbcc7b 100644
--- a/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2003 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.4-r1.ebuild,v 1.6 2003/04/28 16:51:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild,v 1.7 2003/07/02 03:35:31 seemant Exp $
 
 IUSE="perl X cups xml2 lcms"
 
-inherit libtool
-inherit perl-module
+inherit libtool perl-module eutils
 
 MY_PN=ImageMagick
 MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
@@ -18,7 +17,8 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa"
 
-DEPEND="media-libs/libpng
+DEPEND=">=sys-apps/sed-4
+	media-libs/libpng
 	>=sys-apps/bzip2-1
 	>=sys-libs/zlib-1.1.3
 	>=media-libs/freetype-2.0
@@ -41,11 +41,10 @@ src_compile() {
 	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
+	sed -i 's:netscape:mozilla:g' configure
 
 	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
+	epatch ${FILESDIR}/perlpatch.diff
 
 	econf \
 		--enable-shared \
diff --git a/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild b/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild
index c46d0cb6c5bd..5a5a0c3f8551 100644
--- a/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild,v 1.12 2003/05/15 00:51:48 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild,v 1.13 2003/07/02 03:35:31 seemant Exp $
 
 inherit libtool
 inherit perl-module
@@ -23,7 +23,8 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ~ppc ~sparc alpha mips hppa"
 
-DEPEND="media-libs/jbigkit
+DEPEND=">=sys-apps/sed-4
+	media-libs/jbigkit
 	>=sys-apps/bzip2-1
 	sys-libs/zlib
 	X? ( virtual/x11 
@@ -53,11 +54,10 @@ src_compile() {
 	use truetype || myconf="${myconf} --without-ttf"
 
 	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
+	sed -i 's:netscape:mozilla:g' configure
 
 	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
+	epatch ${FILESDIR}/perlpatch.diff
 
 	econf \
 		--enable-shared \
@@ -69,7 +69,7 @@ src_compile() {
 		--with-wmf \
 		--with-threads \
 		--with-bzlib \
-		${myconf}
+		${myconf} || die
 	emake || die "compile problem"
 
 	# More perl stuff 
diff --git a/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild b/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild
index 1e739695a8a8..0ddc6b4b93e2 100644
--- a/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.7 2003/05/15 00:51:48 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.4.4.ebuild,v 1.8 2003/07/02 03:35:31 seemant Exp $
 
 inherit libtool
 inherit perl-module
@@ -23,7 +23,8 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa"
 
-DEPEND="media-libs/jbigkit
+DEPEND=">=sys-apps/sed-4
+	media-libs/jbigkit
 	>=sys-apps/bzip2-1
 	sys-libs/zlib
 	X? ( virtual/x11 
@@ -53,11 +54,10 @@ src_compile() {
 	use truetype || myconf="${myconf} --without-ttf"
 
 	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
+	sed -i 's:netscape:mozilla:g' configure
 
 	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
+	epatch ${FILESDIR}/perlpatch.diff
 
 	econf \
 		--enable-shared \
diff --git a/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild
index 5adead0c3977..457317a14813 100644
--- a/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.2 2003/05/15 00:51:49 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild,v 1.3 2003/07/02 03:35:31 seemant Exp $
 
 inherit libtool flag-o-matic
 replace-flags k6-3 i586
@@ -26,7 +26,8 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
 
-DEPEND="media-libs/jbigkit
+DEPEND=">=sys-apps/sed-4
+	media-libs/jbigkit
 	>=sys-apps/bzip2-1
 	sys-libs/zlib
 	X? ( virtual/x11 
@@ -55,22 +56,22 @@ src_compile() {
 	use truetype || myconf="${myconf} --without-ttf"
 	use wmf || myconf="${myconf} --without-wmf"
 	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
+	sed -i 's:netscape:mozilla:g' configure
 
 	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
+	epatch ${FILESDIR}/perlpatch.diff
 
 	econf \
 		--enable-shared \
-		#--enable-static \
 		--enable-lzw \
 		--with-fpx \
 		--with-jbig \
 		--without-hdf \
 		--with-threads \
 		--with-bzlib \
-		${myconf}
+		${myconf} || die
+		#--enable-static
+		\
 	emake || die "compile problem"
 }
 
diff --git a/media-gfx/imagemagick/imagemagick-5.5.6.ebuild b/media-gfx/imagemagick/imagemagick-5.5.6.ebuild
index d971ea86419f..63ba2ce668a1 100644
--- a/media-gfx/imagemagick/imagemagick-5.5.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.6.ebuild,v 1.3 2003/05/15 00:51:49 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.6.ebuild,v 1.4 2003/07/02 03:35:31 seemant Exp $
 
 inherit libtool flag-o-matic
 replace-flags k6-3 i586
@@ -26,7 +26,8 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc ~sparc ~alpha ~mips ~hppa"
 
-DEPEND="media-libs/jbigkit
+DEPEND=">=sys-apps/sed-4
+	media-libs/jbigkit
 	>=sys-apps/bzip2-1
 	sys-libs/zlib
 	X? ( virtual/x11 
@@ -54,15 +55,13 @@ src_compile() {
 	use truetype || myconf="${myconf} --without-ttf"
 
 	# Netscape is still used ?  More people should have Mozilla
-	cp configure configure.orig
-	sed -e 's:netscape:mozilla:g' configure.orig > configure
+	sed -i 's:netscape:mozilla:g' configure
 
 	#patch to allow building by perl
-	patch -p0 < ${FILESDIR}/perlpatch.diff
+	epatch ${FILESDIR}/perlpatch.diff
 
 	econf \
 		--enable-shared \
-		#--enable-static \
 		--enable-lzw \
 		--with-fpx \
 		--with-jbig \
@@ -70,7 +69,9 @@ src_compile() {
 		--with-wmf \
 		--with-threads \
 		--with-bzlib \
-		${myconf}
+		${myconf} || die
+		#--enable-static \
+
 	emake || die "compile problem"
 }