Gentoo Archives: gentoo-commits

From: Piotr Karbowski <slashbeast@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/
Date: Sat, 03 Jul 2021 20:07:18
Message-Id: 1625342832.e767293c245f83d8981f2122acc0178656f6daba.slashbeast@gentoo
1 commit: e767293c245f83d8981f2122acc0178656f6daba
2 Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 3 20:02:32 2021 +0000
4 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 3 20:07:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e767293c
7
8 x11-base/xwayland: align ebuilds.
9
10 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
11
12 x11-base/xwayland/xwayland-21.1.1-r1.ebuild | 3 ++-
13 x11-base/xwayland/xwayland-21.1.1.901.ebuild | 2 +-
14 2 files changed, 3 insertions(+), 2 deletions(-)
15
16 diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
17 index b5ace4e02ae..f9966135b1c 100644
18 --- a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
19 +++ b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
20 @@ -19,6 +19,7 @@ CDEPEND="
21 >=x11-libs/pixman-0.27.2
22 dev-libs/libbsd
23 >=x11-libs/libXfont2-2.0.1
24 + dev-libs/openssl:=
25 dev-libs/wayland
26 >=x11-libs/libXdmcp-1.0.2
27 >=x11-libs/libdrm-2.4.89
28 @@ -72,7 +73,7 @@ src_configure() {
29 -Dxinerama=true
30 -Dxv=true
31 -Dxvfb=true
32 - -Dxwayland-path=/usr/libexec
33 + -Dxwayland-path="${EPREFIX}"/usr/libexec
34 -Ddtrace=false
35 )
36
37
38 diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
39 index 2727dab21fa..2814cbf9058 100644
40 --- a/x11-base/xwayland/xwayland-21.1.1.901.ebuild
41 +++ b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
42 @@ -13,7 +13,7 @@ IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
43
44 LICENSE="MIT"
45 SLOT="0"
46 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
47 +KEYWORDS=""
48
49 CDEPEND="
50 >=x11-libs/pixman-0.27.2