From 6aa1bccb1977adf71dcb853b0e767decd3ceb83a Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sun, 2 May 2021 01:55:06 +0200
Subject: x11-drivers/xf86-video-intel: Make XORG_CONFIGURE_OPTIONS a local var

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
 .../xf86-video-intel-2.99.917_p20200310.ebuild                | 11 +++++++++--
 .../xf86-video-intel-2.99.917_p20200515.ebuild                | 11 +++++++++--
 .../xf86-video-intel-2.99.917_p20201215.ebuild                |  9 ++++++++-
 x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild     | 11 +++++++++--
 4 files changed, 35 insertions(+), 7 deletions(-)

(limited to 'x11-drivers')

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
index c4843a9eaec0..d806869ebdc8 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200310.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
@@ -57,9 +57,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc-pr65873.patch
 )
 
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
 src_configure() {
+	# bug #582910
 	replace-flags -Os -O2
-	XORG_CONFIGURE_OPTIONS=(
+
+	local XORG_CONFIGURE_OPTIONS=(
 		--disable-dri1
 		$(use_enable debug)
 		$(use_enable dri)
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
index 7ab019865227..adf004155048 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20200515.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
@@ -57,9 +57,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc-pr65873.patch
 )
 
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
 src_configure() {
+	# bug #582910
 	replace-flags -Os -O2
-	XORG_CONFIGURE_OPTIONS=(
+
+	local XORG_CONFIGURE_OPTIONS=(
 		--disable-dri1
 		$(use_enable debug)
 		$(use_enable dri)
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
index 8dd4903ee81e..9c1c1b881395 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20201215.ebuild
@@ -53,9 +53,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
 src_configure() {
+	# bug #582910
 	replace-flags -Os -O2
-	XORG_CONFIGURE_OPTIONS=(
+
+	local XORG_CONFIGURE_OPTIONS=(
 		--disable-dri1
 		$(use_enable debug)
 		$(use_enable dri)
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index ae5f7692fc8b..66379605a4ae 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -53,9 +53,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-3_pkg_setup
+}
+
 src_configure() {
+	# bug #582910
 	replace-flags -Os -O2
-	XORG_CONFIGURE_OPTIONS=(
+
+	local XORG_CONFIGURE_OPTIONS=(
 		--disable-dri1
 		$(use_enable debug)
 		$(use_enable dri)
-- 
cgit v1.2.3-65-gdbad