diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
index 22ade10fa26c6..7a77ae024711e 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 cfd74911baa4e..cc2376f181c14 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
 }