summaryrefslogtreecommitdiff
path: root/x11-base
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/Manifest.gzbin1053 -> 1047 bytes
-rw-r--r--x11-base/xcb-proto/Manifest2
-rw-r--r--x11-base/xcb-proto/xcb-proto-1.13.ebuild4
-rw-r--r--x11-base/xorg-drivers/Manifest6
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.19.ebuild8
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.20.ebuild7
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-9999.ebuild7
-rw-r--r--x11-base/xorg-server/Manifest6
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.1.ebuild1
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.2.ebuild221
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild1
11 files changed, 239 insertions, 24 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 356de0a04a21..a1e7254af759 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
Binary files differ
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index 8bfbab6d344b..73638b5760c6 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 1530 BLAKE2B 40242fd5e864fa5e0fdc243915521ee538f8a8c47c50346e1956e66c976fbf430504fb4a09c30922e58e0c2970233d22b3db045642d6ab6d3ed9bb21e8266013 SHA512 ff3388f28274aad90c00f33ec483d1669b0e0a6ee783834db3766a3d921aa76e659be3476e02430c5bcd60d173e02bda6c2480e037934c9e4c2b2d24528db1df
+EBUILD xcb-proto-1.13.ebuild 1531 BLAKE2B 27ebc43319a56641b2013c9cbb027cb0baa059326ac129f2dc5f17a9ce3449f1271863440da38f2a9b9cb7e135b0dfc623d28b0377da98fbb4e1de8d33587161 SHA512 a98a081e84fae154ae9070453fd10117c6fe72d56b2843125c88db0554e6fbc3c2e80158fbae68b9809e068484b98c5338075ecdd6c5b073061c4c6d54c234a0
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 be027567fd73..2140e9956510 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-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
XORG_MULTILIB=yes
XORG_STATIC=no
diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest
index 930f7f393d47..699b6422e311 100644
--- a/x11-base/xorg-drivers/Manifest
+++ b/x11-base/xorg-drivers/Manifest
@@ -1,4 +1,4 @@
-EBUILD xorg-drivers-1.19.ebuild 5103 BLAKE2B e182f00ee2818a1c74440edbbdf77a0a0bd94cacaa31a9ab05a092df3ed885fba425894d35282cc790d15cfe35724a2982da1b2b70bb82b53200482be262ae37 SHA512 dd55aaf3e14330b15957a5f372b798cc9337a978346ff6a8a09e5e43da5e35595f04a4a913784cb215301b1de3b2831d161642987212e3239bc15090c667c0d2
-EBUILD xorg-drivers-1.20.ebuild 4961 BLAKE2B a0595e691d19c73be267d6fdfa533697b0d66a8d2f4955861e5c44d7b89046c177d2df3c5bb6bb0b919df1ffa3408819d5162f37ca799a9083cfadd2a3bf0f85 SHA512 928984f544ea0cfe7face01c826506921dd2eeae19f6d40691bccc9ed2b0bd83a2bba8d2d9eb1e32b9ae80c02193326d13495fb2edf0a304170177038fbba66b
-EBUILD xorg-drivers-9999.ebuild 4838 BLAKE2B f0ba1390b5572e91c3415822e8ca0d9be2721810f5f133bd871e0a590f8001ab5c3f4ff0901f5cf308d418745a4d020c3d9701aa8a2d6be0d1afe2536ed1d914 SHA512 3abf15f7e8a2c7e1459b631fe6c722ad1b424d622defc6d4a6a2bdfe0650a1ba6a06e7c6e305e0d24d1655dd664e297170e9fa415df1aa9377867cfe7b8d0745
+EBUILD xorg-drivers-1.19.ebuild 5000 BLAKE2B d839d95a107e1f3d2c962bfe05b78a8ae53f987f4f012e08d179305c0f5b4befe91e8b54a8b2d2e53fd7db7b151ea924e087f8ec0c6bcd3cf2fd54099e0c59d1 SHA512 e479f91c7d428857cb612794b3d07d06c9e3d7921ea09c92b0a46da1c21003ffac8ca00adb5fc8de4700eced20a129184d2166630a1efbde1e4c36152589c826
+EBUILD xorg-drivers-1.20.ebuild 4893 BLAKE2B 11b8bb3428e6c39ecb15e124321a6a9f79a777a4b17bcd66cbc057aab4b411b904d72494f3365507afcc2e6afe8097fc4d9c0dbea79b5ca724591fcbde63c5a7 SHA512 2944656306b8ca91fc228533a9322e495c098a2ca9ee3232346e9c7cf9da0984d500533e7c1cab3560bb4ca32a4ec31bfada049ef3987a7bcbb8bb1ab43127c2
+EBUILD xorg-drivers-9999.ebuild 4770 BLAKE2B ef3732c9647dddc173923789d4aad17e3ba408f90f822e61d2a226d03c21b0601840f0706ba28b2e7211c4500d6225563769b528359373f5e617d54cf9516af1 SHA512 7a56b3a2abb99b29f86326151aca78c85dedf780c781fcea69dfb63d28e4a762262f20b60f46862940d45851d7322b09f57b5145a0dc3c98e37454948f6919bb
MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
index 73a61b07b1ba..c2382d5cb061 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -97,10 +97,7 @@ PDEPEND="
video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] )
video_cards_vesa? ( x11-drivers/xf86-video-vesa )
video_cards_via? ( x11-drivers/xf86-video-openchrome )
- video_cards_virtualbox? ( || (
- x11-drivers/xf86-video-vboxvideo
- x11-drivers/xf86-video-virtualbox
- ) )
+ video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo )
video_cards_vmware? ( x11-drivers/xf86-video-vmware )
video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
@@ -136,6 +133,5 @@ PDEPEND="
!<x11-drivers/xf86-video-sunleo-1.2.2
!<x11-drivers/xf86-video-tdfx-1.4.7
!<x11-drivers/xf86-video-trident-1.3.8
- !<x11-drivers/xf86-video-virtualbox-5.1.14
!<x11-drivers/xf86-video-vmware-13.2.1
"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
index a93b958ee8c1..cdbed7492168 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -95,10 +95,7 @@ PDEPEND="
video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] )
video_cards_vesa? ( x11-drivers/xf86-video-vesa )
video_cards_via? ( x11-drivers/xf86-video-openchrome )
- video_cards_virtualbox? ( || (
- x11-drivers/xf86-video-vboxvideo
- >=x11-drivers/xf86-video-virtualbox-5.1.14
- ) )
+ video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo )
video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
index 4e994a9b9503..99c062fe8555 100644
--- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -95,10 +95,7 @@ PDEPEND="
video_cards_vc4? ( >=x11-base/xorg-server-${PV}[glamor] )
video_cards_vesa? ( x11-drivers/xf86-video-vesa )
video_cards_via? ( x11-drivers/xf86-video-openchrome )
- video_cards_virtualbox? ( || (
- x11-drivers/xf86-video-vboxvideo
- >=x11-drivers/xf86-video-virtualbox-5.1.14
- ) )
+ video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo )
video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 )
video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index ee3ffc37f2f0..3c14a6e37ae5 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,7 +8,9 @@ AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b
+DIST xorg-server-1.20.2.tar.bz2 6204242 BLAKE2B 05333d12ca3ca2bca879410093fb193dc2476780b857cd22dcfb22d0dffe0e17afd161ee3a87030bd76ff4109fa1884768614f0bc26318d576f7c65b885aa425 SHA512 1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7
EBUILD xorg-server-1.19.5-r2.ebuild 5766 BLAKE2B 87a961606f85b4c83d9eaebc9cac3ab8d650bf27a204a74f847459996c6cd51c28b94f5ee91bcee549e06a07aa260bf132609a60be733ddc5b51759d111aef4b SHA512 d63b8c99b046240476c93559fb9b672f0214db117c82e05130413b1751e57a43babdc366c7ec9ff0d9db9d08a3b1aa7493da7a6e3e9a73d531722374067b6dd6
-EBUILD xorg-server-1.20.1.ebuild 5522 BLAKE2B 7b66829d822ddff06e190d566871b7a9d915ae093264be4fd25ae5a4fd786f93394dee8e91132aef4b3faae88280e8cbd5786fd6efd658dadeeaa9c7a7fa8041 SHA512 e8a8fb57d5f527786cd6567d9f26f88de0bee3706e7da9a1c59f7d9fd4753db4ebb998288b7d3b663fc0f9869f8992db6615d3371c933f4a1b8f97913b348c4e
-EBUILD xorg-server-9999.ebuild 5527 BLAKE2B ec541ef3827abbdd2a7408df5f00b37692989f3225fd8fbe187bbdc5719a24aae8f6fec8537baffbb32ee3f394d4ce99540985a846109405297a27cdb70abc1d SHA512 011350ca9a119d266bb0a87e05b61c2c64344db1505aae3ed157d0815bf5559dad0cab0fecc6870c9fa58d3d39c93fde8b080345b75a5fec96b1b2992b59ab80
+EBUILD xorg-server-1.20.1.ebuild 5552 BLAKE2B 9104cf713a3bd2bd8578c1f7831ab2736cfc282368b884bc386c37925e313e4d96120a1fabf10f4f4ab26c2a56a482cd447486123bcb8b766b6f8a7a2ee5e79c SHA512 275c564a4d872ad3bb24041d5e836be544c50582da5951e9a308a809b0c70b552e5e06c993b85826d3fea5eaf5991a14132209e01fd561193a1895896004511e
+EBUILD xorg-server-1.20.2.ebuild 5549 BLAKE2B 445c4c499f1900bc85820daf0b1a25017c3a4c402d312f0af4c67677d273f0ae3b59afd57c147ce7e7e06d459d8ef1c90031b6806ad23345a5163ee083a3eb51 SHA512 855b6327daff396cc964755c26fbabf657e5f0296c8f407b197581fba0e6caaf754451df67777a1c466b07aacfd304c73e60cf02ffa536bb18022aabf21c5951
+EBUILD xorg-server-9999.ebuild 5557 BLAKE2B 16a913a88e418f6bf6d58cc358f6aafce34672bc16a4553fef8e448569afe60854b146c90f1215fd3074dff504e97596989b08a01d4d56e310f76d92af729466 SHA512 4fcc051eeeea84849cfd9c264a246b43b317c7c1c335855dd36dbfb3fd7536d4e855f9382b3f0b9e98eda1c11fa9925a1ce29d3d86400a77c8adcf6a4972022c
MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.20.1.ebuild b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
index 4bb5e00c6eba..e721825fa7eb 100644
--- a/x11-base/xorg-server/xorg-server-1.20.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.1.ebuild
@@ -150,6 +150,7 @@ src_configure() {
$(use_enable !minimal xfree86-utils)
$(use_enable !minimal dri)
$(use_enable !minimal dri2)
+ $(use_enable !minimal dri3)
$(use_enable !minimal glx)
$(use_enable xcsecurity)
$(use_enable xephyr)
diff --git a/x11-base/xorg-server/xorg-server-1.20.2.ebuild b/x11-base/xorg-server/xorg-server-1.20.2.ebuild
new file mode 100644
index 000000000000..be5e57d8cb27
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"
+
+CDEPEND=">=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
+ )
+ glamor? (
+ media-libs/libepoxy[X]
+ >=media-libs/mesa-18[egl,gbm]
+ !x11-libs/glamor
+ )
+ 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
+ )
+ udev? ( virtual/libudev:= )
+ unwind? ( sys-libs/libunwind )
+ wayland? (
+ >=dev-libs/wayland-1.3.0
+ media-libs/libepoxy
+ >=dev-libs/wayland-protocols-1.1
+ )
+ >=x11-apps/xinit-1.3.3-r1
+ systemd? (
+ sys-apps/dbus
+ sys-apps/systemd
+ )"
+
+DEPEND="${CDEPEND}
+ sys-devel/flex
+ >=x11-base/xorg-proto-2018.3
+ 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-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+ || ( ${IUSE_SERVERS} )
+ )
+ 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_pretend() {
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+pkg_setup() {
+ if use wayland && ! use glamor; then
+ ewarn "glamor is necessary for acceleration under Xwayland."
+ ewarn "Performance may be unacceptable without it."
+ fi
+}
+
+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
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable debug)
+ $(use_enable dmx)
+ $(use_enable glamor)
+ $(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 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)
+ $(use_with systemd systemd-daemon)
+ $(use_enable systemd systemd-logind)
+ $(use_enable systemd suid-wrapper)
+ $(use_enable !systemd 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
+ )
+
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ server_based_install
+
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example into docs
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/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
+}
+
+pkg_postinst() {
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+ eselect opengl set xorg-x11 --use-old
+}
+
+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 07e8f095df96..22ad7ddccf9b 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -150,6 +150,7 @@ src_configure() {
$(use_enable !minimal xfree86-utils)
$(use_enable !minimal dri)
$(use_enable !minimal dri2)
+ $(use_enable !minimal dri3)
$(use_enable !minimal glx)
$(use_enable xcsecurity)
$(use_enable xephyr)