summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-16 16:27:07 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-16 16:27:07 +0100
commita81c5c251ec00b4354daf651ef95aed9ef08d7b4 (patch)
tree5cf3c84f374c7765533a7aeffc0e69edc8f78725
parentff5af43ada88b9c3dbc4e771c155f2dde699d8da (diff)
x11-base/xwayland : use Gentoo's package
-rw-r--r--metadata/md5-cache/x11-base/xwayland-22.1.3-r10015
-rw-r--r--metadata/pkg_desc_index1
-rw-r--r--x11-base/xwayland/Manifest1
-rw-r--r--x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch27
-rw-r--r--x11-base/xwayland/xwayland-22.1.3-r100.ebuild99
5 files changed, 0 insertions, 143 deletions
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.3-r100 b/metadata/md5-cache/x11-base/xwayland-22.1.3-r100
deleted file mode 100644
index e8f6b87b..00000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.3-r100
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) amd64? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) amd64? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.3.tar.xz
-_eclasses_=meson 1994a5aef5d4f5798b92f64d6f9a6003 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 python-utils-r1 b9fc5e97e886514e5132f50465185401 toolchain-funcs 441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c5620a968b5f5778d4cb21e9176747e0
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 15fbac05..7af7856e 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -78,7 +78,6 @@ virtual/tmpfiles 1.314.1337: Virtual to select between different tmpfiles.d hand
virtual/udev 314.1337: Virtual to select between different udev daemon providers
x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
x11-base/xorg-server 21.1.4-r100: X.Org X servers
-x11-base/xwayland 22.1.3-r100: Standalone X server running under Wayland
x11-drivers/nvidia-drivers 390.154 470.141.03: NVIDIA Accelerated Graphics Driver
x11-libs/gtk+ 2.24.33-r10 3.24.29-r10: Gimp ToolKit +
x11-libs/libX11 1.8.1-r1: X.Org X11 library
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
deleted file mode 100644
index d364df26..00000000
--- a/x11-base/xwayland/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
deleted file mode 100644
index 39e0548e..00000000
--- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/dix/meson.build b/dix/meson.build
-index ddc5cc3..bf5bfa3 100644
---- a/dix/meson.build
-+++ b/dix/meson.build
-@@ -56,8 +56,3 @@ libxserver_main = static_library('libxserver_main',
- include_directories: inc,
- dependencies: common_dep,
- )
--
--install_data(
-- 'protocol.txt',
-- install_dir: serverconfigdir,
--)
-diff --git a/meson.build b/meson.build
-index 4af03ef..791465d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -520,9 +520,3 @@ subdir('hw')
- if host_machine.system() != 'windows'
- subdir('test')
- endif
--
--install_man(configure_file(
-- input: 'man/Xserver.man',
-- output: 'Xserver.1',
-- configuration: manpage_config,
--))
diff --git a/x11-base/xwayland/xwayland-22.1.3-r100.ebuild b/x11-base/xwayland/xwayland-22.1.3-r100.ebuild
deleted file mode 100644
index 1811e604..00000000
--- a/x11-base/xwayland/xwayland-22.1.3-r100.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="selinux unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- dev-libs/libbsd
- dev-libs/openssl:=
- >=dev-libs/wayland-1.20
- >=dev-libs/wayland-protocols-1.22
- media-fonts/font-util
- >=media-libs/libepoxy-1.5.4[X,egl(+)]
- media-libs/libglvnd[X]
- >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
- >=x11-libs/libdrm-2.4.89
- >=x11-libs/libXau-1.0.4
- x11-libs/libxcvt
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont2-2.0.1
- x11-libs/libxkbfile
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-misc/xkeyboard-config-2.4.1-r3
-
- unwind? ( sys-libs/libunwind )
- amd64? ( gui-libs/egl-wayland )
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-base/xorg-proto
- >=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
- ${COMMON_DEPEND}
- x11-apps/xkbcomp
- !<=x11-base/xorg-server-1.20.11
- selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
- sys-devel/flex
- dev-util/wayland-scanner
-"
-
-PATCHES=(
- "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_use selinux xselinux)
- $(meson_use unwind libunwind)
- $(meson_use xcsecurity)
- -Ddpms=true
- -Ddri3=true
- -Ddrm=true
- -Ddtrace=false
- -Dglamor=true
- -Dglx=true
- -Dipv6=true
- -Dsecure-rpc=false
- -Dscreensaver=true
- -Dsha1=libcrypto
- -Dxace=true
- -Dxdmcp=true
- -Dxinerama=true
- -Dxvfb=true
- -Dxv=true
- -Dxwayland-path="${EPREFIX}"/usr/bin
- -Ddocs=false
- -Ddevel-docs=false
- -Ddocs-pdf=false
- )
-
- if use amd64; then
- local emesonargs+=(
- -Dxwayland_eglstream=true
- )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- dosym ../bin/Xwayland /usr/libexec/Xwayland
-
- meson_src_install
-}