Version bump

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 17 insertions, 73 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/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=""