cleanup

6 files changed, 4 insertions, 187 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index fb553c16534f..dd2fb5ebecd2 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,15 +2,11 @@ MD5 8b7cab278204bb6c90903c2c11d99151 ChangeLog 8239
 MD5 522facdb5a107e1ea2a3d5b7e7a3d863 imagemagick-5.4.7.4-r1.ebuild 2061
 MD5 dbd3aedd443e1f68d813c05561a4342f imagemagick-5.5.3.2.ebuild 3203
 MD5 d8befa9c2743118a238545d8aee96379 imagemagick-5.5.4.4.ebuild 3198
-MD5 75e0a743c4a0df767b6909df7ff396ab imagemagick-5.5.6-r1.ebuild 2439
-MD5 c317888195fdaf807a6859fe9eab4325 imagemagick-5.5.6.ebuild 2368
-MD5 64bd3eb547ea164ee21f8a2cefa56245 imagemagick-5.5.7.ebuild 2432
+MD5 4071c9db6a21e1ed68e8b9144df73718 imagemagick-5.5.6-r1.ebuild 2437
 MD5 1ce73f05f7c916a1cb2fe29a51b7f728 imagemagick-5.5.7-r1.ebuild 2283
 MD5 f83c498eca8fc6a0cbd227182619f38e files/digest-imagemagick-5.4.7.4-r1 72
-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
-MD5 5b59068817b5f99f424910fe322b1587 files/digest-imagemagick-5.5.7 71
+MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6-r1 71
 MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
-MD5 4cd3e2742fa943129dca5d63d0109a42 files/digest-imagemagick-5.5.6 71
 MD5 ee6745eeb054f767a003c8d78675f9a1 files/digest-imagemagick-5.5.7-r1 74
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.5.6 b/media-gfx/imagemagick/files/digest-imagemagick-5.5.6
deleted file mode 100644
index 18dd49f4168b..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.5.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eac3971f0704059dcf2f7a5737b7daa8 ImageMagick-5.5.6.tar.bz2 3526303
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7 b/media-gfx/imagemagick/files/digest-imagemagick-5.5.7
deleted file mode 100644
index e3f3ddfef338..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 81587f33cca479923c6863651554f751 ImageMagick-5.5.7.tar.bz2 4194329
diff --git a/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild
index 3d025fb3e2cc..9a0faab89baa 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.7 2003/09/06 23:56:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.5.6-r1.ebuild,v 1.8 2003/09/07 12:11:11 mholzer Exp $
 
 inherit libtool flag-o-matic
 replace-flags k6-3 i586
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.imagemagick.org/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips hppa amd64"
+KEYWORDS="x86 ppc ~sparc ~alpha ~mips hppa amd64"
 
 DEPEND=">=sys-apps/sed-4
 	media-libs/jbigkit
diff --git a/media-gfx/imagemagick/imagemagick-5.5.6.ebuild b/media-gfx/imagemagick/imagemagick-5.5.6.ebuild
deleted file mode 100644
index b8dbedb9a6b2..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.5.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.5 2003/09/06 23:56:39 msterret Exp $
-
-inherit libtool flag-o-matic
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2"
-
-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"
-
-DEPEND=">=sys-apps/sed-4
-	media-libs/jbigkit
-	>=sys-apps/bzip2-1
-	sys-libs/zlib
-	X? ( virtual/x11
-		>=app-text/dgs-0.5.9.1 )
-	cups?   ( >=app-text/ghostscript-6.50 )
-	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* )"
-
-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 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-lzw \
-		--with-fpx \
-		--with-jbig \
-		--without-hdf \
-		--with-wmf \
-		--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.5-Q16.so.0.0.0 /usr/lib/libMagick.so.5
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.5.7.ebuild b/media-gfx/imagemagick/imagemagick-5.5.7.ebuild
deleted file mode 100644
index 82ba54d56328..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.5.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.7.ebuild,v 1.3 2003/09/06 23:56:39 msterret Exp $
-
-inherit libtool flag-o-matic
-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"
-
-DEPEND=">=sys-apps/sed-4
-	media-libs/jbigkit
-	>=sys-apps/bzip2-1
-	sys-libs/zlib
-	X? ( virtual/x11
-		>=app-text/dgs-0.5.9.1 )
-	cups?   ( >=app-text/ghostscript-6.50 )
-	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
-
-	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.5-Q16.so.0.0.0 /usr/lib/libMagick.so.5
-}