diff options
author | Nick Sarnie <sarnex@gentoo.org> | 2018-04-30 21:35:55 -0400 |
---|---|---|
committer | Nick Sarnie <sarnex@gentoo.org> | 2018-04-30 21:48:50 -0400 |
commit | b3623c7de70bde5fc101acd5148598b09e7947e8 (patch) | |
tree | 4a3b82ec6f699854f496421092807ee4251bedf4 | |
parent | app-emulation/wine-staging: Bump to 3.7 (diff) | |
download | wine-b3623c7d.tar.gz wine-b3623c7d.tar.bz2 wine-b3623c7d.zip |
app-emulation/wine-any: Sync with ::gentoo
Package-Manager: Portage-2.3.31, Repoman-2.3.9
23 files changed, 45 insertions, 485 deletions
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml index 8786a15..35b3090 100644 --- a/app-emulation/wine-any/metadata.xml +++ b/app-emulation/wine-any/metadata.xml @@ -11,7 +11,7 @@ </maintainer> <maintainer type="person"> <description>Only CC on bugs that involve USE="d3d9"</description> - <email>commendsarnex@gmail.com</email> + <email>sarnex@gentoo.org</email> <name>Nick Sarnie</name> </maintainer> <longdescription> diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild index bf410a0..52aa80d 100644 --- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.1-r1.ebuild b/app-emulation/wine-any/wine-any-2.1-r1.ebuild index 761bde3..63197a4 100644 --- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.1-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.10-r1.ebuild b/app-emulation/wine-any/wine-any-2.10-r1.ebuild index 8a42d25..f27f48f 100644 --- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.11-r1.ebuild b/app-emulation/wine-any/wine-any-2.11-r1.ebuild index 8a42d25..f27f48f 100644 --- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.12-r1.ebuild b/app-emulation/wine-any/wine-any-2.12-r1.ebuild index 8a42d25..f27f48f 100644 --- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.13-r1.ebuild b/app-emulation/wine-any/wine-any-2.13-r1.ebuild index 8a42d25..f27f48f 100644 --- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.14-r1.ebuild b/app-emulation/wine-any/wine-any-2.14-r1.ebuild index 9b14637..fd52f18 100644 --- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.15-r1.ebuild b/app-emulation/wine-any/wine-any-2.15-r1.ebuild index 9b14637..fd52f18 100644 --- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.16-r1.ebuild b/app-emulation/wine-any/wine-any-2.16-r1.ebuild index 9b14637..fd52f18 100644 --- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild index 9b14637..fd52f18 100644 --- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild index bdbe5cc..d0b16c4 100644 --- a/app-emulation/wine-any/wine-any-2.18.ebuild +++ b/app-emulation/wine-any/wine-any-2.18.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild index bdbe5cc..d0b16c4 100644 --- a/app-emulation/wine-any/wine-any-2.19.ebuild +++ b/app-emulation/wine-any/wine-any-2.19.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild index dfe4cca..913e3e1 100644 --- a/app-emulation/wine-any/wine-any-2.20.ebuild +++ b/app-emulation/wine-any/wine-any-2.20.ebuild @@ -125,22 +125,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -168,17 +152,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild index dfe4cca..913e3e1 100644 --- a/app-emulation/wine-any/wine-any-2.21.ebuild +++ b/app-emulation/wine-any/wine-any-2.21.ebuild @@ -125,22 +125,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -168,17 +152,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.3-r1.ebuild b/app-emulation/wine-any/wine-any-2.3-r1.ebuild index 761bde3..63197a4 100644 --- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.4-r1.ebuild b/app-emulation/wine-any/wine-any-2.4-r1.ebuild index 84b3e09..0f1f7ac 100644 --- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.4-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.5-r1.ebuild b/app-emulation/wine-any/wine-any-2.5-r1.ebuild index 84b3e09..0f1f7ac 100644 --- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.5-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.6-r1.ebuild b/app-emulation/wine-any/wine-any-2.6-r1.ebuild index 84b3e09..0f1f7ac 100644 --- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.6-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.7-r1.ebuild b/app-emulation/wine-any/wine-any-2.7-r1.ebuild index 84b3e09..0f1f7ac 100644 --- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.7-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.8-r1.ebuild b/app-emulation/wine-any/wine-any-2.8-r1.ebuild index 84b3e09..0f1f7ac 100644 --- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.8-r1.ebuild @@ -123,22 +123,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -166,17 +150,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-2.9-r1.ebuild b/app-emulation/wine-any/wine-any-2.9-r1.ebuild index 8a42d25..f27f48f 100644 --- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild @@ -124,22 +124,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -167,17 +151,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index 351fee6..d868884 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -127,22 +127,6 @@ COMMON_DEPEND=" xml? ( dev-libs/libxml2[${MULTILIB_USEDEP}] dev-libs/libxslt[${MULTILIB_USEDEP}] - ) - abi_x86_32? ( - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-baselibs-20140508-r14 - !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-db-20140508-r3 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-medialibs-20140508-r6 - !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-opengl-20140508-r1 - !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-sdl-20140508-r1 - !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-soundlibs-20140508 - !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - !<app-emulation/emul-linux-x86-xlibs-20140508 )" RDEPEND="${COMMON_DEPEND} @@ -170,17 +154,13 @@ DEPEND="${COMMON_DEPEND} >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc - X? ( - x11-proto/inputproto - x11-proto/xextproto - x11-proto/xf86vidmodeproto - ) + X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) - xinerama? ( x11-proto/xineramaproto )" + xinerama? ( x11-base/xorg-proto )" # These use a non-standard "Wine" category, which is provided by # /etc/xdg/applications-merged/wine.menu |