Support multilib unixODBC.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 58 insertions, 5 deletions

diff --git a/app-emulation/emul-linux-x86-db/ChangeLog b/app-emulation/emul-linux-x86-db/ChangeLog
index 30967adc5d8d..9f27d4ba66a6 100644
--- a/app-emulation/emul-linux-x86-db/ChangeLog
+++ b/app-emulation/emul-linux-x86-db/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-db
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/ChangeLog,v 1.17 2014/05/08 21:42:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/ChangeLog,v 1.18 2014/05/25 16:43:55 mgorny Exp $
+
+*emul-linux-x86-db-20140508-r1 (25 May 2014)
+
+  25 May 2014; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-db-20140508-r1.ebuild, +files/remove-native-20140508-r1:
+  Support multilib unixODBC.
 
 *emul-linux-x86-db-20140508 (08 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-db/Manifest b/app-emulation/emul-linux-x86-db/Manifest
index 3dee635b5bfc..04dff6a61030 100644
--- a/app-emulation/emul-linux-x86-db/Manifest
+++ b/app-emulation/emul-linux-x86-db/Manifest
@@ -1,18 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remove-native-20140508-r1 231 SHA256 f45738ec9e662a021d9b26c6ee6107724ea656bdab07f36a6de9fd78ba441ce5 SHA512 f379c08d94b4c1b387d3322d26e1fa3502d70b3fe7492b32d97ae829fcc73c261745679bc159c96c1c9ce54472f52fb8dd226a7e3ee8e21fca01675a7e6087fa WHIRLPOOL 1f5daf077583d4d11f0047d39585090761e00269ab8e0217053d5079994d37cdba0bed02a3ace311f91218698902c00699144dc674fab2552a4b25b8cd5470f1
 DIST emul-linux-x86-db-20131008.tar.xz 1504252 SHA256 d87283b85030f94a1215466846514023af6a1bc6810ba9930de459339391fe2d SHA512 a18e235a86040002df70ef6fcdd050d652391b615882df0f72a70118a31a9de762627a5a011aa8dfc2a813dc19770e782d4ef5ad26e3e6652098a0e865e36629 WHIRLPOOL 0983c56a7743a51c12bb8b75d437f0a5d24f230e1648993849052cabfdc27a38098f1c811c392aebe846909958d728cf96139003e8682bf9e9d2024ab2c8bdce
 DIST emul-linux-x86-db-20140406.tar.xz 1504376 SHA256 89ca0ea44f718d47059eefeb3ef7e5af5b4339e44dba34d67cdff9710c785396 SHA512 d408985d0ae032f92974c640b872f18a420606b1557ecfed4a90005f6a11a9f73d0ec1bee87fbb2991c9f5787b326b2a034b8ae7a0086821c90b55fa0f49e66d WHIRLPOOL 6f12134f675b545ed306267de99eebca11f49d3f92105d8555bba77b3b90d4b9273e40ac5e316479ecfe83bb0c605fae86643cabfbd637c1b247e0aa5c6ab64e
 DIST emul-linux-x86-db-20140508.tar.xz 1504788 SHA256 cbd76b21c8b252a18dd6b03a53a2b95077132254c75488b75a141a72a1e66da2 SHA512 6992911f4665d0648ef60dd223c539b588eacdb36cb6485adf2176f8c3803f22544877fa16515264fb43d9499eeed8df09cf5c42c2fdd585b9ea56107ce263c1 WHIRLPOOL 66a9556e63df65d7e55a54253c1c9e9d717973b9611c6d648c34cde1b3516c30e21eb6b1abdcdcd28d6290d0c616ef97610826c8f6869203b27bd92893abe518
 EBUILD emul-linux-x86-db-20131008.ebuild 389 SHA256 4b9f66e39a9e3b0b7b58a02fa091943fd0fae249e5c5cae2ec22fa7da3c484d3 SHA512 5d1d7e8ce4602800343776c8e46291deea69f6c241dbaded386d00f32d6ba48afe3200e07ba06b4d8d87fac0e74044666e6ce6d1b8fe6c7201eb17366ed338fa WHIRLPOOL 7bdbabdd34e8a49f9eefc1022f06de3e401b13bcdb2de3d59553145f9c96130781fd13ee108c67895f29e50fa88778707cbb34b1eb313187ad96e00efdd21bdc
 EBUILD emul-linux-x86-db-20140406.ebuild 389 SHA256 e900c51b1352c4d97623f3b8757b485705d5065652eca6a61fd304930365a070 SHA512 9ef9a9f517d22cdd688e916e59094bbb0cef80c278d0dcb30feed5da4a322d17e535c7b0c76f8436c4bedd683b5e1fdec7c61859147b3597ef33bb6c758538da WHIRLPOOL e59b82ab8d171f56a2cbddf567a660cfd7d6aa7d8a88c21bfc005f6202b2761461b1096ea370b964c24b117d4654f86368688aa20a9cb37066ff31cccf3fe4c8
+EBUILD emul-linux-x86-db-20140508-r1.ebuild 624 SHA256 f8169359896a22a11606ec86bf7315e467a8e6c529b8dcd84abb216a927cbbe5 SHA512 46d98f9a2159acd87d960c7d694278c03cdbc371e7c2e6cf8bd28c1c605144e679ddcbd77c21ddad8d8b671ffc426e275c2ed277278efbec3c3bee0227c3833f WHIRLPOOL 8425fccdffd0199518b5f8e9c51fa9a1a168fb08ca7b913d7c9f9956f3be20160b083411e1ad2370dd8dcc550dddeba44361c0b04def8fd8751372b542ee0e8e
 EBUILD emul-linux-x86-db-20140508.ebuild 390 SHA256 411de935b469356f74bd3456f1761929379d7ffc04df8af7e78cf826460014a3 SHA512 d334d89694771a95db0b9509f1bdfdccb312dfb4219eba7251b3fdf928052fe32fe07021b1feca30307fa699629ca4a64c4c63d313a8bc35ae1b64f6d8478968 WHIRLPOOL 85514232ffca40373288171bdca5cbbd25b5c6c3fe967de22b369e3aa2cba6709b22ffdae69a3494ecb15627437ff4ebd1ae77e5d460268c5411c836e37df667
-MISC ChangeLog 2737 SHA256 a11011426bc7ea4f18093b6dde90df0317ce0f02a0981935f6ab628c5c380560 SHA512 27350c72bc430d4873c8b6e43714dfc73d8d32790b90ef2e586503d5db60f307cf6bf99b87d26975521ad5ada5914c8f01c2796d3fa87562a129daf13bd69d49 WHIRLPOOL 0d7dc421a95941d45a4c6b6322845aa7b2c11c18a49d689cc0afd78832d29c8d4e6504cbfa2713b32f476c6154c1ce8f96555cdb2168bc55fe5f42493bee174c
+MISC ChangeLog 2939 SHA256 1cbc1a6ca857ed303f77f49b547bc5701d4c864908a061614f24b44e2c542670 SHA512 746291d384e97ac8e6594e18593a9fa1fd8d8335faa5278f3edafce9e227258481c7366e7e95556a0082547d2986528b0949b3d0f990f76abd551c0708fb173a WHIRLPOOL 52ef55641414f9f6e34601d4e8c2df781da4beaa67e1a35aa2ebbdf44c5b6b7621888d8985aafaca6b8fd7eecbc75b7cfaacce1a7fdd54c4280ceac9e1b6b8f7
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNr+lMACgkQCaWpQKGI+9Tt6wCeMEZcz3UCRvVnYCOddqFwNGa2
-ZIAAoIH7csCj/97pZzUZTA3LZxRegxN0
-=DdZW
+iQJ8BAEBCABmBQJTgh3RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2DcQANInTJShVB+KwVWUjLHcKRMk
+pUYs2YZbHvAWNDXL+juzcCE+Gwf9O2Jr+PeCchG/RHhf8AEfuzDIfx7LtiRP1Xmu
+1r0RIb835HvhmgEQcD9BfiNWPP48cDa04e4jjM3GCLSNAmOTHkq+ZKODIhPECU4J
+xyThcGqsUOSqYb1IRxmrTszZcDsSikrPJhaqmnCPU0pok0r10J6Ecl42T5hzgNIJ
+ov99Kf4mIMlo+2ihWt3DPA0EUp7YQcg3dbcVXYvJvlIekRjG4Z1BUUpUYtn2JZbT
+h/cTWvbKubuveFepN7h6owVO960y9irWEza8ptkEP7LY661Ya0NBsgagX85dLye1
+4DnpaY8DXbl9O3NinP4oMorfDLBHr0qR4pvYEj3y6cusWaK2+Va1I/w8NmDZttiH
+omQv1pdGlVIo8YquWhIMuHizKYVIKViQwly/78ZVcbZ4hp42fROCu/TJQRveZSUE
+hTjGiWYCXSbzpT3feslcGcMBacT4/Wa50JQEsKqp8ChBryrDuwHTpKt7SCF/QBSp
+Mr1HliBhqL9prl7VStyxFkwtRP7pH/S5mV7+ety0oXSjVSd67ikw7gACd+FFx7Vh
+cGl9RczkXN5oOTpf3Y5bhWsyYH7T/IpADy1aQ1e9UOk/LQ1WnS7i2ub70sLtTJXx
+9RWroZN36vnrK8XBPE4J
+=kMtF
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r1.ebuild b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r1.ebuild
new file mode 100644
index 000000000000..21d386477216
--- /dev/null
+++ b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r1.ebuild,v 1.1 2014/05/25 16:43:55 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="-* ~amd64"
+
+IUSE="abi_x86_32"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	abi_x86_32? (
+		>=dev-db/unixODBC-2.3.2[abi_x86_32(-)]
+	)"
+
+src_prepare() {
+	emul-linux-x86_src_prepare
+
+	# Remove migrated stuff.
+	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
+}
diff --git a/app-emulation/emul-linux-x86-db/files/remove-native-20140508-r1 b/app-emulation/emul-linux-x86-db/files/remove-native-20140508-r1
new file mode 100644
index 000000000000..ce66bc5dccaf
--- /dev/null
+++ b/app-emulation/emul-linux-x86-db/files/remove-native-20140508-r1
@@ -0,0 +1,9 @@
+usr/lib32/libodbc.so
+usr/lib32/libodbc.so.2
+usr/lib32/libodbc.so.2.0.0
+usr/lib32/libodbccr.so
+usr/lib32/libodbccr.so.2
+usr/lib32/libodbccr.so.2.0.0
+usr/lib32/libodbcinst.so
+usr/lib32/libodbcinst.so.2
+usr/lib32/libodbcinst.so.2.0.0