gentoo auto-resync : 14:10:2022 - 01:43:18

75 files changed, 74 insertions, 39 deletions

diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 0f1a280cb605..98b4f7b61907 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/font-adobe-100dpi/Manifest b/media-fonts/font-adobe-100dpi/Manifest
index f88ffa89cd34..ae8353a16d87 100644
--- a/media-fonts/font-adobe-100dpi/Manifest
+++ b/media-fonts/font-adobe-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-100dpi-1.0.3.tar.bz2 1113104 BLAKE2B 055d8723af853126125eed181d3752c8aa58f5820f7835fab624917ed8bd1bf428064e472811f6538116b3dafd8984f4a651a4ee26924722394535b12e645aa6 SHA512 27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987
-EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 271 BLAKE2B 006f7cb3cf086f5737a8fc7919e3bf6e6e3b1fa94316ccf486a24c2d8175186b3ad3602d6a06f2d22d11118310c1a079ef7618407203d476e48cdc5ab82fc169 SHA512 5cf349655d85c573d6aad8a4c08fd839e887463397d85b716b6bed65b4fbac745126c006384b1de519234c1d592f90fc9f81eda43194b0caa5a3a7a4efa8f02d
+EBUILD font-adobe-100dpi-1.0.3-r2.ebuild 304 BLAKE2B 0de2edd9466a6477d7bb0b2780f1941640691879aa838080808551a1923013608503fefff661703a6fe86a5b571b54242cf2ada88abbfbd52b035d3f13e4e6f5 SHA512 3261bc1da6fb558949e609e0987b57252aa76eb60156e287a18124ab939fc5994492192faf243d6e986f70f6f2fc04c604d7d6eb0924b83524d87daf21fab487
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
index d20da5555820..1cf78cd20177 100644
--- a/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-100dpi/font-adobe-100dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="adobe-100dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
diff --git a/media-fonts/font-adobe-75dpi/Manifest b/media-fonts/font-adobe-75dpi/Manifest
index 8f2f6a353ef8..c2ae8b0b90ab 100644
--- a/media-fonts/font-adobe-75dpi/Manifest
+++ b/media-fonts/font-adobe-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-75dpi-1.0.3.tar.bz2 889542 BLAKE2B 5ca08b27bbf9880794862615af9e6e5b566fea6529523fa393136221690bb244c1a39ef90f939a0275fa8e176a84f9a4bfe0f464acb0549927bfecf6c6831e13 SHA512 c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d
-EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 277 BLAKE2B a956099a399ddadc02202e230f1b7a69e40ac5d8b0003a277ee08822f674206497b28a341a1ca7528856321b7fd1a36154b046b98014f4f9e14775043cf1823e SHA512 374f8898ff3e7022404d7ca1da7bbf2c0df200e84b919b9bb8952aab9f797bd0f0a90a94f6a0a61097b6afb8a9026b5f0620938bcd551d187c6a8179689aa49f
+EBUILD font-adobe-75dpi-1.0.3-r2.ebuild 309 BLAKE2B 36b0d9bea4bd68439b08fac4b8fa60a1deb2f54f0722659030cfd48622371af10a273db458e88495d2aa8c34f84b3679082f4a376bd0f3bf3102e65914d23157 SHA512 a49802eb13c92208f74c008df8a2e1f690888e5420ed04e2c7f81e9e4849ad9f64f13e6e32a7df2691a04d42359190c2c8a9960653f36683ba00ee8fa880a834
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
index c3aa0d6ebdd5..c00502c4c9f5 100644
--- a/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-adobe-75dpi/font-adobe-75dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="adobe-75dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Adobe bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-100dpi/Manifest b/media-fonts/font-adobe-utopia-100dpi/Manifest
index 0db9865be66f..5275d5d9f82f 100644
--- a/media-fonts/font-adobe-utopia-100dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-100dpi-1.0.4.tar.bz2 353852 BLAKE2B e5d37b5608725ca36987999aad269e3ed5a988069cbe232ece934f2ed71dfaa94ed78499e911f16f7f6d8114e684d501920bf927ab3551cc211f27deace2f613 SHA512 fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b
-EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 278 BLAKE2B 2cd2ca8aa6cde1ba87076542dd0dedf1fe78b752343d3f0f8714afa75b4459054df677b0cc17385e5363a11de0909ae55402a6acdce59a9755bce676f7aaf934 SHA512 678208a1893f8c5507cd8c089bf48e494e334def3d84ff2f87be54a93c5a15429227b7ad3850799a8a78e27de849c060520c19a19b7cc3f7ead89fe7ba337027
+EBUILD font-adobe-utopia-100dpi-1.0.4-r2.ebuild 318 BLAKE2B 5730409a15543fb9a73256bdb2e9924b347bf50366c813fd78bf5920fd93dc1fe570dde5d0397219f184c509a9f037281843eb4aa07f9aa9ab1ad0b6b0edb965 SHA512 0e8ec8178b5a89472bc8a3f66b7f57d3066aa398db78b77c0080ea53f4eaa40ca622ff4987fec715ef779aeff8f7858f3ff0d19777e85f29e952af4d79583d06
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
index c80b61be7881..bf7850ed6fbe 100644
--- a/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi-1.0.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="adobe-utopia-100dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-75dpi/Manifest b/media-fonts/font-adobe-utopia-75dpi/Manifest
index 4d16b992bdf0..b1e2909d05b9 100644
--- a/media-fonts/font-adobe-utopia-75dpi/Manifest
+++ b/media-fonts/font-adobe-utopia-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-75dpi-1.0.4.tar.bz2 273484 BLAKE2B a304d690de9727c5678dc1613cf7c8960594607a5f21fea15d03caade18df23ea83ff62fe7bd6c12750a0c9ffd11c28d4507e811eb271a1d1f874f0bcf0e3a92 SHA512 c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92
-EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 278 BLAKE2B 2cd2ca8aa6cde1ba87076542dd0dedf1fe78b752343d3f0f8714afa75b4459054df677b0cc17385e5363a11de0909ae55402a6acdce59a9755bce676f7aaf934 SHA512 678208a1893f8c5507cd8c089bf48e494e334def3d84ff2f87be54a93c5a15429227b7ad3850799a8a78e27de849c060520c19a19b7cc3f7ead89fe7ba337027
+EBUILD font-adobe-utopia-75dpi-1.0.4-r2.ebuild 317 BLAKE2B 7104d7fbe50cd9ee808d4a24f7bd375bd8a7b28ee19e95340f0a7e58edb5435fc387ce69ad7eb0ad861961bcc09ddb275915469d67360ac92c0c9d2d06bc04fc SHA512 ca72e1092b41fc9568378dbb9a8d9c8e5ca7178bd7c97ba88b1ee4bbf260294ee6fec670a61013f7063c20dbc6a1884e12302af5994d516daf375d542348017d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
index c80b61be7881..1c3405c25288 100644
--- a/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi-1.0.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="adobe-utopia-75dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia bitmap fonts"
diff --git a/media-fonts/font-adobe-utopia-type1/Manifest b/media-fonts/font-adobe-utopia-type1/Manifest
index 5e7f66615c80..1ab0a815616b 100644
--- a/media-fonts/font-adobe-utopia-type1/Manifest
+++ b/media-fonts/font-adobe-utopia-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-adobe-utopia-type1-1.0.4.tar.bz2 269159 BLAKE2B 0e23240a7b79a43c0508935b460e1f7f4cedc72e98dd903644b97d042983dde4c62610f53055d35717bdad56c5a9f52962bd11c4ee484cbb9b89b6c4c95752b5 SHA512 53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6
-EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 267 BLAKE2B be8278d30fdba0fdb05219a508954d82273e5575241e4900f6f6f44fe3eb0a49b6258541e77b79774f67199d040873ff57b060818b7d17af9030a5c4f49dfecd SHA512 888a39f40c2dd61d80df3d8d383ff5154fe5e531def62116444fce46d2e5027bce70712f053d00d482f0b195df7fe5416230fc31564fef6b7e3eee10875f88f4
+EBUILD font-adobe-utopia-type1-1.0.4-r2.ebuild 306 BLAKE2B dc2c2467ec0a02d64267b56b5b6dc53953f559dbec140cb3b95288c98515c46fcaf0b846dc77376d074b774d117438511c30db3611aca36c349d9b15d5391133 SHA512 4828def90ed63937980df5a62189535f7e81b40132e5b22f4852eb1d44be19b216474f17671985c894143e977b8be73e4c587ba8a2fa48b842802c1f28256afd
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
index cdcdde41f4c9..fbe05739ecf8 100644
--- a/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-adobe-utopia-type1/font-adobe-utopia-type1-1.0.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="adobe-utopia-type1"
 inherit xorg-3
 
 DESCRIPTION="X.Org Adobe Utopia Type 1 fonts"
diff --git a/media-fonts/font-alias/Manifest b/media-fonts/font-alias/Manifest
index 91222058b98b..09c92f98fb74 100644
--- a/media-fonts/font-alias/Manifest
+++ b/media-fonts/font-alias/Manifest
@@ -1,3 +1,3 @@
 DIST font-alias-1.0.4.tar.bz2 119248 BLAKE2B 40f4fbc7924c57d17cf7166d0d60c4231f83cbb85225c94e6387c0dc72aef106b1e665a1700ec857784047d9ee04eab422cc1f391a952dfdca1b7cd6af2a503a SHA512 c67ac2ee344a601fcc09471580214b30c3fd6acc4800702840de44f0733e6d18b3faeec2fa3f4e2314025cc1724d7d6796ebaf620398fe350710182fd2c4b07d
-EBUILD font-alias-1.0.4.ebuild 523 BLAKE2B ef17d77b043d2d8795c9623fcea21c29d9c50549f3333b503b2582535714f43d769906eebe9753683e905506eff0d75d9cb3f21a1336bf16a9c120e3ece7fe7f SHA512 2c512fc22ed0355ecc7373f073d074b516a931695ee55aec27eb712d9186c627eedd63b5e4681f3efa86ac383c593cce423b93d7a67ebb7a77bf7b9f619f9030
+EBUILD font-alias-1.0.4.ebuild 549 BLAKE2B 3ba56d2685b3a10f290b18723c1f2c7317e416f794f57ba14d50c3f6ad117c31554d50e039b254c6f4308148f3084b63378c83c6078cf41bd235f13bdb12de97 SHA512 6acf3b033bcb99672d7634cc636d183367c3a6c78fb0c2cf29243a860f82d86cac6aa2f3f04f2c802ed4edfa9bdb3bf77d47b41ee10b57c8ee47ac8267c147df
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-alias/font-alias-1.0.4.ebuild b/media-fonts/font-alias/font-alias-1.0.4.ebuild
index a1e6f9da1bb5..4131d7807fa3 100644
--- a/media-fonts/font-alias/font-alias-1.0.4.ebuild
+++ b/media-fonts/font-alias/font-alias-1.0.4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="alias"
 inherit xorg-3
 
 DESCRIPTION="X.Org font aliases"
diff --git a/media-fonts/font-arabic-misc/Manifest b/media-fonts/font-arabic-misc/Manifest
index d00985b0d655..14a478e96be7 100644
--- a/media-fonts/font-arabic-misc/Manifest
+++ b/media-fonts/font-arabic-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-arabic-misc-1.0.3.tar.bz2 112136 BLAKE2B 7ccd19008955a016398afcbb1202b9df34e7cfe6937152d443f2ff381564ef1e91dc4bb7dbb4ba6e5931bd7071ac4f570f2d8167dbc58029ee9a88f5ab18a5fb SHA512 46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0
-EBUILD font-arabic-misc-1.0.3-r2.ebuild 261 BLAKE2B e4e00350d3ce6ecda25d40da61c0a3519eb60be3ef6dc11f175cf606ab349ccd262bc6503adf3a08472bf143c6257fa92ef79ba359a0634a4e705706f9352d54 SHA512 04dfa4a30bff868a1ab1271c51d252eb1ae509ba2376d68720e37ac8af0a18c0a0a8514e302338def30eabb2f0119cbe85f4f60138b431e7720310823ec1c1ee
+EBUILD font-arabic-misc-1.0.3-r2.ebuild 293 BLAKE2B 95da8ad456b1ebcf9020a70e334867d771dcbd2744cd48026ec2725625f74289d8b2c6e7d01117e254d65ae4a6a5f300b4869e2b0cc0290c81cb39460b882ecd SHA512 5aed3f42f90c76f4029ad91469efa690a51cdbb1fc7de1925f17a3d2d7a7cab87ff6025bfecd54dd8653480f083feeb9c2deaa9392e239191443d5dc15c53c73
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
index 71ccf7a3f573..5f367b4191f8 100644
--- a/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-arabic-misc/font-arabic-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="arabic-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org arabic bitmap fonts"
diff --git a/media-fonts/font-bh-100dpi/Manifest b/media-fonts/font-bh-100dpi/Manifest
index fc4a83d2d722..fb0ce5c23101 100644
--- a/media-fonts/font-bh-100dpi/Manifest
+++ b/media-fonts/font-bh-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-100dpi-1.0.3.tar.bz2 713206 BLAKE2B 3433efac96d56d91685cacf3a1ff93fae0378831164381b2e8f16dd216a042c8ed3d0ebd6c622b592b11cefe7822814df57c74e42ee846905a406af208616eca SHA512 60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2
-EBUILD font-bh-100dpi-1.0.3-r2.ebuild 339 BLAKE2B f3f5b9970a573bd9c24a3aac93f32d4bdbd868a1cc92ec6baf46d160b2a25ca45e19739fd476d74a9d5f4f15e5694526250dce802cea68d05cd514dd8e765021 SHA512 a4ab66d4e3b373e968a70f036e88b185dc14d12820e168d0c613bbb477cec3eb865dcd36174ba379fa175dbd22ced1c591a95e57051cc845b2ece551b0152ccf
+EBUILD font-bh-100dpi-1.0.3-r2.ebuild 369 BLAKE2B 527eb0053cc89382e532d0a2477748936205faf8a8f97a38439e91d06e4bfc6482aec4372d2ab5bc0417bc7caa201f050b06efa4dd20c717dd575fe6273f886c SHA512 f0b09aed478990c7c302866037db72b3b5455da61a2fc1707c64adefea23e94eb643212a702b77286d8195e5fe67f0f31317773a904f7d16d6966c4688e41af3
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
index 77adc5b22fd4..64e42648973a 100644
--- a/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-100dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
diff --git a/media-fonts/font-bh-75dpi/Manifest b/media-fonts/font-bh-75dpi/Manifest
index 74a8c1a9a132..201f5dcbfb5e 100644
--- a/media-fonts/font-bh-75dpi/Manifest
+++ b/media-fonts/font-bh-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-75dpi-1.0.3.tar.bz2 553016 BLAKE2B c39213ad487d577763939507c24709413e56147901d4bda5957004ae4c9b53dba4769e93886a7827da4ea149303d92d780f7c745f7de6cd89b6d69770158a52b SHA512 fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50
-EBUILD font-bh-75dpi-1.0.3-r2.ebuild 339 BLAKE2B f3f5b9970a573bd9c24a3aac93f32d4bdbd868a1cc92ec6baf46d160b2a25ca45e19739fd476d74a9d5f4f15e5694526250dce802cea68d05cd514dd8e765021 SHA512 a4ab66d4e3b373e968a70f036e88b185dc14d12820e168d0c613bbb477cec3eb865dcd36174ba379fa175dbd22ced1c591a95e57051cc845b2ece551b0152ccf
+EBUILD font-bh-75dpi-1.0.3-r2.ebuild 368 BLAKE2B 5e8873a23ce39619e2479f6864b13e25e7036d42c86ec5fd067bfc54c4f85d35135158dd576181e4b318a539e174da5a7d1310eceb70f4100c23cd7550c02483 SHA512 adbdda07f7ef6f712f0fdf047ecd16544d0a84e759565085916f385f6aa25ceff2111c67afbd3aca2f504f44f768adee864b3de6e320baeb4f4fe0cdd10b83b7
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
index 77adc5b22fd4..dd7fc523f044 100644
--- a/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-75dpi/font-bh-75dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-75dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes bitmap fonts"
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
index 7c44eb4868b1..04ca0a27986c 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 245807 BLAKE2B f2cd40b5621aa3940e8047bd6b2ca588fde367512da196ebfa32469be06ea15c87641da8f81f14191a65dd5eb791de1256e26c5cc20e0dab3883834028003665 SHA512 1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f
-EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 347 BLAKE2B 220f90de86582c8a762e3e3628726e36e64aabd9a673fde5b00b2ad4bec796104eb533a670e562028a89c8dae58aa72aaeab98593d48c59b0527eb6738ea9ee1 SHA512 70b91ad2d3978429fc6432d76941ac6a7f34cfba28cd1b206007d434065c314a1a5dcefa69fbf82e8a000dbf46d7143508a3c941945b30af0775060a4a0bd7ef
+EBUILD font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild 394 BLAKE2B fef91b918a13524fba62d00352bcbb1f4b1903ee2a4d86d18397ef397f3842ed2521eaf4993c06570232d8290e9b1c3454d1f0d21470c5e84561ea0767a195c5 SHA512 7f1657b3737de62517cd620c1c0a20bd261fa7c49ac2af2af93012127bab5b4770e3377d4ce514b0b76337eb6c94e3af62d657c4872d3292fdcf838b928c877b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
index a4c01c9a9ad0..63808265f7ab 100644
--- a/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-lucidatypewriter-100dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
index 3a4fde02a954..e7e37ac3b235 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 219511 BLAKE2B fe05029295ef04414dd37fe80d023cfbf423fd3c314d53cb71dc2e4c623634e8e5b911f7a92851f49dd66cc9939d4998d4ec78f705a52908d01e1dcb91f08387 SHA512 2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13
-EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 347 BLAKE2B 220f90de86582c8a762e3e3628726e36e64aabd9a673fde5b00b2ad4bec796104eb533a670e562028a89c8dae58aa72aaeab98593d48c59b0527eb6738ea9ee1 SHA512 70b91ad2d3978429fc6432d76941ac6a7f34cfba28cd1b206007d434065c314a1a5dcefa69fbf82e8a000dbf46d7143508a3c941945b30af0775060a4a0bd7ef
+EBUILD font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild 393 BLAKE2B f039592b208bbaf4b829f52d1ff634f74d2abc0e74b602a54fc24852428466fbe524f1f6880fe73ffa8d2c30b292560dacd69424c5e3e93b6b10262c17bca3b9 SHA512 0262706024788132a21043a42a3055b90f92f2d045893498150d1a557874591d0e8cbb16eb38b6bf2638313b08bda3d37950c283bd0d2b1b0ee1474115afbd96
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
index a4c01c9a9ad0..3416c4947fd9 100644
--- a/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-lucidatypewriter-75dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes Lucida bitmap fonts"
diff --git a/media-fonts/font-bh-ttf/Manifest b/media-fonts/font-bh-ttf/Manifest
index bf8da3a13414..28db9883d859 100644
--- a/media-fonts/font-bh-ttf/Manifest
+++ b/media-fonts/font-bh-ttf/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-ttf-1.0.3.tar.bz2 465351 BLAKE2B 2d508265128262b479f184341862687235af0bec4098dec269f257ad3d2ec94de08ccee4701612c9b747214b38587840a4051dbca2fa1852e859482eb8cf6ecb SHA512 36b5b6bbc2894cd90a372e8131281a462b42d503be3e9af8565edbcd954b336690aa86a0b6fb162d865ba71b65669c5b911658c5b820effcea39d086d485be25
-EBUILD font-bh-ttf-1.0.3-r2.ebuild 308 BLAKE2B 8b06efd5b28fd1cde8d9120ceade82666cf250f80f210b3a5044f52bd7577425f964f654d53fc44cf8aa2c51c0c2b8975297219daeff8c556501f23816745cb5 SHA512 82910933fe1b1e7fa4e777418c7b5fc92a527175a68d640dc9ee3d5c8f5d39da70058fb345294151c4699b40a613a73e1ef0a2fe047bdb3ed1778123856dffca
+EBUILD font-bh-ttf-1.0.3-r2.ebuild 335 BLAKE2B 4499dc99020821c1ed13bb8fcc300012ce338fb8febcfa0efff804c37443e0b9322219074df440a6cbc746f5c7b168e8cdd115715cbbd2de6914462d45945b75 SHA512 e917876b8632a13a7ee91b48a77201a63c395ddf998635352176ddcdc10ed747d02a37aa5a5c10fa5f3427f5f3d7751e638ae493ce35b25c70b98cadcbb9dd10
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
index d2f1cf2103bc..de5e2cfc927b 100644
--- a/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-ttf/font-bh-ttf-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-ttf"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes TrueType fonts"
diff --git a/media-fonts/font-bh-type1/Manifest b/media-fonts/font-bh-type1/Manifest
index ff9e9a5992cf..476fd9384020 100644
--- a/media-fonts/font-bh-type1/Manifest
+++ b/media-fonts/font-bh-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bh-type1-1.0.3.tar.bz2 637337 BLAKE2B 122df86566d86a8fa85cc1da3f7d1913a2df589c301540b2bdd73e96726dc5fdb16184f80d8a3a58e6bd1ca54e0f4a3a0f266a35747f500065746f0be209484f SHA512 dc6cfe7d78a549ae5368ddd2bb3edc6746648b32e1f22bce87f6adc0845ef4827cd3b2472d0afa17a16a2c384e84f74f1c7d807510798bc69089920fdc5486da
-EBUILD font-bh-type1-1.0.3-r2.ebuild 300 BLAKE2B c0a5df715b5ce95c2a48bcb0bb08ee42553218109dff07631152b718eee05eb53fa946d498d726218e29604602976a7e4f18a1793f32bfd088b01d5837ee7ffe SHA512 059f9583512569dbdaa287512eef206d725655b078a411059ffbdbef11989de61ad5a56f50948f5132b6985e1468eb8edc6502e22810d487b3d49e7e9c82d171
+EBUILD font-bh-type1-1.0.3-r2.ebuild 329 BLAKE2B ea52ab0b0f402bdb2b9ff0f09e070be87096da888732809afbaf58091ddaf08164a95862848dec39404863a0424682ef57f4fbc449114399ea49c382dbba2239 SHA512 628519cfb444c963de02c7985b4b5074a7f5da095592477c995bc802f6c3e3804d6515b12f05cc600afbbda3064a3c263a8b38eda5daf526ed4699fc49522b27
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
index 25dc802424be..8c8db015b6cc 100644
--- a/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bh-type1/font-bh-type1-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bh-type1"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bigelow & Holmes Type 1 fonts"
diff --git a/media-fonts/font-bitstream-100dpi/Manifest b/media-fonts/font-bitstream-100dpi/Manifest
index 13ccefa3f06c..2ccea7daaae4 100644
--- a/media-fonts/font-bitstream-100dpi/Manifest
+++ b/media-fonts/font-bitstream-100dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-100dpi-1.0.3.tar.bz2 200276 BLAKE2B c5e4584642f49c30d8a1a17f3384a9bec8c3363ff7bc2cc1cfea8d04e8ad39e3f44ccffb461cf1508b5dc96b8a7fa6612b754cee6214fc1c6e6689c68e650819 SHA512 10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd
-EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 264 BLAKE2B 979c4edba687e380808bf20e0b8e4c1ebf30565a7620064d2270eb7f9dfc72e2d00998d7dabc4549fb2ebcc21d4d48121eabad2e569414c8ff4b60acbfaab5af SHA512 2e45bfd8bc83ebd2fa936f5555bf61f46d7cee9e3f3b8c748ac9bf7c78ec8da32b0690940a8e65975c883f46b1fa456fbc31435590accdd35b3050c61e758b73
+EBUILD font-bitstream-100dpi-1.0.3-r2.ebuild 301 BLAKE2B bbfafa012b8666a8039c382888633028cf3a12e39036a93daa15bb058d90a02c74cf69902ecae9a3515c17db97c0ac85a5f73a94b8e14a3a8aef786e6180f933 SHA512 a01f46abbaa75c0b92b790865eb246226e1fc7bbe1e680481dd04c81c06d11d8cf40c75bef2fb63de7d97f3c0f84f56d8e38589eef2bb4ac49d371385057cb76
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
index d8296a93d300..c8e40a996c54 100644
--- a/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-100dpi/font-bitstream-100dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bitstream-100dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
diff --git a/media-fonts/font-bitstream-75dpi/Manifest b/media-fonts/font-bitstream-75dpi/Manifest
index e3a4dcbef57a..c740dab6cca3 100644
--- a/media-fonts/font-bitstream-75dpi/Manifest
+++ b/media-fonts/font-bitstream-75dpi/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-75dpi-1.0.3.tar.bz2 174603 BLAKE2B a4d57cff621d57c27830e4ccf870d74fffe699d0ade6df32300a5f4de1237b263e449fca46879ac21329888820e48efd49f057192ce3ac11aae56243bcc3e1c3 SHA512 9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650
-EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 264 BLAKE2B 979c4edba687e380808bf20e0b8e4c1ebf30565a7620064d2270eb7f9dfc72e2d00998d7dabc4549fb2ebcc21d4d48121eabad2e569414c8ff4b60acbfaab5af SHA512 2e45bfd8bc83ebd2fa936f5555bf61f46d7cee9e3f3b8c748ac9bf7c78ec8da32b0690940a8e65975c883f46b1fa456fbc31435590accdd35b3050c61e758b73
+EBUILD font-bitstream-75dpi-1.0.3-r2.ebuild 300 BLAKE2B b570837682ec83b5aa5790a5a17ccf8fd37efc57cdeb3eef7ebc0f338ef74a51b1468a4982d4e8b9da6a2962a62c44bf3f519a27d4bf1fd5aec75e3d1362e908 SHA512 5af22181a6b9d648f684ecf16328180103e479d6d4fe84f3cf74783b35e24109a7cd8063705748903e7590ea7bce8f2cac077ee1170e747e5290a211c4bc3cfe
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
index d8296a93d300..cd99f4503437 100644
--- a/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-75dpi/font-bitstream-75dpi-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bitstream-75dpi"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream bitmap fonts"
diff --git a/media-fonts/font-bitstream-speedo/Manifest b/media-fonts/font-bitstream-speedo/Manifest
index be04c05f0923..d75542e3bc84 100644
--- a/media-fonts/font-bitstream-speedo/Manifest
+++ b/media-fonts/font-bitstream-speedo/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-speedo-1.0.2.tar.bz2 415776 BLAKE2B c9dd88ed2e7e4a4151254ffadf5254aaf460bf72086a798bbb946a3729be4795a477cced5441792e0d6967e6faf4ddcf72a212ec31b5641b5b67357d659b26e8 SHA512 78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb
-EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 258 BLAKE2B 03c8a1601efa9e508b4f163f77b2fa42e8b36a2f17f148a097a4c194f05438c5dfdf80ac39ef33a48f243321af9b11783d9931fc4254ba6f0c0fd86d992a995b SHA512 398e723d331f800c34d6ead5bf5ff1b95656861b3e62971b41ef9f4b0b4fa522259e3e80e7cd3c19e9d76f1cbea0355b5d7e70b619f76d6de6e8823f501658b8
+EBUILD font-bitstream-speedo-1.0.2-r2.ebuild 295 BLAKE2B 332d92a4be6356aa5156c7dad7076d113bc4facb9a466602bb40b088a8bb711cb29a14c541e8910d8d994ba8ad7818e5e8b54a5403380b0f879f5bcac5017e1a SHA512 e09faa5ba05da04e293be0484be1bab009c7dc9a0aeeba8f234863149d386cc12eff463aa2fee61e87024db93080f0c41e39539affd9ae8bc1defb7b8ec4a7c7
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
index fe22d492966e..a355fa88cfc0 100644
--- a/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
+++ b/media-fonts/font-bitstream-speedo/font-bitstream-speedo-1.0.2-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bitstream-speedo"
 inherit xorg-3
 
 DESCRIPTION="Bitstream Speedo fonts"
diff --git a/media-fonts/font-bitstream-type1/Manifest b/media-fonts/font-bitstream-type1/Manifest
index 67ddc95a78b7..3d494752ce61 100644
--- a/media-fonts/font-bitstream-type1/Manifest
+++ b/media-fonts/font-bitstream-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-bitstream-type1-1.0.3.tar.bz2 415980 BLAKE2B 6877549e25cec38f46ef19ee3b34cc3c2b0f3aaaa497ab3d26e8514405ad09a384c87667e82a220d14a85f4ca448a1f939739b618e3ae62c1214b7c7de39a422 SHA512 71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61
-EBUILD font-bitstream-type1-1.0.3-r2.ebuild 270 BLAKE2B 0453fecd89899e353d2d653a48e512b56a20e64fadc72dcb774ae75c7f937248b93617d600d4cbc8d62c593abc7d7295ea152e6c4b2330f84573bbf14509bf4c SHA512 91a52e26a9bd22cbfae9a2d59cd296eab742e382211d6cb719d7f1f550a7b9411d33b8116350af46e196370407a7513f1dc03671940ec590805453c7dc1689b3
+EBUILD font-bitstream-type1-1.0.3-r2.ebuild 306 BLAKE2B c326316eba8150d5a32e30f67445a37c085b6b2b0b1aa548b962e001d5c59dfd4950d6aebf04fc28b6fa98ce9b21f1cd6bcb3c4c0c786177c72d6b74263838f9 SHA512 5a2f1aa5878d341521395505e1df555943acea3018c6832fe3c2e5f4f7cddc206c1dac1933288997b77c03b71de36b10362dcb2d89d9f382265a50cc2034d001
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
index 8f8337ccffd7..ae1dbde3fc8e 100644
--- a/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-bitstream-type1/font-bitstream-type1-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="bitstream-type1"
 inherit xorg-3
 
 DESCRIPTION="X.Org Bitstream Type 1 fonts"
diff --git a/media-fonts/font-cronyx-cyrillic/Manifest b/media-fonts/font-cronyx-cyrillic/Manifest
index e1ff3da22a37..bb57a2fa4605 100644
--- a/media-fonts/font-cronyx-cyrillic/Manifest
+++ b/media-fonts/font-cronyx-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-cronyx-cyrillic-1.0.3.tar.bz2 262896 BLAKE2B 928c67c3adcedc7e507d097bd522493f4f035e43037792f88e7c239f26b955734023c7c4686e51e9f001804f3f0bffc5025cfed50571bad19c27917fc4f92ef9 SHA512 b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456
-EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 263 BLAKE2B 35e3674dad803d6b425debf325febd35217783e0ad11ebf64b6fd218ead4a1e78f9c5c1f95dc80a863b852383ca01752bd883d0798865b7eb27f066c19710ebc SHA512 d27d2f269169c9fac3ddc0abfa242273fd785101247791ba7193099d4362b8f3c85f08840c8750020e4044d0cebc85f5618ff0ff5c46f5f75acd26755a0dd17d
+EBUILD font-cronyx-cyrillic-1.0.3-r2.ebuild 299 BLAKE2B 4cc69411e2d70de1192e496e9b808e8b37b610088ebab4445908e62b698df53eac7e9ee13a7722f1aeeafc7981e9a2fc5b6c69b20ac267e29ed766c6d4a2a58b SHA512 cabc9a3b822cf34b201ecdd9fdb1691f6e12b7fddd69c4cec9616e05138395267429815b070e56039c66ac5bec6c59c93a4b0e40ac992fbbf94bbb8f90dcbe26
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
index 8ab4fcb2c3c4..72c000ad0289 100644
--- a/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-cronyx-cyrillic/font-cronyx-cyrillic-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="cronyx-cyrillic"
 inherit xorg-3
 
 DESCRIPTION="X.Org Cronyx cyrillic fonts"
diff --git a/media-fonts/font-cursor-misc/Manifest b/media-fonts/font-cursor-misc/Manifest
index 56e50f795e60..8cb4e7e8de7c 100644
--- a/media-fonts/font-cursor-misc/Manifest
+++ b/media-fonts/font-cursor-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-cursor-misc-1.0.3.tar.bz2 102041 BLAKE2B 13ed204f19b64c0e392664665bf670a497b9ad9efaa748ff521787d8f3f0e170c9361dccf97c4e106be557743b57ebe61fbe346f7e0f71fe733df9c6aa378f14 SHA512 7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83
-EBUILD font-cursor-misc-1.0.3-r2.ebuild 263 BLAKE2B a538a35ccd7945dc849d4ed3a058edf93da2d2e756d5c6a67851b7c4f5fa857d925a4456c4cc1b9923c00e63998396a07b5ebe96a6986b16749611027d37f98b SHA512 98a9c17f2fa062b610809dfc085e8e0a3d6efd07120e72da78ad21d559a21b8fe4be990bbcac91737a473451b2728feff36c3cf786c9fa17a359f65388ea9565
+EBUILD font-cursor-misc-1.0.3-r2.ebuild 295 BLAKE2B 99c862fa432241cc6553469fb4eb46574c5a582f3b1d22c877fcfeeefb5da0f6384710e54d4c5d6e86d42a07ad7ba488095dd3e98e1005bc564e472b8a2014f8 SHA512 b77a526a35af2e3a43e8ebf5e6cc4d94b50d6df10def5dea5c9069c92f71ae3700a17eb98699b8e4e1b0191bdbecd0a70e9762b90bcdb3534e2ab308c2d743bf
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
index 7f8a4666b338..712ffd53bff3 100644
--- a/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-cursor-misc/font-cursor-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="cursor-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org cursor font"
diff --git a/media-fonts/font-daewoo-misc/Manifest b/media-fonts/font-daewoo-misc/Manifest
index b8493f1903c6..1c1de824bccb 100644
--- a/media-fonts/font-daewoo-misc/Manifest
+++ b/media-fonts/font-daewoo-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-daewoo-misc-1.0.3.tar.bz2 723414 BLAKE2B 5edc33bb4b3e870158235bcefebde9bf0858e7c9ab766659e2859c69562338746186d9ff59bd2b6bf50abe2054b4f595cb7b55454cf671780f28a3245d208002 SHA512 7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06
-EBUILD font-daewoo-misc-1.0.3-r2.ebuild 254 BLAKE2B 30a65d9a0975b8c4620ba1c843b7ff1db66c97dfcb269083de76d78cf77826af397cf495b8fb0bdad9d9d6c41e1d7178d96c2c05ad520c757c3dc7b730473dc5 SHA512 1ce731947eec97773d4d8a8c581c08f60a40a46e8dee3eb17c1e5b7a22dc4dafa2730b9c8ad0ab8ad0cd46aa507eefff9318f4ce2666168b22e66681191cce9e
+EBUILD font-daewoo-misc-1.0.3-r2.ebuild 286 BLAKE2B 3107f810b6fbce73dcd693d0bf2d9dc7ff9037ae9e84e8c9b697a92b532cacd86599145c31e4995e02e7139804f77d3d33eb46c12aa8e19fab30fc9d0de620e3 SHA512 cb950efbfbef72ba5a277f9665882278db23a9100a8360a4718097d0e5693d7aa60728b231e760f00b979207e26f1235b103f0f0d788c165fcbaaedc8c594951
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
index a3c4cf637d5d..a20838b35f2e 100644
--- a/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-daewoo-misc/font-daewoo-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="daewoo-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org Daewoo fonts"
diff --git a/media-fonts/font-dec-misc/Manifest b/media-fonts/font-dec-misc/Manifest
index fe92e0a584c9..c876f1f3272c 100644
--- a/media-fonts/font-dec-misc/Manifest
+++ b/media-fonts/font-dec-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-dec-misc-1.0.3.tar.bz2 99832 BLAKE2B 930c1435240a485c2bfb55234f767da4aafdccd2fe3d7c5a760acaefc4d145a68bd0cd5757d4daeed61d8f3ef4eb9bc473454402f6eda62d4a298c79bcbdac6c SHA512 af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6
-EBUILD font-dec-misc-1.0.3-r2.ebuild 251 BLAKE2B 8954e43b7aaccbeb0f5102d0f890b7e545d65b48d2e976d5ed054629d470e0e583da4c2e66eface435b95ea3414a045471018a90b73ccc5734d313f81f448623 SHA512 26c298462d6d55be490007dead50234ade77bac02ceaca3b656be5f66d5ca93b355ed7cc356d397cdb900e14c9693dd803bfd36b5b6aa1ae24de212ab4c9a759
+EBUILD font-dec-misc-1.0.3-r2.ebuild 280 BLAKE2B 2125637b9e2d2eb24b46907e00c1b13ac329abb34a5d6ef864f4c7d830777e7531f67c5927d051c94166b2e1d4f26c5a4de13081e1392c3c37f4b0f0e5cea285 SHA512 e95d0cc5653549491b667a4927821fa81a274cd3470d2df116691d2d48e8fb600a58290a874b51f38df8f4e90e5f8a4c7241eb694d74ec449a603a77d55eddb8
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
index f46a92faf149..90dfe48ab970 100644
--- a/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-dec-misc/font-dec-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="dec-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org DEC fonts"
diff --git a/media-fonts/font-ibm-type1/Manifest b/media-fonts/font-ibm-type1/Manifest
index 4825b42c2694..6a317f917e7f 100644
--- a/media-fonts/font-ibm-type1/Manifest
+++ b/media-fonts/font-ibm-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-ibm-type1-1.0.3.tar.bz2 376985 BLAKE2B c8563fe5fb44975dc6d99f8ab106c3040276280969df6fd33db23470eaa49acffb10224fadf19867d71346d357bce96a2be898d256fa7adc9be66469dd822293 SHA512 cbd179522c936c4f956ff1fbdc48fc3a55990083b4f858c938c6a54c8526641b4f25eb3a6795d774630b75a0f4fbdf9c16e861e88b2cd95f04c524f95d40f90f
-EBUILD font-ibm-type1-1.0.3-r2.ebuild 258 BLAKE2B 2a634ae2126ef44725eca201e2ebd55b7c2f955f5f10987eb41270adfbb6a0852608e95b724757c6ad30a7b356821206c3f4bbb2ac0bbdeac1afaa40a26d7b0a SHA512 9b4ce7d1d8d651ee9a9e0e3c27767f95811d42a981e67cad5b1c08b30ced48a67c6a82ac0b6f8170c55f76fd35fab7f56dfc31a77cb201dea8242b205c72226b
+EBUILD font-ibm-type1-1.0.3-r2.ebuild 288 BLAKE2B b56ea5ad64cfadbbe4bac1a9ff101ed3db169411059b92d6232b0c12b8cad083d3c2c157a7787458f7c6acdcfc1e60e82cfda72d8e5d10bed45a31b35672f71c SHA512 263e59763b375c4ff09ef0e4ea36db4ecab03489488861a5cf529da0419762f22c8986fc1e79f7927da2290aa61c275028f9bc09d73a00e4a0546069ea43c807
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
index bc1ba617d060..81a08f68d630 100644
--- a/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
+++ b/media-fonts/font-ibm-type1/font-ibm-type1-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="ibm-type1"
 inherit xorg-3
 
 DESCRIPTION="X.Org IBM Courier font"
diff --git a/media-fonts/font-isas-misc/Manifest b/media-fonts/font-isas-misc/Manifest
index e5c8aa291056..20a8eeaaaccb 100644
--- a/media-fonts/font-isas-misc/Manifest
+++ b/media-fonts/font-isas-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-isas-misc-1.0.3.tar.bz2 845282 BLAKE2B 4c05c83b64617e1f0740d54c53b13b628affb8c9cef43e785f8101ab5a7fa730d9500f2af45a1c4de658e94e2d7c5e467b6e4761fbb27f4767fb8817e77272b1 SHA512 be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b
-EBUILD font-isas-misc-1.0.3-r2.ebuild 300 BLAKE2B 1c2b999d60031b16449e34dc7c25618385e3fe37cd41c00c5a04cce5b452da418991ee9cd821653158ac0aa65135a007791338005675b89f80658a60fcf76436 SHA512 55d433b1b095871b958fe3faaefdf606f03eb1fc409433c5b776ada4b4c45166be661852f3ef2943594c82f024a66f05506eb0457e71d097003142bbbaa7ee2a
+EBUILD font-isas-misc-1.0.3-r2.ebuild 330 BLAKE2B 39c08b2a7e1a080560b827673e307744a2d48a5460ad2965b18789261467215fe3e35a381192796b5c8edb2c3fd132b0b630dee48c402c6fdb2d551320b2afab SHA512 e5a282b56621a082524deb2ce55b72789a00d875653a1bb5423c22069b127b40fb99ac74d7fc4fdc2d72f2f9cf812a7177c883766a714c574733b50f373a5995
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
index 47a646c2cd89..702a48fc0478 100644
--- a/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-isas-misc/font-isas-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="isas-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org the Institute of Software, Academia Sinica (chinese) fonts"
diff --git a/media-fonts/font-jis-misc/Manifest b/media-fonts/font-jis-misc/Manifest
index e275f44cf283..21badf90d8bb 100644
--- a/media-fonts/font-jis-misc/Manifest
+++ b/media-fonts/font-jis-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-jis-misc-1.0.3.tar.bz2 621946 BLAKE2B e188c7f1d0e0b22912062dc94f1e9dba75c0990a497b88886e365d635621366af940d77ee2e7eb5f687e2ea6296cfbfed14ec45a0aa59c1d803010e7b8a6113c SHA512 3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c
-EBUILD font-jis-misc-1.0.3-r2.ebuild 261 BLAKE2B bb26a67e77c4084971b5f6b9e8464e94b7bf2642c8e92ba82a7c3e063e433b53cacf81854ab56e4361a2e86cda48485ef0b17fc450e5cb854484082d76cd751e SHA512 59f5b420a9fede23a32b26bd0c6cd4fc0ded47b4e813b7fd84754f592a0cc83964e65ad1daf042b7123f3af26437b2041fe821ef7d5a83be7becb76b02ff11f7
+EBUILD font-jis-misc-1.0.3-r2.ebuild 290 BLAKE2B dede57359d016b428a4afc6a773d6a0f09fb3e0c913f43c5fcd7fae94b8f96879ea2efa95bdf5b1baaa0ecb27f15268460f8797c6467f3ff3c4a638ea740dbab SHA512 8aeba8cf556e64c0ed3656daacb9a7ddf75fd6abd1098d2d83b3c5f26d28c5d5b6063cc59af31f7766f994a94302f0607d61e04a72f83f2f38195a71ea3b2fb5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
index bb518fc427f0..8b3bb3772644 100644
--- a/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-jis-misc/font-jis-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="jis-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org JIS (japanese) fonts"
diff --git a/media-fonts/font-micro-misc/Manifest b/media-fonts/font-micro-misc/Manifest
index 19ede36f4a27..0e23764a8df0 100644
--- a/media-fonts/font-micro-misc/Manifest
+++ b/media-fonts/font-micro-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-micro-misc-1.0.3.tar.bz2 98366 BLAKE2B 98e6872807c35d6fb8bda2be46fbd0d23720af967d068a6abdbf20ac364484d8acd9f4217f739d853c9d373f3c86c1519ebc9854ff671adf955c603ede7f4c7a SHA512 7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69
-EBUILD font-micro-misc-1.0.3-r2.ebuild 281 BLAKE2B 5ed5af14e20051377d553b067e61de5484fb4d5374215a166bb06849d931ee718c371adbb7136f37f7443398cc20e4ac0386ae3a64774e31475b52d92dcf57c6 SHA512 d9fa9606080261ce19e956f718a6659bea4c403bc0d44b563bc48d4a9479fd58e9ff5b8c3d2ea8907e5f48099fe30a6374b8f27a286e998c8a920444466b3754
+EBUILD font-micro-misc-1.0.3-r2.ebuild 312 BLAKE2B 03defb309a37e5bd4aeeda9f3e149fd15c0598aa53326d9d2e111533a5970129c73e3b3b72559e7e7d98858bdcdb1b0c25d3146d5542395961f399f209b5116d SHA512 8ace74d7707300d989bfa5c2828e1df8e8cd1603a1f6128f36ffdb918c9f8547c352ee99e39841a1e418f96fbbed3f7d255cf791946a4590cb911e24b7abea5b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
index a4d9fe4cd182..87d9034e5ca5 100644
--- a/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-micro-misc/font-micro-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="micro-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org micro-misc font"
diff --git a/media-fonts/font-misc-cyrillic/Manifest b/media-fonts/font-misc-cyrillic/Manifest
index d9cf62d07eb3..b1257ebc298b 100644
--- a/media-fonts/font-misc-cyrillic/Manifest
+++ b/media-fonts/font-misc-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-cyrillic-1.0.3.tar.bz2 125971 BLAKE2B 4b714d9254f00e88537597629944d906766c5f89729fd944a276bbce3c05cb13d5f538e7e046c3bc5651e2a230ccddcb249032228ca5837d04a245fd2a9987f2 SHA512 75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf
-EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 261 BLAKE2B f406c31999d9839528e9d3152c39b3cb7e5d7004eb6565601ab8e66d27921fd065761b1ec8322fae3c4c079bf9baef7f001be0088d67cbc7b22f24406e066723 SHA512 4780136f108c980ec7f5c5e396b0cb7b8af613a7b84defa28c590af6f0478c8abcc72e85f31b0d785076523dae16a93991f24a21fe656d0ac6dc7c1ebb74deb2
+EBUILD font-misc-cyrillic-1.0.3-r2.ebuild 295 BLAKE2B 9dc23325c1d9afa52be90da4c92ed4fcfd0cfe878a043727c72d99adbd4e0b1e4c9b3137f2e0ef92318cbbf937fc386df2aae40133ca99d0917035632d8346a2 SHA512 b38e50c7b14450e9951fad0a4ed49af892061d3c9f5bf6cba4907891d428a4b79db4c0c6404ee75ed9fcd1a565986e084997955ca2284a83b35f2c3d2586215b
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
index 84d9cabca943..af19e8aaa8af 100644
--- a/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-cyrillic/font-misc-cyrillic-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="misc-cyrillic"
 inherit xorg-3
 
 DESCRIPTION="X.Org misc-cyrillic fonts"
diff --git a/media-fonts/font-misc-ethiopic/Manifest b/media-fonts/font-misc-ethiopic/Manifest
index fae35797a334..3d5b756b34a2 100644
--- a/media-fonts/font-misc-ethiopic/Manifest
+++ b/media-fonts/font-misc-ethiopic/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-ethiopic-1.0.4.tar.bz2 270076 BLAKE2B b27d188fcb5be3e4e5fed810f26c0f5edf5a51a3532bd51b44e55283518bc1a353054da4f37c5535197eeb6958bfe1567ab54d1d9f428b046b84c5d1233aae21 SHA512 4fed9ff3782746898c56dac199e9ca89356f4967779937049b9ff4ffad202317c023859f92d44b371dfa5485d5368ccad648e64b12cde0ed21f7d4aee5affcd5
-EBUILD font-misc-ethiopic-1.0.4.ebuild 710 BLAKE2B 51736a717c8ea173069bd95c6ea6294cf13b3a781e1a08b7f1dc8063b518bd522548e754cb9e94efa2b89adc7c97ec48367cb03d6e5166030c478d7c83ce1a1d SHA512 1fad8b3398645a19d2baab85d1ca0b1f612877cbb0fcc237cae40f4b944ad43964d726381da8a495aa4c16805aa4b4fbcbc99cd0ed42ba1e1186b0e6c09f208b
+EBUILD font-misc-ethiopic-1.0.4.ebuild 744 BLAKE2B ef067207530c44e2b272a7b521da31bfe6f252ecc4b0ee51bdc5d9b106b74c861501cb1ff883ac1a1386042db8c09ddb856df8c15f2923dffc1498e84c24a699 SHA512 81b63081af7ed36f1003fbdb54713216e443f601924a3af08c9830b2ffbb1bb15577bc676f97d5bcd6fdd4a4fc8ab0b161364d8322afad9e7dbd3bbd288f3702
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
index 71abc434e638..1e6b0d3c7b04 100644
--- a/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
+++ b/media-fonts/font-misc-ethiopic/font-misc-ethiopic-1.0.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 FONT_DIR="OTF"
 
+XORG_PACKAGE_NAME="misc-ethiopic"
 inherit xorg-3
 
 DESCRIPTION="Miscellaneous Ethiopic fonts"
diff --git a/media-fonts/font-misc-meltho/Manifest b/media-fonts/font-misc-meltho/Manifest
index a5f37480ec6e..b5d72366b5d6 100644
--- a/media-fonts/font-misc-meltho/Manifest
+++ b/media-fonts/font-misc-meltho/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-meltho-1.0.3.tar.bz2 1578992 BLAKE2B e76691a76d1416c7e7188ca53e0ebb639269333f4078fc0de9c1b7ecde69a7985115f7a347e55a3bd86a268b0de36b7a02ebaae343743dd7cc934038928cd7ea SHA512 3f42fe3e127f74259d50754f4bb6d2560cb32d810fecf663bd09fddb34829d29b48f3cbfaf43d02dab70b559afb2f806f321076f83450ff3871604345a0cdb56
-EBUILD font-misc-meltho-1.0.3-r2.ebuild 276 BLAKE2B 28e7a75d24ac38ca1286b59eb5941a4ed8e9445bc8fe3ecd19e1a5ccdaed4ec99f7fab368852e93ec6beea011014ab1e55dec4433d0f9861d788e532e179b395 SHA512 a79820230e5af1de109aea960518eeb5d6e0e952861a6cb944bc383768b1700eabb66013371b834fd3c167c3b5edcaf938f81074f7d9348dc19430cddcdcafae
+EBUILD font-misc-meltho-1.0.3-r2.ebuild 308 BLAKE2B c9b10b6d34a95f91549be486b6322d38eaf82c0f82f0b0e129c556f411fa5189df15d07aa42cd0c80a739e2cd431fa99b130314b8d0754a29b3caba699974b27 SHA512 c4cedc0198a954aa758091075aaac7d5b8b4184941cd037385e7d372d79b237a7ffe6f0a595865c8c2f62cd70fdb9d5463e8deea755441da6629c50513ca6715
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
index 25b69f0d6e4d..5c344727d5f7 100644
--- a/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
+++ b/media-fonts/font-misc-meltho/font-misc-meltho-1.0.3-r2.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 FONT_DIR="OTF"
 
+XORG_PACKAGE_NAME="misc-meltho"
 inherit xorg-3
 
 DESCRIPTION="X.Org Syriac fonts"
diff --git a/media-fonts/font-misc-misc/Manifest b/media-fonts/font-misc-misc/Manifest
index 1e090fe08918..5972b02ca0c6 100644
--- a/media-fonts/font-misc-misc/Manifest
+++ b/media-fonts/font-misc-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-misc-misc-1.1.2.tar.bz2 1933789 BLAKE2B ec60ab2f9c18b5dfe272ea48f46d0af064b1d156bbb87e261a4c1ad60f5771e4a2b3464f054e6264c16e978083cfbb3dbc05a8f96f2041c1efc61f4bf4ee0ab6 SHA512 d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74
-EBUILD font-misc-misc-1.1.2-r2.ebuild 364 BLAKE2B b0a25a392bad2e07064a5521fd345edae97fc7d10cd4c66242d0267ef9f571f4df6f20879cf7d0c887a64ed1bb7a50c3eca0514e8907c3e1f5f7ebfa7bff4e35 SHA512 a25dd36d3d83bc84da891ac0b6f1039725b926d9562162b4be42997dd7bed6219f96eb34a85d0e373a96db0a179ea257eb4e9f1fc36b095db508ddf8db9e9886
+EBUILD font-misc-misc-1.1.2-r2.ebuild 394 BLAKE2B 2f219aa607fa4a6923bea2da17c4807c3b60564aa0ea470b3082c95252e10faf45a14c84fa0681955607c21602383f60202c0db2f20f8c03674179d4f8b14317 SHA512 c8b7c488419f5b8dc9a1838367f8b856a2a77a2c6c4cb15756518d6d34e57c1da211249509e7d08106aed87e2f1572fc1f675fb76f36d7667da91713fd43a9ea
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
index 67445351703c..1cb99fb54a85 100644
--- a/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-misc-misc/font-misc-misc-1.1.2-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="misc-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org miscellaneous fonts"
diff --git a/media-fonts/font-mutt-misc/Manifest b/media-fonts/font-mutt-misc/Manifest
index 0f9af8e03074..8522ce16a97a 100644
--- a/media-fonts/font-mutt-misc/Manifest
+++ b/media-fonts/font-mutt-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-mutt-misc-1.0.3.tar.bz2 266510 BLAKE2B b3e460b5837accf613c9a4b5285a40f160bbf1b791cd90534cfb58da4f1857c1c5ec659ff4b1b6268573574ce2f4ff7cf6bb5abd7512c27fffd9696fb579869c SHA512 7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db
-EBUILD font-mutt-misc-1.0.3-r2.ebuild 256 BLAKE2B 1be020553843d14ccfbfb876a633b05b6a74fa7fb8b72f38e8b687df87eea4de3363e58c460a09d930918a2d788dfbf2ee0165252de7e7ac5de559d4c8dbcea1 SHA512 5e47c41db9db22efd287ab1c377d0d10ff14b8af8a977ac938fc06a274210b30d6d50ab029678b6d7a0765578a5a74beec1610a3f332ec4623b333b4f1fe1b40
+EBUILD font-mutt-misc-1.0.3-r2.ebuild 286 BLAKE2B 47099820ab59fcf390d761e16688323ab4e3464eb977d990e83988f59471e6bb6441ad54314f375bfbaae9671fb9ec31620a3a6c6106e6aee945a1813e025c41 SHA512 5597072724a73f2e5dd9c5dba70c989e88647953de8a02509e44bd910c3750e8351b6a34b6c69536337d715edf6a2d0868b5bf045f2442e5eff4334ec850febf
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
index 7bb71663cb7d..1fdcf1ccf273 100644
--- a/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-mutt-misc/font-mutt-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="mutt-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org ClearlyU fonts"
diff --git a/media-fonts/font-schumacher-misc/Manifest b/media-fonts/font-schumacher-misc/Manifest
index 062dc05facfd..11beb4f1a0a8 100644
--- a/media-fonts/font-schumacher-misc/Manifest
+++ b/media-fonts/font-schumacher-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-schumacher-misc-1.1.2.tar.bz2 141170 BLAKE2B 4a71f13cbd81b50e4a71968561a621cb562172ab547f5dec65e28f610a1053067029e4ce5b7d10452ea3426c459049962da8855f9d4e111ff6331bf6e706041b SHA512 f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a
-EBUILD font-schumacher-misc-1.1.2-r2.ebuild 269 BLAKE2B 73da9a618f5aa3ae7dd90ce301f032d022890cf09a14679100fa9b7c421bf42b3754ad6864bc6ad0b4e29ffd0edd9334b96a3a2c673161d711e86e0847bfeaa7 SHA512 a8a30b4379db68201b0f8c128e97be66c3966d5d9a5bc63b3e5600fc9206cdeb06d80f1f877d20875d5882a648497cf2dfa795fe856a15891a04d07838555db9
+EBUILD font-schumacher-misc-1.1.2-r2.ebuild 305 BLAKE2B a7d600b6753b21695b922ba7e6cf53aeb29b199a056bd9d6abf4afd7d77f3ba914b2268fb779550ad3c95c9926d84f86902791f76ff8bf6d27195bb99e7d1ce7 SHA512 1bc145f02934df44842cc33db54293b3c46ee63ee50b57de0fe9563bb06aa6ff397cebcb59b7557041877279474f4b72b15a49ae9c58b283603a187d2f643b40
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
index b5badb4f2cf8..b6a8ecd27572 100644
--- a/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
+++ b/media-fonts/font-schumacher-misc/font-schumacher-misc-1.1.2-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="schumacher-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org Schumacher fonts"
diff --git a/media-fonts/font-screen-cyrillic/Manifest b/media-fonts/font-screen-cyrillic/Manifest
index 2aca73b22669..f7182e50e5ce 100644
--- a/media-fonts/font-screen-cyrillic/Manifest
+++ b/media-fonts/font-screen-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-screen-cyrillic-1.0.4.tar.bz2 103168 BLAKE2B 6ef447905bc848dc7e31aae0f0c7649e17dbc46ccbb8a09da60cbd1a232891f0777558febd6e91e7844b66cc25796ad54ad6600ce033ff7f493741099c67b52b SHA512 58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51
-EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 263 BLAKE2B 219aa14cc7ac93e82cbcd020fab8623ee092e3da7a1352c8c0ec3155dd214f3eaa2a69498233ca46380f2407107ac5b26d3f4dd270aaa192d8d2abc6f11209be SHA512 c71d5fc9d405708be25a959e788801e74dd8fac1f530c22b686dac6b6897369901ec05a8158774b4ae52f262b325aff88ded9e3657fbd162978db45c1d15e5c3
+EBUILD font-screen-cyrillic-1.0.4-r2.ebuild 299 BLAKE2B 7a1627c7dcd08ab348fda294e36f4c42306b6e7a4dd8c0159bd109ca0dc0816f78f005cba3d2bee81eca6bba1fe0e1f7d5c72aeb36cb6317b30580e72385ec2d SHA512 e69785c383ba58c73e77caa7667b553bcdb885f43ca78f32f292d8659dc1281250e31edbf29a171295265edcb79ff43ae58551eb19d26237437795b3e1521f28
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
index 4ca5e021aab7..77b0fe47dbca 100644
--- a/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
+++ b/media-fonts/font-screen-cyrillic/font-screen-cyrillic-1.0.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="screen-cyrillic"
 inherit xorg-3
 
 DESCRIPTION="X.Org Screen cyrillic fonts"
diff --git a/media-fonts/font-sony-misc/Manifest b/media-fonts/font-sony-misc/Manifest
index 59a896a37068..4e3895161350 100644
--- a/media-fonts/font-sony-misc/Manifest
+++ b/media-fonts/font-sony-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sony-misc-1.0.3.tar.bz2 108098 BLAKE2B 7e095c70f6f10e8fa8e65686622ba443ab49704727e8d9e4067f273e160cfd1c0a0a475c720405ac1a5df8e87cf17e8f5ab53ba5baef80f6145d795a2ed419a4 SHA512 c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d
-EBUILD font-sony-misc-1.0.3-r2.ebuild 252 BLAKE2B 1d2675a8d840f17b3498528f2bc4dbf1fd709487e42e507e39c00584af5cf27e9cbb1637a31a3e0763336c9b9ea41a4f3727d27e3ba3d7a9358da21a8fd7bb49 SHA512 412f8f5e11fd5d034465d7c02aaf0626e144890699cf9ddec9595e6a9019489489685e48fa9f196f6529b2bbfdb62a91a0ea7e48a62680f3d85c528d5eb42138
+EBUILD font-sony-misc-1.0.3-r2.ebuild 282 BLAKE2B a59deb16ebd58dba6d497f42671790d326e25b9bdc205bf2000fdd2845618627636d0c9a845bcdbdf66b87d4759cf32452735a0fc61b2af61025ef4341505151 SHA512 a6b059b961e101b9920170adf083f37fcb6e20d6f48c0683831121e2a06ed6a81e96e38d05e3ff17bfea172ccd3ae13d35fead5b52a9b2d442827fc8d0197561
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
index 1b1b48e1f0d0..63937cd089a6 100644
--- a/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sony-misc/font-sony-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="sony-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org Sony fonts"
diff --git a/media-fonts/font-sun-misc/Manifest b/media-fonts/font-sun-misc/Manifest
index ac818cceecda..23e94e4f01e1 100644
--- a/media-fonts/font-sun-misc/Manifest
+++ b/media-fonts/font-sun-misc/Manifest
@@ -1,3 +1,3 @@
 DIST font-sun-misc-1.0.3.tar.bz2 116360 BLAKE2B 16ed83ef2fc7007670ac91f8356c8bb75775f78cf0a308fd02c2f702d7d2727702ead24c83d843c267ef4ef636f4fd1f0a59d3ffd0883e55e78f87d9cfabd8a7 SHA512 52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275
-EBUILD font-sun-misc-1.0.3-r2.ebuild 275 BLAKE2B 5c7e164b881f6d648d09e0fa3c96dcc83c442fcf022df26190e4debffdcf0e251fccd60dcc0e917252fa7abecef48b84c64d566f5b4654a59accac444a1a80e7 SHA512 87a3710f6992634310a0a6c2f016a5842118414791dc941145232b2d404f8fec5fff6be382b8481f4db3a0aaec0acbee61ffe9a839cb6ac208d6f51c852154c8
+EBUILD font-sun-misc-1.0.3-r2.ebuild 304 BLAKE2B 6a10879295bdf287ca7f1c6feed768d9158826028d2be6f7457ad7bfd7c9164683785386a151a6931e81f893e6bb325b6e0c7903234172d6973be70d4cc952d2 SHA512 cd484e2aeb291be28c44e294e5c1ee19d5598c428974004fe6aa0873d9a7e16b2cbd159b4cae2d57cbe4a3f21d52502d7e0ddfbd5a5c343e6113729506b06002
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
index 30c4744256a7..e01158eebf36 100644
--- a/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
+++ b/media-fonts/font-sun-misc/font-sun-misc-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="sun-misc"
 inherit xorg-3
 
 DESCRIPTION="X.Org Sun fonts"
diff --git a/media-fonts/font-util/Manifest b/media-fonts/font-util/Manifest
index ae6ec4d46d31..c027b65ca802 100644
--- a/media-fonts/font-util/Manifest
+++ b/media-fonts/font-util/Manifest
@@ -1,3 +1,3 @@
 DIST font-util-1.3.3.tar.xz 142544 BLAKE2B b893159496fb242c33facda98597e200b41d05fbc28c9c1cf04f5214788f421472562a79ad24cffddad72ebf38f751858712a5c7c2904370ea77f501f78ccc77 SHA512 5e1cb8af44fe0bea72b1a6a4e455f50ca49b7531c2f4b605800c0b2b7578b9826ccf17fa195c505ab1d6339fd4ad697c01ba3b9777616f354ab62b23434d47c9
-EBUILD font-util-1.3.3.ebuild 681 BLAKE2B 071459b98022db196f40054112d113cc66d5d2f6eb357dabe814882341a2ff610adf4c51aaaef45a59de7781e14b03b91d17b3e128ada0ae8d08a56231628ac8 SHA512 f5700d29852d5f5b325f5c54663c9bcb7418ecfe1ff9ac9f8947c9fae1cf5b105a7dd701a3d4ff084f72ccea87d87d869ed92a03139ccefb845e5b528456c5cc
+EBUILD font-util-1.3.3.ebuild 554 BLAKE2B 61d4b30a09745b02e5929eab6fa61355cad610fa9baacb19c7e025aa72fc1f2ebf18043517910863be5dc1bbb221485174355f9b056325412efab4585fabca15 SHA512 cd3c315b3ca60621d209a1d98810c8e11e3d9913c5b22e2445314a1f14f654bd2c3569a349e9dc4bd9303d050490596f608f8a32d67b9e4de6401448fe0bbd15
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-util/font-util-1.3.3.ebuild b/media-fonts/font-util/font-util-1.3.3.ebuild
index cac82f93edcb..48ab3f5d3388 100644
--- a/media-fonts/font-util/font-util-1.3.3.ebuild
+++ b/media-fonts/font-util/font-util-1.3.3.ebuild
@@ -4,11 +4,10 @@
 EAPI=8
 
 XORG_TARBALL_SUFFIX="xz"
+XORG_PACKAGE_NAME="util"
 inherit xorg-3
 
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/font/util.git"
 DESCRIPTION="X.Org font utilities"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/font/util"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
diff --git a/media-fonts/font-winitzki-cyrillic/Manifest b/media-fonts/font-winitzki-cyrillic/Manifest
index 8ea875af7bf3..9ac05348d054 100644
--- a/media-fonts/font-winitzki-cyrillic/Manifest
+++ b/media-fonts/font-winitzki-cyrillic/Manifest
@@ -1,3 +1,3 @@
 DIST font-winitzki-cyrillic-1.0.3.tar.bz2 100564 BLAKE2B cc2de32277e55a3f7a92be7deec895e23f75efea541e2dcd33a56e1911d7216af149234fe010bd6445952399e246a4bb7123ff2bd220d44874b065a56ac4155e SHA512 f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7
-EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 264 BLAKE2B 5d0e429f38a3d86b59b8fdd8d4c51af8a5a19056f08b3d051dc331a0c5189bceb4172010ff0a52714199f92e675dc4554e1ba7f2bb8c8c426f8efa0a2c50b71f SHA512 63b9e62ab9c94062d874f377864fbf98f8dc9bb6a2c057b7af9da9284ce5329bb2c082e3eee2068692e11cede64d25323a7872a56a2c822c8d2816147b42db97
+EBUILD font-winitzki-cyrillic-1.0.3-r2.ebuild 302 BLAKE2B 0d1e59a791f0eac795465564ca96f6befc60d7f2261d724728bc417287b6d7ec7c3851d4770807c9fcb9a3861fe8207c2314d852ccba4bc53946948d98c6f1d6 SHA512 a96ab27110b9201472930b61dd40cc2c67c8b09b7c9d9847bac11caf3790e05c27a490fab1c897ebf9be47b1792b26fe5df1969f1eb686c0634beb3e17dec554
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
index 580647cb3ced..01dc80cbc64e 100644
--- a/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
+++ b/media-fonts/font-winitzki-cyrillic/font-winitzki-cyrillic-1.0.3-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="winitzki-cyrillic"
 inherit xorg-3
 
 DESCRIPTION="X.Org Winitzki cyrillic font"
diff --git a/media-fonts/font-xfree86-type1/Manifest b/media-fonts/font-xfree86-type1/Manifest
index 538b2d20c812..ca3c26db8af4 100644
--- a/media-fonts/font-xfree86-type1/Manifest
+++ b/media-fonts/font-xfree86-type1/Manifest
@@ -1,3 +1,3 @@
 DIST font-xfree86-type1-1.0.4.tar.bz2 126641 BLAKE2B 12588b7cc3a489854695cf0cc6a9edd18840e0048b4e35a76eb6f3642807e208823133368299d6ff65117699bb7312d3664ae9fe8264631051fdeaf8f157b516 SHA512 2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c
-EBUILD font-xfree86-type1-1.0.4-r2.ebuild 261 BLAKE2B 39488aa098a8f87b2aeae500f845ef3e3a651c32c6eb47b3ed12f1e607cbb13359aba05ffdc682e481f5b5282b906ae3ef785cdaee9142815c9f55829becc7e5 SHA512 983d341180066de1f72c1ae78e250eb602c5e85340c84d231380190fa3c4f568bb87f226490e6fe6591fb6ec4507aaa70544690f3865ae053128163788486625
+EBUILD font-xfree86-type1-1.0.4-r2.ebuild 295 BLAKE2B 6e99c58f8ac805bf996b02731650c86b63a5cce29886e4506352fdb64d34a44f5fdf077be206b55567df45d80237ae86d7a9538eea7c8b9134d325e44b77fc8d SHA512 b3552ea233a2392dcea43d3915d417934adac3906d6a2b0f212ab3cc10c9aa1ea4612c984806c3060ce0412c6c2663ac2d1fe1aa863eeffc55af3ebb7727bb4a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
index 25cc382ad718..a1bd554053a4 100644
--- a/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
+++ b/media-fonts/font-xfree86-type1/font-xfree86-type1-1.0.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+XORG_PACKAGE_NAME="xfree86-type1"
 inherit xorg-3
 
 DESCRIPTION="X.Org XFree86 Type 1 font"