Revbump(s), fixes #299347, #299558 and #299562

(Portage version: 2.2_rc61/cvs/Linux x86_64)

3 files changed, 26 insertions, 12 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index e024657db2c1..09c491cec200 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.40 2009/12/31 10:48:40 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.41 2010/01/26 19:08:58 dertobi123 Exp $
+
+*oracle-instantclient-basic-11.2.0.1-r1 (26 Jan 2010)
+*oracle-instantclient-basic-11.2.0.0.2-r1 (26 Jan 2010)
+
+  26 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-basic-11.2.0.0.2.ebuild,
+  +oracle-instantclient-basic-11.2.0.0.2-r1.ebuild,
+  -oracle-instantclient-basic-11.2.0.1.ebuild,
+  +oracle-instantclient-basic-11.2.0.1-r1.ebuild:
+  Revbump(s), fixes #299347, #299558 and #299562
 
   31 Dec 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   oracle-instantclient-basic-11.2.0.0.2.ebuild:
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild
index b501fdc3013c..15c5d5163172 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-11.2.0.0.2.ebuild,v 1.2 2009/12/31 10:48:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.0.2-r1.ebuild,v 1.1 2010/01/26 19:08:58 dertobi123 Exp $
 
 inherit eutils
 
@@ -63,17 +63,19 @@ src_install() {
 	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
 	cd "${S}"/instantclient_11_2
 	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.2
+	doins *.jar *.so *.so.11.1
 
 	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.2 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.2 /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_11_2/sdk/include
+	# Remove ldap.h, #299562
+	rm ldap.h || die "rm failed"
 	doins *.h
 	# link to original location
 	dodir /usr/include/oracle/${PV}/
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild
index d5658c6cf2df..f817d7d3d81e 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-11.2.0.1.ebuild,v 1.2 2009/12/31 10:48:40 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.1-r1.ebuild,v 1.1 2010/01/26 19:08:58 dertobi123 Exp $
 
 inherit eutils
 
@@ -62,17 +62,19 @@ src_install() {
 	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
 	cd "${S}"/instantclient_11_2
 	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.2
+	doins *.jar *.so *.so.11.1
 
 	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.2 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.2 /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_11_2/sdk/include
+	# Remove ldap.h, #299562
+	rm ldap.h || die "rm failed"
 	doins *.h
 	# link to original location
 	dodir /usr/include/oracle/${PV}/