From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- x11-base/Manifest.gz | Bin 1052 -> 1049 bytes x11-base/xcb-proto/Manifest | 2 +- x11-base/xcb-proto/xcb-proto-1.14.1.ebuild | 2 +- x11-base/xorg-drivers/Manifest | 2 +- x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild | 4 +- x11-base/xorg-proto/Manifest | 2 +- x11-base/xorg-proto/xorg-proto-2020.1.ebuild | 4 +- x11-base/xorg-server/Manifest | 6 +- x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild | 15 +- x11-base/xorg-server/xorg-server-1.20.11.ebuild | 226 +++++++++++++++++++++ x11-base/xorg-server/xorg-server-9999.ebuild | 13 +- 11 files changed, 253 insertions(+), 23 deletions(-) create mode 100644 x11-base/xorg-server/xorg-server-1.20.11.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index c95e88c6ea57..883a62beef34 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest index 474f21bae61b..7e8387cb1234 100644 --- a/x11-base/xcb-proto/Manifest +++ b/x11-base/xcb-proto/Manifest @@ -1,3 +1,3 @@ DIST xcb-proto-1.14.1.tar.xz 143588 BLAKE2B 24983ec26632e93ef2d0c854cd41272925b6f3aab2642701232b73bc37d200d794c46f438e4a4102484e6ac9723e78c923b99cc78ada3541f43eaf0ad7ebc863 SHA512 140fbf48483bacc7f6b70fdcf76f9e4ff0e87df9cb3a071cea47d8fe4574407cdefcfbd674099014d297e5fc010748e71d8609fca4cc32e8b25c634f928b727d -EBUILD xcb-proto-1.14.1.ebuild 1261 BLAKE2B a692b307584b2d605abc7a7bc731d6071f08bf490c39be98703063e383fa7192fee7320eb0543c18384a70b69afbea3a20d0b5bfb69b1aa9a1471ff48a43a899 SHA512 65aa8337461a34912337e0af14a7a4089a5d68b85a0700eff1d94ad546597913f935eaf1bc74d8f3a71efc0d9fa0dcbf456d5856f60d681a326dc28dc18fe3e7 +EBUILD xcb-proto-1.14.1.ebuild 1262 BLAKE2B 034be8b9b069e7fecc7d308976a12150ea0e7d5c5d37760d95ba86f8b09915f34e9673ed6c3b756ccdcd858c282ee0331523cd7a069d8986eb2beafc0322b2cc SHA512 09b3b1c5123caf00daecc1b2150341ccd1c6d2c62d55e422ef7488f2e0224fed6139a800d572e259bb4b687b142cd829e6d7c05866906cebe603684de9284209 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild index 935942fbc234..e7aaddbcc928 100644 --- a/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.14.1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="X C-language Bindings protocol headers" HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto" EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index 0d166cddb61c..f19e12b40175 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,3 +1,3 @@ -EBUILD xorg-drivers-1.20-r2.ebuild 3662 BLAKE2B f9b50054a56869227220c5cc7c0486d40a7a3a866bccbbc8ea463d5f07d7d53f540d76a65ab3687c3309554f55b8aeb5df433b00dd3bbd3e0dc9df8c1f6bb054 SHA512 2c7ad85dfdf285c9123aaf5babb20504747ca0d0db9885281ff7eb9145fa4e1e64acc1d7ddd5fe8365d5f3f85edd2a093f4c7f20231c86269ee3f2b82dd05a89 +EBUILD xorg-drivers-1.20-r2.ebuild 3663 BLAKE2B 8bea6180884af5bface58cb832be4aedebd3246aa04ac425202611d70ffeb6373a191f92bd626c86161f5e0916b4b094275c824063254c2f0e9765c25ba3ac4b SHA512 8598f1dbc448d42daf1eb738a9ac42701f19777f585529e7af7c9c761eabf0ac19e41af0374297e186e0bf363be409ef13937a12ece193237c160af671cd70dd EBUILD xorg-drivers-9999.ebuild 3689 BLAKE2B 90c471e6925594be628396251f7a5d408fdc0068c0e1285a603b5f3a85e5647b68345e24efd23143a739482db5169f5cf274a443238301d3667c0ded59c1ff32 SHA512 74478e2ae3af50ca9594f92e214a011ac00780649dc45e3b64614193b7b524960fcd7bad42ce8894ba0dd23519d767d1a081b4ebb5ab4de4feae58d51f7ba364 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild index d07b1188f95b..2c489dbcbd66 100644 --- a/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi IUSE_INPUT_DEVICES=" diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index 199c4335901d..10eb4df171e2 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,6 +1,6 @@ DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9 DIST xorgproto-2021.3.tar.gz 1130599 BLAKE2B 21aa84621984cd2635871c059ecbfe2c6290c74a3569f15cdce6080dd7e4106726ae9338112c075c8f64332ecb555a4ccb666bd7bf7e9bb1156b4591e5f37908 SHA512 0c2610551cc180b619611e0ad344e1a01cb0e5e83b3c8643cd6dbe19d8acc3a22e7c1522855923159dd753e4458c9f2d65b709bb045b27e17b83aa8c264e3d5a -EBUILD xorg-proto-2020.1.ebuild 760 BLAKE2B d5ee62b7f0fdf038006af93d7308c98768ab4a04567fb3a4eddde9230705105ac424de678b8499b8c5694a459b18f5fbda007b93f98958f16537531ccee3388a SHA512 63d593adb4886476c7f2abd99b309557fac32f23639a3094ab16fbb530e487a55f908576c285f747c27c743ed1c69b8461e465e59ca86543639dc8cdaa5fc74d +EBUILD xorg-proto-2020.1.ebuild 761 BLAKE2B cf874501547f2e236e3f3774654b164fe1a518b8afd88df412840f3ef4c0f3f170749c837c84164c0ac54ea2e0a0916710387835f9001076390de26aa58bc769 SHA512 f6c42bff81e6c5ebcc0a7db0ab03ecdd194d6cb230d9b95ca12c17ad10e0e4e74f5f7ae4aaebb2c37fbf46042942438c6fc3d8c18419de3765ab5f10d9e3743f EBUILD xorg-proto-2021.3.ebuild 1102 BLAKE2B 1149ac256e9aafa4eec429bcacc7245fee6caf4a6ea6dbf78749f947b81c08720daede7f059b116252156df77ac15f624aa30ede7c702c7bc1550ca454f385f8 SHA512 a156a1e5d9cd148a6eab8128ebf13c1d1d3656fd523bf0704f0a58becd94d1d45147354bba2e27dffd469fb4bfc2f79f7c488104ba9e231915d22b7b699a8543 EBUILD xorg-proto-9999.ebuild 1102 BLAKE2B 1149ac256e9aafa4eec429bcacc7245fee6caf4a6ea6dbf78749f947b81c08720daede7f059b116252156df77ac15f624aa30ede7c702c7bc1550ca454f385f8 SHA512 a156a1e5d9cd148a6eab8128ebf13c1d1d3656fd523bf0704f0a58becd94d1d45147354bba2e27dffd469fb4bfc2f79f7c488104ba9e231915d22b7b699a8543 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild index 938908c713b4..60b24a0bb11a 100644 --- a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index b0720fc0a4a5..daefa3663d59 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -5,7 +5,9 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae +DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 EBUILD xorg-server-1.20.10-r2.ebuild 5627 BLAKE2B 47fc55000e249b1856668e2bcdbc0898a9090524d60f57a525c3f311bc7c7490d2fe1b005642c967752acfb0ba8d11547324a4cd4241fb22720084a2bf84cc66 SHA512 c540aa4d2ec79649ebfa0b3a99fa58035796b27bd6155127d335155e3914cbc4848e7f07c2127127fdb0a5dc8c3fae2a85841ee584e8160cf01acf98b9dba544 -EBUILD xorg-server-1.20.10-r3.ebuild 5544 BLAKE2B de7885c917acb0c217a08a5eccb6bd830dec1f17920fdd4d0658484c86a3f4c435dbe96d2fa1a4822b269c60c33e0940ac2fb8f6852d6cbab33efe3f813fd18e SHA512 e72825561059e425146147b9886b719f9f44c79b9e4a5119571f65ae91eacb09ac3a8d81163c269a72469ee747276ce06af990bb89138e36e3880caeed60bd7d -EBUILD xorg-server-9999.ebuild 5542 BLAKE2B ad3e4bbb3e758164e3f5283183f66414714025bf63ec5398f49ca8c12cd659a64848b155e5fbe04a8902c42741101622f78bd3cec6c6fbe81599cbe09ade8e52 SHA512 46394e9752df797905eeed61c4e089fde6c23c27e0e37b7cba3f158c3a0d527bcde7c8bade2810b3b63cfe37c19c86a1947c8f8ef486ce0f62ec491875ff0bda +EBUILD xorg-server-1.20.10-r3.ebuild 5587 BLAKE2B 425087c2c190292f8f1cbc2bde071ed96ab820a0e047480f11f778d4ff32578cf59ea6c34e7b2f6825942c684334af455ebf5c663f205ac7c9369e5c4a110436 SHA512 19b6f64b77d06651a5bbccadb3e705f8025da639115997866cbdf07235ed0e76de407e1b50beed187f8ed6267cae562800c49b1f93220370bb282a5cd39b805d +EBUILD xorg-server-1.20.11.ebuild 5587 BLAKE2B 425087c2c190292f8f1cbc2bde071ed96ab820a0e047480f11f778d4ff32578cf59ea6c34e7b2f6825942c684334af455ebf5c663f205ac7c9369e5c4a110436 SHA512 19b6f64b77d06651a5bbccadb3e705f8025da639115997866cbdf07235ed0e76de407e1b50beed187f8ed6267cae562800c49b1f93220370bb282a5cd39b805d +EBUILD xorg-server-9999.ebuild 5591 BLAKE2B b9300975a40cf7e73aca144f8de42c143a75f8df17d35e1c6fe5f96145e0b32cf7db6ad298790161f88f628a3ed22a42b52d489c850759b4f47bf60d2b211cc4 SHA512 daad55b535b59e86026d3b3b86e6c327d9fc9535572615fdd3f136b6760af866a548b0c340dddb2d3341ee16066340c8f84c47c7304a5aa3f350e9f7786c1eac MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c diff --git a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild index b815b67a8397..d7f946f1e641 100644 --- a/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r3.ebuild @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/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 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" @@ -33,7 +33,6 @@ CDEPEND=" >=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? ( @@ -86,10 +85,9 @@ CDEPEND=" ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] " - DEPEND="${CDEPEND} - sys-devel/flex >=x11-base/xorg-proto-2018.4 + >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( @@ -98,13 +96,16 @@ DEPEND="${CDEPEND} www-client/w3m ) ) - )" - + ) +" RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " - +BDEPEND=" + sys-devel/flex + wayland? ( dev-util/wayland-scanner ) +" PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" diff --git a/x11-base/xorg-server/xorg-server-1.20.11.ebuild b/x11-base/xorg-server/xorg-server-1.20.11.ebuild new file mode 100644 index 000000000000..d7f946f1e641 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.20.11.ebuild @@ -0,0 +1,226 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 multilib flag-o-matic toolchain-funcs +EGIT_REPO_URI="https://gitlab.freedesktop.org/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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + !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-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 + ) + 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[X(+),egl,gbm] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind ) + wayland? ( + >=dev-libs/wayland-1.3.0 + >=media-libs/libepoxy-1.5.4[egl(+)] + >=dev-libs/wayland-protocols-1.18 + ) + >=x11-apps/xinit-1.3.3-r1 + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2018.4 + >=x11-libs/xtrans-1.3.5 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) +" +BDEPEND=" + sys-devel/flex + wayland? ( dev-util/wayland-scanner ) +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd ) + minimal? ( !wayland ) + 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_setup() { + if use wayland && use minimal; then + ewarn "glamor is necessary for acceleration under Xwayland." + ewarn "Performance may be unacceptable without it." + ewarn "Build with USE=-minimal to enable glamor." + fi + + # 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 kdrive) + $(use_enable test unit-tests) + $(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 glamor) + $(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) + --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 + CPP="$(tc-getPROG CPP cpp)" + ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + "--enable-systemd-logind" + "--disable-install-setuid" + "$(use_enable suid suid-wrapper)" + ) + else + XORG_CONFIGURE_OPTIONS+=( + "--disable-systemd-logind" + "--disable-suid-wrapper" + "$(use_enable suid install-setuid)" + ) + fi +} + +src_install() { + xorg-3_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${S}"/hw/xfree86/xorg.conf.example + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf + + find "${ED}"/var -type d -empty -delete || die +} + +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 b77e074e4801..7b4a9180cd77 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -34,7 +34,6 @@ CDEPEND=" >=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? ( @@ -87,10 +86,9 @@ CDEPEND=" ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] " - DEPEND="${CDEPEND} - sys-devel/flex >=x11-base/xorg-proto-2018.4 + >=x11-libs/xtrans-1.3.5 dmx? ( doc? ( || ( @@ -99,13 +97,16 @@ DEPEND="${CDEPEND} www-client/w3m ) ) - )" - + ) +" RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) " - +BDEPEND=" + sys-devel/flex + wayland? ( dev-util/wayland-scanner ) +" PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" -- cgit v1.2.3