[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/, app-emulation/qemu/

[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/, app-emulation/qemu/

[Piotr Karbowski]

commit:     f644cc5c8fde401ab4b1575063d807ece1c8534f
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 18 10:42:36 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Dec 18 10:45:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f644cc5c

x11-base/xorg-server: font-utils is only build time; align 9999.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 app-emulation/qemu/qemu-6.1.0-r2.ebuild                                 | 2 +-
 .../{xorg-server-21.1.2-r1.ebuild => xorg-server-21.1.2-r2.ebuild}      | 2 +-
 x11-base/xorg-server/xorg-server-9999.ebuild                            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/qemu/qemu-6.1.0-r2.ebuild b/app-emulation/qemu/qemu-6.1.0-r2.ebuild
index bef1e26f9036..74cd38afc262 100644
--- a/app-emulation/qemu/qemu-6.1.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-6.1.0-r2.ebuild
@@ -97,7 +97,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
+REQUIRED_USE="
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
 	qemu_softmmu_targets_mips64el? ( fdt )

diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild
similarity index 100%
rename from x11-base/xorg-server/xorg-server-21.1.2-r1.ebuild
rename to x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild
index bf3ac9cffacf..05df79d40fe4 100644
--- a/x11-base/xorg-server/xorg-server-21.1.2-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.2-r2.ebuild
@@ -20,7 +20,6 @@ RESTRICT="!test? ( test )"
 
 CDEPEND="
 	media-libs/libglvnd[X]
-	media-fonts/font-util
 	dev-libs/libbsd
 	dev-libs/openssl:0=
 	>=x11-apps/iceauth-1.0.2
@@ -71,6 +70,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
+	media-fonts/font-util
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )

diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 8e9f6cb25f32..05df79d40fe4 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -70,6 +70,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	>=x11-base/xorg-proto-2021.4.99.2
 	>=x11-libs/xtrans-1.3.5
+	media-fonts/font-util
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )