--- icedtea-7.2.3.3.ebuild
+++ icedtea-7.2.3.3.ebuild
@@ -14,29 +14,42 @@
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+
+ICEDTEA_TARBALL="${ICEDTEA_PKG}.tar.gz"
+OPENJDK_TARBALL="301e79a966b4.tar.gz"
 CORBA_TARBALL="9a95d714d136.tar.gz"
+HOTSPOT_TARBALL="d2d0a106917c.tar.gz"
 JAXP_TARBALL="f45296ac69be.tar.gz"
 JAXWS_TARBALL="03f54ef33914.tar.gz"
 JDK_TARBALL="5ec94d162f05.tar.gz"
 LANGTOOLS_TARBALL="ec73c6927fb7.tar.gz"
-OPENJDK_TARBALL="301e79a966b4.tar.gz"
-HOTSPOT_TARBALL="d2d0a106917c.tar.gz"
 CACAO_TARBALL="a567bcb7f589.tar.gz"
 JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
 
+ICEDTEA_GENTOO_TARBALL="${P}.tar.gz"
+OPENJDK_GENTOO_TARBALL="${P}-openjdk-${OPENJDK_TARBALL}"
+CORBA_GENTOO_TARBALL="${P}-corba-${CORBA_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="${P}-hotspot-${HOTSPOT_TARBALL}"
+JAXP_GENTOO_TARBALL="${P}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="${P}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="${P}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="${P}-langtools-${LANGTOOLS_TARBALL}"
+CACAO_GENTOO_TARBALL="${P}-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="${P}-${JAMVM_TARBALL}"
+
 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
 HOMEPAGE="http://icedtea.classpath.org"
 SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL}
-	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
+	http://icedtea.classpath.org/download/source/${ICEDTEA_TARBALL} -> ${ICEDTEA_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/archive/${OPENJDK_TARBALL} -> ${OPENJDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/corba/archive/${CORBA_TARBALL} -> ${CORBA_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/hotspot/archive/${HOTSPOT_TARBALL} -> ${HOTSPOT_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxp/archive/${JAXP_TARBALL} -> ${JAXP_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jaxws/archive/${JAXWS_TARBALL} -> ${JAXWS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/jdk/archive/${JDK_TARBALL} -> ${JDK_GENTOO_TARBALL}
+	http://icedtea.classpath.org/hg/release/icedtea7-forest-${ICEDTEA_BRANCH}/langtools/archive/${LANGTOOLS_TARBALL} -> ${LANGTOOLS_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
 
 LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
 SLOT="7"
@@ -147,7 +160,7 @@
 }
 
 src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
+	unpack ${ICEDTEA_GENTOO_TARBALL}
 }
 
 java_prepare() {
@@ -212,15 +225,15 @@
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 
 	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
 		--with-jdk-home="$(java-config -O)" \
 		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
 		--disable-downloading --disable-Werror \