--- oracle-instantclient-basic-10.1.0.3.ebuild.orig	2005-08-11 17:21:41.000000000 +0000
+++ oracle-instantclient-basic-10.1.0.3.ebuild	2005-08-12 00:44:56.000000000 +0000
@@ -4,38 +4,36 @@
 
 inherit eutils
 
-MY_P="${P}-1.i386"
-MY_PSDK="${MY_P/basic/devel}"
+MY_P="instantclient-basic-linux-x86-64-10.1.0.3"
+MY_PSDK="${MY_P/basic/sdk}"
 
-S=${WORKDIR}
+S="${WORKDIR}/instantclient10_1"
 DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.rpm ${MY_PSDK}.rpm"
+HOMEPAGE="http://www.oracle.com/technology/software/tech/oci/instantclient/htdocs/linuxx86_64soft.html"
+SRC_URI="${MY_P}.zip ${MY_PSDK}.zip"
 
 LICENSE="OTN"
 SLOT="${KV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64"
 RESTRICT="fetch"
 IUSE=""
 
-DEPEND="app-arch/rpm2targz"
+DEPEND="app-arch/unzip"
 
 pkg_nofetch() {
 	eerror "Please go to:"
 	eerror "  ${HOMEPAGE}"
 	eerror "and download the Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.rpm"
-	eerror "  ${MY_PSDK}.rpm"
+	eerror "  ${MY_P}.zip"
+	eerror "  ${MY_PSDK}.zip"
 	eerror "Then after downloading put them in:"
 	eerror "  ${DISTDIR}"
 }
 
 src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
-	rpm2targz ${DISTDIR}/${MY_PSDK}.rpm
-	tar zxf ${WORKDIR}/${MY_PSDK}.tar.gz
-
+	unzip ${DISTDIR}/${MY_P}.zip -d ${WORKDIR}/
+	unzip ${DISTDIR}/${MY_PSDK}.zip -d ${WORKDIR}/
+	
 	# this is needed because of sdk package as we handle symlinks using dosym in src_install
 	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libclntsh.so
 	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libocci.so
@@ -44,7 +42,7 @@
 src_install() {
 	# library
 	dodir /usr/lib/oracle/${PV}/client/lib
-	cd ${S}/usr/lib/oracle/${PV}/client/lib
+	cd ${S}/
 	insinto /usr/lib/oracle/${PV}/client/lib
 	doins *.jar *.so *.so.10.1
 
@@ -55,16 +53,12 @@
 	# includes
 	dodir /usr/lib/oracle/${PV}/client/include
 	insinto /usr/lib/oracle/${PV}/client/include
-	cd ${S}/usr/include/oracle/${PV}/client
+	cd ${S}/sdk/include/
 	doins *.h
 	# link to oroginal location
 	dodir /usr/include/oracle/${PV}/
 	ln -s ${D}/usr/lib/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client
 
-	# share info
-	cd ${S}/usr/share/oracle/${PV}/client
-	dodoc *
-
 	# Add OCI libs to library path
 	dodir /etc/env.d
 	echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic