From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE90A1382C5 for ; Thu, 15 Apr 2021 00:43:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 031B4E07AE; Thu, 15 Apr 2021 00:43:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9FBEE07AE for ; Thu, 15 Apr 2021 00:43:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA22B335D07 for ; Thu, 15 Apr 2021 00:43:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 161FD645 for ; Thu, 15 Apr 2021 00:43:27 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1618447352.fd2d0b360f907df15845719e5f48c33e152d7e9c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/waffle/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/waffle/waffle-1.7.0.ebuild media-libs/waffle/waffle-9999.ebuild X-VCS-Directories: media-libs/waffle/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: fd2d0b360f907df15845719e5f48c33e152d7e9c X-VCS-Branch: master Date: Thu, 15 Apr 2021 00:43:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4dbb3f7d-abf1-4645-b56c-f8a1db1615cf X-Archives-Hash: 47fb2106ec03fef6343687440ed3ea77 commit: fd2d0b360f907df15845719e5f48c33e152d7e9c Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Mon Mar 29 15:53:01 2021 +0000 Commit: Matt Turner gentoo 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 hacktivis.me> Closes: https://github.com/gentoo/gentoo/pull/20182 Signed-off-by: Matt Turner 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