Ebuild clean up

11 files changed, 4 insertions, 460 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 70febaaf6ffc..899f3ec91c28 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,10 +1,11 @@
 # 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.72 2004/09/14 18:33:55 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.73 2004/09/14 18:38:41 sekretarz Exp $
 
-  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org> :
+  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
   -imagemagick-5.4.7.4-r1.ebuild, -imagemagick-5.5.3.2.ebuild,
-  -imagemagick-5.5.7.14.ebuild, -imagemagick-6.0.5.2.ebuild:
+  -imagemagick-5.5.7.11.ebuild, -imagemagick-5.5.7.14.ebuild,
+  -imagemagick-6.0.5.2.ebuild:
   Ebuild clean up
 
   08 Sep 2004; Bryan Østergaard <kloeri@gentoo.org>
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7.4-r1 b/media-gfx/imagemagick/files/digest-imagemagick-5.4.7.4-r1
deleted file mode 100644
index 3e3153118c5c..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.4.7.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7440256c33fca7f095da90d4e14b15f7 ImageMagick-5.4.7-4.tar.gz 3662554
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.5.3.2 b/media-gfx/imagemagick/files/digest-imagemagick-5.5.3.2
deleted file mode 100644
index 68691be46328..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.5.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4037f8a6f41d71542564f9d07db59757 ImageMagick-5.5.3-2.tar.gz 4264358
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.11 b/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.11
deleted file mode 100644
index cf3f76fafa9c..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8edfa9a91d6e939f1311717f4bf1591a ImageMagick-5.5.7-11.tar.bz2 4214196
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.14 b/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.14
deleted file mode 100644
index 2a0b9ac9a454..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-5.5.7.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 841d103c36b6f2ccd8e408c33fc31db9 ImageMagick-5.5.7-14.tar.bz2 4218561
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.0.5.2 b/media-gfx/imagemagick/files/digest-imagemagick-6.0.5.2
deleted file mode 100644
index 805c72b2de1a..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45325d113d53e990452ca89ddf2c3aae ImageMagick-6.0.5-2.tar.bz2 5746345
diff --git a/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild b/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild
deleted file mode 100644
index f7887ffa247b..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.4.7.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-5.4.7.4-r1.ebuild,v 1.12 2004/06/24 22:42:45 agriffis Exp $
-
-IUSE="perl X cups xml2 lcms"
-
-inherit libtool perl-module eutils
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}-${PV#*.*.*.}
-S=${WORKDIR}/${MY_PN}-${PV%.*}
-DESCRIPTION="A collection of tools and libraries for many image formats"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc ~alpha ~mips ~hppa"
-
-DEPEND=">=sys-apps/sed-4
-	media-libs/libpng
-	>=app-arch/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?   ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	perl? ( >=dev-lang/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
-	sed -i 's:netscape:mozilla:g' configure
-
-	#patch to allow building by perl
-	epatch ${FILESDIR}/perlpatch.diff
-
-	econf \
-		--enable-shared \
-		--enable-static \
-		--enable-lzw \
-		--with-ttf \
-		--with-fpx \
-		--without-gslib \
-		--without-hdf \
-		--with-jbig \
-		--with-wmf \
-		--with-threads \
-		${myconf} || die "bad configure"
-	emake || die "compile problem"
-
-	# More perl stuff
-	cd PerlMagick
-	make clean
-	perl-module_src_prep
-	cd ..
-}
-
-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"
-	perl-module_src_install
-
-	rm -f ${D}/usr/share/ImageMagick/*.txt
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild b/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild
deleted file mode 100644
index 15615f9df775..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.5.3.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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-5.5.3.2.ebuild,v 1.20 2004/06/24 22:42:45 agriffis Exp $
-
-inherit libtool eutils perl-module flag-o-matic
-replace-flags k6-3 i586
-replace-flags k6-2 i586
-replace-flags k6 i586
-
-IUSE="X cups jpeg lcms mpeg perl png truetype tiff xml2"
-
-MY_PN=ImageMagick
-MY_P=${MY_PN}-${PV%.*}-${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.gz"
-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
-	>=app-arch/bzip2-1
-	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 )
-	perl? ( >=dev-lang/perl-5 )
-	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 perl || myconf="${myconf} --without-perl"
-	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-static \
-		--enable-lzw \
-		--with-fpx \
-		--with-jbig \
-		--without-hdf \
-		--with-wmf \
-		--with-threads \
-		--with-bzlib \
-		${myconf} || die
-	emake || die "compile problem"
-
-	# More perl stuff
-	cd PerlMagick
-	make clean
-	perl-module_src_prep
-}
-
-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"
-#	myinst="${myinst} libdir=${D}/usr/lib"
-#	myinst="${myinst} MagickLibPath=${D}/usr/lib/${MY_P2}"
-#	myinst="${myinst} MagickModulesPath=${D}/usr/lib/${MY_P2}/modules/coders"
-#	myinst="${myinst} MagickSharePath=${D}/usr/share/${MY_PN}"
-	myinst="DESTDIR=${D}"
-
-	# sandbox violation hack
-#	cp coders/Makefile coders/Makefile.bak
-#	sed \
-#		-e "s:^pkglibdir = :pkglibdir = ${D}:" \
-#		-e "s:^MagickLibPath = :MagickLibPath = ${D}:" \
-#		-e "s:^MagickModulesPath = :MagickModulesPath = ${D}:" \
-#		-e "s:^MagickSharePath = :MagickSharePath = ${D}:" \
-#		coders/Makefile.bak coders/Makefile
-
-	mydoc="*.txt"
-	perl-module_src_install
-
-	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
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.5.7.11.ebuild b/media-gfx/imagemagick/imagemagick-5.5.7.11.ebuild
deleted file mode 100644
index 966999d0d7fe..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.5.7.11.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-5.5.7.11.ebuild,v 1.8 2004/06/24 22:42:45 agriffis Exp $
-
-inherit libtool flag-o-matic eutils
-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 jbig"
-
-MY_PN=ImageMagick
-
-### uncomment the right variables depending on if we have a patchlevel or not
-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"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa"
-
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
-	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 )"
-
-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"
-	use jbig || myconf="${myconf} --without-jbig"
-
-	# 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.7-Q16.so.0.0.0 /usr/lib/libMagick.so.5
-}
diff --git a/media-gfx/imagemagick/imagemagick-5.5.7.14.ebuild b/media-gfx/imagemagick/imagemagick-5.5.7.14.ebuild
deleted file mode 100644
index 0f8f477a1b9e..000000000000
--- a/media-gfx/imagemagick/imagemagick-5.5.7.14.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-5.5.7.14.ebuild,v 1.4 2004/06/24 22:42:45 agriffis Exp $
-
-inherit libtool flag-o-matic eutils
-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 jbig"
-
-MY_PN=ImageMagick
-
-### uncomment the right variables depending on if we have a patchlevel or not
-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"
-RESTRICT="nomirror"
-HOMEPAGE="http://www.imagemagick.org/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
-
-DEPEND=">=sys-apps/sed-4
-	>=app-arch/bzip2-1
-	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 )"
-
-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"
-	use jbig || myconf="${myconf} --without-jbig"
-
-	# 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.so /usr/lib/libMagick-5.5.7-Q16.so.0.0.0
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.0.5.2.ebuild b/media-gfx/imagemagick/imagemagick-6.0.5.2.ebuild
deleted file mode 100644
index c06b7df55193..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.0.5.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.5.2.ebuild,v 1.3 2004/08/30 08:01:40 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="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64"
-
-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-modles \
-		${myconf} || die
-
-	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
-
-}