diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2014-08-19 16:04:59 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2014-08-19 16:04:59 +0000 |
| commit | 7311de1a6a695259e67f0cd8b06d8c6c4d856f70 (patch) | |
| tree | 434d04cc37bd66245f6f144a916be3bfdd0a0cb3 /app-emulation/emul-linux-x86-db | |
| parent | Add missing eclass + use get_libdir instead of hardcoded path. (diff) | |
| download | gentoo-2-7311de1a6a695259e67f0cd8b06d8c6c4d856f70.tar.gz gentoo-2-7311de1a6a695259e67f0cd8b06d8c6c4d856f70.tar.bz2 gentoo-2-7311de1a6a695259e67f0cd8b06d8c6c4d856f70.zip | |
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
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Diffstat (limited to 'app-emulation/emul-linux-x86-db')
3 files changed, 55 insertions, 1 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/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 |