Solved file collision problem, bug #78740. Ebuild clean up

Package-Manager: portage-2.0.51-r14

9 files changed, 21 insertions, 255 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 296ac963c39d..a051335f32a9 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.118 2005/01/20 20:11:41 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.119 2005/01/20 23:35:53 sekretarz Exp $
+
+  21 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  -imagemagick-6.0.7.1.ebuild, -imagemagick-6.0.8.1.ebuild,
+  -imagemagick-6.1.0.1.ebuild, imagemagick-6.1.8.8.ebuild:
+  Solved file collision problem, bug #78740. Ebuild clean up
 
   20 Jan 2005; Hardave Riar <hardave@gentoo.org> imagemagick-6.1.8.8.ebuild:
   Stable on mips, bug #77932.
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 14b3c3f86efa..b630740b0cca 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,22 @@
-MD5 2138063473fc1d9a3b517e7e797a061d imagemagick-6.0.8.1.ebuild 2318
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ef4af3dba983edbe00115f3e31b3e64c imagemagick-6.1.6.0.ebuild 2164
-MD5 7b8474c823224fc868c8dd4630d98467 imagemagick-6.1.0.1.ebuild 2314
-MD5 07f50c96fc95326da7df3201a7080864 imagemagick-6.1.8.8.ebuild 2323
+MD5 c8df0d58f7a511379108aa7ecc4b4ca7 imagemagick-6.1.8.8.ebuild 2320
 MD5 905394a2ebdbfa1a49e7ea6cb9de1180 imagemagick-6.1.3.2.ebuild 2123
 MD5 51d852e32341aca08dc8108a1e34866a imagemagick-6.1.3.4.ebuild 2387
-MD5 bcf3e0a00400338fe64c055ddeea9ac3 ChangeLog 17780
+MD5 3160a959adc142e6e32234f2824fc7e1 ChangeLog 18017
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 5d4260370fd22d4fa6d0a921e5036b47 imagemagick-6.0.7.1.ebuild 2311
 MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
-MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
-MD5 95b9bca1e2ef2b6fed9919fcc59b1462 files/digest-imagemagick-6.0.8.1 73
-MD5 a4a32e0f76d7fe0b204a2d408fc52158 files/digest-imagemagick-6.1.0.1 73
 MD5 2dd9ba895922b7d6bb513572bb851254 files/digest-imagemagick-6.1.3.2 73
 MD5 88435dc2f0a4064ae49313f41419695d files/digest-imagemagick-6.1.3.4 73
 MD5 4dbe04f2c27a20911e1080d591674997 files/digest-imagemagick-6.1.6.0 73
 MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
 MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB8E6IZ/iYVBmujdURAp3fAKC7W3zW/9uaad1FHpkeXAatUPEFbQCg8dSp
+0Sw/YvKohTsRt9bNxYQjzps=
+=vWJ2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.0.7.1 b/media-gfx/imagemagick/files/digest-imagemagick-6.0.7.1
deleted file mode 100644
index 2eb6b05ce28e..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.0.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c9f5bd9afa95b747480040abd456784 ImageMagick-6.0.7-1.tar.bz2 5752309
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.1 b/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.1
deleted file mode 100644
index ce2d27797f3a..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa6ada892fa16a00cc40affc91653ec4 ImageMagick-6.0.8-1.tar.bz2 4527213
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.1.0.1 b/media-gfx/imagemagick/files/digest-imagemagick-6.1.0.1
deleted file mode 100644
index 33a06a674c6b..000000000000
--- a/media-gfx/imagemagick/files/digest-imagemagick-6.1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1ab788ab6fef208741627cbaf98fb420 ImageMagick-6.1.0-1.tar.bz2 4535582
diff --git a/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild b/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild
deleted file mode 100644
index dc491a153533..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.0.7.1.ebuild
+++ /dev/null
@@ -1,80 +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.0.7.1.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"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 mips ppc64 ia64"
-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 )
-	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-modules \
-		${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
-
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild b/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild
deleted file mode 100644
index 5bc0c81c6eca..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.0.8.1.ebuild
+++ /dev/null
@@ -1,80 +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.0.8.1.ebuild,v 1.4 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"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips ~ppc64 ia64"
-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 )
-	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-modules \
-		${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
-
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.1.0.1.ebuild b/media-gfx/imagemagick/imagemagick-6.1.0.1.ebuild
deleted file mode 100644
index 2784da42a62c..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.1.0.1.ebuild
+++ /dev/null
@@ -1,80 +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.0.1.ebuild,v 1.8 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"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz"
-
-DEPEND="app-arch/bzip2
-	sys-libs/zlib
-	X? ( virtual/x11 )
-	cups? ( virtual/ghostscript )
-	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 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	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-modules \
-		--with-zlib \
-		${myconf} || die
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install
-	mydoc="*.txt www/*"
-
-	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-6.1.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild
index 4c6edc67422d..01aaeaeb0587 100644
--- a/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.8.ebuild,v 1.11 2005/01/20 20:11:41 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v 1.12 2005/01/20 23:35:53 sekretarz Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -82,8 +82,8 @@ src_install() {
 	#bug 69705
 	rm -f ${D}/usr/lib/libltdl*
 
-	#bug 73464
-	rm -f ${D}/usr/lib/perl5/5.8.6/x86_64-linux/perllocal.pod
+	#bug 73464 and 78740
+	rm -f ${D}/usr/lib/perl5/*/*/perllocal.pod
 
 	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
 	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config