summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2021-12-15 20:30:51 -0500
committerMatt Turner <mattst88@gentoo.org>2021-12-15 21:37:22 -0500
commit8778b79096ac5a2a9c824345204a1ba92e16ccc4 (patch)
tree394ae30bcee17b8ef45629c76795db8f2848a18c /x11-base
parentx11-base/xorg-server: Restore setuid for non-logind meson build (diff)
downloadgentoo-8778b79096ac5a2a9c824345204a1ba92e16ccc4.tar.gz
gentoo-8778b79096ac5a2a9c824345204a1ba92e16ccc4.tar.bz2
gentoo-8778b79096ac5a2a9c824345204a1ba92e16ccc4.zip
x11-base/xorg-server: Remove IUSE=doc
Not sure if this ever installed anything useful. Developer docs were not installed because it needed the fop utility. Bug: https://bugs.gentoo.org/700308 Closes: https://bugs.gentoo.org/827976 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild8
1 files changed, 1 insertions, 7 deletions
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index bb014071154e..f800c760fa63 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-XORG_DOC=doc
XORG_TARBALL_SUFFIX="xz"
XORG_EAUTORECONF="no"
inherit xorg-3 meson
@@ -72,9 +71,6 @@ CDEPEND="
DEPEND="${CDEPEND}
>=x11-base/xorg-proto-2021.4.99.2
>=x11-libs/xtrans-1.3.5
- doc? (
- x11-base/xorg-sgml-doctools
- )
"
RDEPEND="${CDEPEND}
!systemd? ( gui-libs/display-manager-init )
@@ -106,15 +102,12 @@ 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 emesonargs=(
--localstatedir "${EPREFIX}/var"
--sysconfdir "${EPREFIX}/etc/X11"
--buildtype $(usex debug debug plain)
-Db_ndebug=$(usex debug false true)
- $(meson_use doc docs)
$(meson_use !minimal dri1)
$(meson_use !minimal dri2)
$(meson_use !minimal dri3)
@@ -129,6 +122,7 @@ src_configure() {
$(meson_use xorg)
$(meson_use xvfb)
-Ddefault_font_path="${EPREFIX}"/usr/share/fonts
+ -Ddocs=false
-Ddrm=true
-Ddtrace=false
-Dipv6=true