Revbump. Use EAPI 4. Update homepage.

Add multilib support.
RDEPEND on _same_ version of oracle-instantclient-basic.

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

4 files changed, 139 insertions, 9 deletions

diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index 34dd83fe4f47..c494fedb396a 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST instantclient-jdbc-linux-11.2.0.3.0.zip 1562543 RMD160 8ba44a1852c84c58ba67c1cf477a844ae5ff4fac SHA1 08904bda1960a650470455659aef00b188d6fca3 SHA256 45f9b5ecfba90e3936418e8047660b7d2c90b276a78b5f51c70235abefc50acd
 DIST instantclient-jdbc-linux-x86-64-10.2.0.3-20070103.zip 1493549 RMD160 946a0664d1fcfbd626920941d85a839726d5172d SHA1 90269a81b82c036ee69cd9fb3955916801b832a7 SHA256 894a015af4105e2f65a415e597e62e6bd9702d6f75a99e27af74cd901f5e7ee9
 DIST instantclient-jdbc-linux-x86-64-11.2.0.2.0.zip 1563157 RMD160 5550d050ea7f11d5f8625d95206911d83e1defc1 SHA1 4a1675556f8a35cacfb7fc15cb4752d923b50df7 SHA256 07fcfbd61a183588813fb755dafd04c052a771959fcbc4ee89e2180337d6c537
+DIST instantclient-jdbc-linux.x64-11.2.0.3.0.zip 1562504 RMD160 c2f03317ec0666368275b142723c1c2181d21e00 SHA1 2709e76fb67a59962af0f352e5013a525f4bd31c SHA256 cfbcaacd85cd2964dae8478337e9020312b9827284ce86140db3c5e310436df1
 DIST instantclient-jdbc-linux32-10.2.0.3-20061115.zip 1482939 RMD160 d24857fc78238634a9e1af21a28906ff5d576c4c SHA1 5da60b57a4e0323cc0c837c743c96da8c21907b0 SHA256 23536b1bf8113f231e2f197e1011b6ddf04a79c5ccedae542cb6100eae28a547
 DIST instantclient-jdbc-linux32-11.2.0.2.0.zip 1562555 RMD160 8b42f6bb3f0d918f9e608ba590a3f8ee13d9f6ff SHA1 b6e663b5b43e03ac9973bb82369538d9cabf9a50 SHA256 25b58a2a42407d665af6e913066de716d9fe16ebda140954b8f03b71056871cb
 EBUILD oracle-instantclient-jdbc-10.2.0.3.ebuild 1621 RMD160 1a7701a08f06ab92514672d7805d18ad4e3f3863 SHA1 4dbe9baeae191ef0a4792ee706422849fb04dcca SHA256 9097e9c57efe1ee0530d44b561d99b89580d84dffeec1c609f4bd2c5a58aad86
 EBUILD oracle-instantclient-jdbc-11.2.0.2.ebuild 1494 RMD160 5a635bf153f6be975f3eb09aa13e302184994678 SHA1 6924acee626235307589c46e1cc3ce3e99bbbeab SHA256 fc0a5068cff708838299618ee2db32b13b3b4081bf92ca7d285c4696203597da
-MISC ChangeLog 5705 RMD160 59837a86f3987f4b7576aef22a8ee1ed7e2d1725 SHA1 a6352450c647111c05655ea50606d53ee16472c1 SHA256 97648b76b7f9ae7d14e4a90a1db7397a95a248411bfcf8a8ac4bb3960bef0258
+EBUILD oracle-instantclient-jdbc-11.2.0.3.ebuild 2255 RMD160 b75ccfe040c05bee7fa8beaed607e69bb7cb25d6 SHA1 cf9c71fa1a981ff501aaeba44b65e3c9397c2ee3 SHA256 216a5483d7947d74352ab779e5f1a58be48f39020f0e4090ea40917314f8cc3b
+MISC ChangeLog 6010 RMD160 94de660f7f7297c131c4f9c986a6158f7c1df35b SHA1 ef6a9c97031cbc0b139179ff4a76a10b244af7e9 SHA256 b33a13f9daed7dfcc3ece44eb467f38b088afa367e4f26a7af74fc9b700850fd
 MISC metadata.xml 330 RMD160 f6fc1cba6cc8c62cc86940331118ec3908edda4b SHA1 bb85a93cee99895dbe00a0e3c468171263fe82f0 SHA256 229663e1b0f455156e4ba1ebe34b4b56bfc13785676a3bec391edcd6a6a9fd67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8z1zIACgkQLc0TWKYwzLi94gCeIJJVDBCP5AK3sXvmq5ai+V2T
-MwQAn0QlTeSCjuWpZSaZNXQxXyhkZhyS
-=eu+M
+iEYEARECAAYFAk9Xb9sACgkQLc0TWKYwzLj4cgCfTIQtOTvXGD4gt1Eonx/lxkvH
+j6cAn2fx5uTgOro0jT8z9QLN5a1lKOgC
+=vMPi
 -----END PGP SIGNATURE-----
diff --git a/dev-db/oracle-instantclient-odbc/ChangeLog b/dev-db/oracle-instantclient-odbc/ChangeLog
index 3ed66faed453..0d61f8b91823 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.6 2012/02/09 14:25:40 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.7 2012/03/07 14:23:05 haubi Exp $
+
+*oracle-instantclient-odbc-11.2.0.3 (07 Mar 2012)
+
+  07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  +oracle-instantclient-odbc-11.2.0.3.ebuild:
+  Revbump. Use EAPI 4. Update homepage.
+  Add multilib support.
+  RDEPEND on _same_ version of oracle-instantclient-basic.
 
   09 Feb 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   Taking over maintainership.
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
index cc5f6ef0430d..5b69be577971 100644
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST instantclient-odbc-linux-11.2.0.3.0.zip 273840 RMD160 8c6663a165317be4cc099288a8ee0f0bc71dd535 SHA1 0d5429e19d9890e3a1667178a0314ee2ede3d395 SHA256 e327fc2627d792a296085d15638eb79df85ce4fcc16ed5c7d304d406131d5d3b
 DIST instantclient-odbc-linux-x86-64-11.2.0.2.0.zip 308445 RMD160 7d5324729e99763d35c721efe6a79ab281c6204d SHA1 93a0d2035947114513f028f27863e9997d7540d1 SHA256 1d24d3f7b38a7d1cd1fa67c34a4c64aa556c0e4c93777bc7ceb0ee32e3504dc0
+DIST instantclient-odbc-linux.x64-11.2.0.3.0.zip 309061 RMD160 52a81eadadc6ced784484835cd2941196ba0a604 SHA1 948447704c07dd2d4b63cda76d40073033b1fce1 SHA256 78584746ada1ed09e5587e3f39980e45c5c4d7c7fa4aaca3bd606be08c9f2e61
 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-r1.ebuild 1693 RMD160 45248b8090bf6c687106f329f7d33023bb4ca9ba SHA1 e2668bc6f2ed6323cceafd0486d07574f842c374 SHA256 f3f1eb44b7bdec09b8a4c36052253c7d7319a6ee910ed438cd51319daf05b15f
-MISC ChangeLog 1340 RMD160 66e55344b4e2121fb12ac114da998a7e5594120e SHA1 6c3d23828730a2b282d777a7e7dbed0a7592ed76 SHA256 6de2456510e3f0f15adf42154a9dcedc157f3183b628407cc53c2cfb3c1cd829
+EBUILD oracle-instantclient-odbc-11.2.0.3.ebuild 2452 RMD160 91aafc1e40c52d886a43e8a389ad0bdaee67b42f SHA1 639f08c9854090c012af4cd6213e0a21eedf124c SHA256 6363f8e86ca5c0bb363996a45c56a671acd6af7d73f9167a6ff96a59025cf0cd
+MISC ChangeLog 1617 RMD160 aeed27ff1df3e979c7db9ae31218a5bbbfb0af1f SHA1 4346da303dd132779460363ef31b4925c6f32612 SHA256 207bea23d1ab6301fb38052236d519e98e591cb84b1e03cfa4cba0fd08def116
 MISC metadata.xml 276 RMD160 86026518f07e569ae8a03c56625160a22e604e94 SHA1 ba98788a65d6b9f6d3db105d46f94cb2d9aa73a3 SHA256 516647d3d1331fc85d9fae454030f96b95512c0eb06e473431d0b49ace52c222
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8z12sACgkQLc0TWKYwzLj2uACfSWxPk6W6Nkh3Y83JjkHZDxY/
-H5wAn1Yw7sUKWWUxN6fDEB0aZbs8NVrS
-=tkXx
+iEYEARECAAYFAk9Xb1EACgkQLc0TWKYwzLgd7wCfY8kgz3RLxtPlt2vxlUcIrm3C
+4UIAnA8zkQr12qoKj8iacqTSrBDWIEbe
+=Rnwp
 -----END PGP SIGNATURE-----
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
new file mode 100644
index 000000000000..5f0b037d6935
--- /dev/null
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 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.3.ebuild,v 1.1 2012/03/07 14:23:05 haubi Exp $
+
+EAPI="4"
+
+inherit eutils
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}                             )
+	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="fetch"
+IUSE="multilib"
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"
+
+default_abi() {
+	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
+}
+
+abi_list() {
+	if use multilib; then
+		echo ${MULTILIB_ABIS}
+	elif [[ ${DEFAULT_MULTILIB} == default ]]; then
+		# no multilib-able platform
+		echo ${ARCH}
+	else
+		echo ${DEFAULT_ABI}
+	fi
+	return 0
+}
+
+set_abivars() {
+	local abi=$1
+	# platform name
+	MY_PLAT=MY_PLAT_${abi}
+	MY_PLAT=${!MY_PLAT}
+	# runtime distfile
+	MY_A=MY_A_${abi}
+	MY_A=${!MY_A}
+	# abi sourcedir
+	MY_S="${S}/${abi}/instantclient_11_2"
+	# abi libdir
+	MY_LIBDIR=$(ABI=${abi} get_libdir)
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE%/*}/index-097480.html"
+	eerror "  and download"
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		eerror "Instant Client for ${MY_PLAT}"
+		eerror "    ODBC: ${MY_A}"
+	done
+	eerror "After downloading, put them in:"
+	eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		mkdir -p "${MY_S%/*}" || die
+		cd "${MY_S%/*}" || die
+		unpack ${MY_A}
+	done
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		ABI=${abi} dolib.so libsqora*$(get_libname)*
+
+		# ensure to be linkable
+		[[ -e libsqora$(get_libname) ]] ||
+		dosym libsqora$(get_libname 11.1) \
+			"${oracle_home}"/${MY_LIBDIR}/libsqora$(get_libname)
+
+		eend $?
+	done
+
+	set_abivars $(default_abi)
+	cd "${MY_S}" || die
+	dobin odbc_update_ini.sh
+	dodoc *htm*
+}