From 35986799d3cee799b6b0a554cbf2a8a1a6efa255 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 4 May 2023 01:13:00 -0400 Subject: [PATCH] x11-base/xorg-x11: Remove bitstream-speedo dependency. This is apparently an obsolete font format which isn't supported by X11 for a long time and is being removed from the Gentoo tree. --- x11-base/xorg-x11/Manifest | 2 +- ...g-x11-7.4-r3.ebuild => xorg-x11-7.4-r4.ebuild} | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) rename x11-base/xorg-x11/{xorg-x11-7.4-r3.ebuild => xorg-x11-7.4-r4.ebuild} (89%) diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index d230665..322d9cd 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,2 +1,2 @@ -EBUILD xorg-x11-7.4-r3.ebuild 3797 BLAKE2B d87d8f37f7440d5171695c698a723c34bc85c24ec9565f112733e3b8de064d54fd7d94238957daca7f7f066c228dc68cbe4669c54029f79aae31c7e3e9d1db2a SHA512 1a8c057764d50bbe7ca90d2a6915409157a17d79c7e43a446421099a2803255293b57f00e92b9970044f26f9ca90f0ced1b76d01fcc0d7fb1d8e3541878db258 +EBUILD xorg-x11-7.4-r4.ebuild 3709 BLAKE2B e493ca2572c029173683ccb5dcea4e280028139fdf19b749b2b57f0e807f3ac17f6346a191623c44616dd853819868d82214541bc7aebbaa9d2500bdc9eec79c SHA512 e3061538b59d68de45feef1dc7ae1ef3618a1b23d47e2aa7153e539c823e8bc94f933f50efc35578807311f3b8556160a783a6b59f5bd660a31c65751d9f25d0 MISC metadata.xml 233 BLAKE2B 275dfed53b44f8c976a9b718cfbdb421c28ad80097e632173f27a3400ce32f2eaf7f686929b486626b9aa23afa40cd49f61b975a3876a8e61e1577c3c1db9405 SHA512 a06995e9f52455988091f273b40be5bbfa56c864d45f5fe73f731f0aaa9a317804305bd87c36eaa39ffd6b6d096c1fc54559221a0e11fa56ac2f01e0b959e12e diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r4.ebuild similarity index 89% rename from x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild rename to x11-base/xorg-x11/xorg-x11-7.4-r4.ebuild index d9a447f..d2eb32b 100644 --- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-7.4-r4.ebuild @@ -1,13 +1,13 @@ -# Copyright © 2014,2017-2018,2020 Nick Bowler -# License GPLv2+: GNU General Public License version 2 or any later version. -# This is free software: you are free to change and redistribute it. -# There is NO WARRANTY, to the extent permitted by law. -# -# This a modified version of the original ebuild from Gentoo GNU/Linux, -# covered by the following copyright and permission notice: +# This ebuild is a modified version of the work originally distributed with +# Gentoo GNU/Linux, covered by the following copyright and permission notice: # # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# +# The modifications are: +# +# * Add bh-fonts USE flag to avoid installing nonfree B&H fonts (2014-09) +# * Remove dependency on unsupported bitstreem-speedo fonts (2023-05) EAPI=6 @@ -99,7 +99,6 @@ RDEPEND="${RDEPEND} ) media-fonts/font-bitstream-100dpi media-fonts/font-bitstream-75dpi - media-fonts/font-bitstream-speedo media-fonts/font-bitstream-type1 media-fonts/font-cronyx-cyrillic media-fonts/font-cursor-misc -- 2.43.2