diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-12-01 21:03:47 -0500 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2020-12-01 21:03:47 -0500 |
| commit | 79d2556678671ab75762a89ba25d8ec19d221129 (patch) | |
| tree | c02f6ba3db73060da827826338c4a5df26dc0d0f | |
| parent | 2ecd943940e562ac8f5e3ba4ab9b20049951e661 (diff) | |
| download | gentoo-overlay-79d2556678671ab75762a89ba25d8ec19d221129.tar.xz gentoo-overlay-79d2556678671ab75762a89ba25d8ec19d221129.zip | |
x11-base/xorg-server: sync
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.9-r1.ebuild) | 24 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 23 |
3 files changed, 12 insertions, 37 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 54fca18..08a6911 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,2 +1,2 @@ +DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805 -DIST xorg-server-1.20.9.tar.bz2 6302902 BLAKE2B b5d78f38dcf6a9af980a8d5caab751bd7b159a4af5503f176c5af87cce371ecc71572af67f99f08b5794410d2e9a32379ed0d70ceda9f9e2ed3eb6de3bb5fb72 SHA512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 diff --git a/x11-base/xorg-server/xorg-server-1.20.9-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild index 2f73536..0205d5a 100644 --- a/x11-base/xorg-server/xorg-server-1.20.9-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.10-r1.ebuild @@ -10,18 +10,14 @@ 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 ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" -CDEPEND="libglvnd? ( - media-libs/libglvnd[X] - !app-eselect/eselect-opengl - !!x11-drivers/nvidia-drivers[-libglvnd(-)] - ) - !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) +CDEPEND=" + media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -86,7 +82,8 @@ CDEPEND="libglvnd? ( sys-auth/elogind[pam] sys-auth/pambase[elogind] ) - " + !!x11-drivers/nvidia-drivers[-libglvnd(-)] +" DEPEND="${CDEPEND} sys-devel/flex @@ -211,15 +208,6 @@ src_install() { find "${ED}"/var -type d -empty -delete || die } -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - if ! use libglvnd; then - eselect opengl set xorg-x11 --use-old - fi - fi -} - 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 diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index e6b07ab..99a8c50 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity" -CDEPEND="libglvnd? ( - media-libs/libglvnd[X] - !app-eselect/eselect-opengl - !!x11-drivers/nvidia-drivers[-libglvnd(-)] - ) - !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) +CDEPEND=" + media-libs/libglvnd[X] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -78,7 +74,6 @@ CDEPEND="libglvnd? ( >=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 @@ -88,7 +83,8 @@ CDEPEND="libglvnd? ( sys-auth/elogind[pam] sys-auth/pambase[elogind] ) - " + !!x11-drivers/nvidia-drivers[-libglvnd(-)] +" DEPEND="${CDEPEND} sys-devel/flex @@ -212,15 +208,6 @@ src_install() { find "${ED}"/var -type d -empty -delete || die } -pkg_postinst() { - if ! use minimal; then - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - if ! use libglvnd; then - eselect opengl set xorg-x11 --use-old - fi - fi -} - 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 |