gentoo auto-resync : 01:06:2024 - 00:07:06

10 files changed, 37 insertions, 175 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5c2d5def1645..a2d6106358a4 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 216af36d25ca..d3d6cb1644d2 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -11,8 +11,8 @@ DIST calibre-7.10.0.tar.xz 44201168 BLAKE2B 9d851ae6cbf0efd16790351720e1e86efb3d
 DIST calibre-7.10.0.tar.xz.sig 566 BLAKE2B ef5aceae5e181e1f1e22e4ef90248e54a77bc35a9da51a152408d11833c35a1e1f131d68c8dbb39303446a6a695694b4aa3b84c16eddd273f79f84bae3a7f073 SHA512 23aa5d044524d23f3bb0cab8cbee1a12f3f147cf1a557703f36eec59e651b63cd6185484515accb4456c3dc3adfb9918eb6b88cd9d205a016232347f1db0ebd1
 DIST calibre-7.11.0.tar.xz 44329708 BLAKE2B 0c5a1ccafb9c192b7f25998174f2b9ea3571d63a6aeca274d72e7e8e8ed27b433a209d805fd35079f01a72201cb01e741f95d8c83265ea39d3c191bf41dab93f SHA512 93216323d23919ce37f3983304f0d5e88847833c52a00a8a780db1c95860d814298358347848a439ff006827742a7c19171ed4d3e3569cd03296a682200e8160
 DIST calibre-7.11.0.tar.xz.sig 566 BLAKE2B 2b035fd2a31f5954de229c932c4aca58c0850a3fdfa793932ef81bd84c4612e65ad12138684932714a85e7be68d21cd808f4008d096121d047ae9bf053b893ca SHA512 ffca64e38e5e402c8fc146dff850a67e0644dcf665c5b0d36f9c9ade6702a980f11dcdf73147412c6ee384110fa8a27168fe5c759ba4754005647f8f656a543b
-DIST calibre-7.7.0.tar.xz 44006620 BLAKE2B f29dcf4c6550c7649dfddcaa4f5390ebf23ae7ef8d8103c9d001c9fcb8ca4a120c7cc8d5c2c36acced6672d78e45b6a93c6c505482f78e21ecc170c56c2641b3 SHA512 8444811e63be007e075b716c70c7df989408b8a323068fb763a07b27a2c52557e5625f311ac7672d5367df9dd3d071354cf3dd1102a0aa057e5cbbdc09ed24df
-DIST calibre-7.7.0.tar.xz.sig 566 BLAKE2B 6e21d5e8517abd2cf9e278cf40308709422b97cf2c953e1f1b8487aeb6561c57902d233fb397abfe50b8a42ce28071426477171a9d5b0b055af5cf41fdb78ef4 SHA512 17d91e46aa0dc3e12f1d65c5956f3c0f6b9fb07705042efd73508cc0040d0df2bae939544fd4bc123064393174057b5107cb38167b2db2f9477988ce369e10ac
+DIST calibre-7.12.0.tar.xz 44341928 BLAKE2B 18d3178b9daafaa674949b29528d055dea4e13aad937b8b75e22ac7ec9f9df1aa5c6bd5ca76b151347461077d2e2fc7888a9b46d1c727059db97ea49cb396b1f SHA512 ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363
+DIST calibre-7.12.0.tar.xz.sig 566 BLAKE2B 3fb90d638b00e1a9bf481b16e947cf855e89f4c13f5614ef2003fb0447c1131dc4d1a6101dde7e413bc1b9b5ca3812d3f090f00a0f4e14e8029f5b2896286b23 SHA512 12c78975b175f08208a4e7d2b9734b2f886d0cd3804b1d2f32f87190b648a79bf4eac6b0650b74c0e93682ff60f74be74d86a5c02d7e5bd1615c0799b9f6020a
 DIST calibre-7.8.0.tar.xz 44167208 BLAKE2B 676f5519b2809ca91c972ce0b4227aeac977945248063be58f8ed387c2dc1285f01e0d59c52ba9dea3a25842be1f97cdaece7f1eac5c208503240ff9ac3f0093 SHA512 c90d247af3a8ba3b2a94ca3a03bf9ee4d1c8f07d6feaa1ec045d639f448c476c4be9568e66845e7067e32b746e0ab034be65084a60f2b64f961f6678a30910e7
 DIST calibre-7.8.0.tar.xz.sig 566 BLAKE2B 03f283bee606d3071a2602ad2b1cc962b3d0cf6737ca294955524da6de7f22ddbe740d9b455332961b847331ad15f47efa884cc65bfe1a42eb46bef9f7a4a1dd SHA512 527a931f6d8701580b7b405124f53b54bb6ca65056aa41d677806a00c2ece3cb138c1c37e0d29394ee4e83487dec9dc7e82b6db63a4154e19f8463c19956e040
 DIST calibre-7.9.0.tar.xz 44164396 BLAKE2B 523b3aad25b73f4de4e2e5ce323dc63759fa1d2b65b646d3597dea42723f6a047782b019547df69d824f64cea8ca4c5964a17f37c3ea6beca95c5016bb839791 SHA512 388f47e13e0a682ae61a32ec2d7840e1514dd5cc79cc9ba271cee7619ad67f270c5059849e9412545bd4b9fa0904d105f5e88736956aba37abf9ef3ac8e1e09f
@@ -20,7 +20,7 @@ DIST calibre-7.9.0.tar.xz.sig 566 BLAKE2B 7a5c9b835edf649d790c5da143f982deb3ce90
 EBUILD calibre-5.44.0-r3.ebuild 8840 BLAKE2B e391fd8baf637882693b9c11b43d2b7e102c8a91767d46210f36a30617d641dcf57146b79230beddf9260ed4db10942b8496458f03b6d9acd24d4ffe0867ed68 SHA512 369964a397b4caccdd060163ad4b15cb6212cbebd021dd1ea8646c9e4a08e25da73bdcaa664f3a23eca0205fcb31d8feaf4abdd655f8cdc00c0608db46535220
 EBUILD calibre-7.10.0.ebuild 7988 BLAKE2B 9ec4691deb16f634e88cb4edc5523e0632f064f9ae1dd7bb579bae22599efb6eb6ba769e1c8be9e3038b362f0829b50a6f2a4b53482a42e1fe11d0501df35666 SHA512 15a2b185880432363f736e19957b9a81e8657a60217bab023a80cefdbb656924da708cd820f3544f7eb0d4fa510a68dd2e800fa14b7a82588eafe6057e6cc7b5
 EBUILD calibre-7.11.0.ebuild 7988 BLAKE2B 9ec4691deb16f634e88cb4edc5523e0632f064f9ae1dd7bb579bae22599efb6eb6ba769e1c8be9e3038b362f0829b50a6f2a4b53482a42e1fe11d0501df35666 SHA512 15a2b185880432363f736e19957b9a81e8657a60217bab023a80cefdbb656924da708cd820f3544f7eb0d4fa510a68dd2e800fa14b7a82588eafe6057e6cc7b5
-EBUILD calibre-7.7.0-r1.ebuild 7980 BLAKE2B 0942305d00a95dcf106940d1f07aac3cb4504d63011d01a9584e8769cd2e9aa2baf1698c54e03329ab6be735d32198efe8a59f490ea38705c208525dffdefd18 SHA512 889b3fe90d8a33fdc756bbe69eddbd92005c7201dde7c5f31c9ee2246fe94ec6de01aa32f1609a186d91467e9c03084025b1497ec96784c11156dae8090e2145
+EBUILD calibre-7.12.0.ebuild 7988 BLAKE2B 9ec4691deb16f634e88cb4edc5523e0632f064f9ae1dd7bb579bae22599efb6eb6ba769e1c8be9e3038b362f0829b50a6f2a4b53482a42e1fe11d0501df35666 SHA512 15a2b185880432363f736e19957b9a81e8657a60217bab023a80cefdbb656924da708cd820f3544f7eb0d4fa510a68dd2e800fa14b7a82588eafe6057e6cc7b5
 EBUILD calibre-7.8.0-r1.ebuild 7980 BLAKE2B 7fdfbfeae68c49b62eaf36c704bb1e188d84ae8d7d87f30647146e39432ee9e12318d3a2ade1344318284aad11dbc43aba3fe1b1a6fc3a69348b2a91876be7dd SHA512 aff7340f9af08af560139a5f307b0c5e5f637a4608833ddb77ec206f6180b3c43ba809f5ee2c83b1dba471c8119492f4dc7ac1a476a6204febbd7b9e3134dbaa
-EBUILD calibre-7.9.0.ebuild 7988 BLAKE2B 9ec4691deb16f634e88cb4edc5523e0632f064f9ae1dd7bb579bae22599efb6eb6ba769e1c8be9e3038b362f0829b50a6f2a4b53482a42e1fe11d0501df35666 SHA512 15a2b185880432363f736e19957b9a81e8657a60217bab023a80cefdbb656924da708cd820f3544f7eb0d4fa510a68dd2e800fa14b7a82588eafe6057e6cc7b5
+EBUILD calibre-7.9.0.ebuild 7987 BLAKE2B 9e15b0398c634b14a318965bd141df972766a0384db403f4c2525b0626f20018b7166c7bb9f0afc5d38d0e84c33bc9153ab9f1336a4f491ec1487e4dff6d402e SHA512 d13eb6b9e6cb31aff9481580b7ccd1e7b334b8ccfe2c3216d78b21a91c7e51088c86c6e17962ba26578a3bb84718b365ba50da83b0cbc430418ccdcfebeafd30
 MISC metadata.xml 760 BLAKE2B 5ba72f0a076d86ebb3348b30aab00754108f012221f2b387e22e772841d861b9cfb1e3ff29df78bb5971b32c312a4d5ae3f13cbf23c34226f271281180e9cfe6 SHA512 0d7ed014e4ff33a793433f7ee4260e047ea6cc18825deaa024330accbbc7fe0e78b782914f5dcdcf5f3bc5d2bb8200167566c0faa44aa8cbbfaf3dcfbf4ff533
diff --git a/app-text/calibre/calibre-7.7.0-r1.ebuild b/app-text/calibre/calibre-7.12.0.ebuild
index 331a32a8a077..8bbc8f3c7a6f 100644
--- a/app-text/calibre/calibre-7.7.0-r1.ebuild
+++ b/app-text/calibre/calibre-7.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 PYTHON_REQ_USE="sqlite,ssl"
 
 inherit edo toolchain-funcs python-single-r1 qmake-utils verify-sig xdg
@@ -35,7 +35,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm64"
 SLOT="0"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
diff --git a/app-text/calibre/calibre-7.9.0.ebuild b/app-text/calibre/calibre-7.9.0.ebuild
index 8bbc8f3c7a6f..176a40d67c9a 100644
--- a/app-text/calibre/calibre-7.9.0.ebuild
+++ b/app-text/calibre/calibre-7.9.0.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 SLOT="0"
 IUSE="+font-subsetting ios speech +system-mathjax test +udisks unrar"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 07ddf3d03d80..923d076a44fd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,8 +3,6 @@ AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203
 AUX poppler-23.10.0-qt-deps.patch 2020 BLAKE2B e9f022a7ddbc0e2533554c3263e0f22e62da8c28881a4f6a5bef18b1f85c5db9e6a4c3b312d5e1b0fbeec6f265716d376fe2036b9ae3d0e5396fc6cc1510d1ac SHA512 7ab6f92cc9f019b9f01b6f4cb4bfe7f8f269fd172ac46379b212ae623452265bbbb223e840897fb6c483c65919f3573a9bd79814b719b115cabd97950a202c7a
 DIST poppler-24.02.0.tar.xz 1897604 BLAKE2B ba97ea0807eab8e27112f66bcdcc695fe71881b873e129ebbaab521ad895815cf782faf9e32efd8530ec7c840546a505ef9a1b195258dafd55ce21fe4e11250e SHA512 95a208d21ac4d2d308a7ab3da43b95092ef78cd55ebe873c97e0d6c12d8b9d5c4614f83087616c35e1ed9d67ca606a5e008a98698bd12a332a8206ed4cf55500
 DIST poppler-24.02.0.tar.xz.sig 833 BLAKE2B 9daed6e9c3ba6f42f7b7e81abcf835658a03c4041a221b1de2e3a8e016eebe7b369174379f8faadb6119cac4502bf58e9f1c548e401d417d8ef5c1a2ab5fb322 SHA512 9bb03899e5fc475097a3422ed5f03b528796dc09d14bef0dabbbb457f9d5b20b48db462cc1478522803bae42c5b25ef46715d3ff6c26f4582f2ecf9c1bf1598e
-DIST poppler-24.03.0.tar.xz 1902068 BLAKE2B 34cd3b64b1fbee53727d99bf73a896331c15d816ea77aa678a9ebe4bc6ddf8c859ae004915aba36346dbcb13862d7d6670562e45d99888d444c523d83c90b58a SHA512 7b337249b3a3a4b4702447c7a0d19d2fd3ef5a6159d024d75846f397e223805758d4116eb155421545b17f02f151a96228932d162c0ff8a74147ef21424e9a96
-DIST poppler-24.03.0.tar.xz.sig 833 BLAKE2B efdf579fec7d5aca5ec197220d46e4420f60946992e0c6f0a461f4ebc0b45c363eca269e93ffa36e840a7959c8ca2225da17b62b412a0eb37e4d4e74f98a22c6 SHA512 7276311721a7c6ea35773e38147c816b79359422add5f9b954a1e95fd399f16161ff8791a82db56707b143e207e6cf8264d353b3a6da298c9f65f2e9cb2533d0
 DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9
 DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
 DIST poppler-24.05.0.tar.xz 1909164 BLAKE2B 65d5d1509078012a26d0bd97985516a39c49594a3c83016f1b7c7745caf1d13faaa82bbaea62c16466f4b1c159c765fa88f97e20f10a87b08514b00e5bdb1113 SHA512 caa3d31b8f22186a7218831039c2ff7384b07863de04f166980dfe534a7a5f047e7c21e1114b9ed0ef323beb60983b45a36bb906c4189c0828f4119e3e2dbaa1
@@ -12,8 +10,7 @@ DIST poppler-24.05.0.tar.xz.sig 833 BLAKE2B f1125a8b81089a4b8beb9385fa4a9b170b97
 DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.02.0.ebuild 4417 BLAKE2B b40e98b84d176b81769316c3a9ec3ee7094beb3a9dc126095d77bc37a35a2baa5d92a7261ca4ae41bd09b9a159b519bdfabd3d34bf3b957bbc3eb07ccf5c8b9a SHA512 40c8572bcc3740b96ab5d79f503c6004b629d6975db25fa5b6191ad19ba1dd5cec35e9a3cbf56a815d7e1abe70026d4939f89533dafd174754b3f21d65dad9b6
-EBUILD poppler-24.03.0.ebuild 4425 BLAKE2B 59bde449ff26fac6215ee6b6aa0545eb13db02a70bbf1e77812aa59db4130d6496e5677ff1449d001785d87a5be58d284aa0d182b76f7552498e94e2cb99f751 SHA512 1c7f0defa59e073053d97d3e3a6ce26522742e5e394236ed55b9c1a25f197fd153fcfc08d5ee02f5aa5342775578354e1569ce13b4c7f3926f09a3494d3b1284
-EBUILD poppler-24.04.0.ebuild 4425 BLAKE2B 949c40d63491e2e77610b879178e58ebe3e14851759d7653bfa4c825987431979fb9be5bc60e6cdc605287b86a442ef489ed639457814bc05b60eff9898bba8a SHA512 f6b145756adf5652dd93c0662cfcb8960e8a17549f718954194aa4fb8961248cdee775a1db099a505fc8e3abb02a515ec3a5879ed808b16d2f244779d066b8b5
+EBUILD poppler-24.04.0.ebuild 4419 BLAKE2B 3ecb6e104105113d5cd765143826fd57760f2d84b771426c0430a4392ae4047de61d154e35f9489050ba86a037b6a86698fc45985f0306554215241df1020070 SHA512 69a4fe5780410b36a9f69de6e3a44b05d5c7d0fc80cb223e9e38fea2e4a36a147405571da50c4996cc6a5c9f5b1db735e71b86d76ada3ae4c2e102ea8cbbc99d
 EBUILD poppler-24.05.0.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
 EBUILD poppler-9999.ebuild 4470 BLAKE2B 47bfdd4c11718af3603491d0863ca24d44b45177c34dde290fe00faa438c8897ca9899ded3db480131f70dce5813d02b82911a98ae7393a7b7718766f7c44876 SHA512 bbf33cd833105cbca2eddbf5b41136047c7232f7e333e98f7b790afc982c0e588f687cc204b0702f3e3b330422e886a99ae2811588b53ee589f25edbf41bf889
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/poppler-24.03.0.ebuild b/app-text/poppler/poppler-24.03.0.ebuild
deleted file mode 100644
index 719b3b8646b8..000000000000
--- a/app-text/poppler/poppler-24.03.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2005-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
-	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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	SLOT="0/135"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.13
-	>=media-libs/freetype-2.10
-	sys-libs/zlib
-	cairo? (
-		>=dev-libs/glib-2.64:2
-		>=x11-libs/cairo-1.16
-		introspection? ( >=dev-libs/gobject-introspection-1.64:= )
-	)
-	curl? ( net-misc/curl )
-	gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
-	jpeg? ( >=media-libs/libjpeg-turbo-1.1.0:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.49 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	qt6? ( dev-qt/qtbase:6[gui,xml] )
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( >=dev-libs/boost-1.71 )
-	test? (
-		qt5? (
-			dev-qt/qttest:5
-			dev-qt/qtwidgets:5
-		)
-		qt6? ( dev-qt/qtbase:6[widgets] )
-	)
-"
-BDEPEND="
-	>=dev-util/glib-utils-2.64
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-aacid-20230907 )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-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"
-)
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-	elif use verify-sig ; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if tc-is-clang ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-	append-lfs-flags # bug #898506
-
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
-		-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
-		-DBUILD_CPP_TESTS=$(usex test)
-		-DBUILD_MANUAL_TESTS=$(usex test)
-		-DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT}
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DENABLE_GPGME=$(usex gpgme)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_LCMS=$(usex lcms)
-		-DENABLE_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		-DENABLE_QT5=$(usex qt5)
-		-DENABLE_QT6=$(usex qt6)
-		-DENABLE_LIBTIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-24.04.0.ebuild b/app-text/poppler/poppler-24.04.0.ebuild
index 83006151fd51..5bc32a09f0e6 100644
--- a/app-text/poppler/poppler-24.04.0.ebuild
+++ b/app-text/poppler/poppler-24.04.0.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 ~ia64 ~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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/136"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 618768865743..8f05a56b1e08 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,4 +1,5 @@
 AUX zathura-0.5.4-disable-seccomp-tests.patch 736 BLAKE2B 20a1ad3dbf0f74853ac2deecf5273eb339e5c1a3386abcd11ec8abbe75b16ee8d1c49b06ce6f0d61e4bc3712f5cf0f45ed61bd63a2e6be89821db53f7deace5d SHA512 87924178c4a173e0db343cc7e9d087555a3be412d24ae808cfbe53ce6f53b7a2e23abd5354f77327e01d0afc7e74c8218884ba96998cc3d3667ab5f43fc6079e
+AUX zathura-9999-disable-seccomp-tests.patch 614 BLAKE2B 4191ff3dc542ec5d80876d7d1848abd4d99a1d5a161882a2985dfa09727ca50840d3a1dd237096beba621c5869c96a597eb9cc0fb577228b3049d7a90e379c49 SHA512 8c7765a88a511195ebf8799eabbba460fc4bcb45f987e4c67d6f9df9ec7adbebe73b0d201d8af8744c38619a6952dbb741e9801cec03df28a7c54e48f5c9b741
 AUX zathura-disable-seccomp-tests.patch 676 BLAKE2B a0fb24ad08247cb14e8017abf952b019aa8f8e0de3382fe5a9dfa20ab5ec9da9e8bdd3f8680c83c82520412f22f4fc1b328e73d9f58a04be34f0474aaba7ba05 SHA512 e68eacf092be083af7bb3b8ff350192544bbe60c8f40fa08cd756f9459f259b35805b44ec13c5b7ce92c58446b026272bf5b11ffaec75906fe70f5697f93319b
 DIST zathura-0.5.2-manpages.tar.xz 9696 BLAKE2B 23c6e94d5b44c1e20338ea04afb7644e4c76618cdc4902d2edd436734498c6b17e1522b37269d67a62801632595f535724d8f5d4c9817e017e6341c5365c5842 SHA512 3bb431f0564ddc1f67bcd21f019a43f6af95c3e3b42b264b7e1f01f10cebd7c05115e452a868dd176e5a0d65a9085ac3d554d69e553aa53569593ea494036f7c
 DIST zathura-0.5.2.tar.gz 208606 BLAKE2B fc7e8042a373a3fd66973fd5d6c7c3e7d6da884fb40269545e4074b42fdbc9b6f286089769a435394812e24a8b24de328521a2fd797bbb13c16115b112dd9a48 SHA512 17f2a6535b2b3c6f61986cd8a6ccdef2c1a129d8ebf8c86cbe3c8eac868c2780801f3fe2fdc17c429ca0c63a71a328bbb6c7f814f82714dd7f1a5a4728663b1f
@@ -7,5 +8,5 @@ DIST zathura-0.5.4.tar.gz 216719 BLAKE2B 94219e1feb22dc5cf3c072ed7d53b984c58e1f5
 EBUILD zathura-0.5.2-r4.ebuild 1472 BLAKE2B 5e5c891b8b524b0415727ddc0ad64b1ef4aa58cf77078d7370b06e325608304f6ffe12ca982b0162d109cad4f583b15f465c17e400ef35134d213c5c4061235e SHA512 11a7f3c5a1a6cac9ed648d41a24e09d44b79cd37433aec90898f91615da18862e575c04a8b57bc9a06f7edd4233abc20585074ca758b2b13d1a18f476a4c7f9f
 EBUILD zathura-0.5.2-r5.ebuild 1550 BLAKE2B 2a07787e80374649f3e9ae523242062f7e036a76e3b64f63e14ce5724ecf0b5fdee294fac8a806227ac3d08be592439e3cb5190ad7533b9fa87f15d917cd0acf SHA512 f9eac669bf2944cfc9f2ab6e669e3dfe044ecbb2383cf7db9e6068a51c989774b4540e7d7e3ff1386a3ae77877961ad1e095913d89d1bc4da8fd26ce31381487
 EBUILD zathura-0.5.4.ebuild 1521 BLAKE2B edcf9de67cbc63e82febcf9ea6330065c6dc6cbe8da5664063340b61a49d6f6770520c7bcf24f2eec5ab983f01cd3cb39a23ffbcbdb399191d19eade8b8a893c SHA512 308e196daea2def30595aa66e1d5a06eebd40f75a69284cf004b5cc5714ce52cc1cd69686d0a29102a373ee3193e4c36d086a4656a11f0fd75185f7c5f81e9a5
-EBUILD zathura-9999.ebuild 1543 BLAKE2B 222379713b1c7886930c8911166c223d982696786a729d604daff8aa905f3bedbb53e3f863bd115d03fef7235ea01c46ba9bf5f08805cc74da76bd5dc0d6b367 SHA512 5e72169dabf627cee2adf23d2fef6ccb60cd76499aa23052e095ee6bddded1c526cd2c4482258bf0b2c094b08ca6880f0325521182cf69cb371002e2d0699be3
+EBUILD zathura-9999.ebuild 1472 BLAKE2B 56edebaa8fa63f1692e10d5d12d8631f075b6b48c7ed241415d75f73e0c333bd8b374f14a06973745c1ab4a8dee539e2ab44455676a576432f57d71712b4cf94 SHA512 e9bc750fe6f3fa917d067822c24b2dd153b492aa3d76bf2eecb8376d0c9f3dff2f2c40d0ed2c1196f91dc744c9a5d459535df7078d5075d87977024902589510
 MISC metadata.xml 920 BLAKE2B ca0d49998fae1b1661154d99cc8017d4afe8e2fd76869ef5b7adb3320a64df091e38ac288b7b1d9704d46b4d2cb9a477f17a9baa71ab1cffed0b9cb45c59e0f1 SHA512 b5403a9336fe7f382ce8ba3c5744a36b437c3a6bc2c7793812085dcb4315585859c17aaf29b567be9d95925a4f5d71f4596eb114620ac2d69804d340728efce2
diff --git a/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch b/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
new file mode 100644
index 000000000000..09947eb722b4
--- /dev/null
+++ b/app-text/zathura/files/zathura-9999-disable-seccomp-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/meson.build b/tests/meson.build
+index 10531a5..1c79e29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -54,17 +54,5 @@ if check.found()
+       args: xvfb_args + [session],
+       timeout: 60*60
+     )
+-
+-    if seccomp.found()
+-      sandbox = executable('test_sandbox', ['test_sandbox.c', 'tests.c'],
+-        dependencies: build_dependencies + test_dependencies,
+-        include_directories: include_directories,
+-        c_args: defines + flags
+-      )
+-      test('sandbox', xvfb,
+-        args: xvfb_args + [sandbox],
+-        timeout: 60*60
+-      )
+-    endif
+   endif
+ endif
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 3cf03fc8f6e7..0a26c971eaf0 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -22,19 +22,19 @@ fi
 
 LICENSE="ZLIB"
 SLOT="0/5.6"
-IUSE="seccomp sqlite synctex test"
+IUSE="seccomp synctex test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/girara-0.4.1
+	>=dev-libs/girara-0.4.3
 	>=dev-libs/glib-2.50:2
 	dev-libs/json-glib
 	sys-apps/file
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
+	>=dev-db/sqlite-3.6.23:3
 	seccomp? ( sys-libs/libseccomp )
-	sqlite? ( >=dev-db/sqlite-3.6.23:3 )
 	synctex? ( app-text/texlive-core )
 "
 DEPEND="
@@ -50,7 +50,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/zathura-0.5.4-disable-seccomp-tests.patch"
+	"${FILESDIR}"/${P}-disable-seccomp-tests.patch
 )
 
 src_configure() {
@@ -58,7 +58,6 @@ src_configure() {
 		-Dconvert-icon=disabled
 		-Dmanpages=disabled
 		-Dseccomp=$(usex seccomp enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
 		-Dsynctex=$(usex synctex enabled disabled)
 		)
 	meson_src_configure