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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 29 insertions, 15 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/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index bd94c30eba2e..35220f9d2a1e 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -13,7 +13,7 @@ DIST oracle-instantclient11.2-devel-11.2.0.0.2-1.x86_64.zip 631185 RMD160 d66d7d
 DIST sdk-11.1.0.7.0-linux-x86_64.zip 607351 RMD160 e1a753e9058501bbd0d523968930c75709d9d85c SHA1 aef7bb9872ecb3dc988cf1fa33f347c6bf184b3b SHA256 dc26f837ff62899f8f5543e9fa1cb086e08fc57ac5c361dd2071580c5ea7a401
 EBUILD oracle-instantclient-basic-10.2.0.3-r1.ebuild 3921 RMD160 d7e9b57eab0dfedde4e7bdea333c8d043b684589 SHA1 5f84a37c80424e1160ec15b9cfcd5bd8bd79eb4d SHA256 d73b72122030197ac5b4b590fe4d64804c15b23b8fcc19e6d59446fcd81331a1
 EBUILD oracle-instantclient-basic-11.1.0.7.0.ebuild 3788 RMD160 7244211c44e5c698ca1b301d833c5e80b94fb58a SHA1 ba99a9163294a13d92c971e35d361992a2e72bb6 SHA256 d065e43783c1f5075d7ab34fe2842998a35417a90cd5eb6a1482f6d5747fe7c0
-EBUILD oracle-instantclient-basic-11.2.0.0.2.ebuild 3690 RMD160 7a115684808584b56365af6033d81efb61293a0c SHA1 89c959de6d75cbcddcf953df0c6a61f19cf146dd SHA256 6bba91d288a64a75523113d6b72b6dd207f15852d19bb2533a3666a589fc50d5
-EBUILD oracle-instantclient-basic-11.2.0.1.ebuild 3542 RMD160 c0d9056daf55eac2fa01932a9471bff59e8267b0 SHA1 3afcedbc6345fcb5d564cb0d7224f143145ad043 SHA256 5dab6b7dc3f65b394c216daa5db67a0fb506d5226bb2c443cc5a62eb6e5f6a14
-MISC ChangeLog 8081 RMD160 6e65cdec225bb576db1dcb3465bc791a1893e7df SHA1 9f5e30b4b363d1acfdb409f18c7f9fb80095f80d SHA256 404711e3e4a2d74bef4aaf1f4af203ece870fff1aeb34e5753cdbd436ccd85f9
+EBUILD oracle-instantclient-basic-11.2.0.0.2-r1.ebuild 3749 RMD160 8d9e3a7a5d08c5b15b6aa9dd461386d43e36cd29 SHA1 034745cb21c40b2df60462c459a8867bc7ca066b SHA256 a069074157d47d2c1e8e946e78048fc1bdfe6200ce11ca6d744425607a7cc6c7
+EBUILD oracle-instantclient-basic-11.2.0.1-r1.ebuild 3601 RMD160 7f3ddbe1a412cc73ebbce9e66b4f61bbd58c94a3 SHA1 c868aff9bc1a834e944255540aced00f1fdbd528 SHA256 2d166cad79686eef4e93b88be85d2571bcbf47fbd8840e08e2e67944c1320e55
+MISC ChangeLog 8496 RMD160 fcb2576ee15f279e284698f35c4e9cfcba6b5529 SHA1 fb4b75a3692ec2d07794af6d5c840468c6afbc74 SHA256 6b9ff62d90e33d567d61e88efeab9ccc7bd509b690b5b753355fb992f0799470
 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893
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}/