diff options
| -rw-r--r-- | metadata/md5-cache/x11-base/xorg-server-21.1.3-r100 | 18 | ||||
| -rw-r--r-- | metadata/md5-cache/x11-base/xorg-server-21.1.4-r100 | 18 | ||||
| -rw-r--r-- | metadata/pkg_desc_index | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild) | 33 |
5 files changed, 39 insertions, 34 deletions
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r100 b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r100 deleted file mode 100644 index 99280d39..00000000 --- a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r100 +++ /dev/null @@ -1,18 +0,0 @@ -BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util -DESCRIPTION=X.Org X servers -EAPI=7 -HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server -INHERIT=xorg-3 meson -IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=MIT -PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 ) -RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 ) -REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) -RESTRICT=!test? ( test ) -SLOT=0/21.1.3 -SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.3.tar.xz -_eclasses_=autotools 2fd69a56a527d12409ba43c733b7ac8f eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic a3abd6002fafb3022597be6b8d01f88b gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e meson 2cc95670908abda0d67e9e16a6b4341e multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 python-utils-r1 32313e7e2fbfba8f62a99ef923fc923c strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb wrapper 4a1902f969e5718126434fc35f3a0d9c xorg-3 d2463997f7fda5cfc20b4c390039a361 -_md5_=0fb12c81d90163b153eb26189e54d6e7 diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.4-r100 b/metadata/md5-cache/x11-base/xorg-server-21.1.4-r100 new file mode 100644 index 00000000..8d3b7cc7 --- /dev/null +++ b/metadata/md5-cache/x11-base/xorg-server-21.1.4-r100 @@ -0,0 +1,18 @@ +BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 ) +DESCRIPTION=X.Org X servers +EAPI=8 +HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server +INHERIT=xorg-3 meson +IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=MIT +PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 ) +RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) +RESTRICT=!test? ( test ) +SLOT=0/21.1.4 +SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.4.tar.xz +_eclasses_=autotools 2fd69a56a527d12409ba43c733b7ac8f flag-o-matic a3abd6002fafb3022597be6b8d01f88b gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e meson 2cc95670908abda0d67e9e16a6b4341e multilib 4fbbbc98f236f1b43acd99476bc3cd85 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 58ec4e54962bf45d065fb95030701514 python-utils-r1 32313e7e2fbfba8f62a99ef923fc923c toolchain-funcs e9da88162e7a3c60376e80c2c2adcdfb xorg-3 d2463997f7fda5cfc20b4c390039a361 +_md5_=c655734c755ede816d4e1ee9de4d2170 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 9d943936..ff0a1cce 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -84,7 +84,7 @@ virtual/rust 100: Virtual for Rust language compiler virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers virtual/udev 1000: 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.3-r100: X.Org X servers +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 470.103.01: NVIDIA Accelerated Graphics Driver x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 1d987c68..253c3b83 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b +DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild index 71b9d8d0..bc871a95 100644 --- a/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" @@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="xephyr xnest xorg xvfb" @@ -31,14 +31,18 @@ CDEPEND=" >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 - >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 - >=x11-libs/libXext-1.0.5 - x11-libs/libXv + xorg? ( + >=x11-libs/libxcvt-0.1.0 + ) + xnest? ( + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libX11-1.1.5 + ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util @@ -48,14 +52,15 @@ CDEPEND=" x11-libs/xcb-util-wm ) !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - selinux? ( sys-libs/libselinux ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -65,11 +70,13 @@ CDEPEND=" sys-auth/elogind[pam] sys-auth/pambase[elogind] ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] " DEPEND="${CDEPEND} >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util + test? ( >=x11-libs/libxcvt-0.1.0 ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -88,9 +95,6 @@ REQUIRED_USE="!minimal? ( elogind? ( udev ) ?? ( elogind systemd )" -UPSTREAMED_PATCHES=( -) - PATCHES=( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch @@ -117,6 +121,7 @@ src_configure() { $(meson_use udev udev_kms) $(meson_use unwind libunwind) $(meson_use xcsecurity) + $(meson_use selinux xselinux) $(meson_use xephyr) $(meson_use xnest) $(meson_use xorg) @@ -157,7 +162,7 @@ src_install() { meson_src_install # The meson build system does not support install-setuid - if ! use systemd || ! use elogind; then + if ! use systemd && ! use elogind; then if use suid; then chmod u+s "${ED}"/usr/bin/Xorg fi |