fix empty src_uri

6 files changed, 54 insertions, 140 deletions

diff --git a/dev-java/jdbc3-oracle/ChangeLog b/dev-java/jdbc3-oracle/ChangeLog
index be4367d90f44..25a0a841d584 100644
--- a/dev-java/jdbc3-oracle/ChangeLog
+++ b/dev-java/jdbc3-oracle/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jdbc3-oracle
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/ChangeLog,v 1.6 2004/06/24 22:32:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/ChangeLog,v 1.7 2004/07/17 11:01:19 axxo Exp $
+
+  17 Jul 2004; Thomas Matthijs <axxo@gentoo.org> jdbc3-oracle-9.2.0.3.ebuild:
+  kill empty src_uri
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> jdbc3-oracle-9.2.0.1.ebuild,
   jdbc3-oracle-9.2.0.3.ebuild:
diff --git a/dev-java/jdbc3-oracle/Manifest b/dev-java/jdbc3-oracle/Manifest
index eebd6ac7a1c7..ac73ae1daa40 100644
--- a/dev-java/jdbc3-oracle/Manifest
+++ b/dev-java/jdbc3-oracle/Manifest
@@ -1,6 +1,6 @@
 MD5 f1465c271d2444cbd9b48f56e70a036b jdbc3-oracle-9.2.0.1.ebuild 2237
-MD5 3844a2fec15b15cb142b039f18f83156 jdbc3-oracle-9.2.0.3.ebuild 2237
+MD5 afe9e87e29b1c1690bd4a888c755da73 jdbc3-oracle-9.2.0.3.ebuild 2185
 MD5 ef38b773eac6fa0096e403d9584b8ee2 ChangeLog 1045
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc3-oracle-9.2.0.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc3-oracle-9.2.0.3 0
+MD5 5c7d8ab08871e9cd7610159835e96fa1 files/digest-jdbc3-oracle-9.2.0.3 311
diff --git a/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.1 b/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.1
+++ /dev/null
diff --git a/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.3 b/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.3
index e69de29bb2d1..96d145088f88 100644
--- a/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.3
+++ b/dev-java/jdbc3-oracle/files/digest-jdbc3-oracle-9.2.0.3
@@ -0,0 +1,4 @@
+MD5 a03db66f6d46b772e7ae0fbde348724f jdbc3-oracle-9.2.0.3-ocrs12.zip 36764
+MD5 7112a5fc693c2f361fcb6a0820505490 jdbc3-oracle-9.2.0.3-ojdbc14.jar 1181679
+MD5 a1253314be601f38a61f7467dc31dffe jdbc3-oracle-9.2.0.3-javadoc.tar 3619840
+MD5 6bad87f796ea19a67437acd7f1473a97 jdbc3-oracle-9.2.0.3-ojdbc14_g.jar 1391860
diff --git a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild
deleted file mode 100644
index 7e656c864aed..000000000000
--- a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild
+++ /dev/null
@@ -1,83 +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/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild,v 1.7 2004/06/24 22:32:35 agriffis Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}
-DESCRIPTION="JDBC 3.0 Drivers for Oracle"
-SRC_URI=""
-HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc9201.html"
-KEYWORDS="x86 sparc"
-LICENSE="oracle-jdbc"
-SLOT="1"
-DEPEND=">=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jdk-1.4"
-IUSE="debug doc"
-
-use debug && DISTFILE1=ojdbc14_g.jar || DISTFILE1=ojdbc14.jar
-DISTFILE2=ocrs12.zip
-DISTFILE3=javadoc.zip
-FILE1=${P}-${DISTFILE1}
-FILE2=${P}-${DISTFILE2}
-FILE3=${P}-${DISTFILE3}
-
-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} ---> ${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}
-	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
-		unzip ${DISTDIR}/${FILE3}
-		dohtml -r ${S}/javadoc/
-	fi
-	java-pkg_dojar ${S}/*.zip
-	java-pkg_dojar ${S}/*.jar
-}
-
diff --git a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
index 07c4a0ada2a6..2444d902fa1f 100644
--- a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
@@ -1,69 +1,64 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.7 2004/06/24 22:32:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.8 2004/07/17 11:01:19 axxo Exp $
 
 inherit java-pkg
 
+IUSE="debug doc"
+
+file_main=${P}-ojdbc14.jar
+file_main_debug=${P}-ojdbc14_g.jar
+file_rowset=${P}-ocrs12.zip
+file_doc=${P}-javadoc.tar
+
+file_main_orig=ojdbc14.jar
+file_main_debug_orig=ojdbc14_g.jar
+file_rowset_orig=ocrs12.zip
+file_doc_orig=javadoc.tar
+
 S=${WORKDIR}
 DESCRIPTION="JDBC 3.0 Drivers for Oracle"
-SRC_URI=""
 HOMEPAGE="http://otn.oracle.com/software/tech/java/sqlj_jdbc/htdocs/jdbc9201.html"
+SRC_URI="${file_rowset} ${file_main}
+		doc? ( ${file_doc} )
+		debug? ( ${file_main_debug} )"
 KEYWORDS="x86 sparc"
 LICENSE="oracle-jdbc"
 SLOT="2"
 DEPEND=">=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jdk-1.4"
-IUSE="debug doc"
+RESTRICT="fetch"
 
-use debug && DISTFILE1=ojdbc14_g.jar || DISTFILE1=ojdbc14.jar
-DISTFILE2=ocrs12.zip
-DISTFILE3=javadoc.tar
-FILE1=${P}-${DISTFILE1}
-FILE2=${P}-${DISTFILE2}
-FILE3=${P}-${DISTFILE3}
+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}"
+	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}"
+	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}"
-	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 " "
+	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}
 
-
-	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} ---> ${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}
-	use doc && mv ${S}/${FILE3} ${S}/${DISTFILE3}
 }
 
 src_compile() {
@@ -71,12 +66,7 @@ src_compile() {
 }
 
 src_install() {
-	if use doc ; then
-		mkdir ${S}/javadoc
-		cd ${S}/javadoc
-		tar xf ${DISTDIR}/${FILE3}
-		dohtml -r ${S}/javadoc/
-	fi
+	use doc && dohtml -r ${S}/javadoc/
 	java-pkg_dojar ${S}/*.zip
 	java-pkg_dojar ${S}/*.jar
 }