Support multilib mariadb. When other mysql providers become multilib aware, no additional file exclusions will be necessary but the ebuild will probably still need to be revbumped

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

4 files changed, 62 insertions, 6 deletions

diff --git a/app-emulation/emul-linux-x86-db/ChangeLog b/app-emulation/emul-linux-x86-db/ChangeLog
index 8647fdee6e67..0bf593899c9e 100644
--- a/app-emulation/emul-linux-x86-db/ChangeLog
+++ b/app-emulation/emul-linux-x86-db/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2014/06/26 09:21:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-db/ChangeLog,v 1.20 2014/08/19 16:04:59 axs Exp $
+
+*emul-linux-x86-db-20140508-r2 (19 Aug 2014)
+
+  19 Aug 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +emul-linux-x86-db-20140508-r2.ebuild, +files/remove-native-20140508-r2:
+  Support multilib mariadb.  When other mysql providers become multilib aware,
+  no additional file exclusions will be necessary but the ebuild will probably
+  still need to be revbumped
 
   26 Jun 2014; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-db-20140508-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-db/Manifest b/app-emulation/emul-linux-x86-db/Manifest
index 7b17642016dc..9f213dd7ba8a 100644
--- a/app-emulation/emul-linux-x86-db/Manifest
+++ b/app-emulation/emul-linux-x86-db/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 AUX remove-native-20140508-r1 231 SHA256 f45738ec9e662a021d9b26c6ee6107724ea656bdab07f36a6de9fd78ba441ce5 SHA512 f379c08d94b4c1b387d3322d26e1fa3502d70b3fe7492b32d97ae829fcc73c261745679bc159c96c1c9ce54472f52fb8dd226a7e3ee8e21fca01675a7e6087fa WHIRLPOOL 1f5daf077583d4d11f0047d39585090761e00269ab8e0217053d5079994d37cdba0bed02a3ace311f91218698902c00699144dc674fab2552a4b25b8cd5470f1
+AUX remove-native-20140508-r2 563 SHA256 f73fdf9749d74507e931031d83bdc7adfdc3cdfcfd2557572ef46b6976496d3b SHA512 1f6f8649d15f85c55e4da7095a7fca0f64baea0796d07709d971fd82dcf5db797c63064b7508068e7620501a6531e018edb314344798fd0f19ef55b436ea7df4 WHIRLPOOL 7e0164bb4407de58d591b4156c6da1abe0877ea7ac9e45b8d097b7c8f4f619b692bf12a3aa61c593595df95816a8eac087f06479c5de0b5b94b142a50a46292d
 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 622 SHA256 5670074c49ef33dc4a2a9a333de6b772dc6eade1de46f2b4a6a9a9d7bea81a12 SHA512 ab9150c1319d2bd69a6f9f0e205b69aa0d4cb9b9b003d75f48789ef3926a6cc88eb1eb55f749b4284c9ec34a68a3da5e8ba75c47ff190ca881a0e14e3e16cd80 WHIRLPOOL a4463164fa11e23ab7887ab607e9e1ae5e9f76be231e9ff50c7a1e983841df344ef05a29308381653fc447e8d94086f540b42dcbd64c213b78206d28ba5b9d7a
+EBUILD emul-linux-x86-db-20140508-r2.ebuild 725 SHA256 7b85d2e9148ea14eb4fc59f6fd8170d9d4b9752d2951c02864af09f389b6617d SHA512 496e4bbfc5622ce59176924351635c7bba248cf1f0016fefc3484fb5dd330b51d8a9826ad818d57b9d03f851afa7b72e8262517201fb8813806bc9b0b4071eb1 WHIRLPOOL 94690a17b7d2074f15cda120df3961b8cb566ae3c43748bd90949e7ece6a0c1cc41eb8bd5ed15f74b312c641d9aa36f53416de2faaaf46c72652e6f4098a80c4
 EBUILD emul-linux-x86-db-20140508.ebuild 390 SHA256 411de935b469356f74bd3456f1761929379d7ffc04df8af7e78cf826460014a3 SHA512 d334d89694771a95db0b9509f1bdfdccb312dfb4219eba7251b3fdf928052fe32fe07021b1feca30307fa699629ca4a64c4c63d313a8bc35ae1b64f6d8478968 WHIRLPOOL 85514232ffca40373288171bdca5cbbd25b5c6c3fe967de22b369e3aa2cba6709b22ffdae69a3494ecb15627437ff4ebd1ae77e5d460268c5411c836e37df667
-MISC ChangeLog 3040 SHA256 2f2904f965f2ab9de6973aa5c5817bd17876ad44d3e88fc44fccbbfbd57e3fc9 SHA512 51f783d42b094b316f14bfaadcb7b683e5ac408ff2907dc4b9d0b4e122fae9850e8689631b04bc04399bedf94c7d357d37b907187f01997e6080499c999004f1 WHIRLPOOL 8e9dd4465958ffa4118308a1d7402629376134480d0ba143e9f3979d5f9b4794dd5a1a5da4c450d1a6249df7d8b82a42f09a56a748294483d4ad93722b54898d
+MISC ChangeLog 3404 SHA256 fd8607e1dc24acf6dce0fd3531457e3be9a5b19dcaded6f9e56c70d492ce6bb0 SHA512 aadebefb3c958bacdf5e417d9eedde282d5612b6cc06787ca1285f413ea989277f0b297c2e881f127cb52c3bd7fd4c8260320f6bec9247efbe809db7b63bd835 WHIRLPOOL 129c572af65fcc6f01e060e695a9faf9068277f49ce46b564af9a71b94a925e92e10aa03c5a085fb53788f15f6cb255ed5b52ddfd0490220af2147d93671f39a
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlOr5gwACgkQCaWpQKGI+9TO0gCfaGRNZhC5suR7mtbRnt1EadhJ
-YwIAn1AP2YcSzQ1+WxNaa3/fBJKw8qzt
-=3imG
+iF4EAREIAAYFAlPzdaoACgkQ2ugaI38ACPAgOAEAmc8hYI3OA6wTnQ5/RME3INaO
+XKRDRi81In0wIyTK68wBAJ2ej1LJ2SJDysqEnKpouFSPZ8EyMWl6wEgpqVI03zBO
+=QeOX
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r2.ebuild b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r2.ebuild
new file mode 100644
index 000000000000..4691deec8227
--- /dev/null
+++ b/app-emulation/emul-linux-x86-db/emul-linux-x86-db-20140508-r2.ebuild
@@ -0,0 +1,28 @@
+# 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-r2.ebuild,v 1.1 2014/08/19 16:04:59 axs 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(-)]
+		|| (
+			>=dev-db/mariadb-10.0.13[abi_x86_32(-)]
+			>=dev-db/mariadb-galera-10.0.12[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-r2 b/app-emulation/emul-linux-x86-db/files/remove-native-20140508-r2
new file mode 100644
index 000000000000..79708ed14ee7
--- /dev/null
+++ b/app-emulation/emul-linux-x86-db/files/remove-native-20140508-r2
@@ -0,0 +1,18 @@
+# unixODBC
+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
+# mysql - leave the *.so.16 files as they don't collide
+usr/lib32/libmysqlclient.so
+usr/lib32/libmysqlclient_r.so
+usr/lib32/mysql/libmysqlclient.so
+usr/lib32/mysql/libmysqlclient_r.so
+usr/lib32/mysql/plugin/ha_innodb_plugin.so
+usr/lib32/mysql/plugin/ha_innodb_plugin.so.0
+usr/lib32/mysql/plugin/ha_innodb_plugin.so.0.0.0