gentoo auto-resync : 14:11:2024 - 03:02:32

20 files changed, 105 insertions, 64 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d0523362ef3d..b41b389b3c4b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f03df337feb3..2835e155e817 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -21,7 +21,7 @@ DIST calibre-7.20.0.tar.xz 44795188 BLAKE2B 2ccb7fcd5acdf9f627d79f5656709a7eddee
 DIST calibre-7.20.0.tar.xz.sig 566 BLAKE2B 4d89a7781eb1500969ca75ddf01890bbfea6ecfde4e7173f062be6546e898f68a16e0ff7a3d76e5e17dc0abca617d381de24e18e72f4f05b5965b051f28e6cab SHA512 62dc9964c3a30477e22f832148fdaa57860559e2aaddccff107b37c399854ac3ca84097cd7072c2ee4e57403c7ed17286469f31f6efc3d790f63f438d9c78c79
 DIST calibre-7.21.0.tar.xz 44802864 BLAKE2B f86ce0f310ac5b38f3aa54ca6436ad9c22c465e5608089c0178fcc5ed87d988ffae50d6b760ae4281ce68315998a5e1c426f243b58bfae86a78e5479d824070d SHA512 0c2ee610833df83219c0c33b09e1374a8262f1630ccd48e3c4725c92922a3ac5d102ad83fc213457fb9de3efa4f5a2c98ff6dff039828e1661085a1054d7f631
 DIST calibre-7.21.0.tar.xz.sig 566 BLAKE2B 6410767553809878644ccae960b756b3b0571309bf4cbb61b9282586442243d41d1b2da578f97fbf7fbac573c7e9f84bc293e6b38e921850bce44bc7c87d74c8 SHA512 444492b958a01105cb60e8653f8b0e3c5c27a42876527b642f176a375459d3a5664b601aa8fa64c3d39ae486200cd456cd8691a055f7f7530225df106b1bd074
-EBUILD calibre-5.44.0-r5.ebuild 8978 BLAKE2B aefccace3b939a72817f8c9cf36f4687d492af4ea84f8b588199dab1134989ebf030ddcf7609c834f4ea3b313dfb403e50af8c5e007309f0b3aa6e036128706b SHA512 63cadd04ff3ffb9b2d27fde04caf7caf43f981dd012cacd36569efc305db15aca09ddaf1875308368a8001e6b047cf44f55ff6a513d9d03428963fb171d4c45b
+EBUILD calibre-5.44.0-r5.ebuild 8984 BLAKE2B b57a9013cd9dbbad0d5fbee518820a71135e023c703b93baac02261d18dc1dc99e246997dd5ba013ae19497ddacb89679ac5013e2538664f259ca4d70a20850b SHA512 12cc11f817f72646c07cae7695316414020f52c24d4636ed48689f52d57ed0fad8bde05e19ed0cc9a2fbabcb700d4b8ec718163409cab9950ae700292a4ea348
 EBUILD calibre-7.16.0.ebuild 7987 BLAKE2B 15c5678554e68f5187d228175e6f65548a1ea9807bf06b7020c8e11b41a7a3e6fd03100d86ca32abc296c300309df7d9165364539cbaec15ca56c1dce03278e9 SHA512 af7c748f66e8a76338d96d20fa7d91d9d09b1bc00d8d187c9b44f952e827fbca63a3eb3d9d81302ce8b84ba911fe4ef711cba9df5b8d4a2dd9ed6d06f3b04c2d
 EBUILD calibre-7.17.0.ebuild 8155 BLAKE2B a060ef935f07e432387deef0774f3c9fe7e59e5d3a5e24280dc81f72e3e8dc8c1b25cc74d47bf6eb4962809996723772c88bb7b5b403e72a685f3d2a66f3c82c SHA512 c36e49975799de79a76f3bb18e3c6c3d200d719f6ca3a842109172afeb99793a23bb7867428b535ee93c135f926427f651c90ecd8a0ec9500ae1e9972d87668a
 EBUILD calibre-7.19.0.ebuild 8374 BLAKE2B 8405ada1bc40c13e09d7325bc4a84e3edbc74528437b57dce7b19c2fa6615086b46d10c9a843699d9d878bd27963b5caec18b0e764633cd291310ce6766c8c84 SHA512 f40c997a182fa48880443fb41f1ab37a25400705a778e05eac04ddd30821c9ef7774dbdf84acd1ea333526e2087aa15d10765dd893a52132ba2f9c8588afacb2
diff --git a/app-text/calibre/calibre-5.44.0-r5.ebuild b/app-text/calibre/calibre-5.44.0-r5.ebuild
index 73941b1a26cd..30d0db51319b 100644
--- a/app-text/calibre/calibre-5.44.0-r5.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r5.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
 		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/cchardet[${PYTHON_USEDEP}]
+		dev-python/faust-cchardet[${PYTHON_USEDEP}]
 		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
 		dev-python/dnspython[${PYTHON_USEDEP}]
 		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 8f5ae6d76810..be912b395fb0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,6 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.6.1.tar.gz 1014436 BLAKE2B 3df1d72d4fa2e912788d4e12e7bc4ab2676952e358e97457259284e78c32006482be0713059d5feeef56905e83ded975e7d723563c58e4f92c845b0b279a6827 SHA512 e2faabeb6a4edc7237a0a279b210512100fb1662b097cd23f0fc07a3519e48632e5527b0d393793a7623667011eae7e11f15fcddcaa155c4abd26ab6981ddf44
-EBUILD enchant-1.6.1-r2.ebuild 1390 BLAKE2B 8b28318a81df7e32db160a162c01b09390c93597cfa9b52a214827d56880f3d8c3ecc2fcd0f9142c888dfe87216495c9bfee03713dfaf9b812bcfdc8ce41830e SHA512 f9d8a1a19852ad3e29874843221051f1af76737792b9126bb5c793999190e09b7d41cecc1852bc00f5504568b137850b312dcdd2f3ea1f9199aaacf67859db33
-EBUILD enchant-2.6.1.ebuild 1433 BLAKE2B 35772c4710bd45ee1e0bd6fb54f584db183117398292d3dd76067a6278946d946ab5180f4771793e8a5cbe6d5c87e9794547c977aa52b95aaaccdbbae305756e SHA512 90a593986afb4e4fa76fc5521de3a2b159b2eb2aca1e3e2135d2e616b413b9202796d3af1f9c557104a34163e9b28ecfc0370b52efce364f449d875e8bc3d836
-MISC metadata.xml 726 BLAKE2B fcab9997afd2447879cfcbe3b3c679f5de4374f3e5529bf6e36ae8a4ed7a8e8575d5ffc0c7b9de61685646efc15559656137397c3f02b98d787cf51171915817 SHA512 fa71282d374a9ab1a37665cfc2e6a4c33bd4e8aa9d57e223002603326f7c754bed82a4802d37c7f34adc33bd9b289e59d725e1fe835302f58e962271acb8cd34
+EBUILD enchant-1.6.1-r2.ebuild 1392 BLAKE2B a0796f4a0cabf1f00842360897e299647d3a93b1f44106bf4a5b34d693aa13acf2afadec7e97a2d49043164ab476451cfea8fdebb94c158ad76f5a1aeb907eac SHA512 ce03d4398939c927725dce694945c3ee9c9d37e7392b13e5a0a323994107927a68c24712c1147ada99c66af4a1d3d2717db7995802cdc8071598946114cf1caf
+EBUILD enchant-2.6.1.ebuild 1435 BLAKE2B 9df58cd2ff37a26064bfec1ae3f1779b56cfff42c8b36419d6c43cdea41c4abcd11b1806ef37f7128e293b1d397702386ba7018112eb15a05eb313fe9db55c7f SHA512 db8df1eedbb9c329dc65b1a2eb11a249226522e740dd3413f5c7ca4b23c0e14377565155b763767a439643b6a91a86a54a601c41e503fbc7d38362380811d7a3
+MISC metadata.xml 727 BLAKE2B f5f72db9cc9a106f85b8a51bcc65903c91ece3145a1ff9888aae30a81dd8cbf94dff12679dc1fae93d4432b872582f6311752dca109cf0b6b6171f3e41b7fc6b SHA512 a2abde29731b741666d4050e21390f6e11de9b01083fb9de597b1816d3f302899dcc28d83cb096590bc7c02e8a895840e7f83f5cfa8c8d71e324f702a401549e
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
index a064cee07326..c011eda172ef 100644
--- a/app-text/enchant/enchant-1.6.1-r2.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PV="${PV//./-}"
 DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/rrthomas/enchant"
+SRC_URI="https://github.com/rrthomas/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/app-text/enchant/enchant-2.6.1.ebuild b/app-text/enchant/enchant-2.6.1.ebuild
index 2237fda4eca3..74eb9c8b1868 100644
--- a/app-text/enchant/enchant-2.6.1.ebuild
+++ b/app-text/enchant/enchant-2.6.1.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit libtool
 
 DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/rrthomas/enchant"
+SRC_URI="https://github.com/rrthomas/enchant/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index 4b8be47deda0..42a24bc94200 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/metadata.xml
@@ -12,6 +12,6 @@
     <flag name="voikko">Adds support for <pkg>dev-libs/libvoikko</pkg> spell checker</flag>
   </use>
   <upstream>
-    <remote-id type="github">AbiWord/enchant</remote-id>
+    <remote-id type="github">rrthomas/enchant</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 4bd33ce133e7..388cfacbdbf2 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -2,6 +2,6 @@ DIST paperwork-2.2.3.tar.bz2 2531208 BLAKE2B 6259a9b7a916ad71fc0f0747ce0c17e874d
 DIST paperwork-2.2.5.tar.bz2 2515993 BLAKE2B 3d4e6607d06efc40939fb1d6df72937acb58d54200be96f8c276efe2564ec3e67cafde11e1d8733ff7fd9647b3f30410f9eb584569d56efc3ea5bff21b25acb1 SHA512 60e8acc439bd935f402871208b6acccda033c6324b734aac7adde45716c0e44770902bf97499c10d11af171be5c8bd8ab832b714a972bac27cd274ff5b9fb8ef
 DIST paperwork-data-2.2.3.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
 DIST paperwork-data-2.2.5.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
-EBUILD paperwork-backend-2.2.3.ebuild 1558 BLAKE2B 8ddfdded6f3f9e859aa807fe32e4f44df258f45296d3dba5643d8c1e95e3aaa95b0a18ef5e63e6ef0059ec3517af02a2a64b076a31c41590bd067fac09a79dd1 SHA512 b28a03086688353c38c92f0056ad069089ec862b805d5330821359c99db0a88a9cd702581c45837e318f411d5e9c751d7859e9c53073f367383ae6b7b18d6032
-EBUILD paperwork-backend-2.2.5.ebuild 1558 BLAKE2B 8ddfdded6f3f9e859aa807fe32e4f44df258f45296d3dba5643d8c1e95e3aaa95b0a18ef5e63e6ef0059ec3517af02a2a64b076a31c41590bd067fac09a79dd1 SHA512 b28a03086688353c38c92f0056ad069089ec862b805d5330821359c99db0a88a9cd702581c45837e318f411d5e9c751d7859e9c53073f367383ae6b7b18d6032
+EBUILD paperwork-backend-2.2.3.ebuild 1557 BLAKE2B ee1f332b5e90edee386dbffb589e9841afd703261fdf926b444f7e3e5afc8014857c139e0f3d3ce5c1635192d27aa9380ccb64dcdd8c7da0b331ce466899b38d SHA512 7603218c0f7dfda39ce17a89845675dd24e74863738619d74e00c0fc93375394618fd37f2b976dc37fd57425557cbb092cddbf5eec6c47880cd0a4d9e3f5ffcb
+EBUILD paperwork-backend-2.2.5.ebuild 1557 BLAKE2B ee1f332b5e90edee386dbffb589e9841afd703261fdf926b444f7e3e5afc8014857c139e0f3d3ce5c1635192d27aa9380ccb64dcdd8c7da0b331ce466899b38d SHA512 7603218c0f7dfda39ce17a89845675dd24e74863738619d74e00c0fc93375394618fd37f2b976dc37fd57425557cbb092cddbf5eec6c47880cd0a4d9e3f5ffcb
 MISC metadata.xml 410 BLAKE2B c6ed41347886699086f69694dbaa5134e9ebfb02cbc157909e02971cce01cc562e82f31c15bb5ae1ee261d79d6e5a9ece81c1cf7fa48a9839ddf467c06fab392 SHA512 01bf86e9c8fd1b9e1d514edca46992609eb8789fe95ea914914ef4fc43c7b3f0fcaffaa712bb5c72e3936679b44749837b0ba73c2b62c1b0bc52f318fcc8e31f
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild
index 122954f5aaab..be0d8895ffe6 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.3.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 	sys-apps/which
 	sys-devel/gettext
 	test? (
-		dev-python/libpillowfight[${PYTHON_USEDEP}]
+		dev-python/pypillowfight[${PYTHON_USEDEP}]
 		media-libs/libinsane
 	)
 "
diff --git a/app-text/paperwork-backend/paperwork-backend-2.2.5.ebuild b/app-text/paperwork-backend/paperwork-backend-2.2.5.ebuild
index 122954f5aaab..be0d8895ffe6 100644
--- a/app-text/paperwork-backend/paperwork-backend-2.2.5.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-2.2.5.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
 	sys-apps/which
 	sys-devel/gettext
 	test? (
-		dev-python/libpillowfight[${PYTHON_USEDEP}]
+		dev-python/pypillowfight[${PYTHON_USEDEP}]
 		media-libs/libinsane
 	)
 "
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 95958bbb7d57..1b3b9b36428d 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -2,6 +2,6 @@ DIST paperwork-2.2.3.tar.bz2 2531208 BLAKE2B 6259a9b7a916ad71fc0f0747ce0c17e874d
 DIST paperwork-2.2.5.tar.bz2 2515993 BLAKE2B 3d4e6607d06efc40939fb1d6df72937acb58d54200be96f8c276efe2564ec3e67cafde11e1d8733ff7fd9647b3f30410f9eb584569d56efc3ea5bff21b25acb1 SHA512 60e8acc439bd935f402871208b6acccda033c6324b734aac7adde45716c0e44770902bf97499c10d11af171be5c8bd8ab832b714a972bac27cd274ff5b9fb8ef
 DIST paperwork-data-2.2.3.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
 DIST paperwork-data-2.2.5.tar.gz 5206588 BLAKE2B 7dd15d31b0b3b59900556d78b271f36cc1cab533d273948a7d0eb364028ec0d1c26b2743a10565e2fc1d65786a11a1589c776c2ec1df6030efe8a79b2fba53a0 SHA512 aaf8e4174504eed7b33b2a0d3ad1b0af489d70bd9a425cf9363011fc6e24dd42a6822a5d078898279e78bbe15b4e36075c5a57a5ec74eabb3c2af7b9c3cc3e76
-EBUILD paperwork-2.2.3.ebuild 1940 BLAKE2B f4a1422746cf2015fd269924e1a5a30f9358d253714f595110a030b6622ba5fad3b48aeb812dcd5f397cbcb6a9c3a48b4b73f2974b6e0b1f0595c71f052837b1 SHA512 617531d2afe3aaa33a086cf21a2b02f42c2b0726c31a31b57fbd8fd2a0f094e361224d8ca8fc37028326f34836b688a68ec3b6d4d3228e6f871e2d7a16ffad87
-EBUILD paperwork-2.2.5.ebuild 1940 BLAKE2B f4a1422746cf2015fd269924e1a5a30f9358d253714f595110a030b6622ba5fad3b48aeb812dcd5f397cbcb6a9c3a48b4b73f2974b6e0b1f0595c71f052837b1 SHA512 617531d2afe3aaa33a086cf21a2b02f42c2b0726c31a31b57fbd8fd2a0f094e361224d8ca8fc37028326f34836b688a68ec3b6d4d3228e6f871e2d7a16ffad87
+EBUILD paperwork-2.2.3.ebuild 1940 BLAKE2B a738bf676434103e9ff7dc5c16864ffc545ade9ffb8a4373432d1c59c115f8da7f6fecb1ebe153562ca0947f44dc7d9b1889f6cef81ec099bd7a29050b7287d1 SHA512 6b35cfd489ccaa7e0c523ca0b40583df7ab420433e4062d845744ee1dd6a565831675f72102b02af228b5407ce0525040a229ae251942a77154ac595d91cac31
+EBUILD paperwork-2.2.5.ebuild 1940 BLAKE2B a738bf676434103e9ff7dc5c16864ffc545ade9ffb8a4373432d1c59c115f8da7f6fecb1ebe153562ca0947f44dc7d9b1889f6cef81ec099bd7a29050b7287d1 SHA512 6b35cfd489ccaa7e0c523ca0b40583df7ab420433e4062d845744ee1dd6a565831675f72102b02af228b5407ce0525040a229ae251942a77154ac595d91cac31
 MISC metadata.xml 795 BLAKE2B eaa7ea613cab3ed3e9d3a009b5fba74f1424ae26d68321ab6e2942a16ccf154e5ff8db1559e7ab97864b7b979b97215a553bf2be97a0d0049feae4156ef66803 SHA512 2fd9d23d6b951b3d993b4acc6a6107ed907cd2cad4bfe88b40e72eaf9bc69d85c60a3192628658db9d2dc7dc2bf94d61b09816b7343bf8f2d72ee310b66dcc12
diff --git a/app-text/paperwork/paperwork-2.2.3.ebuild b/app-text/paperwork/paperwork-2.2.3.ebuild
index 9ab2b91ff373..13dc300cda30 100644
--- a/app-text/paperwork/paperwork-2.2.3.ebuild
+++ b/app-text/paperwork/paperwork-2.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg
 
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
 	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
 	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pypillowfight[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/app-text/paperwork/paperwork-2.2.5.ebuild b/app-text/paperwork/paperwork-2.2.5.ebuild
index 9ab2b91ff373..13dc300cda30 100644
--- a/app-text/paperwork/paperwork-2.2.5.ebuild
+++ b/app-text/paperwork/paperwork-2.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 xdg
 
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
 	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
 	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pypillowfight[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9623802ad989..0c4472267d49 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,9 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 AUX poppler-23.10.0-qt-deps.patch 2020 BLAKE2B e9f022a7ddbc0e2533554c3263e0f22e62da8c28881a4f6a5bef18b1f85c5db9e6a4c3b312d5e1b0fbeec6f265716d376fe2036b9ae3d0e5396fc6cc1510d1ac SHA512 7ab6f92cc9f019b9f01b6f4cb4bfe7f8f269fd172ac46379b212ae623452265bbbb223e840897fb6c483c65919f3573a9bd79814b719b115cabd97950a202c7a
+AUX poppler-24.11.0-readd-SplashFont.patch 672 BLAKE2B 39d3d22cac3600ca71e803eb0fab6396d67bfd9a054c7a79480bfaadfbff3a5cfb10450f88025df9f1779903d3e16f94a0e614bdb5141a7bb33c8700e13bc533 SHA512 6774e05bae26819220ed207ac171ff422807bfc206c2a23a11ed6612b4c5e28c1bfda4b75c3bc827ecc37e92383ebed64d5cc6a60862e03feda69eaddca0aaae
+AUX poppler-24.11.0-readd-StructTreeRoot.patch 698 BLAKE2B 08171ca524a1005a923624f2d849295df8a06ed9872fd3e0b0bf961076290069803c34cadc3cab36e3199fdb615325ad6d365f31da85cfd9e711bb1efc962a67 SHA512 b0d786601770a9ea73bd7a8dfc3a91eff086090e599cb335cd9e7bc9719d9752256a1a487d446f8affb68d52f5cf13a71ab17f7c583c66809948e5ec26ba1bf2
+AUX poppler-24.11.0-readd-ViewerPreferences.patch 719 BLAKE2B bd3e34a65493b7b76e0cfef98f6ef91ef62bf98aed0250a0d1ca16c0d7ff4babe112513746368c8506d9c844491d1f3d8f1b2986f5c4b8d71bcc7d2102a85f32 SHA512 9b68c2b826b73523f94d5c2264b636ea2962d9d3574185ea913b8387b1ad584a2c42792f648a9093f25a5599b3c53228b9215c37eaf966ed7ad800c551ad5e79
 DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad734d31b460bc7b3578d08a75ad146d6d2c1e4108acb33d08fd518fee014cc84e23d2e04ea92ad152702af614c5ca2 SHA512 47309b75746d5bc309ae98da9280e5178c81505c8873e849ece6923eb0ae0df6f271dab1e38b3aac1dbd5d05518284ad237ea78ba40d90420c6fc53ae1c3b400
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 DIST poppler-24.10.0.tar.xz 1920580 BLAKE2B 5eee232c64f18083fa189b1839a7757c34f31a8711c4f173bfe0ded7c08d96618c9276fade85b3802cc79e31ca4b22f425904102f52a42985c9506f9cefbcf9f SHA512 5515b4c439cd2e92119aedcb8960dd82e6f78a1ffd82543d3649bedb3e0e8e97689ea592f4df347cc3c97d5d90c8518c13859f80be25f157b9aea78e62a31502
@@ -10,6 +13,6 @@ DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a394611
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.08.0.ebuild 4447 BLAKE2B f88e585dd3992006527baac658f55d778cda382ee76fe3fea904ce890625d3d0c03453b5c8c4d7e3b1df204039b8f2563349ad4ffa386161cdf6c1cd288c949c SHA512 9f35693e28a92d3e5f8cf3f710a67f028571b38814ea2126713b19ab8b229738d89cd7808117323563ad779053ce375b68fc1ed03d62cbec53770be3f06f29d2
 EBUILD poppler-24.10.0.ebuild 4455 BLAKE2B e80ab3bcf12fe79a4d6ed9bd4b4876245c9ca5a7a4cfbb94facad8f10c07599afd0b363aaf1a9a7ec030a13e89d73e4bd5e64f511cedce3e93bdebf71b4b3eae SHA512 935a8e4f1e2b0f376ab8145381469da1c00792bd550005ecee2897ac132cbd770908b6f170bf67172b69bd6e67aff019e8195456a09b9c9a8f5c0439e4fb7438
-EBUILD poppler-24.11.0.ebuild 4456 BLAKE2B 28ff323c722d7da896e04236859966e2bd5ee148baf0cc69383e256de35588a5a3db52444f8c52c4df24639b712c501bed038a79dec21eb86e3969c06044662b SHA512 20de416f33870bd70015018696ee8155348815f6f902b099a8751edcd8fb4cd743f9224ef36fc915b758ca6528e314f6d2d1216dd2ad24e5da4b713ac7bb9267
+EBUILD poppler-24.11.0-r1.ebuild 4609 BLAKE2B 5780609e7252c5d09a76b5eaa9ee9cd75fca3452c273add127c3f9124833e6ab3419b333b6b4e0ca10f5923ffcc0308972d469de61f8e6e8b9ce0de492767c63 SHA512 e8cbf60fbda57d9968539526b86604897044248abcf0e6a80f4dd6e3cbade67352df9813dc143950ed82a8244147d62ff10605eb1666152f87698b41fa4a0b92
 EBUILD poppler-9999.ebuild 4455 BLAKE2B e03e1ba798e681c3426cefe2c5da396e3884060ddcbbc6bb109a38e16b715fb0f2e6c02c05848fa25c1f3166112145c51698fba36db1d834b7fb9baf8c79e572 SHA512 e9bef5746dd9fa1a77a2f4ce7adcea4034aba009cd2a309a906f5a96b8cf2d7b9db55359dc0b0229771f434cd3bc7ccad3adbcafd4d405c55a9abdc8ab501987
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
new file mode 100644
index 000000000000..35daf33c7c6f
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
@@ -0,0 +1,25 @@
+From 6a87cf2157e6ce5b1f98288727e8fc2a2caf0220 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Nov 2024 21:15:55 +0100
+Subject: [PATCH] Install SplashFont again
+
+I failed realizing it was usable
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5c8b7610..ef0dc236a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -756,6 +756,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     splash/SplashBitmap.h
+     splash/SplashClip.h
+     splash/SplashErrorCodes.h
++    splash/SplashFont.h
+     splash/SplashFontEngine.h
+     splash/SplashFontFile.h
+     splash/SplashFontFileID.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
new file mode 100644
index 000000000000..9b0a5211abd0
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
@@ -0,0 +1,25 @@
+From 2d7188a3a3679a359e3eb49beb9657027a16b3bd Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Nov 2024 22:06:46 +0100
+Subject: [PATCH] Install StructTreeRoot.h again
+
+I didn't realize it was usable without being exported
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef0dc236a..574b50deb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -713,6 +713,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     poppler/Stream-CCITT.h
+     poppler/Stream.h
+     poppler/StructElement.h
++    poppler/StructTreeRoot.h
+     poppler/UnicodeMap.h
+     poppler/UnicodeMapFuncs.h
+     poppler/UnicodeMapTables.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
new file mode 100644
index 000000000000..9787e6f3a80d
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
@@ -0,0 +1,25 @@
+From b9620f70a41e878b7f4e615ced4bd7ecf9fe7233 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 10 Nov 2024 23:47:18 +0100
+Subject: [PATCH] Install ViewerPreferences again
+
+I failed realizing it was usable given it's all inline functions
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb1c73a05..a5c8b7610 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -720,6 +720,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     poppler/UnicodeCClassTables.h
+     poppler/UnicodeCompTables.h
+     poppler/UnicodeDecompTables.h
++    poppler/ViewerPreferences.h
+     poppler/XRef.h
+     poppler/CharTypes.h
+     poppler/ErrorCodes.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/poppler-24.11.0.ebuild b/app-text/poppler/poppler-24.11.0-r1.ebuild
index 054f0ab434e4..f432eea6736d 100644
--- a/app-text/poppler/poppler-24.11.0.ebuild
+++ b/app-text/poppler/poppler-24.11.0-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/143"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -80,6 +80,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
 	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	# git master
+	"${FILESDIR}/${P}-readd-ViewerPreferences.patch"
+	"${FILESDIR}/${P}-readd-SplashFont.patch"
+	"${FILESDIR}/${P}-readd-StructTreeRoot.patch"
 )
 
 src_unpack() {
diff --git a/app-text/ronn-ng/Manifest b/app-text/ronn-ng/Manifest
index 1e4ea37c668c..ad126f793cfd 100644
--- a/app-text/ronn-ng/Manifest
+++ b/app-text/ronn-ng/Manifest
@@ -1,4 +1,3 @@
-AUX ronn-ng-0.9.1-psych-4-tests.patch 1640 BLAKE2B 52ec0e314d9253c06874ce95ab5be8bb9fa9e5ff8b04b6df385a7e14c3edb919b0f2b9a7e2048552cf235c91d77877485e4fb3239eb222c99f53c412a46983d8 SHA512 803f7f4368599e8b55ed78d8444d585bc9f7568af4f9ab3d4b53c12d31fdc412776c259bff91a9b905b3482c68ce29ed2827682d2d7541669b9e5a4bdf1ebe3b
 DIST ronn-ng-0.10.1.tar.gz 78696 BLAKE2B 1e56b90c5919e0a1af317da78161b34124268521fbc379fbba09ff9cb344073665460abc53fd961e4773ee444f33fba7e72ae3f6af84f8a170cfb1e89e557922 SHA512 3f6ee5355c7a19d5cb04c1b677028dd13ad2ff620acdb2e83d9b6f154a7b1e7b5a77ea0bcfbcef4bbb46a60b1c0fbc52fda079ff860c83a71f89b8fed0b83665
 EBUILD ronn-ng-0.10.1.ebuild 1295 BLAKE2B d94ceff24db5bd831637f1c493217db58d0695ae95a14f78199efff8d55de904ee79a85b2d0265cd48d9d0df0040ab3473735371362f77538e57d694d4e70bf6 SHA512 bebc4d3578a342e7d420431bd2fe788b834267c1bd414077063a5cdf70d58b90074533d413104f6b1eb14d292dd432ac819391f7590258f0d44a8306b15211fe
 MISC metadata.xml 342 BLAKE2B 71ab5a2d2a9e2d20165f54c1cf79f483768c3637cc87a32acf80708d79b3be9d24408a330ed23ad837848933b0a40f1165f60d7b7e08146a28088a4d9d558630 SHA512 92e6778f8a2f44a81dfdbbd6699ce2186cc48b801f5c462c99b4bc35f79806ff154d72bec2916d79dc7435c1a9b75f2bf3842b7dba2b132335afc38d00d22780
diff --git a/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch b/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch
deleted file mode 100644
index b9e05cfff455..000000000000
--- a/app-text/ronn-ng/files/ronn-ng-0.9.1-psych-4-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/apjanke/ronn-ng/commit/e194bf62b1d0c0828cc83405e60dc5ece829e62f
-
-From e194bf62b1d0c0828cc83405e60dc5ece829e62f Mon Sep 17 00:00:00 2001
-From: Andrew Janke <andrew@apjanke.net>
-Date: Fri, 6 Jan 2023 07:25:48 -0500
-Subject: [PATCH] Workaround for Psych 4.0+ in tests
-
-Psych 4.0, shipped with Ruby 3.1, switched to a "safe load" by default, and requires you to explicitly set allowed classes. But previous Psych versions didn't support this kwarg, so the call needs to be made differently depending on which version of Psych/Ruby this is running under.
-
-Co-authored-by: Takuya Noguchi <takninnovationresearch@gmail.com>
----
- test/test_ronn_document.rb  | 7 ++++++-
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/test/test_ronn_document.rb b/test/test_ronn_document.rb
-index 75788dc..cd573fe 100644
---- a/test/test_ronn_document.rb
-+++ b/test/test_ronn_document.rb
-@@ -137,6 +137,11 @@ def canonicalize(text)
- 
-     test 'converting to yaml' do
-       require 'yaml'
-+      actual = begin
-+        YAML.load(@doc.to_yaml, permitted_classes: [Time])
-+      rescue ArgumentError # Remove this line when Ruby 3.0.x support is dropped
-+        YAML.load(@doc.to_yaml)
-+      end
-       assert_equal({
-                      'section'      => '1',
-                      'name'         => 'hello',
-@@ -146,7 +151,7 @@ def canonicalize(text)
-                      'toc'          => [['NAME', 'NAME']],
-                      'organization' => nil,
-                      'manual'       => nil
--                   }, YAML.load(@doc.to_yaml))
-+                   }, actual)
-     end
- 
-     test 'converting to json' do
-