Version bump, #228803

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.28-gentoo i686

2 files changed, 26 insertions, 21 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 6553cb03151e..0f9339f6da3d 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.34 2008/06/18 22:34:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.35 2008/12/27 12:32:37 dertobi123 Exp $
+
+*oracle-instantclient-basic-11.1.0.7.0 (27 Dec 2008)
+
+  27 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-basic-10.2.0.3.ebuild,
+  +oracle-instantclient-basic-11.1.0.7.0.ebuild:
+  Version bump, #228803
 
   18 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   oracle-instantclient-basic-10.2.0.3-r1.ebuild:
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild
index 0b1b677af696..f2ed4b0a86e6 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.10 2008/05/02 19:44:20 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.1.0.7.0.ebuild,v 1.1 2008/12/27 12:32:37 dertobi123 Exp $
 
 inherit eutils
 
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
+MY_P_x86="${PN/oracle-/}-linux32-${PV/7.0/7}"
 MY_PSDK_x86="${MY_P_x86/basic/sdk}"
 
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
+MY_PBASE_amd64="${PN/oracle-instantclient-/}-${PV}-linux-x86_64"
+MY_P_amd64="${PN/oracle-instantclient-/}-${PV/7.0/70}-linux-x86_64"
+MY_PSDK_amd64="${MY_PBASE_amd64/basic/sdk}"
 
-S=${WORKDIR}
 DESCRIPTION="Oracle 10g client installation for Linux with SDK"
 HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
 SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
@@ -18,12 +18,15 @@ SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="fetch"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )"
+RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )
+	dev-libs/libaio"
+
+S="${WORKDIR}"
 
 my_arch() {
 	MY_P=MY_P_${ARCH}
@@ -54,37 +57,35 @@ src_unpack() {
 }
 
 src_install() {
-	# Patch the SDK makefile
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
 	# SDK makefile
 	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_10_2/sdk/demo
+	cd "${S}"/instantclient_11_1/sdk/demo
 	mv demo.mk demo_xe.mk
 	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
 	doins demo_xe.mk
 
 	# library
 	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_10_2
+	cd "${S}"/instantclient_11_1
 	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
+	doins *.jar *.so *.so.11.1
 
 	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
+	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
+	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
+	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
 
 	# includes
 	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
 	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_10_2/sdk/include
+	cd "${S}"/instantclient_11_1/sdk/include
 	doins *.h
 	# link to original location
 	dodir /usr/include/oracle/${PV}/
 	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
 
 	# share info
-	cd "${S}"/instantclient_10_2/sdk/demo
+	cd "${S}"/instantclient_11_1/sdk/demo
 	dodoc *
 
 	# Add OCI libs to library path
@@ -107,9 +108,6 @@ pkg_postinst() {
 	elog
 	elog "Examples are located in /usr/share/doc/${PF}/"
 	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-	elog
 	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
 	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
 	elog "your user specific configuration."