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.

(Portage version: 2.2_rc19/cvs/Linux 2.6.28-rc5-00117-g7f0f598 x86_64)

7 files changed, 30 insertions, 15 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/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"