Add thirdpartymirror for imagemagick, so that there are upstream http sources available instead of only ftp. Also include an optional /legacy/ path, as upstream moves the files there after a while, but some mirrors explicitly place the legacy content in the main directory still.

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64

8 files changed, 37 insertions, 22 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index d258b4dd1ed4..4e1b6d34d4fa 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.324 2008/12/29 04:05:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.325 2008/12/29 05:15:22 robbat2 Exp $
+
+  29 Dec 2008; Robin H. Johnson <robbat2@gentoo.org>
+  imagemagick-6.3.3.ebuild, imagemagick-6.3.4.ebuild,
+  imagemagick-6.4.4.6.ebuild, imagemagick-6.4.5.7.ebuild,
+  imagemagick-6.4.5.7-r1.ebuild, imagemagick-6.4.5.9.ebuild:
+  Add thirdpartymirror for imagemagick, so that there are upstream http
+  sources available instead of only ftp. Also include an optional /legacy/
+  path, as upstream moves the files there after a while, but some mirrors
+  explicitly place the legacy content in the main directory still.
 
 *imagemagick-6.4.5.9 (29 Dec 2008)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 2257d58ec3a3..056752586446 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,11 +4,11 @@ DIST ImageMagick-6.3.4-4.tar.bz2 5796376 RMD160 519126459cd80e4c07f23aa21147d579
 DIST ImageMagick-6.4.4-6.tar.bz2 8856594 RMD160 e64f485d54118d6c99df392001645da213e2756b SHA1 703b0e5017fcffd4f6dca4f607862e984d8b5d1a SHA256 9c85e5c43adce21588fc0eaa526fa514797d985760cd302b904e27112e01da91
 DIST ImageMagick-6.4.5-7.tar.bz2 8889574 RMD160 e519b19e1d584a62c911b5b1b57641bafcd732b5 SHA1 154ec72e118974f016f513eccf3e7bddd102dbbb SHA256 1e98ed76650263f84a3b827400dbdb1105f5d335c7a2782c5fbd83a971ab48ae
 DIST ImageMagick-6.4.5-9.tar.bz2 8900134 RMD160 f6bacce146442d5c7a961589d778a2ce6123623c SHA1 34496734b15e90e55ccea6ff5e8428d89f2cddb2 SHA256 e98e6ab8196b7bc2942b31429d85110efe05a1dbd695c56dd0a132b24beb35b7
-EBUILD imagemagick-6.3.3.ebuild 2690 RMD160 78f27e2aea0e06ff092328d4082b6a6d0857270e SHA1 769b0d4df8008cf2992e5d2daa53b67db67af6d9 SHA256 a993f97c6064baf130c3183c60a26de325ab10ba409b5dff0af4203275103822
-EBUILD imagemagick-6.3.4.ebuild 2699 RMD160 ec3ea0cfce3bb848a8bd5663594af3508d3959e9 SHA1 4c41e4cf194da3c3ee3c9c745d8b66cd03064cf1 SHA256 3ace432b149f986a33ec449dbb5f59187190b5d0a22d1192332ed45df3750f36
-EBUILD imagemagick-6.4.4.6.ebuild 4841 RMD160 ece3878f864c1f24cc761b5aa6214730648328b4 SHA1 bc865e676ae04dfa29c51af684328747e70e4b2d SHA256 407de616e02d4ebd92b69d2241f1f7d73dcf8a6b840c8cf3badaef73398ae277
-EBUILD imagemagick-6.4.5.7-r1.ebuild 4656 RMD160 31b12f6e01b10b85e8b28eab363eaf8c780c4065 SHA1 0f91bf46cfc7acee54be70f945b7a6893c095639 SHA256 7f7ae665d7a45616221502ad339f76bcc8c96a2f8ea63c69767a8db9e181ca59
-EBUILD imagemagick-6.4.5.7.ebuild 4864 RMD160 5923058317859725d891fcaf9475a58825e56c22 SHA1 273d140a9f0e7e1b4f24cb70b682b72896a81ca3 SHA256 810ee9f400047d65cd683eca7178f15b5a08279c9ee3362a79c5925e6a863da5
-EBUILD imagemagick-6.4.5.9.ebuild 4654 RMD160 b94b8476b56f52dd78248f2f79ca943e251c3027 SHA1 e96d95239ed02c9d4fd9d9adb98bc6750d27b056 SHA256 c3975a6d968b845a80261019c2ee77abdca080140483b36130a9a3c6aaa6961f
-MISC ChangeLog 48828 RMD160 baf1d344d7e25e9ddeb4b162a6ec55425874e8b4 SHA1 5b34b0eb804cce3b47ae6c9014edc3a51d630e3e SHA256 07be7e7f05474b43fccb2f20b07c409a1c922bcfa31813abad558161f95a6216
+EBUILD imagemagick-6.3.3.ebuild 2722 RMD160 3cb1bfec6ea49aedf35b26b804ce11b858bc6e64 SHA1 dd9e9482d92e0e5af7fd34814a9340b955faf3c8 SHA256 ac065b03da2154f5e26d6418f4d1b0670b0c13ee3a3b6f4f250baa4f580c5dc9
+EBUILD imagemagick-6.3.4.ebuild 2731 RMD160 ff8305814d13be0d542231c909b4b39134cf2ab4 SHA1 7b4fabefddb827abcbfdfb47c87933c118cafb44 SHA256 ea742826c5e4cc50a05b98c47aee6d8fb0165a91cb5ac3e02c2d15e2f7e54e4c
+EBUILD imagemagick-6.4.4.6.ebuild 4872 RMD160 5bb4b5a29e87f2cb7e85c648e7e4d58021c34b17 SHA1 9efc1444800a9636080ab316b97c8fd5a657ee1e SHA256 d4bc339ff66cd47c71eadd9e9039bdb7bead51655b232494482a373cf9a9578d
+EBUILD imagemagick-6.4.5.7-r1.ebuild 4687 RMD160 2c43ad120c1fe47e320f2eefa3e44ea646c6e993 SHA1 fa966cdf03f810efda6767e7a2b936267369101e SHA256 93bb895e7a60dcf137f22dc894d0ada3db7e9e6dcafc2979d2cca87223c61663
+EBUILD imagemagick-6.4.5.7.ebuild 4895 RMD160 f918dea58a6769757a948ef0cda2eb72405d3c13 SHA1 4566c8fdc28f1a51467387ec811fde59061b2b81 SHA256 994070e176db691cc99845294d9008b7bc6f64f4f3a8e0eb32137367c9a6ed70
+EBUILD imagemagick-6.4.5.9.ebuild 4684 RMD160 6bc812643ed225e283958fec760dd02685d910a1 SHA1 c43dc9997382481dc5cd0634f822a19745caea2b SHA256 070bd20bcf094ea245a21a519f5701315c6cfa37f25752cbde9480ba341b1e19
+MISC ChangeLog 49343 RMD160 6b2740a3c2bbe72fb4d1fe11d5bc456e81d46b4f SHA1 63ca96370736bb39c8196023914512483800abad SHA256 26fa85f45fa6df26d4b3f7206df6a10e0eb3f383027f6e799d7701e3f231b50b
 MISC metadata.xml 620 RMD160 facd588ff7e13cf1a573927c5f3e653f384bb4b2 SHA1 e989aa7d14e2a1c7382b5fdf1c395ed7dcf7d6cb SHA256 86955c079d63a4faacc4be59e01a4ce47934fc35f5b89f6accfdb755cd4ff2df
diff --git a/media-gfx/imagemagick/imagemagick-6.3.3.ebuild b/media-gfx/imagemagick/imagemagick-6.3.3.ebuild
index c296e915b84a..493a986bf68e 100644
--- a/media-gfx/imagemagick/imagemagick-6.3.3.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.3.ebuild,v 1.13 2007/12/07 22:48:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.3.ebuild,v 1.14 2008/12/29 05:15:22 robbat2 Exp $
 
 inherit eutils multilib perl-app
 
@@ -9,7 +9,8 @@ MY_P=${MY_PN}-${PV}
 
 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_P}-8.tar.bz2"
+SRC_URI="mirror://imagemagick/${MY_P}-8.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P}-8.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.3.4.ebuild b/media-gfx/imagemagick/imagemagick-6.3.4.ebuild
index ee92577c553b..96efa5bbf829 100644
--- a/media-gfx/imagemagick/imagemagick-6.3.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.4.ebuild,v 1.3 2007/12/07 22:48:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.4.ebuild,v 1.4 2008/12/29 05:15:22 robbat2 Exp $
 
 inherit eutils multilib perl-app
 
@@ -9,7 +9,8 @@ MY_P=${MY_PN}-${PV}
 
 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_P}-4.tar.bz2"
+SRC_URI="mirror://imagemagick/${MY_P}-4.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P}-4.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild b/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
index 8cddc5eb34d9..b6d3d3503312 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild,v 1.12 2008/12/23 16:39:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.4.6.ebuild,v 1.13 2008/12/29 05:15:22 robbat2 Exp $
 
 EAPI="1"
 
@@ -12,7 +12,8 @@ MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 
 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"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild
index 5c3fc3cb4152..4ba2a0f3b04e 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild,v 1.1 2008/11/16 21:21:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.7-r1.ebuild,v 1.2 2008/12/29 05:15:22 robbat2 Exp $
 
 EAPI="2"
 
@@ -12,7 +12,8 @@ MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 
 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"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild b/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild
index 4671653b6be1..9318a80d12ee 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild,v 1.1 2008/11/16 21:21:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.7.ebuild,v 1.2 2008/12/29 05:15:22 robbat2 Exp $
 
 EAPI="1"
 
@@ -12,7 +12,8 @@ MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 
 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"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"
diff --git a/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild b/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild
index b4dd049b5d2c..a7c79976ee6d 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild,v 1.1 2008/12/29 04:05:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.4.5.9.ebuild,v 1.2 2008/12/29 05:15:22 robbat2 Exp $
 
 EAPI="2"
 
@@ -12,7 +12,8 @@ MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
 
 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"
+SRC_URI="mirror://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
 
 LICENSE="imagemagick"
 SLOT="0"