[gentoo-commits] repo/gentoo:master commit in: x11-libs/libXfont2/

["Matt Turner" <mattst88@gentoo.org>]

commit:     555523ed86e5e3eecb035af5b27a156dcd01fa79
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 23:55:06 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May  2 15:24:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555523ed

x11-libs/libXfont2: Define XORG_CONFIGURE_OPTIONS in src_configure

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-libs/libXfont2/libXfont2-2.0.4.ebuild | 5 +++--
 x11-libs/libXfont2/libXfont2-9999.ebuild  | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 22ade10fa26..7a77ae02471 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
@@ -21,8 +21,8 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/xtrans"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
@@ -30,4 +30,5 @@ pkg_setup() {
 		$(use_enable truetype freetype)
 		--without-fop
 	)
+	xorg-3_src_configure
 }

diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild
index cfd74911baa..cc2376f181c 100644
--- a/x11-libs/libXfont2/libXfont2-9999.ebuild
+++ b/x11-libs/libXfont2/libXfont2-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
@@ -21,8 +21,8 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/xtrans"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
@@ -30,4 +30,5 @@ pkg_setup() {
 		$(use_enable truetype freetype)
 		--without-fop
 	)
+	xorg-3_src_configure
 }