diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-06-18 19:08:47 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-06-18 19:08:47 +0000 |
commit | dccc41acc7c2154acc40fda9d9c3701f71c7e8b1 (patch) | |
tree | caf910aeae7f23066c74a7a6de85982ed4fc8bb2 | |
parent | Version bump (bug #510748 by Manuel Rüger). (diff) | |
download | gentoo-2-dccc41acc7c2154acc40fda9d9c3701f71c7e8b1.tar.gz gentoo-2-dccc41acc7c2154acc40fda9d9c3701f71c7e8b1.tar.bz2 gentoo-2-dccc41acc7c2154acc40fda9d9c3701f71c7e8b1.zip |
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #513718.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
21 files changed, 604 insertions, 594 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index a9edb73dd415..f80571f0f473 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -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.515 2014/06/17 09:03:20 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.516 2014/06/18 19:08:47 mgorny Exp $ + + 18 Jun 2014; Michał Górny <mgorny@gentoo.org> wine-1.6.1.ebuild, + wine-1.6.2.ebuild, wine-1.6.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.3.ebuild, wine-1.7.4.ebuild, wine-1.7.8.ebuild, + wine-1.7.9.ebuild, wine-9999.ebuild: + Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug + #513718. 17 Jun 2014; Chema Alonso <nimiux@gentoo.org> wine-1.6.2.ebuild: Stable for amd64 wrt bug #501442 diff --git a/app-emulation/wine/wine-1.6.1.ebuild b/app-emulation/wine/wine-1.6.1.ebuild index b71aad10e2a2..d9032e9293dc 100644 --- a/app-emulation/wine/wine-1.6.1.ebuild +++ b/app-emulation/wine/wine-1.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.5 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.1.ebuild,v 1.6 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -97,26 +97,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -125,80 +125,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32(+)] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(+)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:0[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.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.6.2.ebuild b/app-emulation/wine/wine-1.6.2.ebuild index 3640edc60c3b..9b218d78e716 100644 --- a/app-emulation/wine/wine-1.6.2.ebuild +++ b/app-emulation/wine/wine-1.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.4 2014/06/17 09:03:20 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.5 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -97,26 +97,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -125,80 +125,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.6.ebuild b/app-emulation/wine/wine-1.6.ebuild index a34a1c9043a6..8229ee2eef6c 100644 --- a/app-emulation/wine/wine-1.6.ebuild +++ b/app-emulation/wine/wine-1.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.12 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.ebuild,v 1.13 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -99,26 +99,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -127,82 +127,82 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libICE[abi_x86_32] - x11-libs/libSM[abi_x86_32] - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32(+)] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(+)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:0[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.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.0.ebuild b/app-emulation/wine/wine-1.7.0.ebuild index 664482c5a0df..5efc56c55f93 100644 --- a/app-emulation/wine/wine-1.7.0.ebuild +++ b/app-emulation/wine/wine-1.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.8 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.0.ebuild,v 1.9 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -99,26 +99,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -127,82 +127,82 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libICE[abi_x86_32] - x11-libs/libSM[abi_x86_32] - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.10.ebuild b/app-emulation/wine/wine-1.7.10.ebuild index 433e26f72f3a..2400c98548fa 100644 --- a/app-emulation/wine/wine-1.7.10.ebuild +++ b/app-emulation/wine/wine-1.7.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.10.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.11.ebuild b/app-emulation/wine/wine-1.7.11.ebuild index 223c9cd317b2..b6265052d4d8 100644 --- a/app-emulation/wine/wine-1.7.11.ebuild +++ b/app-emulation/wine/wine-1.7.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.11.ebuild,v 1.3 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.12.ebuild b/app-emulation/wine/wine-1.7.12.ebuild index fd25be32d332..d22005a6e096 100644 --- a/app-emulation/wine/wine-1.7.12.ebuild +++ b/app-emulation/wine/wine-1.7.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.12.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.13.ebuild b/app-emulation/wine/wine-1.7.13.ebuild index 2c4186ad27a1..5ca8e8af32aa 100644 --- a/app-emulation/wine/wine-1.7.13.ebuild +++ b/app-emulation/wine/wine-1.7.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.13.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.14.ebuild b/app-emulation/wine/wine-1.7.14.ebuild index 372470a76651..c47a63911148 100644 --- a/app-emulation/wine/wine-1.7.14.ebuild +++ b/app-emulation/wine/wine-1.7.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.1 2014/03/08 04:35:53 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.14.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.15.ebuild b/app-emulation/wine/wine-1.7.15.ebuild index 8288f26bd0df..6487438cfae4 100644 --- a/app-emulation/wine/wine-1.7.15.ebuild +++ b/app-emulation/wine/wine-1.7.15.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.1 2014/03/23 05:30:35 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.15.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.16.ebuild b/app-emulation/wine/wine-1.7.16.ebuild index 09b9e4c17db9..25199b490243 100644 --- a/app-emulation/wine/wine-1.7.16.ebuild +++ b/app-emulation/wine/wine-1.7.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.1 2014/04/05 19:16:41 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.16.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.17.ebuild b/app-emulation/wine/wine-1.7.17.ebuild index ad1ec60e9b19..85c25c2eae2b 100644 --- a/app-emulation/wine/wine-1.7.17.ebuild +++ b/app-emulation/wine/wine-1.7.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.1 2014/04/19 18:57:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.17.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.18.ebuild b/app-emulation/wine/wine-1.7.18.ebuild index db4b8d54d720..f2d15fb2828b 100644 --- a/app-emulation/wine/wine-1.7.18.ebuild +++ b/app-emulation/wine/wine-1.7.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.1 2014/05/04 01:23:57 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.18.ebuild,v 1.2 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild index e3aa550972b0..e8c1d05af430 100644 --- a/app-emulation/wine/wine-1.7.19-r1.ebuild +++ b/app-emulation/wine/wine-1.7.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.5 2014/06/15 13:59:29 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.6 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -102,131 +102,131 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] - >=media-libs/freetype-2.0.0[abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-libs/ncurses[abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] - sys-apps/dbus[abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - media-libs/fontconfig[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[abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] - media-libs/openal[abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( - media-libs/gstreamer:0.10[abi_x86_32(-)] - media-libs/gst-plugins-base:0.10[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,-abi_x86_32(-)] ( - x11-libs/libXcursor[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXrandr[abi_x86_32(-)] - x11-libs/libXi[abi_x86_32(-)] - x11-libs/libXxf86vm[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,-abi_x86_32(-)] - x11-libs/libXinerama[abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs - net-print/cups[abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) - opencl? ( virtual/opencl[abi_x86_32(-)] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - virtual/glu[abi_x86_32(-)] - virtual/opengl[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,-abi_x86_32(-)] - media-sound/gsm[abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - virtual/jpeg:0[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:=[abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/lcms:2[abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/mpg123-1.5.0[abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-devel/gettext[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:=[abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] - media-libs/mesa[osmesa,abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-apps/attr[abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - dev-libs/libxml2[abi_x86_32(-)] - dev-libs/libxslt[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,-abi_x86_32(-)] - media-gfx/sane-backends:=[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:=[abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/libpng:0[abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] - media-libs/libv4l[abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - x11-libs/libXcomposite[abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.20.ebuild b/app-emulation/wine/wine-1.7.20.ebuild index f5aa74823233..0852e2f2a60a 100644 --- a/app-emulation/wine/wine-1.7.20.ebuild +++ b/app-emulation/wine/wine-1.7.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.1 2014/06/16 12:08:06 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.20.ebuild,v 1.2 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -104,132 +104,132 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] - >=media-libs/freetype-2.0.0[abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-libs/ncurses[abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] - sys-apps/dbus[abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - media-libs/fontconfig[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[abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] - media-libs/openal[abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( - media-libs/gstreamer:0.10[abi_x86_32(-)] - media-libs/gst-plugins-base:0.10[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,-abi_x86_32(-)] ( - x11-libs/libXcursor[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXrandr[abi_x86_32(-)] - x11-libs/libXi[abi_x86_32(-)] - x11-libs/libXxf86vm[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,-abi_x86_32(-)] - x11-libs/libXinerama[abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs - net-print/cups[abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) - opencl? ( virtual/opencl[abi_x86_32(-)] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - virtual/glu[abi_x86_32(-)] - virtual/opengl[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,-abi_x86_32(-)] - media-sound/gsm[abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - virtual/jpeg:0[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:=[abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/lcms:2[abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/mpg123-1.5.0[abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) - netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)] ) + netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-devel/gettext[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:=[abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] - media-libs/mesa[osmesa,abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-apps/attr[abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - dev-libs/libxml2[abi_x86_32(-)] - dev-libs/libxslt[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,-abi_x86_32(-)] - media-gfx/sane-backends:=[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:=[abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/libpng:0[abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] - media-libs/libv4l[abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - x11-libs/libXcomposite[abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.3.ebuild b/app-emulation/wine/wine-1.7.3.ebuild index 96aa14d94a10..9895e4a67472 100644 --- a/app-emulation/wine/wine-1.7.3.ebuild +++ b/app-emulation/wine/wine-1.7.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.5 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.3.ebuild,v 1.6 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -97,26 +97,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -125,80 +125,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.4.ebuild b/app-emulation/wine/wine-1.7.4.ebuild index 84a6e627a0b3..a82a786e891d 100644 --- a/app-emulation/wine/wine-1.7.4.ebuild +++ b/app-emulation/wine/wine-1.7.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.6 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.4.ebuild,v 1.7 2014/06/18 19:08:47 mgorny Exp $ EAPI="5" @@ -97,26 +97,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -125,80 +125,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.8.ebuild b/app-emulation/wine/wine-1.7.8.ebuild index 8bb0161dd257..6602d30b9403 100644 --- a/app-emulation/wine/wine-1.7.8.ebuild +++ b/app-emulation/wine/wine-1.7.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.4 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.8.ebuild,v 1.5 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-1.7.9.ebuild b/app-emulation/wine/wine-1.7.9.ebuild index 066f0963cfbd..a9cb36378c9f 100644 --- a/app-emulation/wine/wine-1.7.9.ebuild +++ b/app-emulation/wine/wine-1.7.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.2 2014/03/04 06:10:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.9.ebuild,v 1.3 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -98,26 +98,26 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=media-libs/freetype-2.5.0.1[abi_x86_32] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + >=sys-libs/ncurses-5.9-r3[abi_x86_32] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + >=media-libs/fontconfig-2.10.92[abi_x86_32] ) ) gphoto2? ( app-emulation/emul-linux-x86-medialibs[development] ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + >=media-libs/openal-1.15.1[abi_x86_32] ) ) gstreamer? ( app-emulation/emul-linux-x86-gstplugins @@ -126,80 +126,80 @@ COMMON_DEPEND=" X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( - x11-libs/libXcursor[abi_x86_32] - x11-libs/libXext[abi_x86_32] - x11-libs/libXrandr[abi_x86_32] - x11-libs/libXi[abi_x86_32] - x11-libs/libXxf86vm[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[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[abi_x86_32] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32] ) ) cups? ( app-emulation/emul-linux-x86-baselibs ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development] ( - virtual/glu[abi_x86_32] - virtual/opengl[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[abi_x86_32] + >=media-sound/gsm-1.0.13-r1[abi_x86_32] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + >=virtual/jpeg-0-r2:0[abi_x86_32] ) ) ldap? ( app-emulation/emul-linux-x86-baselibs[development] ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + >=media-libs/lcms-2.5:2[abi_x86_32] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + >=media-sound/mpg123-1.15.4[abi_x86_32] ) ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + >=sys-devel/gettext-0.18.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[osmesa,abi_x86_32] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + >=media-sound/pulseaudio-5.0[abi_x86_32] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[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] ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + >=media-libs/libpng-1.6.10:0[abi_x86_32] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + >=media-libs/libv4l-0.9.5[abi_x86_32] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32] ) ) ) )" diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index f348eba71dd1..a27582124bcd 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.170 2014/06/16 12:08:06 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.171 2014/06/18 19:08:46 mgorny Exp $ EAPI="5" @@ -104,132 +104,132 @@ COMMON_DEPEND=" abi_x86_32? ( truetype? ( || ( >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] - >=media-libs/freetype-2.0.0[abi_x86_32(-)] + >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] ) ) ncurses? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-libs/ncurses[abi_x86_32(-)] + >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] ) ) udisks? ( || ( >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] - sys-apps/dbus[abi_x86_32(-)] + >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)] ) ) fontconfig? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - media-libs/fontconfig[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[abi_x86_32(-)] + >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)] ) ) openal? ( || ( app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] - media-libs/openal[abi_x86_32(-)] + >=media-libs/openal-1.15.1[abi_x86_32(-)] ) ) gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] ( - media-libs/gstreamer:0.10[abi_x86_32(-)] - media-libs/gst-plugins-base:0.10[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,-abi_x86_32(-)] ( - x11-libs/libXcursor[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/libXrandr[abi_x86_32(-)] - x11-libs/libXi[abi_x86_32(-)] - x11-libs/libXxf86vm[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,-abi_x86_32(-)] - x11-libs/libXinerama[abi_x86_32(-)] + >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] ) ) alsa? ( || ( app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs - net-print/cups[abi_x86_32(-)] + >=net-print/cups-1.7.1-r1[abi_x86_32(-)] ) ) - opencl? ( virtual/opencl[abi_x86_32(-)] ) + opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] ) opengl? ( || ( app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - virtual/glu[abi_x86_32(-)] - virtual/opengl[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,-abi_x86_32(-)] - media-sound/gsm[abi_x86_32(-)] + >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) ) jpeg? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - virtual/jpeg:0[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:=[abi_x86_32(-)] + >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)] ) ) lcms? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/lcms:2[abi_x86_32(-)] + >=media-libs/lcms-2.5:2[abi_x86_32(-)] ) ) mp3? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/mpg123-1.5.0[abi_x86_32(-)] + >=media-sound/mpg123-1.15.4[abi_x86_32(-)] ) ) - netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)] ) + netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] ) nls? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-devel/gettext[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:=[abi_x86_32(-)] + >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)] ) ) osmesa? ( || ( >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] - media-libs/mesa[osmesa,abi_x86_32(-)] + >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - sys-apps/attr[abi_x86_32(-)] + >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] ) ) pulseaudio? ( || ( app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] + >=media-sound/pulseaudio-5.0[abi_x86_32(-)] ) ) xml? ( || ( >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - dev-libs/libxml2[abi_x86_32(-)] - dev-libs/libxslt[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,-abi_x86_32(-)] - media-gfx/sane-backends:=[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:=[abi_x86_32(-)] + >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)] ) ) png? ( || ( app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - media-libs/libpng:0[abi_x86_32(-)] + >=media-libs/libpng-1.6.10:0[abi_x86_32(-)] ) ) v4l? ( || ( app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] - media-libs/libv4l[abi_x86_32(-)] + >=media-libs/libv4l-0.9.5[abi_x86_32(-)] ) ) xcomposite? ( || ( app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] - x11-libs/libXcomposite[abi_x86_32(-)] + >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)] ) ) ) )" |