From: Matt Turner Date: Sun, 24 Nov 2019 22:26:26 +0000 (-0500) Subject: x11-base/xorg-server: Drop glvnd version workaround X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3463e2c1c2b4ebb142cfebb7a702537bcfbd6909;p=gentoo.git x11-base/xorg-server: Drop glvnd version workaround Added in commit 5a6deca6e403 ("x11-base/xorg-server: Allow building against libglvnd") as a workaround for the pkgconfig version number changing from Mesa to glvnd, this code necessitated an autoreconf due to modifying configure.ac. With configure.ac fixed upstream (and in 1.20.6) this is no longer needed, and in fact can lead to build failures since normally XORG_EAUTORECONF=yes pulls in those deps. Signed-off-by: Matt Turner --- diff --git a/x11-base/xorg-server/xorg-server-1.20.6.ebuild b/x11-base/xorg-server/xorg-server-1.20.6.ebuild index 3e71760e1d7f..7895950fe71a 100644 --- a/x11-base/xorg-server/xorg-server-1.20.6.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.6.ebuild @@ -179,12 +179,6 @@ pkg_setup() { ) } -src_prepare() { - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - default - eautoreconf -} - src_install() { xorg-3_src_install diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 25dac9a8620a..d89869862d0a 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -179,12 +179,6 @@ pkg_setup() { ) } -src_prepare() { - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - default - eautoreconf -} - src_install() { xorg-3_src_install