fix empty src_uri, remove old versions

12 files changed, 61 insertions, 410 deletions

diff --git a/dev-java/jdbc2-oracle/ChangeLog b/dev-java/jdbc2-oracle/ChangeLog
index 4631e72d9d70..c3390091fa0d 100644
--- a/dev-java/jdbc2-oracle/ChangeLog
+++ b/dev-java/jdbc2-oracle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc2-oracle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/ChangeLog,v 1.6 2004/06/24 22:32:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/ChangeLog,v 1.7 2004/07/17 11:42:00 axxo Exp $
+
+  17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> -jdbc2-oracle-8.1.7.ebuild,
+  -jdbc2-oracle-9.0.1.4.ebuild, -jdbc2-oracle-9.0.1.ebuild,
+  -jdbc2-oracle-9.2.0.1.ebuild, jdbc2-oracle-9.2.0.3.ebuild:
+  fix empty src_uri
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> jdbc2-oracle-8.1.7.ebuild,
   jdbc2-oracle-9.0.1.4.ebuild, jdbc2-oracle-9.0.1.ebuild,
diff --git a/dev-java/jdbc2-oracle/Manifest b/dev-java/jdbc2-oracle/Manifest
index 29e9452b2dfe..aa65aa3efca0 100644
--- a/dev-java/jdbc2-oracle/Manifest
+++ b/dev-java/jdbc2-oracle/Manifest
@@ -1,12 +1,4 @@
-MD5 435aaab58b2cecf6f2e7bb7e1a75d651 jdbc2-oracle-9.0.1.4.ebuild 2386
-MD5 438d9234f457fb7760219c47df0c7aec jdbc2-oracle-9.2.0.1.ebuild 2387
-MD5 b22de8ebf83d7d66fd1df18395b03f2e jdbc2-oracle-8.1.7.ebuild 2176
-MD5 9c9896c5b04b4cd859616f29520e3bf8 jdbc2-oracle-9.2.0.3.ebuild 2388
-MD5 44737d475f92681a2a4769ddd05464fd jdbc2-oracle-9.0.1.ebuild 2339
+MD5 f707531f29594f3b766a407876858c14 jdbc2-oracle-9.2.0.3.ebuild 2404
 MD5 336a958264420f10611316ee7fe218d2 ChangeLog 1306
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-8.1.7 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-9.0.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-9.0.1.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-9.2.0.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-9.2.0.3 0
+MD5 7d8a2b744f94287becd640337d7d3910 files/digest-jdbc2-oracle-9.2.0.3 399
diff --git a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-8.1.7 b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-8.1.7
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-8.1.7
+++ /dev/null
diff --git a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1 b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1
+++ /dev/null
diff --git a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1.4 b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1.4
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.0.1.4
+++ /dev/null
diff --git a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.1 b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.1
+++ /dev/null
diff --git a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.3 b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.3
index e69de29bb2d1..02fa710880b2 100644
--- a/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.3
+++ b/dev-java/jdbc2-oracle/files/digest-jdbc2-oracle-9.2.0.3
@@ -0,0 +1,5 @@
+MD5 dab9a1e516d75769e6bcf0384f26f874 jdbc2-oracle-9.2.0.3-classes12.zip 1213897
+MD5 a03db66f6d46b772e7ae0fbde348724f jdbc2-oracle-9.2.0.3-ocrs12.zip 36764
+MD5 88cdfac4d37d99b369a48a851ba2faee jdbc2-oracle-9.2.0.3-nls_charset12.zip 1813731
+MD5 0f2a9f51383968232d4a5469c54d9691 jdbc2-oracle-9.2.0.3-classes12_g.zip 1451562
+MD5 a1253314be601f38a61f7467dc31dffe jdbc2-oracle-9.2.0.3-javadoc.tat 3619840
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild
deleted file mode 100644
index a58e0e4c2fb8..000000000000
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild,v 1.6 2004/06/24 22:32:02 agriffis Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}
-DESCRIPTION="JDBC Drivers for Oracle"
-SRC_URI=""
-HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc817.html"
-KEYWORDS="x86 ppc sparc"
-LICENSE="oracle-jdbc"
-SLOT="1"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE="doc"
-
-DISTFILE1=classes12.zip
-DISTFILE2=nls_charset12.zip
-DISTFILE3=javadoc.tar
-FILE1=${P}-classes12.zip
-FILE2=${P}-nls_charset12.zip
-FILE3=${P}-javadoc.tar
-
-src_unpack() {
-	# Build File List
-	FILELIST="${FILE1} ${FILE2}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}"
-
-	# Check for distributables
-	echo " "
-	for i in ${FILELIST} ; do
-		if [ ! -f ${DISTDIR}/${i} ] ; then
-			echo "!!! MISSING FILE: ${DISTDIR}/${i}"
-			MISSING_FILES="true"
-		else
-			cp ${DISTDIR}/${i} ${S}
-		fi
-	done
-	echo " "
-
-
-	if [ "${MISSING_FILES}" == "true" ] ; then
-		einfo " "
-		einfo " Because of license terms and file name conventions, please:"
-		einfo " "
-		einfo " 1. Visit ${HOMEPAGE}"
-		einfo "    (you may need to create an account on Oracle's site)"
-		einfo " 2. Download the appropriate files:"
-		einfo "    2a. ${DISTFILE1}"
-		einfo "    2b. ${DISTFILE2}"
-		use doc > /dev/null && einfo "    2c. ${DISTFILE3}"
-		einfo " 3. Rename the files:"
-		einfo "    3a. ${DISTFILE1} ---> ${FILE1}"
-		einfo "    3b. ${DISTFILE2} ---> ${FILE2}"
-		use doc > /dev/null && einfo "    3c. ${DISTFILE3} ---> ${FILE3}"
-		einfo " 4. Place the files in ${DISTDIR}"
-		einfo " 5. Repeat the emerge process to continue."
-		einfo " "
-		die "User must manually fetch/rename files"
-	fi
-
-	# Move files back to their original filenames
-	mv ${S}/${FILE1} ${S}/${DISTFILE1}
-	mv ${S}/${FILE2} ${S}/${DISTFILE2}
-	use doc && mv ${S}/${FILE3} ${S}/${DISTFILE3}
-}
-
-src_compile() {
-	einfo " This is a binary-only (bytecode) ebuild."
-}
-
-src_install() {
-	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		tar xf ${DISTDIR}/${FILE3}
-		dohtml -r ${S}/javadoc/
-	fi
-	java-pkg_dojar ${S}/*.zip
-}
-
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild
deleted file mode 100644
index 8494d0de1685..000000000000
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild,v 1.6 2004/06/24 22:32:02 agriffis Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}
-DESCRIPTION="JDBC Drivers for Oracle"
-SRC_URI=""
-HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc901.html"
-KEYWORDS="x86 ppc sparc"
-LICENSE="oracle-jdbc"
-SLOT="3"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE="debug doc"
-
-use debug && DISTFILE1=classes12_g.zip || DISTFILE1=classes12.zip
-DISTFILE2=nls_charset12.zip
-DISTFILE3=ocrs12.zip
-DISTFILE4=javadoc.zip
-FILE1=${P}-${DISTFILE1}
-FILE2=${P}-${DISTFILE2}
-FILE3=${P}-${DISTFILE3}
-FILE4=${P}-${DISTFILE4}
-
-src_unpack() {
-	# Build File List
-	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
-
-	# Check for distributables
-	echo " "
-	for i in ${FILELIST} ; do
-		if [ ! -f ${DISTDIR}/${i} ] ; then
-			echo "!!! MISSING FILE: ${DISTDIR}/${i}"
-			MISSING_FILES="true"
-		else
-			cp ${DISTDIR}/${i} ${S}
-		fi
-	done
-	echo " "
-
-
-	if [ "${MISSING_FILES}" == "true" ] ; then
-		einfo " "
-		einfo " Because of license terms and file name conventions, please:"
-		einfo " "
-		einfo " 1. Visit ${HOMEPAGE}"
-		einfo "    (you may need to create an account on Oracle's site)"
-		einfo " 2. Download the appropriate files:"
-		einfo "    2a. ${DISTFILE1}"
-		einfo "    2b. ${DISTFILE2}"
-		einfo "    2c. ${DISTFILE3}"
-		use doc > /dev/null && einfo "    2d. ${DISTFILE4}"
-		einfo " 3. Rename the files:"
-		einfo "    3a. ${DISTFILE1} ---> ${FILE1}"
-		einfo "    3b. ${DISTFILE2} ---> ${FILE2}"
-		einfo "    3c. ${DISTFILE3} ---> ${FILE3}"
-		use doc > /dev/null && einfo "    3d. ${DISTFILE4} ---> ${FILE4}"
-		einfo " 4. Place the files in ${DISTDIR}"
-		einfo " 5. Repeat the emerge process to continue."
-		einfo " "
-		die "User must manually fetch/rename files"
-	fi
-
-	# Move files back to their original filenames
-	mv ${S}/${FILE1} ${S}/${DISTFILE1}
-	mv ${S}/${FILE2} ${S}/${DISTFILE2}
-	mv ${S}/${FILE3} ${S}/${DISTFILE3}
-	use doc && mv ${S}/${FILE4} ${S}/${DISTFILE4}
-}
-
-src_compile() {
-	einfo " This is a binary-only (bytecode) ebuild."
-}
-
-src_install() {
-	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		unzip ${DISTDIR}/${FILE4}
-		dohtml -r ${S}/javadoc/
-	fi
-	java-pkg_dojar ${S}/*.zip
-}
-
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild
deleted file mode 100644
index 5490a4232941..000000000000
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild,v 1.6 2004/06/24 22:32:02 agriffis Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}
-DESCRIPTION="JDBC Drivers for Oracle"
-SRC_URI=""
-HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc901.html"
-KEYWORDS="x86 ppc sparc"
-LICENSE="oracle-jdbc"
-SLOT="2"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE="doc"
-
-DISTFILE1=classes12.zip
-DISTFILE2=nls_charset12.zip
-DISTFILE3=ocrs12.zip
-DISTFILE4=javadoc.zip
-FILE1=${P}-classes12.zip
-FILE2=${P}-nls_charset12.zip
-FILE3=${P}-ocrs12.zip
-FILE4=${P}-javadoc.zip
-
-src_unpack() {
-	# Build File List
-	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
-
-	# Check for distributables
-	echo " "
-	for i in ${FILELIST} ; do
-		if [ ! -f ${DISTDIR}/${i} ] ; then
-			echo "!!! MISSING FILE: ${DISTDIR}/${i}"
-			MISSING_FILES="true"
-		else
-			cp ${DISTDIR}/${i} ${S}
-		fi
-	done
-	echo " "
-
-
-	if [ "${MISSING_FILES}" == "true" ] ; then
-		einfo " "
-		einfo " Because of license terms and file name conventions, please:"
-		einfo " "
-		einfo " 1. Visit ${HOMEPAGE}"
-		einfo "    (you may need to create an account on Oracle's site)"
-		einfo " 2. Download the appropriate files:"
-		einfo "    2a. ${DISTFILE1}"
-		einfo "    2b. ${DISTFILE2}"
-		einfo "    2c. ${DISTFILE3}"
-		use doc > /dev/null && einfo "    2d. ${DISTFILE4}"
-		einfo " 3. Rename the files:"
-		einfo "    3a. ${DISTFILE1} ---> ${FILE1}"
-		einfo "    3b. ${DISTFILE2} ---> ${FILE2}"
-		einfo "    3c. ${DISTFILE3} ---> ${FILE3}"
-		use doc > /dev/null && einfo "    3d. ${DISTFILE4} ---> ${FILE4}"
-		einfo " 4. Place the files in ${DISTDIR}"
-		einfo " 5. Repeat the emerge process to continue."
-		einfo " "
-		die "User must manually fetch/rename files"
-	fi
-
-	# Move files back to their original filenames
-	mv ${S}/${FILE1} ${S}/${DISTFILE1}
-	mv ${S}/${FILE2} ${S}/${DISTFILE2}
-	mv ${S}/${FILE3} ${S}/${DISTFILE3}
-	use doc && mv ${S}/${FILE4} ${S}/${DISTFILE4}
-}
-
-src_compile() {
-	einfo " This is a binary-only (bytecode) ebuild."
-}
-
-src_install() {
-	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		unzip ${DISTDIR}/${FILE4}
-		dohtml -r ${S}/javadoc/
-	fi
-	java-pkg_dojar ${S}/*.zip
-}
-
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild
deleted file mode 100644
index b2464ff68cad..000000000000
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild,v 1.6 2004/06/24 22:32:02 agriffis Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}
-DESCRIPTION="JDBC Drivers for Oracle"
-SRC_URI=""
-HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc9201.html"
-KEYWORDS="x86 ppc sparc"
-LICENSE="oracle-jdbc"
-SLOT="4"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.2"
-IUSE="debug doc"
-
-use debug && DISTFILE1=classes12_g.zip || DISTFILE1=classes12.zip
-DISTFILE2=nls_charset12.zip
-DISTFILE3=ocrs12.zip
-DISTFILE4=javadoc.zip
-FILE1=${P}-${DISTFILE1}
-FILE2=${P}-${DISTFILE2}
-FILE3=${P}-${DISTFILE3}
-FILE4=${P}-${DISTFILE4}
-
-src_unpack() {
-	# Build File List
-	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
-
-	# Check for distributables
-	echo " "
-	for i in ${FILELIST} ; do
-		if [ ! -f ${DISTDIR}/${i} ] ; then
-			echo "!!! MISSING FILE: ${DISTDIR}/${i}"
-			MISSING_FILES="true"
-		else
-			cp ${DISTDIR}/${i} ${S}
-		fi
-	done
-	echo " "
-
-
-	if [ "${MISSING_FILES}" == "true" ] ; then
-		einfo " "
-		einfo " Because of license terms and file name conventions, please:"
-		einfo " "
-		einfo " 1. Visit ${HOMEPAGE}"
-		einfo "    (you may need to create an account on Oracle's site)"
-		einfo " 2. Download the appropriate files:"
-		einfo "    2a. ${DISTFILE1}"
-		einfo "    2b. ${DISTFILE2}"
-		einfo "    2c. ${DISTFILE3}"
-		use doc > /dev/null && einfo "    2d. ${DISTFILE4}"
-		einfo " 3. Rename the files:"
-		einfo "    3a. ${DISTFILE1} ---> ${FILE1}"
-		einfo "    3b. ${DISTFILE2} ---> ${FILE2}"
-		einfo "    3c. ${DISTFILE3} ---> ${FILE3}"
-		use doc > /dev/null && einfo "    3d. ${DISTFILE4} ---> ${FILE4}"
-		einfo " 4. Place the files in ${DISTDIR}"
-		einfo " 5. Repeat the emerge process to continue."
-		einfo " "
-		die "User must manually fetch/rename files"
-	fi
-
-	# Move files back to their original filenames
-	mv ${S}/${FILE1} ${S}/${DISTFILE1}
-	mv ${S}/${FILE2} ${S}/${DISTFILE2}
-	mv ${S}/${FILE3} ${S}/${DISTFILE3}
-	use doc && mv ${S}/${FILE4} ${S}/${DISTFILE4}
-}
-
-src_compile() {
-	einfo " This is a binary-only (bytecode) ebuild."
-}
-
-src_install() {
-	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		unzip ${DISTDIR}/${FILE4}
-		dohtml -r ${S}/javadoc/
-	fi
-	java-pkg_dojar ${S}/*.zip
-}
-
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
index 8192add60edd..dcac44e708e4 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
@@ -1,74 +1,69 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.6 2004/06/24 22:32:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.7 2004/07/17 11:42:00 axxo Exp $
 
 inherit java-pkg
 
+file_main_orig=classes12.zip
+file_main_debug_orig=classes12_g.zip
+file_rowset_orig=ocrs12.zip
+file_nls_orig=nls_charset12.zip
+file_doc_orig=javadoc.tat
+
+file_main=${P}-${file_main_orig}
+file_main_debug=${P}-${file_main_debug_orig}
+file_rowset=${P}-${file_rowset_orig}
+file_nls=${P}-${file_nls_orig}
+file_doc=${P}-${file_doc_orig}
+
 S=${WORKDIR}
 DESCRIPTION="JDBC Drivers for Oracle"
-SRC_URI=""
+IUSE="debug doc"
+SRC_URI="${file_main} ${file_rowset} ${file_nls}
+	debug? ( ${file_main_debug} )
+	doc? ( ${file_doc} )
+"
 HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc9201.html"
 KEYWORDS="x86 ppc sparc"
 LICENSE="oracle-jdbc"
 SLOT="5"
 DEPEND=">=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jdk-1.2"
-IUSE="debug doc"
+RESTRICT="fetch"
 
-use debug && DISTFILE1=classes12_g.zip || DISTFILE1=classes12.zip
-DISTFILE2=nls_charset12.zip
-DISTFILE3=ocrs12.zip
-DISTFILE4=javadoc.tar
-FILE1=${P}-${DISTFILE1}
-FILE2=${P}-${DISTFILE2}
-FILE3=${P}-${DISTFILE3}
-FILE4=${P}-${DISTFILE4}
+pkg_nofetch() {
+	einfo " "
+	einfo " Because of license terms and file name conventions, please:"
+	einfo " "
+	einfo " 1. Visit ${HOMEPAGE}"
+	einfo "    (you may need to create an account on Oracle's site)"
+	einfo " 2. Download the appropriate files:"
+	einfo "    - ${file_main_orig}"
+	einfo "    - ${file_rowset_orig}"
+	einfo "    - ${file_nls_orig}"
+	use doc > /dev/null && einfo "    - ${file_doc_orig}"
+	use debug > /dev/null && einfo "    - ${file_main_debug_orig}"
+	einfo " 3. Rename the files:"
+	einfo "    - ${file_main_orig} --> ${file_main}"
+	einfo "    - ${file_rowset_orig} --> ${file_rowset}"
+	einfo "    - ${file_nls_orig} --> ${file_nls}"
+	use doc > /dev/null && einfo "    - ${file_doc_orig} --> ${file_doc}"
+	use debug > /dev/null && einfo "    - ${file_main_debug_orig} --> ${file_main_debug}"
+	einfo " 4. Place the files in ${DISTDIR}"
+	einfo " 5. Repeat the emerge process to continue."
+	einfo " "
+}
 
 src_unpack() {
-	# Build File List
-	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
-
-	# Check for distributables
-	echo " "
-	for i in ${FILELIST} ; do
-		if [ ! -f ${DISTDIR}/${i} ] ; then
-			echo "!!! MISSING FILE: ${DISTDIR}/${i}"
-			MISSING_FILES="true"
-		else
-			cp ${DISTDIR}/${i} ${S}
-		fi
-	done
-	echo " "
+	use debug && cp ${DISTDIR}/${file_main_debug} ${S}/${file_main_debug_orig} || cp ${DISTDIR}/${file_main} ${S}/${file_main_orig}
+	cp ${DISTDIR}/${file_rowset} ${S}/${file_rowset_orig}
+	cp ${DISTDIR}/${file_nls} ${S}/${file_nls_orig}
 
-
-	if [ "${MISSING_FILES}" == "true" ] ; then
-		einfo " "
-		einfo " Because of license terms and file name conventions, please:"
-		einfo " "
-		einfo " 1. Visit ${HOMEPAGE}"
-		einfo "    (you may need to create an account on Oracle's site)"
-		einfo " 2. Download the appropriate files:"
-		einfo "    2a. ${DISTFILE1}"
-		einfo "    2b. ${DISTFILE2}"
-		einfo "    2c. ${DISTFILE3}"
-		use doc > /dev/null && einfo "    2d. ${DISTFILE4}"
-		einfo " 3. Rename the files:"
-		einfo "    3a. ${DISTFILE1} ---> ${FILE1}"
-		einfo "    3b. ${DISTFILE2} ---> ${FILE2}"
-		einfo "    3c. ${DISTFILE3} ---> ${FILE3}"
-		use doc > /dev/null && einfo "    3d. ${DISTFILE4} ---> ${FILE4}"
-		einfo " 4. Place the files in ${DISTDIR}"
-		einfo " 5. Repeat the emerge process to continue."
-		einfo " "
-		die "User must manually fetch/rename files"
+	if use doc; then
+		mkdir ${S}/javadoc
+		cd ${S}/javadoc
+		tar -xf ${DISTDIR}/${file_doc}
 	fi
-
-	# Move files back to their original filenames
-	mv ${S}/${FILE1} ${S}/${DISTFILE1}
-	mv ${S}/${FILE2} ${S}/${DISTFILE2}
-	mv ${S}/${FILE3} ${S}/${DISTFILE3}
-	use doc && mv ${S}/${FILE4} ${S}/${DISTFILE4}
 }
 
 src_compile() {
@@ -77,9 +72,6 @@ src_compile() {
 
 src_install() {
 	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		tar xf ${DISTDIR}/${FILE4}
 		dohtml -r ${S}/javadoc/
 	fi
 	java-pkg_dojar ${S}/*.zip