oracle-instantclient-basic-11.2.0.4: Fix for pure x86_32 setup, pointed out by Cedric Godin in #505522.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA630CCB8

3 files changed, 15 insertions, 8 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 8466001feb09..342dbdc3ce5f 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.58 2014/04/04 08:39:54 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.59 2014/04/10 14:55:13 haubi Exp $
+
+  10 Apr 2014; Michael Haubenwallner <haubi@gentoo.org>
+  oracle-instantclient-basic-11.2.0.4.ebuild:
+  Fix for pure x86_32 setup, pointed out by Cedric Godin in #505522.
 
 *oracle-instantclient-basic-11.2.0.4 (04 Apr 2014)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index b8b78daf6a75..66fb7a1ef908 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -23,13 +23,13 @@ DIST instantclient-sdk-linux32-11.2.0.2.0.zip 638200 SHA256 172c0116de16f55abd77
 EBUILD oracle-instantclient-basic-10.2.0.3-r1.ebuild 3929 SHA256 947ff636b2b8c24ad14ea74ccaa0e9946def6a627b5d1cd4e9d537cd0ba0ec72 SHA512 63340fe50d786775a3459c3e67412a0227ec2e6d43c1634d91541fe48ebbe81c968b8b6fd6d20d32791c418d1e0d81f886e66dd35af58a78f100b0f12b1ad54b WHIRLPOOL 9ffb1b71bb2568ebef3e80782369870ad763a6385d202df4d987f349d30764961443596cbcd5d40698707a1771f7f8e32a697f8f0e28101e3b5d9a9758a58ebb
 EBUILD oracle-instantclient-basic-11.2.0.2.ebuild 3891 SHA256 93f02f786f3245339b995a18973c4aca504def26dbd908ad47d0e5d72ea4c891 SHA512 a1174446ac4b1aeb5bc7d6325430c3336b62d6812c0a192dd8275758534f19db05ad9f96fde41520059b03bf74174655df54c2254d0c7eb13103f8458a1b49f8 WHIRLPOOL 316fb982b125e12a6180ad1b9bade82e89aff3045c8ecb2040b265622d2b42aea2eb9512218630181411c78aad83fe8a2641e2c948c513f01a1b99715fc9f337
 EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 5533 SHA256 e627d0b826bc1858652509eac7ed4bddba14af91e274eff9349dc6d7af2db75f SHA512 726e17db4452c0b6f864aa1688e617034baac70f8d1204ca878042637790d2ceb220a97d1559243abcc39fe72abc0af978ec6038cabdfd52ab17b45706ee330c WHIRLPOOL 5a3e4f2fcf5d1cfb202365aac9da8b9fa6f56c30b1a06b34bd031995c38a95056b84ff55eb21d8449e0ac1a47c94ffd7c59281fb1739153ccd73180b6c1e8d3a
-EBUILD oracle-instantclient-basic-11.2.0.4.ebuild 5634 SHA256 8b832e0892b1b2c37cc7f7165a121c6195cb7c4b90437e38d9ce1dd4e339b461 SHA512 8c8685634e290c974b340054e949a60b2b113675a3ef37f21563c628a79bfd75d0347ce49322dfc9431366ab71263043bd0eea9665a9cc585f5570163a32daf0 WHIRLPOOL ba3d97b26a0224da3300b86a7c0ddb7efa07718db49f5b02ee2a35a5f7a92ca60c6dfaae367a83450fb419881926ac059e116bf1925667e9d793e59fea3c906f
-MISC ChangeLog 11444 SHA256 9cb64b05bfbf18d4f616146809d9967ee0d6dc06c29594350565facf09257daf SHA512 04ccd907b88e19dbad9316c326883914f97a5b6a8b3cebe9de8b307987b63701a9b10519344983fa87f688c4498c31a305749b7643539ab36c504598d233b7f2 WHIRLPOOL edcbaa5adcc230fb1d1110573932447e2b484a782c811296835636108558046ec86ceda9cf17b74a1744c49b2609107f03b4fd947b4d3179f70e707e6a154b04
+EBUILD oracle-instantclient-basic-11.2.0.4.ebuild 5697 SHA256 9de0275b75d947979e96d4869cbb445a0f97f22c082666073dd4d1db4fa9d7fa SHA512 00a7be635f0338ff2543fab38c6cbd37e71585a34e9e1e5629bb847920506166245356566095e8657bdcc24b18a8029262fbcc416ba7b646ec696113cf197fe9 WHIRLPOOL 2d4656c04ed5eb7a00cff6acbfb554e53e8564cec261ed5a209a00d7a4d9a2155d2dbc947e3a06ff3dade98893dec190ba7b67a531804a3149334d9a26c71330
+MISC ChangeLog 11616 SHA256 fb3f8f113a53b5aa104d2ae82c6efb901b6acdc6a492c90353548f26c502876b SHA512 b2dca5b918d35e31ca54894aca16835a8af6a5b545ecffe6105fe95b3f798aa4e569ab9a7c9d4471c6405c2eac19e9093323be686a034ca95979b6b08713d9d7 WHIRLPOOL 9876f4d48d221e4ac6dcbbe8f00fb29494d50faa7ebd00fd086c4bccf577a44023ec22a0ee1da4b4bc25bfc3f443e4e47bf1b2ce53dcc80fcd96477ddab4c7bd
 MISC metadata.xml 330 SHA256 229663e1b0f455156e4ba1ebe34b4b56bfc13785676a3bec391edcd6a6a9fd67 SHA512 0df4fb059d602579aeebd968ebc38464eaee321991be563c81210e34bad85d3e68fad0eef075901fd423aab3c9f1bf28e7109eddaa2c83e786c33eb60ba91dc8 WHIRLPOOL ee3a8191681da15e211c2c18f3e6460cc2bd546e0bc8ef559f1a5cb8d77ac85ea1113f8a10bd2154c0af2b0085d917ef32ffa519e76ba1443b68f63413366cb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM+b9YACgkQLc0TWKYwzLh4BACeIDf9hkIrEwsdVlcS49WE+oC3
-UlMAoINQKATbQJ4ll9DuQOvV1MfD0e/Z
-=9jei
+iEYEAREIAAYFAlNGsNMACgkQLc0TWKYwzLimrQCfTUoyaY6vlaBcVwVDeZmURYK/
+7LUAn27kO4ENwLJn5UQB1AHz9ZcgjuaI
+=Hl9P
 -----END PGP SIGNATURE-----
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
index bd747a602087..cf54fc898e2f 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.4.ebuild,v 1.1 2014/04/04 08:19:10 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild,v 1.2 2014/04/10 14:55:13 haubi Exp $
 
 EAPI="4"
 
@@ -88,7 +88,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	# need to patch for the final ABI only
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do : # need to patch for the final ABI only
+	done
 	set_my_abivars || die "${ABI} ABI not supported!"
 	cd "${S}" || die
 	epatch "${FILESDIR}"/11.2.0.3-makefile.patch