commit: 479766b5a174ed233a787e200949bfc3408f5389 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Mon Apr 30 02:14:17 2018 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Mon Apr 30 02:16:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=479766b5
app-emulation/wine-staging: Sync with ::gentoo Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../wine-staging/wine-staging-2.0-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.1-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.10-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.11-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.12-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.13-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.14-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.15-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.16-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.17-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.18.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.19.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.2-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.20.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.21.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.3-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.4-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.5-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.6-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.7-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.8-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-2.9-r1.ebuild | 24 ++-------------------- .../wine-staging/wine-staging-9999.ebuild | 24 ++-------------------- 23 files changed, 46 insertions(+), 506 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild index 22f656f..2eb9fbd 100644 --- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.1-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild index 57930a0..f046389 100644 --- a/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.1-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.10-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild index 95e9e2e..8aaef30 100644 --- a/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.10-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.11-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild index 95e9e2e..8aaef30 100644 --- a/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.11-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.12-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild index 95e9e2e..8aaef30 100644 --- a/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.12-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.13-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild index 95e9e2e..8aaef30 100644 --- a/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.13-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.14-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild index 9352d87..aca612b 100644 --- a/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.14-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.15-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild index 9352d87..aca612b 100644 --- a/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.15-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.16-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild index 9352d87..aca612b 100644 --- a/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.16-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.17-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild index 9352d87..aca612b 100644 --- a/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.17-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.18.ebuild b/app-emulation/wine-staging/wine-staging-2.18.ebuild index bc67087..933b53a 100644 --- a/app-emulation/wine-staging/wine-staging-2.18.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.18.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild index bc67087..933b53a 100644 --- a/app-emulation/wine-staging/wine-staging-2.19.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-2.2-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild index 57930a0..f046389 100644 --- a/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.2-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild index 9454c3d..e3bcca8 100644 --- a/app-emulation/wine-staging/wine-staging-2.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild @@ -115,22 +115,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} @@ -158,17 +142,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-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild index 9454c3d..e3bcca8 100644 --- a/app-emulation/wine-staging/wine-staging-2.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild @@ -115,22 +115,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} @@ -158,17 +142,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-staging/wine-staging-2.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild index 57930a0..f046389 100644 --- a/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.3-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.4-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild index 347c76d..1e58470 100644 --- a/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.4-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild index 347c76d..1e58470 100644 --- a/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.5-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.6-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild index 347c76d..1e58470 100644 --- a/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.6-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.7-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild index 347c76d..1e58470 100644 --- a/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.7-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.8-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild index 347c76d..1e58470 100644 --- a/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.8-r1.ebuild @@ -113,22 +113,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} @@ -156,17 +140,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-staging/wine-staging-2.9-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild index 95e9e2e..8aaef30 100644 --- a/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-2.9-r1.ebuild @@ -114,22 +114,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} @@ -157,17 +141,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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 477b896..fd41d6c 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -117,22 +117,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} @@ -160,17 +144,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