| 1 |
commit: 2c7df62f64eaaa29b20b3b68d41eca93ec2134de |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Sat Jan 19 08:47:12 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 23 19:28:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2c7df62f |
| 7 |
|
| 8 |
x11-base/xorg-server: sync with tree |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-base/xorg-server/xorg-server-1.20.3.ebuild | 11 ++++++----- |
| 13 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/x11-base/xorg-server/xorg-server-1.20.3.ebuild b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
| 16 |
index a057e05..6018177 100644 |
| 17 |
--- a/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
| 18 |
+++ b/x11-base/xorg-server/xorg-server-1.20.3.ebuild |
| 19 |
@@ -13,8 +13,8 @@ if [[ ${PV} != 9999* ]]; then |
| 20 |
KEYWORDS="arm" |
| 21 |
fi |
| 22 |
|
| 23 |
-IUSE_SERVERS="dmx kdrive suid wayland xephyr xnest xorg xvfb" |
| 24 |
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity" |
| 25 |
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
| 26 |
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" |
| 27 |
|
| 28 |
CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 29 |
!libressl? ( dev-libs/openssl:0= ) |
| 30 |
@@ -106,6 +106,7 @@ PDEPEND=" |
| 31 |
REQUIRED_USE="!minimal? ( |
| 32 |
|| ( ${IUSE_SERVERS} ) |
| 33 |
) |
| 34 |
+ minimal? ( !glamor !wayland ) |
| 35 |
xephyr? ( kdrive )" |
| 36 |
|
| 37 |
UPSTREAMED_PATCHES=( |
| 38 |
@@ -162,8 +163,8 @@ src_configure() { |
| 39 |
$(use_with doc xmlto) |
| 40 |
$(use_with systemd systemd-daemon) |
| 41 |
$(use_enable systemd systemd-logind) |
| 42 |
- $(use_enable systemd suid-wrapper) |
| 43 |
- $(use_enable suid install-setuid) |
| 44 |
+ $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper') |
| 45 |
+ $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid') |
| 46 |
--enable-libdrm |
| 47 |
--sysconfdir="${EPREFIX}"/etc/X11 |
| 48 |
--localstatedir="${EPREFIX}"/var |
| 49 |
@@ -198,7 +199,7 @@ src_install() { |
| 50 |
insinto /usr/share/portage/config/sets |
| 51 |
newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 52 |
|
| 53 |
- [ -d "${ED}"/var/log ] && rmdir "${ED}"/var/log || die |
| 54 |
+ find "${ED}"/var -type d -empty -delete || die |
| 55 |
} |
| 56 |
|
| 57 |
pkg_postinst() { |
Archives