1 |
commit: 5fb83d0a5b8ba540a803e9f97c192752aa0f0e42 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 1 17:56:35 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 1 18:04:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb83d0a |
7 |
|
8 |
x11-base/xorg-server: Drop IUSE=libglvnd |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-base/xorg-server/xorg-server-9999.ebuild | 22 +++++----------------- |
13 |
1 file changed, 5 insertions(+), 17 deletions(-) |
14 |
|
15 |
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild |
16 |
index e6b07abb3bb..ed1a5f6c51e 100644 |
17 |
--- a/x11-base/xorg-server/xorg-server-9999.ebuild |
18 |
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild |
19 |
@@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then |
20 |
fi |
21 |
|
22 |
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" |
23 |
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" |
24 |
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" |
25 |
|
26 |
-CDEPEND="libglvnd? ( |
27 |
- media-libs/libglvnd[X] |
28 |
- !app-eselect/eselect-opengl |
29 |
- !!x11-drivers/nvidia-drivers[-libglvnd(-)] |
30 |
- ) |
31 |
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) |
32 |
+CDEPEND=" |
33 |
+ media-libs/libglvnd[X] |
34 |
!libressl? ( dev-libs/openssl:0= ) |
35 |
libressl? ( dev-libs/libressl:0= ) |
36 |
>=x11-apps/iceauth-1.0.2 |
37 |
@@ -88,7 +84,8 @@ CDEPEND="libglvnd? ( |
38 |
sys-auth/elogind[pam] |
39 |
sys-auth/pambase[elogind] |
40 |
) |
41 |
- " |
42 |
+ !!x11-drivers/nvidia-drivers[-libglvnd(-)] |
43 |
+" |
44 |
|
45 |
DEPEND="${CDEPEND} |
46 |
sys-devel/flex |
47 |
@@ -212,15 +209,6 @@ src_install() { |
48 |
find "${ED}"/var -type d -empty -delete || die |
49 |
} |
50 |
|
51 |
-pkg_postinst() { |
52 |
- if ! use minimal; then |
53 |
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
54 |
- if ! use libglvnd; then |
55 |
- eselect opengl set xorg-x11 --use-old |
56 |
- fi |
57 |
- fi |
58 |
-} |
59 |
- |
60 |
pkg_postrm() { |
61 |
# Get rid of module dir to ensure opengl-update works properly |
62 |
if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |