Ebuild clean up

Package-Manager: portage-2.0.51.19

8 files changed, 24 insertions, 283 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index ad4c102701b7..b1a9a695eb09 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.139 2005/04/27 11:23:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.140 2005/04/27 13:49:55 sekretarz Exp $
+
+  27 Apr 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.1.3.2.ebuild, -imagemagick-6.1.3.4.ebuild,
+  -imagemagick-6.1.6.0.ebuild:
+  Ebuild clean up
 
   27 Apr 2005; Luca Barbato <lu_zero@gentoo.org> imagemagick-6.2.2.0.ebuild:
   Marked ppc
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index c3e30e538bf5..2ffeb6e1d9f7 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,20 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa6c1d3fe1c9cd20706566d07e695aa3 imagemagick-6.2.1.5.ebuild 2738
 MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
-MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 905394a2ebdbfa1a49e7ea6cb9de1180 imagemagick-6.1.3.2.ebuild 2123
 MD5 e49053080861e0686e37f633664ca61c imagemagick-6.2.2.0.ebuild 2731
-MD5 fa6c1d3fe1c9cd20706566d07e695aa3 imagemagick-6.2.1.5.ebuild 2738
-MD5 51d852e32341aca08dc8108a1e34866a imagemagick-6.1.3.4.ebuild 2387
-MD5 01d411aafad71f38b460221946d49d21 ChangeLog 20524
-MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
-MD5 ef4af3dba983edbe00115f3e31b3e64c imagemagick-6.1.6.0.ebuild 2164
 MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
-MD5 3463dd071a5d891ab69d1797c256df76 files/digest-imagemagick-6.2.0.6 72
-MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
-MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
-MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
-MD5 2dd9ba895922b7d6bb513572bb851254 files/digest-imagemagick-6.1.3.2 73
+MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
+MD5 83e0ba498367fe09af2df4e8697ea64c ChangeLog 20690
+MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
+MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
 MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-imagemagick-6.2.0.4 72
+MD5 3463dd071a5d891ab69d1797c256df76 files/digest-imagemagick-6.2.0.6 72
 MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5 73
-MD5 88435dc2f0a4064ae49313f41419695d files/digest-imagemagick-6.1.3.4 73
-MD5 4dbe04f2c27a20911e1080d591674997 files/digest-imagemagick-6.1.6.0 73
+MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
+MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCb5ilZ/iYVBmujdURAm7GAJ4lotG27fOceoRWeo4VoCCXLjOJ7wCg9WPL
+2DG3594UWHbizZ+85QEo7Bw=
+=c01F
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.2 b/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.2
deleted file mode 100644
index a68212c5cc3b..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e6d170ff728618853856d4ea3c93143d ImageMagick-6.1.3-2.tar.bz2 4564596
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.4 b/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.4
deleted file mode 100644
index ee044009f064..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7bb67a4aaf679dc177ee079d00026362 ImageMagick-6.1.3-4.tar.bz2 4564915
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0 b/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0
deleted file mode 100644
index fc5a2e78ffd4..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c40549e22bdc7f8b74ed44381bf1fee5 ImageMagick-6.1.6-0.tar.bz2 4558525
diff --git a/media-gfx/imagemagick/imagemagick-6.1.3.2.ebuild b/media-gfx/imagemagick/imagemagick-6.1.3.2.ebuild
deleted file mode 100644
index f517c6366691..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.1.3.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.3.2.ebuild,v 1.15 2005/01/10 19:37:30 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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/bzip2
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	cups?   ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
-	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-0.2.8 )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( >=media-libs/jpeg-6b )
-	perl? ( dev-lang/perl )
-	graphviz? ( media-gfx/graphviz )
-	fpx? ( media-libs/libfpx )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	chmod +x config.sub
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		--enable-lzw \
-		--without-hdf \
-		--with-threads \
-		--with-bzlib \
-		--without-dot \
-		--with-modules \
-		--with-zlib \
-		$(use_with X x) \
-		$(use_with wmf) \
-		$(use_with fpx) \
-		$(use_with perl) \
-		$(use_with jbig) \
-		$(use_with tiff) \
-		$(use_with lcms) \
-		$(use_with xml2 xml) \
-		$(use_with jpeg jp2) \
-		$(use_with jpeg jpeg) \
-		$(use_with mpeg mpeg2) \
-		$(use_with cups gslib) \
-		$(use_with graphviz dot) \
-		$(use_with truetype ttf) || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	#bug 69705
-#	rm -f ${D}/usr/lib/libltdl*
-
-	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-6.1.3.4.ebuild b/media-gfx/imagemagick/imagemagick-6.1.3.4.ebuild
deleted file mode 100644
index 62dbb7d7ba80..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.1.3.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.3.4.ebuild,v 1.11 2005/01/10 19:47:53 gustavoz 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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/bzip2
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	cups?   ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
-	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-0.2.8 )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( >=media-libs/jpeg-6b )
-	perl? ( dev-lang/perl )
-	graphviz? ( media-gfx/graphviz )
-	fpx? ( media-libs/libfpx )"
-
-RDEPEND="${DEPEND}
-		>=sys-devel/libtool-1.5.2-r6"
-
-pkg_setup() {
-		ewarn ""
-		ewarn "If this is an upgrade of Imagemagick, it may broke your"
-		ewarn "libtool. If you experience any problems with libtld* files,"
-		ewarn "please reemerge sys-devel/libtool."
-		ewarn ""
-		epause 10
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	chmod +x config.sub
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		--enable-lzw \
-		--without-hdf \
-		--with-threads \
-		--with-bzlib \
-		--with-modules \
-		--with-zlib \
-		$(use_with X x) \
-		$(use_with wmf) \
-		$(use_with fpx) \
-		$(use_with perl) \
-		$(use_with jbig) \
-		$(use_with tiff) \
-		$(use_with lcms) \
-		$(use_with xml2 xml) \
-		$(use_with jpeg jp2) \
-		$(use_with jpeg jpeg) \
-		$(use_with mpeg mpeg2) \
-		$(use_with cups gslib) \
-		$(use_with graphviz dot) \
-		$(use_with truetype ttf) || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	#bug 69705
-	rm -f ${D}/usr/lib/libltdl*
-
-	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-6.1.6.0.ebuild b/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild
deleted file mode 100644
index 58a7b18e3546..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild,v 1.2 2005/01/10 19:37:30 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="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
-
-DEPEND=">=sys-apps/sed-4
-	app-arch/bzip2
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	cups?   ( virtual/ghostscript )
-	lcms? ( >=media-libs/lcms-1.06 )
-	mpeg? ( >=media-video/mpeg2vidcodec-12 )
-	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-0.2.8 )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( >=media-libs/jpeg-6b )
-	perl? ( dev-lang/perl )
-	graphviz? ( media-gfx/graphviz )
-	fpx? ( media-libs/libfpx )"
-
-RDEPEND="${DEPEND}
-		>=sys-devel/libtool-1.5.2-r6"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	chmod +x config.sub
-}
-
-src_compile() {
-	econf \
-		--enable-shared \
-		--enable-lzw \
-		--without-hdf \
-		--with-threads \
-		--with-bzlib \
-		--with-modules \
-		--with-zlib \
-		$(use_with X x) \
-		$(use_with wmf) \
-		$(use_with fpx) \
-		$(use_with perl) \
-		$(use_with jbig) \
-		$(use_with tiff) \
-		$(use_with lcms) \
-		$(use_with xml2 xml) \
-		$(use_with jpeg jp2) \
-		$(use_with jpeg jpeg) \
-		$(use_with mpeg mpeg2) \
-		$(use_with cups gslib) \
-		$(use_with graphviz dot) \
-		$(use_with truetype ttf) || die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	#bug 69705
-	rm -f ${D}/usr/lib/libltdl*
-
-	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
-	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
-
-}