summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-21 21:10:38 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-21 21:10:38 +0100
commitb243d715a0527d268e76f57a0f8dc496b30a515a (patch)
treec374b3e7bd62caf122b0e7557e5d5c75b04e57c7
parente785ec03f72ca5bef4514f7adfe446f9c7a0e959 (diff)
x11-base/xorg-server : resync with gentoo changes
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch (renamed from x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch)0
-rw-r--r--x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild8
2 files changed, 4 insertions, 4 deletions
diff --git a/x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
index 8a3cb769..8a3cb769 100644
--- a/x11-base/xorg-server/files/xorg-server-1.19.5-sysmacros.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.19.4-sysmacros.patch
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild
index edeee84e..596d09b8 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r1710.ebuild
@@ -9,10 +9,10 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug glamor ipv6 libressl minimal selinux systemd tslib +udev unwind xcsecurity"
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
!libressl? ( dev-libs/openssl:0= )
@@ -144,7 +144,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
# needed for new eselect-opengl, bug #541232
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
- "${FILESDIR}"/${P}-sysmacros.patch #633530
+ "${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
)
pkg_pretend() {
@@ -175,7 +175,6 @@ src_configure() {
$(use_enable kdrive kdrive-kbd)
$(use_enable kdrive kdrive-mouse)
$(use_enable kdrive kdrive-evdev)
- $(use_enable suid install-setuid)
$(use_enable tslib)
$(use_enable unwind libunwind)
$(use_enable wayland xwayland)
@@ -195,6 +194,7 @@ src_configure() {
$(use_with systemd systemd-daemon)
$(use_enable systemd systemd-logind)
--enable-libdrm
+ --enable-suid-wrapper
--sysconfdir="${EPREFIX}"/etc/X11
--localstatedir="${EPREFIX}"/var
--with-fontrootdir="${EPREFIX}"/usr/share/fonts