pacho 14/12/16 11:57:04 Modified: wine-1.7.16.ebuild wine-1.7.9.ebuild wine-1.6.1.ebuild wine-1.7.10.ebuild wine-1.7.18.ebuild wine-1.7.17.ebuild wine-1.7.14.ebuild wine-1.6.2.ebuild wine-1.7.0.ebuild wine-1.7.8.ebuild wine-1.7.15.ebuild wine-1.7.12.ebuild wine-1.7.3.ebuild wine-1.7.13.ebuild wine-1.7.11.ebuild wine-1.7.4.ebuild ChangeLog Log: Update multilib deps for more versions (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Revision Changes Path 1.3 app-emulation/wine/wine-1.7.16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild?r1=1.2&r2=1.3 Index: wine-1.7.16.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wine-1.7.16.ebuild 18 Jun 2014 19:08:46 -0000 1.2 +++ wine-1.7.16.ebuild 16 Dec 2014 11:57:04 -0000 1.3 @@ -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.16.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.4 app-emulation/wine/wine-1.7.9.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild?r1=1.3&r2=1.4 Index: wine-1.7.9.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-1.7.9.ebuild 18 Jun 2014 19:08:46 -0000 1.3 +++ wine-1.7.9.ebuild 16 Dec 2014 11:57:04 -0000 1.4 @@ -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.9.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.7 app-emulation/wine/wine-1.6.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild?r1=1.6&r2=1.7 Index: wine-1.6.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-1.6.1.ebuild 18 Jun 2014 19:08:47 -0000 1.6 +++ wine-1.6.1.ebuild 16 Dec 2014 11:57:04 -0000 1.7 @@ -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.6.1.ebuild,v 1.6 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.7 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -96,109 +96,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32(+)] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-1.19-r1:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-1.19-r1:0[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.4 app-emulation/wine/wine-1.7.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild?r1=1.3&r2=1.4 Index: wine-1.7.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-1.7.10.ebuild 18 Jun 2014 19:08:46 -0000 1.3 +++ wine-1.7.10.ebuild 16 Dec 2014 11:57:04 -0000 1.4 @@ -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.10.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.3 app-emulation/wine/wine-1.7.18.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild?r1=1.2&r2=1.3 Index: wine-1.7.18.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wine-1.7.18.ebuild 18 Jun 2014 19:08:46 -0000 1.2 +++ wine-1.7.18.ebuild 16 Dec 2014 11:57:04 -0000 1.3 @@ -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.18.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.3 app-emulation/wine/wine-1.7.17.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild?r1=1.2&r2=1.3 Index: wine-1.7.17.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wine-1.7.17.ebuild 18 Jun 2014 19:08:46 -0000 1.2 +++ wine-1.7.17.ebuild 16 Dec 2014 11:57:04 -0000 1.3 @@ -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.17.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.3 app-emulation/wine/wine-1.7.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild?r1=1.2&r2=1.3 Index: wine-1.7.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wine-1.7.14.ebuild 18 Jun 2014 19:08:46 -0000 1.2 +++ wine-1.7.14.ebuild 16 Dec 2014 11:57:04 -0000 1.3 @@ -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.14.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.6 app-emulation/wine/wine-1.6.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild?r1=1.5&r2=1.6 Index: wine-1.6.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-1.6.2.ebuild 18 Jun 2014 19:08:47 -0000 1.5 +++ wine-1.6.2.ebuild 16 Dec 2014 11:57:04 -0000 1.6 @@ -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.6.2.ebuild,v 1.5 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.6 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -96,109 +96,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.10 app-emulation/wine/wine-1.7.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild?r1=1.9&r2=1.10 Index: wine-1.7.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-1.7.0.ebuild 18 Jun 2014 19:08:47 -0000 1.9 +++ wine-1.7.0.ebuild 16 Dec 2014 11:57:04 -0000 1.10 @@ -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.0.ebuild,v 1.9 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.10 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -98,111 +98,131 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] + >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.6 app-emulation/wine/wine-1.7.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild?r1=1.5&r2=1.6 Index: wine-1.7.8.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-1.7.8.ebuild 18 Jun 2014 19:08:46 -0000 1.5 +++ wine-1.7.8.ebuild 16 Dec 2014 11:57:04 -0000 1.6 @@ -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.8.ebuild,v 1.5 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.6 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.3 app-emulation/wine/wine-1.7.15.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild?r1=1.2&r2=1.3 Index: wine-1.7.15.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wine-1.7.15.ebuild 18 Jun 2014 19:08:46 -0000 1.2 +++ wine-1.7.15.ebuild 16 Dec 2014 11:57:04 -0000 1.3 @@ -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.15.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.3 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.4 app-emulation/wine/wine-1.7.12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild?r1=1.3&r2=1.4 Index: wine-1.7.12.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-1.7.12.ebuild 18 Jun 2014 19:08:46 -0000 1.3 +++ wine-1.7.12.ebuild 16 Dec 2014 11:57:04 -0000 1.4 @@ -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.12.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.7 app-emulation/wine/wine-1.7.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild?r1=1.6&r2=1.7 Index: wine-1.7.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-1.7.3.ebuild 18 Jun 2014 19:08:46 -0000 1.6 +++ wine-1.7.3.ebuild 16 Dec 2014 11:57:04 -0000 1.7 @@ -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.3.ebuild,v 1.6 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.7 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -96,109 +96,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.4 app-emulation/wine/wine-1.7.13.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild?r1=1.3&r2=1.4 Index: wine-1.7.13.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-1.7.13.ebuild 18 Jun 2014 19:08:46 -0000 1.3 +++ wine-1.7.13.ebuild 16 Dec 2014 11:57:04 -0000 1.4 @@ -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.13.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.4 app-emulation/wine/wine-1.7.11.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild?r1=1.3&r2=1.4 Index: wine-1.7.11.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wine-1.7.11.ebuild 18 Jun 2014 19:08:47 -0000 1.3 +++ wine-1.7.11.ebuild 16 Dec 2014 11:57:04 -0000 1.4 @@ -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.11.ebuild,v 1.3 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.4 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -97,109 +97,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.8 app-emulation/wine/wine-1.7.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild?r1=1.7&r2=1.8 Index: wine-1.7.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine-1.7.4.ebuild 18 Jun 2014 19:08:47 -0000 1.7 +++ wine-1.7.4.ebuild 16 Dec 2014 11:57:04 -0000 1.8 @@ -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.4.ebuild,v 1.7 2014/06/18 19:08:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.8 2014/12/16 11:57:04 pacho Exp $ EAPI="5" @@ -96,109 +96,129 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.5.0.1[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-libs/ncurses-5.9-r3[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - >=sys-apps/dbus-1.6.18-r1[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=media-libs/fontconfig-2.10.92[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] + ) ) + gphoto2? ( || ( + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) - gphoto2? ( - app-emulation/emul-linux-x86-medialibs[development] - ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - >=media-libs/openal-1.15.1[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins - app-emulation/emul-linux-x86-medialibs[development] + gstreamer? ( || ( + app-emulation/emul-linux-x86-gstplugins[development,-abi_x86_32(-)] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ) + ( + >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)] + >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)] + ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - >=x11-libs/libXcursor-1.1.14[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] + >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] + >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] + >=x11-libs/libXi-1.7.2[abi_x86_32(-)] + >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) - cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) + cups? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] + ) ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - >=virtual/glu-9.0-r1[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] + >=virtual/glu-9.0-r1[abi_x86_32(-)] + >=virtual/opengl-7.0-r1[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/gsm-1.0.13-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=virtual/jpeg-0-r2:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=virtual/jpeg-0-r2:0[abi_x86_32(-)] + ) ) + ldap? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) - ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/lcms-2.5:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.15.4[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=sys-devel/gettext-0.18.3.2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)] + ) ) + odbc? ( || ( + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) - odbc? ( app-emulation/emul-linux-x86-db[development] ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - >=dev-libs/libxml2-2.9.1-r4[abi_x86_32] - >=dev-libs/libxslt-1.1.28-r1[abi_x86_32] + >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] + >=dev-libs/libxslt-1.1.28-r1[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,-abi_x86_32(-)] + >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)] + ) ) + ssl? ( || ( + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] + ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - >=media-libs/libpng-1.6.10:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - >=media-libs/libv4l-0.9.5[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" 1.522 app-emulation/wine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.522&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.522&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.521&r2=1.522 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v retrieving revision 1.521 retrieving revision 1.522 diff -u -r1.521 -r1.522 --- ChangeLog 25 Oct 2014 20:37:44 -0000 1.521 +++ ChangeLog 16 Dec 2014 11:57:04 -0000 1.522 @@ -1,6 +1,16 @@ # 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.521 2014/10/25 20:37:44 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.522 2014/12/16 11:57:04 pacho Exp $ + + 16 Dec 2014; Pacho Ramos <pa...@gentoo.org> wine-1.6.1.ebuild, + wine-1.6.2.ebuild, wine-1.7.0.ebuild, wine-1.7.10.ebuild, wine-1.7.11.ebuild, + wine-1.7.12.ebuild, wine-1.7.13.ebuild, wine-1.7.14.ebuild, + wine-1.7.15.ebuild, wine-1.7.16.ebuild, wine-1.7.17.ebuild, + wine-1.7.18.ebuild, wine-1.7.19-r1.ebuild, wine-1.7.20.ebuild, + wine-1.7.21.ebuild, wine-1.7.22.ebuild, wine-1.7.28.ebuild, + wine-1.7.29.ebuild, wine-1.7.3.ebuild, wine-1.7.4.ebuild, wine-1.7.8.ebuild, + wine-1.7.9.ebuild: + Update multilib deps for more versions *wine-1.7.29 (25 Oct 2014)