mgorny 14/05/21 19:37:14 Modified: wine-1.7.19-r1.ebuild ChangeLog Log: Support new multilib-enabled packages as dependencies. Partially bug #510646. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 app-emulation/wine/wine-1.7.19-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?r1=1.1&r2=1.2 Index: wine-1.7.19-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wine-1.7.19-r1.ebuild 17 May 2014 15:31:17 -0000 1.1 +++ wine-1.7.19-r1.ebuild 21 May 2014 19:37:13 -0000 1.2 @@ -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.1 2014/05/17 15:31:17 tetromino Exp $ +# $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 $ EAPI="5" @@ -116,9 +116,10 @@ app-emulation/emul-linux-x86-xlibs[development] media-libs/fontconfig[abi_x86_32] ) ) - gphoto2? ( + gphoto2? ( || ( app-emulation/emul-linux-x86-medialibs[development] - ) + media-libs/libgphoto2[abi_x86_32] + ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] media-libs/openal[abi_x86_32] @@ -145,7 +146,10 @@ app-emulation/emul-linux-x86-soundlibs[alsa,development] media-libs/alsa-lib[abi_x86_32] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs + net-print/cups[abi_x86_32] + ) ) opencl? ( virtual/opencl[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] @@ -162,7 +166,10 @@ app-emulation/emul-linux-x86-baselibs[development] virtual/jpeg:0[abi_x86_32] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + net-nds/openldap:=[abi_x86_32] + ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/lcms:2[abi_x86_32] @@ -195,8 +202,14 @@ dev-libs/libxslt[abi_x86_32] ) ) ) - scanner? ( app-emulation/emul-linux-x86-medialibs[development] ) - ssl? ( app-emulation/emul-linux-x86-baselibs[development] ) + scanner? ( || ( + app-emulation/emul-linux-x86-medialibs[development] + media-gfx/sane-backends:=[abi_x86_32] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development] + net-libs/gnutls:=[abi_x86_32] + ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] media-libs/libpng:0[abi_x86_32] 1.509 app-emulation/wine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.509&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.509&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.508&r2=1.509 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v retrieving revision 1.508 retrieving revision 1.509 diff -u -r1.508 -r1.509 --- ChangeLog 17 May 2014 15:31:17 -0000 1.508 +++ ChangeLog 21 May 2014 19:37:13 -0000 1.509 @@ -1,6 +1,9 @@ # 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.508 2014/05/17 15:31:17 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.509 2014/05/21 19:37:13 mgorny Exp $ + + 21 May 2014; Michał Górny <mgo...@gentoo.org> wine-1.7.19-r1.ebuild: + Support new multilib-enabled packages as dependencies. Partially bug #510646. *wine-1.7.19-r1 (17 May 2014)
