diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-25 16:47:55 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-25 16:47:55 +0000 |
| commit | 5183443701ec3919982c8d2531308ca91362c799 (patch) | |
| tree | 50188ed5f9bc618e355a6977c00592853bcad2ee /app-emulation | |
| parent | Support multilib unixODBC. (diff) | |
| download | gentoo-2-5183443701ec3919982c8d2531308ca91362c799.tar.gz gentoo-2-5183443701ec3919982c8d2531308ca91362c799.tar.bz2 gentoo-2-5183443701ec3919982c8d2531308ca91362c799.zip | |
Support multilib unixODBC ebuild.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.7.19-r1.ebuild | 7 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 475734c7284b..0384c867ab25 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.510 2014/05/23 22:43:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.511 2014/05/25 16:47:55 mgorny Exp $ + + 25 May 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild, + wine-9999.ebuild: + Support multilib unixODBC ebuild. 23 May 2014; Michał Górny <mgorny@gentoo.org> wine-9999.ebuild: Forward-port the emul-linux dependency changes to the live ebuild. diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild index d97cb9de5efe..579dbaa5da06 100644 --- a/app-emulation/wine/wine-1.7.19-r1.ebuild +++ b/app-emulation/wine/wine-1.7.19-r1.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/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.2 2014/05/21 19:37:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.3 2014/05/25 16:47:55 mgorny Exp $ EAPI="5" @@ -182,7 +182,10 @@ COMMON_DEPEND=" app-emulation/emul-linux-x86-baselibs[development] sys-devel/gettext[abi_x86_32] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development] + dev-db/unixODBC:=[abi_x86_32] + ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 5b0673334df2..0e526b12b883 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.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/app-emulation/wine/wine-9999.ebuild,v 1.167 2014/05/23 22:43:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.168 2014/05/25 16:47:55 mgorny Exp $ EAPI="5" @@ -182,7 +182,10 @@ COMMON_DEPEND=" app-emulation/emul-linux-x86-baselibs[development] sys-devel/gettext[abi_x86_32] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development] + dev-db/unixODBC:=[abi_x86_32] + ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development] media-libs/mesa[osmesa,abi_x86_32] |