1 |
commit: fd2d0b360f907df15845719e5f48c33e152d7e9c |
2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
3 |
AuthorDate: Mon Mar 29 15:53:01 2021 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 15 00:42:32 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2d0b36 |
7 |
|
8 |
media-libs/waffle: Put X11 packages behind existing USE=X |
9 |
|
10 |
And since mesa is a dependency, virtual/opengl is removed. |
11 |
|
12 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/20182 |
14 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
15 |
|
16 |
media-libs/waffle/waffle-1.7.0.ebuild | 9 +++++---- |
17 |
media-libs/waffle/waffle-9999.ebuild | 9 +++++---- |
18 |
2 files changed, 10 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild |
21 |
index a3d7588a87d..1a2174a6add 100644 |
22 |
--- a/media-libs/waffle/waffle-1.7.0.ebuild |
23 |
+++ b/media-libs/waffle/waffle-1.7.0.ebuild |
24 |
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage |
25 |
|
26 |
RDEPEND=" |
27 |
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] |
28 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
29 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
30 |
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
31 |
+ X? ( |
32 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
33 |
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
34 |
+ ) |
35 |
gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
36 |
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) |
37 |
" |
38 |
DEPEND="${RDEPEND} |
39 |
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] |
40 |
+ X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] ) |
41 |
" |
42 |
BDEPEND=" |
43 |
dev-libs/libxslt |
44 |
|
45 |
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild |
46 |
index a3d7588a87d..1a2174a6add 100644 |
47 |
--- a/media-libs/waffle/waffle-9999.ebuild |
48 |
+++ b/media-libs/waffle/waffle-9999.ebuild |
49 |
@@ -23,14 +23,15 @@ RESTRICT="test" # gl_basic tests don't work when run from portage |
50 |
|
51 |
RDEPEND=" |
52 |
>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}] |
53 |
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] |
54 |
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
55 |
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
56 |
+ X? ( |
57 |
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] |
58 |
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] |
59 |
+ ) |
60 |
gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) |
61 |
wayland? ( >=dev-libs/wayland-1.10[${MULTILIB_USEDEP}] ) |
62 |
" |
63 |
DEPEND="${RDEPEND} |
64 |
- >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] |
65 |
+ X? ( >=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}] ) |
66 |
" |
67 |
BDEPEND=" |
68 |
dev-libs/libxslt |