mgorny 14/06/15 13:59:29 Modified: wine-1.7.19-r1.ebuild ChangeLog Log: Disallow mixing of emul-linux-x86 with multilib dependencies, since all dependencies are unmasked now. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.5 app-emulation/wine/wine-1.7.19-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild?r1=1.4&r2=1.5 Index: wine-1.7.19-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wine-1.7.19-r1.ebuild 12 Jun 2014 14:30:41 -0000 1.4 +++ wine-1.7.19-r1.ebuild 15 Jun 2014 13:59:29 -0000 1.5 @@ -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.4 2014/06/12 14:30:41 mgorny Exp $ +# $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 $ EAPI="5" @@ -101,132 +101,132 @@ abi_x86_64? ( ${NATIVE_DEPEND} ) abi_x86_32? ( truetype? ( || ( - >=app-emulation/emul-linux-x86-xlibs-2.1[development] - >=media-libs/freetype-2.0.0[abi_x86_32] + >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] ) ) ncurses? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - sys-libs/ncurses[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + sys-libs/ncurses[abi_x86_32(-)] ) ) udisks? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20130224[development] - sys-apps/dbus[abi_x86_32] + >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)] + sys-apps/dbus[abi_x86_32(-)] ) ) fontconfig? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - media-libs/fontconfig[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + media-libs/fontconfig[abi_x86_32(-)] ) ) gphoto2? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - media-libs/libgphoto2[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + media-libs/libgphoto2[abi_x86_32(-)] ) ) openal? ( || ( - app-emulation/emul-linux-x86-sdl[development] - media-libs/openal[abi_x86_32] + app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)] + media-libs/openal[abi_x86_32(-)] ) ) gstreamer? ( || ( - app-emulation/emul-linux-x86-medialibs[development] + 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[abi_x86_32(-)] + media-libs/gst-plugins-base:0.10[abi_x86_32(-)] ) ) ) X? ( || ( - app-emulation/emul-linux-x86-xlibs[development] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] ( - x11-libs/libXcursor[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[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(-)] ) ) ) xinerama? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXinerama[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + x11-libs/libXinerama[abi_x86_32(-)] ) ) alsa? ( || ( - app-emulation/emul-linux-x86-soundlibs[alsa,development] - media-libs/alsa-lib[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)] + media-libs/alsa-lib[abi_x86_32(-)] ) ) cups? ( || ( app-emulation/emul-linux-x86-baselibs - net-print/cups[abi_x86_32] + net-print/cups[abi_x86_32(-)] ) ) - opencl? ( virtual/opencl[abi_x86_32] ) + opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( || ( - app-emulation/emul-linux-x86-opengl[development] + app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)] ( - virtual/glu[abi_x86_32] - virtual/opengl[abi_x86_32] + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) ) ) gsm? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - media-sound/gsm[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + media-sound/gsm[abi_x86_32(-)] ) ) jpeg? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - virtual/jpeg:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + virtual/jpeg:0[abi_x86_32(-)] ) ) ldap? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - net-nds/openldap:=[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + net-nds/openldap:=[abi_x86_32(-)] ) ) lcms? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - media-libs/lcms:2[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + media-libs/lcms:2[abi_x86_32(-)] ) ) mp3? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/mpg123-1.5.0[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) ) nls? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - sys-devel/gettext[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + sys-devel/gettext[abi_x86_32(-)] ) ) odbc? ( || ( - app-emulation/emul-linux-x86-db[development] - dev-db/unixODBC:=[abi_x86_32] + app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)] + dev-db/unixODBC:=[abi_x86_32(-)] ) ) osmesa? ( || ( - >=app-emulation/emul-linux-x86-opengl-20121028[development] - media-libs/mesa[osmesa,abi_x86_32] + >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)] + media-libs/mesa[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - sys-apps/attr[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + sys-apps/attr[abi_x86_32(-)] ) ) pulseaudio? ( || ( - app-emulation/emul-linux-x86-soundlibs[development] - >=media-sound/pulseaudio-4.0-r1[abi_x86_32] + app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)] + >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] ) ) xml? ( || ( - >=app-emulation/emul-linux-x86-baselibs-20131008[development] + >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)] ( - dev-libs/libxml2[abi_x86_32] - dev-libs/libxslt[abi_x86_32] + dev-libs/libxml2[abi_x86_32(-)] + dev-libs/libxslt[abi_x86_32(-)] ) ) ) scanner? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - media-gfx/sane-backends:=[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + media-gfx/sane-backends:=[abi_x86_32(-)] ) ) ssl? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - net-libs/gnutls:=[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + net-libs/gnutls:=[abi_x86_32(-)] ) ) png? ( || ( - app-emulation/emul-linux-x86-baselibs[development] - media-libs/libpng:0[abi_x86_32] + app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] + media-libs/libpng:0[abi_x86_32(-)] ) ) v4l? ( || ( - app-emulation/emul-linux-x86-medialibs[development] - media-libs/libv4l[abi_x86_32] + app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)] + media-libs/libv4l[abi_x86_32(-)] ) ) xcomposite? ( || ( - app-emulation/emul-linux-x86-xlibs[development] - x11-libs/libXcomposite[abi_x86_32] + app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)] + x11-libs/libXcomposite[abi_x86_32(-)] ) ) ) )" 1.513 app-emulation/wine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.513&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?rev=1.513&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/ChangeLog?r1=1.512&r2=1.513 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v retrieving revision 1.512 retrieving revision 1.513 diff -u -r1.512 -r1.513 --- ChangeLog 12 Jun 2014 14:30:41 -0000 1.512 +++ ChangeLog 15 Jun 2014 13:59:29 -0000 1.513 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.512 2014/06/12 14:30:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.513 2014/06/15 13:59:29 mgorny Exp $ + + 15 Jun 2014; Michał Górny <[email protected]> wine-1.7.19-r1.ebuild: + Disallow mixing of emul-linux-x86 with multilib dependencies, since all + dependencies are unmasked now. 12 Jun 2014; Michał Górny <[email protected]> wine-1.7.19-r1.ebuild, wine-9999.ebuild:
