commit: fd2d0b360f907df15845719e5f48c33e152d7e9c Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Mon Mar 29 15:53:01 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 15 00:42:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2d0b36
media-libs/waffle: Put X11 packages behind existing USE=X And since mesa is a dependency, virtual/opengl is removed. Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> Closes: https://github.com/gentoo/gentoo/pull/20182 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/waffle/waffle-1.7.0.ebuild | 9 +++++---- media-libs/waffle/waffle-9999.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild index a3d7588a87d..1a2174a6add 100644 --- a/media-libs/waffle/waffle-1.7.0.ebuild +++ b/media-libs/waffle/waffle-1.7.0.ebuild @@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage RDEPEND=" >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + ) gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] + X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] ) " BDEPEND=" dev-libs/libxslt diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild index a3d7588a87d..1a2174a6add 100644 --- a/media-libs/waffle/waffle-9999.ebuild +++ b/media-libs/waffle/waffle-9999.ebuild @@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage RDEPEND=" >=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] + ) gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} - >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] + X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] ) " BDEPEND=" dev-libs/libxslt
