gentoo resync : 29.12.2022

3 files changed, 2 insertions, 29 deletions

diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 4511a2580fb7..05dac7b4d905 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
 DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3
-EBUILD mkfontscale-1.2.1.ebuild 611 BLAKE2B c240104b6305309a7dcf3d2c5eb4377315206b3bba217322980275bcedee0f3da02ebd0ce8b603c44c3c30c6a87240971cfa346813b95a6aa3db43ab69a6745d SHA512 cf9a4488f2407b03499b56f1db528a5e69507d08a341e1710cd3a5fc2dfcb75cc05322225c33e7a87314b0469d4e6ca351b94ec0ce82fd1d4ee15b4b19ec0679
-EBUILD mkfontscale-1.2.2.ebuild 572 BLAKE2B 39d3f4b05948e2fcfc98896904b887dc2b12099ad2b78dd0186ad29d3908e4424372278510b1f1997337e27f058c16c54df1bf5cb0ad6b8137055756c0db5d62 SHA512 86ef7ab39a3289e03570c930dd4d6f4e0ca43021807b84addc9dfb181d2ce3cc816ac122797dbd82a004ca065c8f56140b75bfb188cd363a88eecb20a6f94f74
+EBUILD mkfontscale-1.2.2.ebuild 568 BLAKE2B 4d389938770f797b98ae26a21b22e98d96cbcb6d46e1d44c7d3c2fb98ae4cd500f6ff51d3f4f2a96cee0d4e7fdfabea8095a4e588f99335e08a3fd3b71745885 SHA512 0c170d405791a5229ef82ea9d1aab556a2e54b2129fa8f1595be5f7b6c1c7d35f60162e3981d8b1133dfde7b063f08316f719928eb3ce896412ff028499265d4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
deleted file mode 100644
index 3095e7332bfb..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-apps/mkfontdir-1.2.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
index 5e2b5f156352..754e9e1106ae 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libfontenc