diff options
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/Manifest.gz | bin | 1045 -> 1049 bytes | |||
-rw-r--r-- | x11-base/xcb-proto/Manifest | 2 | ||||
-rw-r--r-- | x11-base/xcb-proto/xcb-proto-1.13.ebuild | 4 | ||||
-rw-r--r-- | x11-base/xorg-proto/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xorg-proto/xorg-proto-2019.2.ebuild | 2 | ||||
-rw-r--r-- | x11-base/xorg-proto/xorg-proto-9999.ebuild | 2 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.6.ebuild | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.7.ebuild | 235 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 4 |
10 files changed, 250 insertions, 13 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex 788a82e356dc..e6225bb6b7b3 100644 --- a/x11-base/Manifest.gz +++ b/x11-base/Manifest.gz diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest index a760ee8d7016..f6198e6cbf84 100644 --- a/x11-base/xcb-proto/Manifest +++ b/x11-base/xcb-proto/Manifest @@ -1,3 +1,3 @@ DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 -EBUILD xcb-proto-1.13.ebuild 1577 BLAKE2B bf78bdba9091684e419f53499576481df2b9cbd80f81c229bbb30f26a3b82aefe684dca8eb9337543f77c4dd86a6ddb8c24a8b470b35deee2d3699d52933d5d0 SHA512 9d47dc4747fed4b941285e0f2557178639c14c616f5f4e6d28535dda645a2374afa4e54a70306a8ae29566c219b501c8a389745387d4b0055490eedc636ed346 +EBUILD xcb-proto-1.13.ebuild 1573 BLAKE2B 2ca0855a4837db2325f7bb73a928ff32c4471f87df4c1f81d2c243a364292cb9080f0ad006aa1f77c9c4004b30619880e54dae14dea2ce52f4a3854b2d97a43a SHA512 efb0617aa9302233a90a93749e3f8c9e70925ad19f84bf9f01aba506742b737eba47328610cacc8f824eb8747f346c9363af56d411464af934e6673024e5af44 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild index 9fe2256a4dab..e39be24f18b9 100644 --- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} ) +PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} ) XORG_MULTILIB=yes XORG_STATIC=no diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index 504d7cad2f2e..344a51237468 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,4 +1,4 @@ DIST xorgproto-2019.2.tar.gz 1080686 BLAKE2B 4e0218ef02a8df5220431ae36ac1bc8feaa2bfdefe784f9b7393fe1d27db5b39ba90a38a3570bd78279964c5842ea65df3724b2407535a43fd867922156d92e9 SHA512 3385e7eb8ae1384aa01945c7f5a300884a1deb8d564ab62bd5bcaa3703d3dbf9bbc19797ac17d19e15417bf8456f706f993e90ece2d34cc94046ac302c062cbe -EBUILD xorg-proto-2019.2.ebuild 1832 BLAKE2B b942cf32c7c1bc5ad4a9e31afb78afa02f2112b64524466ce40aeaac9bbb68563cdb13a012302b19299e08f873485609ee6e89ae6d11072728e668bf56474f9f SHA512 dbb6e210cf21bf938054fde38676105471b77e9aa5122850e82a72e84618b3c319d467ea8d9c83058a035234cf5456e4c8ddb266b36c6131a10821c71ae4d9c0 -EBUILD xorg-proto-9999.ebuild 1842 BLAKE2B 636bd6612f6fce904998db0aa0ff56b2354b3300a990c26539e8a91fa79899e044783850c9b859561fcfe69280391d673a475dc3cf62df786f6b7312ab4e1e24 SHA512 6c07ceee7a91b2a43c4bcf525c2b5d0fd492bfb68f2691bdbb578a5a768f97a2e3871e92ba307c506190ca2e6f940f95f23fff1138d225108115587b298e5f07 +EBUILD xorg-proto-2019.2.ebuild 1839 BLAKE2B 1ecd5f8ec6e14324dc9f4b269a55db6cdbd822766d7e8491429467c8503dfde5674104c4f4fd9902feafd174446fa8e9d7757b9f95e7d4231e9417f10b0d780b SHA512 ac07de189c60cd41740f6e67ef7b3fd2bbf2b4da3c8522b6fb59efd5ccee681a5ba6fde0b49bca091e3906e008fbeab88b219c06cc01770c49a19c6b7ef701c1 +EBUILD xorg-proto-9999.ebuild 1852 BLAKE2B 6f9e67007084ca8defe1711748cdf8fb32141455f005889d0cad0d897abf3d96a68dfd5588dae9bd5c2f1939d5d4e70bc97e520c9cd3e065391588d78f4cd313 SHA512 433308abe047b655050a594f8621d9cc29c612c2a6a246a49bbb15b0edbf748e7abd17123f53e15d75467fea995f68ba77d3e2b3faddb8afbd75d60c0a1fc9d5 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild index 60850b7bb5a0..5acf2e9f4f20 100644 --- a/x11-base/xorg-proto/xorg-proto-2019.2.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2019.2.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild index 0d8a1c69b15d..bc256f70e154 100644 --- a/x11-base/xorg-proto/xorg-proto-9999.ebuild +++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index b9dbaefe7ccf..e274a8d1645c 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -9,7 +9,9 @@ AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 17 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 DIST xorg-server-1.20.6.tar.bz2 6298697 BLAKE2B 30e505cf83bb2b20e17533b89b81521d029412ea6bd804ecf20458af20364172eb7b21561f14c885d5e16597e6d09985b255b6cec2beb30662658d9e316bc953 SHA512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 +DIST xorg-server-1.20.7.tar.bz2 6303005 BLAKE2B 343ebc1ff45fc1cd459b204d92eabdd0629c94d4338d2d7cb635f73642080d07ef174cfbd83e5b7f253f2918af2d1efbe99d7c75720b88857f69093ee0be1b65 SHA512 c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 EBUILD xorg-server-1.20.5.ebuild 6057 BLAKE2B d509009a97278827f4d78e2a8e2f3d23d7e7d26b7f9c8c550bbd760fedb5cb9165166a5c03ed3c2d23255aba557546ed2ce65bbceb1cc0d32bf50bccc028a680 SHA512 f33ba6c619e3c9319e48673db7315e627115a2a0393de7f872cd37098d0028982a3f4737b733c36638e7b755de1022feb76291cf3dbdfc05186c7cda2f9b76d6 -EBUILD xorg-server-1.20.6.ebuild 5718 BLAKE2B 4a8d276ba106263eff75579d88c7a5bb5842f7ec3779c9892385c2de25c395461de3f92617e10601ea88610550b4d5248fcd5e0adec9538e04f917659845b1bb SHA512 6b17525a455a65fda02881c6369577d5f3d6617292af7f1ff81fafdbe3e0aec10ce2c811443ff361cddb27a72f13911f51692bcce27a27c7eb0e49af04fed685 -EBUILD xorg-server-9999.ebuild 5716 BLAKE2B 50a60dc16740b10899b4e79e01e22712dc60eaf889e3d75daaf3a440f7e93c0dd14914aaf0ec7692b88f3f906a07f3282c3d17303a02d6be92a5b61387950f06 SHA512 dd197909ee02f895109823812864e2bb6c7be6b7f97c5d91384991b4b46a84dfa14ff539957ca51ac76387c8ea5a66e9595aa92a28295791faf16d8a4a4fd805 +EBUILD xorg-server-1.20.6.ebuild 5709 BLAKE2B d4654865f6a9464a7d3fe6931725e74fa9ce9c16dd836653a1c8a4764e99c9f7ee98c4a53a9d758b45bdde838346c1c23f25e4905a87772bc1a38f96e522e631 SHA512 34f1aeaf50b2a5dd11186264295d8dc4417449d3ca57912b39d660cd028df37ab6f08921f503584b15f71e12b95009341ac2930f243677572a823b0e6e1c1245 +EBUILD xorg-server-1.20.7.ebuild 5977 BLAKE2B 0b66adfe59d0b08e197f92f1f86ba37af9f4c35e99d408bde481cf015bcb59b6f0072dbdb963757869c1edd8eb711e1b09dbb226347672d235c8a2c680533802 SHA512 5b063ba18902dda2ef56a9db0090a6b889c46ab0efd1d60a8ccdd5817c9ec03c21a07b02a17c325c71bb7162e9f9b49c7db15e4bf20dfcccb689fdde9c4bd1f6 +EBUILD xorg-server-9999.ebuild 5732 BLAKE2B 05d56cc6d4152831143a74102ac2eddfe0568cd6859fef72adea4ae250c123faef560a9dd9f61ec02d3100b7f68ea2bc5a96ae04d04360c194e4df8e73cfc47c SHA512 dea98d8b7831ba248c9d88e6bbf86eaf0ee3bb722f8d197afa07d55adfba9ae7b69b93fdba9ade9031ca1a79fdaf1ba6a2da3fe44d36296c89c8f50a4a89e6f3 MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198 diff --git a/x11-base/xorg-server/xorg-server-1.20.6.ebuild b/x11-base/xorg-server/xorg-server-1.20.6.ebuild index 7895950fe71a..55a55f546479 100644 --- a/x11-base/xorg-server/xorg-server-1.20.6.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild new file mode 100644 index 000000000000..86bbf55a2653 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.20.7.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 multilib flag-o-matic +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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" + +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl: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-libs/xtrans-1.3.5 + >=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 ) + wayland? ( + >=dev-libs/wayland-1.3.0 + >=media-libs/libepoxy-1.5.4[egl(+)] + >=dev-libs/wayland-protocols-1.18 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind + sys-auth/pambase[elogind] + ) + " + +DEPEND="${CDEPEND} + sys-devel/flex + >=x11-base/xorg-proto-2018.4 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-xserver ) + !x11-drivers/xf86-video-modesetting +" + +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd ) + minimal? ( !wayland ) + 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 +) + +pkg_setup() { + if use wayland && use minimal; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + ewarn "Build with USE=-minimal to enable glamor." + fi + + # 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 + XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable unwind libunwind) + $(use_enable wayland xwayland) + $(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 xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind') + $(use_with systemd systemd-daemon) + $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') + $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') + --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-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + ) +} + +src_configure() { + # Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the + # driver name via EGL_MESA_query_driver") neglected to add autotools + # support + append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER + + xorg-3_src_configure +} + +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 + fi + + newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup + newinitd "${FILESDIR}"/xdm.initd-11 xdm + newconfd "${FILESDIR}"/xdm.confd-4 xdm + + # 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_postinst() { + if ! use minimal; then + # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi + fi +} + +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 +} + +server_based_install() { + if ! use xorg; then + rm "${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 + fi +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index d89869862d0a..061fe06600d4 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -68,13 +68,13 @@ CDEPEND="libglvnd? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] - media-libs/libepoxy[X,egl(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 - media-libs/libepoxy[egl(+)] + >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 |