gentoo resync : 04.05.2021

10 files changed, 22 insertions, 17 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index abf1539b7a9e..129468f218d6 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 0da01194fa5c..6b745efbe712 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,4 @@
 DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
-EBUILD xauth-1.1.ebuild 596 BLAKE2B 5d88fb6e91c756c1025a716d6a150a638d6752a2c4375d84326cc08530857f70cfe70138a0516a4321a0a5f16af37cf8bdf21cb4385ed781f19c647fee84d62d SHA512 3e364fd1f509b732bb98ab70d85ad1e5ce9af453ed011ac3a7cff2686244063e6af03c1e94cb5d142b25a6db3d7ef21c5ff3c6958e637314351995b064a6cc72
-EBUILD xauth-9999.ebuild 596 BLAKE2B e9747b6e1e2b3a3cc828c3ec739323322a747ffb00a6967a09bba5e2e42d27ef5826f70b114f17f16bb0a609cf3ca15df25ce7e63fb728b3ee7f18f54baaf601 SHA512 9e4f6c135735eafbb0b09c03ba39b372360f559529c02c1402d090a3f4c7a406b17cd300a756d8c1d142d0f01afb1d4216be654f6f19e4c5adac1c4179f81b49
+EBUILD xauth-1.1.ebuild 628 BLAKE2B 32c203a7d548f3c66792b6a6ebe5e83e2da5aa0e2f11d252c326eeffd246c0f93aa44b3047d1d963cafcba9fdca55bdeccfbb6a8f5bd58610a55d837c830c422 SHA512 6bc3bd83e06160f31c77a9e727a2b035faee94ee337686fa4fe96990bf72541c03927d3d74aa48590ba6a747851801df13be226e636dc24d61682858c89bb6d2
+EBUILD xauth-9999.ebuild 628 BLAKE2B 077a7198ef7ee9d3a4e391a2eb88a53cc6a38c2ac9a978acdd30207bb55be0d07459133aaf35a5396c81e92e48ebca42f73382f6a34d487dbd2d66e0510ff2f2 SHA512 ccf6679fcfcaa00f2620890f6a297bb81ec099c1d2cc4bba6b6ee95c2885e088733dc8b17e6ad142e14cd4786ab7bda02d8f038b471d2f5a88bd9b20f4d6c347
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
index d81c5122af45..fe2bc9e5bdcf 100644
--- a/x11-apps/xauth/xauth-1.1.ebuild
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -22,8 +22,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index f46da39bc300..50da5eb529dd 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.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
@@ -22,8 +22,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
+	xorg-3_src_configure
 }
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 7e32b6fe248a..11daf418582e 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,3 +1,3 @@
 DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
-EBUILD xdpyinfo-1.3.2-r1.ebuild 772 BLAKE2B c5f074af1dd2821b9cd42dc1319a1c234d79cbc20364e2715cd6c8ba53faf3257344c259afbea669f6952d2bc9f9e9bac2ba36300432873379b86743e6daaf2c SHA512 1f0ea649b90fb33352ea926febe812fc1424628a9c126959d005aa5dc22d1e99cf5e4b09e6b45d5f2e803f98687139c770d0a848e7293d645d9c403577f9e4c6
+EBUILD xdpyinfo-1.3.2-r1.ebuild 801 BLAKE2B 09eda0f6ab0d9b029c10a1ff86c70e4ccd535cad50bd3723eecb05f20e61d98bfbe5ae638205cfd6f11470926b0e3d0a247d1d4da1d3d168ba5af8a4c1cf4991 SHA512 2e399c20a831febf3ff23299c1fb77b603204afaea402ebbe45989457fb9fa386eb047adb8c2a45f37efc36d65f5261a50f67f53f2d6605a7259ae725d8ce767
 MISC metadata.xml 347 BLAKE2B 0496b148ad07710139de96e153b80e6035e6731a18d6e8a4dce75dd17bdfc54ad77276f1f82791393d198e96c9306f464dbce832b4d643b6285fb9a6d92e6261 SHA512 98174497a1f55be4b14d769ec110dafd63a8942eb8f51e2953237b76705128e47bd36a39b9c25985cdd99a3b431f3d5aa856fd634b2a2fbfc1a5cc13a3826fab
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
index e3ef22a0543c..2a2d1656cdbd 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
@@ -26,12 +26,12 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		"--without-xf86misc"
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--without-xf86misc
 		$(use_with dga)
 		$(use_with dmx)
 		$(use_with xinerama)
 	)
-
+	xorg-3_src_configure
 }
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index d777da8454e7..0b1cfd953337 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,3 +1,3 @@
 DIST xhost-1.0.8.tar.bz2 138539 BLAKE2B f05d58444537431d9dce5e6dccc27bc8116141d66b34b6edb356dbe823898dbb2927f8ad8dc133178efc7e5b399b7b6428883ea7c665577d4b1984300474eabe SHA512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b
-EBUILD xhost-1.0.8.ebuild 515 BLAKE2B 1e344a7d387e542074c0c8f004c4e62e4ee3b6a9fcde608d364ce64b22bb1743306853a04baeecb9d840e9d7384bbda96aef16393ad5beb275544623c9b1267c SHA512 4e26365fe7a12462240717742ff7e50943c7cd999887d44116e1252be0aad2624657591b99caab0a45a1d4e9911f447b03c21d863ad2934848a68d2ae2688e13
+EBUILD xhost-1.0.8.ebuild 552 BLAKE2B c4c4b530cffdae27378ce6e01745dd73e38738a7ba64649b0968ecffb7f0486f7b5a6f5927376922cc07f1f27a2e22d40a786e1d12be2e355bd645e4cfacb43c SHA512 2a45be445bdbc1375d2fa9f34794891f32ade53a1468924cfe38066f148f244f1f374425ad4955a7d7ce76486093f5e01243bedcf1737e6e7574ca9f10ce12db
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xhost/xhost-1.0.8.ebuild b/x11-apps/xhost/xhost-1.0.8.ebuild
index 6b32368a13b7..a2a75a11d671 100644
--- a/x11-apps/xhost/xhost-1.0.8.ebuild
+++ b/x11-apps/xhost/xhost-1.0.8.ebuild
@@ -15,6 +15,9 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXau"
 DEPEND="${RDEPEND}"
 
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+	xorg-3_src_configure
 }
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index b716e6c4d369..ad0b0a5ba394 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,3 +1,3 @@
 DIST xlogo-1.0.5.tar.bz2 135608 BLAKE2B eeaa9dfdca57bd5b60035dc31981f3b3e390862b5e8f695422505059f657cfe727d491c757e8ef4dba4a913179c92827741f04e3fc6765b0257d63f1382fc69f SHA512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b
-EBUILD xlogo-1.0.5.ebuild 461 BLAKE2B e70ab714b2482a7aeb49a1cc35b3faa920354cdcf9563c0627716527753610aa79663eb25255d04699c6c7734124e118dcec7283b224a61b6d4b56ed0b03625f SHA512 2e5eeb5f533efe279cf701f4ec4220a4ba3bdfc4568bdce756403a664e122cb86c26aa2579265c3a50a1e4f01c76d34bc5289cd58c12f1dd2c4eef8999238b3a
+EBUILD xlogo-1.0.5.ebuild 463 BLAKE2B 343e265c09c977825f279f8c911b128061cee347c53e6f7b0b75e3c28d5a33ed6d9b739723d66ce518ae23501df47e9900e7d3e22fe2fadc1e1e31f1ee5841da SHA512 dd0f6c88a2462341fa3c3ba65014cb7231ff160976d5719ccf022eb1c1a663892d6b242d29c45d33149c1b66eaa8ad0230b6a2b229fe641ba3e554320df93b22
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
index e8c3fbcf83ae..2ad3f292106e 100644
--- a/x11-apps/xlogo/xlogo-1.0.5.ebuild
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -20,4 +20,4 @@ RDEPEND="x11-libs/libXrender
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
-XORG_CONFIGURE_OPTIONS="--with-render"
+XORG_CONFIGURE_OPTIONS=( --with-render )