diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-29 15:22:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-29 15:22:55 +0100 |
commit | 3a2444aaf0bafd5c58c0dc8dda102352f20c76d8 (patch) | |
tree | 055720c0e02ac3f8bc4255b6740f18ba32db1c54 /x11-base/xorg-server | |
parent | b94ab464dd0d948b7e7eac833b9bb51c03515918 (diff) |
gentoo auto-resync : 29:09:2022 - 15:22:54
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/metadata.xml | 2 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild | 214 |
3 files changed, 1 insertions, 219 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 3021a32557cc..ccabe2fa440f 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -3,12 +3,10 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b AUX xorg-server-21.1.3-gcc12.patch 4223 BLAKE2B f38d002068286d8feae49ecc64640765f29bfbd95352835dd1dd908663515e5bc4febcfbe3b0f01605cca6919e816174a7f8f1f545e427d2d7a83be95012fd2f SHA512 7608d63af6f4ddce888be7e4a9997d816bcb289fb827671060b75af30810dabc866fd7b329bd5b70958dfdc0eb236434a71ea7a21cc87f057d2981a57bb4f72c AUX xorg-server-21.1.3-present-null-check.patch 1059 BLAKE2B 4702229922d575ed93d6b2f1545e7ab61cf8376edc6be5e29eeade32a4fa74b7cfa4e48c756ae0d6e5d149bcfab8ca8cc1d7385cf7d86c50a2231b0cec6bfc0d SHA512 2073221b5bd4226ac08a860081e332802139714dc4348cbdda3dc3909f9bdbdbb9e07aa75a4d7a5e568c334c81ff230ea0a82b343eaf0bd992b58253b6e9dfb5 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 -DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 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 -EBUILD xorg-server-1.20.14-r1.ebuild 5195 BLAKE2B 845754526068efc9d3e98256ce1d9a947a1533429416acd94b6025a86d7c4de4737177b8786a3238aee42e3f10314c42a00445dcad29caad6c94253fcfb9a1e0 SHA512 9615fbd48424508cec887368ed589857f80ad2087f63887529b3fa569a781c70aa7e1fa5a7d253c3731ca25db6da2f7cd9c9f9fd65f2eff66378412731dfcdc9 EBUILD xorg-server-21.1.3-r2.ebuild 4484 BLAKE2B 95ac43670df395fbd1c6ee31e7cc85d9b467be934e159eeab08e3b2638e16f7b4470065a6e20f4aa1829fc116882826e7252742a99c23038411dabeb097eee88 SHA512 0f180a3ec665f29436d978352846015a8046b1aca9717692aa9458ec22f9d36794b3cb98d6f29d9857f7f2d1159c2f9663a4ae8af5249b19882bd0003d9fa7cd EBUILD xorg-server-21.1.3-r3.ebuild 4530 BLAKE2B 8358f69ad5fd9b84d3f8d7b3cfc5f58f006c24ec5e4ebb3411202585f486665151dd405149808485998b228f7044adbb86e17c934875c31efe887fe9573c93bf SHA512 9959c03c2795c8ee83f043ecc659dc08f47245d013f433a8fa1da7b3b8c6be60268faecf8441b78ee3f810a002d222a52fe8ca095fdec79922dbdd11ba974528 EBUILD xorg-server-21.1.4.ebuild 4451 BLAKE2B 4e6e0a405e8c92ccf0e96bf582da830095e4503baccf57488067cc26fa7dab03e4232e1359a60006450a5afe252258ed8cd894457ba6efbac2cfeb18f234c1ff SHA512 1f362b0cf23ea22aa883086fa89aadd7356819740cc043a83c7ae4d5695a81ee6da849923c097f7f0f32af6cbdfc6a7a7dde7193dc2c666b52d6e4373ebb4a59 EBUILD xorg-server-9999.ebuild 4459 BLAKE2B 07b51df2be6cb5939c6d3b23982df5b691453fb1a4b1c9afc37cded6823371a03bb09bcede9417304edc319861414571171f1c05e5e742edf333ec858239426e SHA512 8f2363b32a015c816b8169a6db437bd5fd3550f02f62d91fce850f63f9f4a043e8094959da670ff4b8daa67099cc3632c99e35b8898b80fd5c28ed5335638659 -MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637 +MISC metadata.xml 773 BLAKE2B 6a1a9928078d1a473f542bd10c9d3768bb0ec46df2bee6573c858754477cbfeeca3e8b40c9050a986a0ac5496b9799b703f3bbd11f627679b59a87a894600f6d SHA512 fab80f13aef9ccbeebab328bb931b35f052842a66267399d6dbeb62dbff82e259ee2f19b6dc31f3796fc0bd1048bd6288fa493c160201a9da0aafd7c034511f2 diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index e3f80df32744..1c9d6dba3ff6 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -6,9 +6,7 @@ <name>X11</name> </maintainer> <use> - <flag name="dmx">Build the Distributed Multiheaded X server</flag> <flag name="elogind">Use elogind to get control over framebuffer when running as regular user</flag> - <flag name="kdrive">Build the kdrive X servers</flag> <flag name="unwind">Enable libunwind usage for backtraces</flag> <flag name="xcsecurity">Build Security extension</flag> <flag name="xephyr">Build the Xephyr server</flag> diff --git a/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild deleted file mode 100644 index ba7bcec8880c..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 toolchain-funcs -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" -fi - -IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" -RESTRICT="!test? ( test )" - -CDEPEND=" - media-libs/libglvnd[X] - 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 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=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:= ) - >=x11-apps/xinit-1.3.3-r1 - 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(+)] -" -DEPEND="${CDEPEND} - >=x11-base/xorg-proto-2018.4 - >=x11-libs/xtrans-1.3.5 -" -RDEPEND="${CDEPEND} - !systemd? ( gui-libs/display-manager-init ) - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - xephyr? ( kdrive )" - -UPSTREAMED_PATCHES=( -) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch - # needed for new eselect-opengl, bug #541232 - "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch -) - -src_configure() { - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - local XORG_CONFIGURE_OPTIONS=( - $(use_enable debug) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable test unit-tests) - $(use_enable unwind libunwind) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable selinux xselinux) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with systemd systemd-daemon) - --enable-ipv6 - --disable-xwayland - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-doxygen - --without-fop - --without-xmlto - --with-os-vendor=Gentoo - --with-sha1=libcrypto - CPP="$(tc-getPROG CPP cpp)" - ) - - if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( - --enable-systemd-logind - --disable-install-setuid - $(use_enable suid suid-wrapper) - ) - else - XORG_CONFIGURE_OPTIONS+=( - --disable-systemd-logind - --disable-suid-wrapper - $(use_enable suid install-setuid) - ) - fi - - xorg-3_src_configure -} - -server_based_install() { - if ! use xorg; then - rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ - "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${ED}"/usr/share/man/man1/Xserver.1x || die - fi -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - - rm \ - "${ED}"/usr/bin/cvt \ - "${ED}"/usr/share/man/man1/cvt.1 || die - fi - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules - fi -} |