Version bump

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 21 insertions, 78 deletions

diff --git a/dev-db/oracle-instantclient-odbc/ChangeLog b/dev-db/oracle-instantclient-odbc/ChangeLog
index 216e84627fe3..ba2a6f41cfc5 100644
--- a/dev-db/oracle-instantclient-odbc/ChangeLog
+++ b/dev-db/oracle-instantclient-odbc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.2 2009/12/31 10:47:07 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.3 2010/11/12 18:26:38 dertobi123 Exp $
+
+*oracle-instantclient-odbc-11.2.0.2 (12 Nov 2010)
+
+  12 Nov 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-odbc-11.1.0.7.0.ebuild,
+  -oracle-instantclient-odbc-11.2.0.1.ebuild,
+  +oracle-instantclient-odbc-11.2.0.2.ebuild:
+  Version bump
 
 *oracle-instantclient-odbc-11.2.0.1 (31 Dec 2009)
 
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
index d3f2ca74557f..f98f1d338cbc 100644
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -1,6 +1,5 @@
-DIST instantclient-odbc-linux32-11.1.0.7.zip 274181 RMD160 c9a0965c1825cf4d9f0efea5febdf798dc7a5075 SHA1 d7d7e37382907ea289e81451b836ce592a4ad08a SHA256 7a752d4e7adf9d4486e5dbf8ca007dc494baf9b74d4f3cbafd4bbba1c8a58eea
-DIST instantclient-odbc-linux32-11.2.0.1.zip 273638 RMD160 7f2089fc3000a9f0c42411ac2de4690519e68d59 SHA1 535ff08d577f22855f476c0d9ce23ea567579f69 SHA256 d33b1c4fa39e14b862ce9f45fbf96320544e86b00d2066dfa97d41cd86c1342a
-EBUILD oracle-instantclient-odbc-11.1.0.7.0.ebuild 1608 RMD160 098bbf820d620c94710c9492984ef4c07b0a982a SHA1 263c63aaef6cbfcbb0e6f70b31467f1c4f8e6cb6 SHA256 b198733e8f5fc22f6bdca0f1f154a745d44751edac07752db4442628f389f271
-EBUILD oracle-instantclient-odbc-11.2.0.1.ebuild 1600 RMD160 01b83111b4950fcc31687db4fbc58b5e1cb1957f SHA1 543c3619008be5ebbf8b295c5b0bc8c0898c870d SHA256 0bc7aa694690c42b9e525a9be53a471f2890492fdc0d7a78fafb025b46005afb
-MISC ChangeLog 619 RMD160 4e1abf097aa976926b72ee73ab6343571e22fbda SHA1 6648cc8ef262c03dbfb303b84e9f6083eed61c97 SHA256 54f7c1316dd10d6ab0a105eabccbd2d2d5171f0331b4acc276ee3b4e5851dfa9
+DIST instantclient-odbc-linux-x86-64-11.2.0.2.0.zip 308445 RMD160 7d5324729e99763d35c721efe6a79ab281c6204d SHA1 93a0d2035947114513f028f27863e9997d7540d1 SHA256 1d24d3f7b38a7d1cd1fa67c34a4c64aa556c0e4c93777bc7ceb0ee32e3504dc0
+DIST instantclient-odbc-linux32-11.2.0.2.0.zip 273410 RMD160 80b58003fa3ad724a4913e1762c2b744af39a5b8 SHA1 e96d0c72f5a7ceee10916520ac3e052507cecedd SHA256 a09d8c913bdb8d6afc84fe42b17505cceccac620077ce4a21c8db313773000a1
+EBUILD oracle-instantclient-odbc-11.2.0.2.ebuild 1690 RMD160 b3fa4f7023368f2339dfabca11e72701a37ddde3 SHA1 718c5885e4ae4a0b81d7c1255fdb304b282f5785 SHA256 cd33bac7de55f1ba1a2772dcdf785ce55e0c806a201c1ae7c7a6dfe16af6daaf
+MISC ChangeLog 882 RMD160 edc96721ed83b29e17bf1db220f5d93c201fc36e SHA1 255b1d411d183cda2614d99c56b0a59c2cd53b6e SHA256 76edc6cc12da911cc3614504265d0ae8df0708b07b3f71f6ed6cc6d89367af56
 MISC metadata.xml 334 RMD160 f081726bd03b91b486483524c6bd576f3c19529c SHA1 9c6076ca655622022fb56e169deec1cd5f7c0ee0 SHA256 465908c49a2d5cc6d5dce119e366e68b6701df5720745bf9c92f9748a655a937
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.1.0.7.0.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.1.0.7.0.ebuild
deleted file mode 100644
index ae31501920d2..000000000000
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.1.0.7.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-odbc/oracle-instantclient-odbc-11.1.0.7.0.ebuild,v 1.1 2008/12/30 20:51:58 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV/7.0/7}"
-
-DESCRIPTION="Oracle 11g client installation ODBC supplement"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-db/oracle-instantclient-basic"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "ODBC supplement, which is:"
-	eerror "  ${MY_P}.zip"
-	eerror "Then after downloading put it in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-}
-
-src_install() {
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_1
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libsqora.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libsqora.so
-
-	# odbc_update_ini.sh
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/bin
-	cd "${S}"/instantclient_11_1
-	exeinto /usr/$(get_libdir)/oracle/${PV}/client/bin
-	doexe odbc_update_ini.sh
-
-	# documentation
-	dodoc *htm*
-}
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.1.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2.ebuild
index ec28101454ab..573c940519a2 100644
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.1.ebuild
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2.ebuild
@@ -1,18 +1,20 @@
-# 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-odbc/oracle-instantclient-odbc-11.2.0.1.ebuild,v 1.1 2009/12/31 10:47:07 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.2.ebuild,v 1.1 2010/11/12 18:26:38 dertobi123 Exp $
 
 inherit eutils
 
-MY_P_x86="${PN/oracle-/}-linux32-${PV}"
+MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
+MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}.0"
 
 DESCRIPTION="Oracle 11g client installation ODBC supplement"
 HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip )"
+SRC_URI="x86? ( ${MY_P_x86}.zip )
+		 amd64? ( ${MY_P_amd64}.zip )"
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~x86 ~amd64"
 RESTRICT="fetch"
 IUSE=""