dev-java/swt: Fix SRC_URIs, closes bug #598360

Package-Manager: portage-2.3.2

diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild
index 62bc824f43682f4bdbecd20e2e889be2f945850b..79a975a6f01e82cfc1aaa40d7213e428a6006e7c 100644 (file)
--- a/dev-java/swt/swt-3.5.2.ebuild
+++ b/dev-java/swt/swt-3.5.2.ebuild
@@ -7,26 +7,17 @@ EAPI=2
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               x86-fbsd? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               amd64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-               )
-               ppc? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip
-               )
-               ppc64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-               )"
+SRC_URI="
+       amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+       ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc.zip )
+       ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+       x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+       x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 SLOT="3.5"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"

diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild
index 5d09ebb0dc854251f0873999d23d98385aec249b..95012a506401d7b850ef5e6bf05a7b2d49c79449 100644 (file)
--- a/dev-java/swt/swt-3.7.2-r1.ebuild
+++ b/dev-java/swt/swt-3.7.2-r1.ebuild
@@ -7,26 +7,17 @@ EAPI=4
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               x86-fbsd? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               amd64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-               )
-               ppc? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               ppc64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-               )"
+SRC_URI="
+       amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+       ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+       ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+       x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+       x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 SLOT="3.7"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"

diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild
index 01520fc07500b7205262f49360674053525e255e..0089fa3423d1fffc202339b72ce5b0e7846b39cb 100644 (file)
--- a/dev-java/swt/swt-3.8.2-r1.ebuild
+++ b/dev-java/swt/swt-3.8.2-r1.ebuild
@@ -7,26 +7,17 @@ EAPI="5"
 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
+MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="x86? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               x86-fbsd? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               amd64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
-               )
-               ppc? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
-               )
-               ppc64? (
-                       http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
-               )"
+SRC_URI="
+       amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+       ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+       ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+       x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+       x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
 
 SLOT="3.8"
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"