[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

[Matt Turner]

commit:     3463e2c1c2b4ebb142cfebb7a702537bcfbd6909
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 22:26:26 2019 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 22:30:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3463e2c1

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 <mattst88 <AT> gentoo.org>

 x11-base/xorg-server/xorg-server-1.20.6.ebuild | 6 ------
 x11-base/xorg-server/xorg-server-9999.ebuild   | 6 ------
 2 files changed, 12 deletions(-)

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 3e71760e1d7..7895950fe71 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 25dac9a8620..d89869862d0 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