gentoo auto-resync : 25:01:2023 - 08:07:03

13 files changed, 124 insertions, 302 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fc352b971398..7b455dc5a9a1 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index fdac8c2153a1..5a8a0a1ae708 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,8 @@
 AUX kbibtex-0.9.2-fix-crash-w-newer-Qt.patch 1014 BLAKE2B c283889e375a09be741d6e8f5ef1dc3d5f37f1dd8d2a0b5418220bc660410f1e80e0a3efeb82bc761d9049cd19c2376fa6e729fdf22b03396262d14d88f5587c SHA512 9144a537c7b5e58c3ed795cb173ad66e37d6bb038ad30cd279b4637e60b6760f4c3d9519c8d159dcfe1558b4070c3bfdb989b97e58c449d26eeb0849324d5562
 AUX kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch 984 BLAKE2B c6db4643c03cb72a735751c62195f878d9346638d6675520de2aa16f4a33f7235d248c268abf0ca5abd1d0eddb1e558355e5c637ca1e0e6550c42b4e8ec81253 SHA512 375e2e642a02cd2144fd4fc854e8a2e0e882535a4785771ac154f9bb33816af98527f8c77a86b3228375acb3cbca246c143ed14096d9823a5d87dc1945b9237a
+AUX kbibtex-0.9.3.1-bogus-dep.patch 827 BLAKE2B e57d65a88acecb3ce17688ce6c1a5bbeaf6d28950edfc8ab61e77f86e6dbe73211c64f9b048edbabc80b126c17c6838f1c0186e7b3a7250adfd3338b0d6253d4 SHA512 2e3638e5e4034745ca0a2bfb8b22d5cd8bfa14fcc17a6434124fb7602574dc20f5bf3229881487e8717afed18e9ebac14262671bb70ff03fa0dd309851eb9122
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
+DIST kbibtex-0.9.3.1.tar.xz 4219496 BLAKE2B dc57f8f54ec6cbadc1b0b529387a47524f3ceb9e69a79e777a9b69c14c8cd2f240a6153bf9f95f5f5c57483a93c84505d6673625ccb38233c3a3b177bc20b4c4 SHA512 2e7406c16e1e520973166d6a4d27f4e3d51a4276ea25de611d09010ca40e3b0ea56fce6c29589ae51c58096c362cab11b439df0d80ff1b6951d4b92d46262e27
 EBUILD kbibtex-0.9.2-r1.ebuild 2173 BLAKE2B d7dcd8591635e83ade8a366390ac7caafec1089505941917abe6f395aef06c8cac4cece8a4ff61844a0f2e6b1dc0b44839aa070615ab609b91b3da00b7ccab7e SHA512 3a8977714bc1976d6edb0f99661c6c6f91d79169990755d3b0b7b46fecfdf7f3cb6b96a10f7bcf0d7ecfd5f2a7986b109ec0eba2e513aba3ed86691c0f2ade08
+EBUILD kbibtex-0.9.3.1.ebuild 2094 BLAKE2B 781c653ea2321baf0cc3851b7454eeb33fa6dcdd4c44102da5428828b903b93501d66300b8ddf91e4a6b4ace30625063d5cc4b0fa9d5dd28f7f2e4fb1aa922ae SHA512 4befc946959eb7383ab55ec14890724b4e67eed693337b35362cc69030476e814c43ff5d93522cd5ccc0ca2ff0d73e85cafc9ca3bd84f9738c8ec4e829d18ff7
 MISC metadata.xml 509 BLAKE2B 3543de8d45cd889e8789bfa26154243b90c679126cb37e4a6701bb766dc0a72a39c5c14830dd3dca77b735532d10dc6d513c953bb3268767ea66599eb689b831 SHA512 5f8aeb6e149e2dbad6e06d085afc75d4a04117921e2a5897023a110a9aea2bd2916691c2d43f8f3bd0f575e12175a5a3da1a61fc000c5458aef7b1ebdb11306a
diff --git a/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch b/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch
new file mode 100644
index 000000000000..2235498bbe7a
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch
@@ -0,0 +1,34 @@
+From f12d17d38011fd8b432ed4ba8952eb9241b152a6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 24 Jan 2023 20:17:55 +0100
+Subject: [PATCH] Revert "Fixing minore build system issues"
+
+This reverts commit 6860474d423c47f0633d537851b793fda76ae223.
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c375a34b..48196146 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,8 +43,6 @@ include(KDECMakeSettings)
+ include(ECMInstallIcons)
+ include(ECMSetupVersion)
+ include(ECMAddAppIcon)
+-include(ECMQtDeclareLoggingCategory)
+-include(ECMGenerateHeaders)
+ include(GenerateExportHeader)
+ 
+ find_package(
+@@ -54,7 +52,6 @@ find_package(
+     Core
+     Widgets
+     Network
+-    NetworkAuth
+     XmlPatterns
+     Concurrent
+ )
+-- 
+2.39.1
+
diff --git a/app-text/kbibtex/kbibtex-0.9.3.1.ebuild b/app-text/kbibtex/kbibtex-0.9.3.1.ebuild
new file mode 100644
index 000000000000..0e5ab051d168
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.9.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org optfeature
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/KBibTeX/$(ver_cut 1-3)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="webengine zotero"
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	virtual/tex-base
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	zotero? (
+		>=app-crypt/qca-2.3.0:2[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	dev-tex/bibtex2html
+"
+
+PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package zotero Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}
diff --git a/app-text/pandoc-bin/Manifest b/app-text/pandoc-bin/Manifest
index 268a040b685b..1d44cabff40e 100644
--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@@ -5,6 +5,6 @@ DIST pandoc-2.19.2-linux-arm64.tar.gz 19033935 BLAKE2B c6964e708d6f0fbb4be4c3ba2
 DIST pandoc-3.0-linux-amd64.tar.gz 26474024 BLAKE2B 0abbeae952861061f05d5c1ff98d47d26b59e75c73655a215725020b588f06864ffce29c73b1bb37b19fa0805029883055791057edf4d133f7953ed1ac207d02 SHA512 30253053bad2ffc29fe3758db0007156657b567cf10b0e8febea17eafacc65cb6646801b9425c2c8d42654c8219ee1fe0753f7edaf3ba17b6bc1b41d91ba25e7
 DIST pandoc-3.0-linux-arm64.tar.gz 28539589 BLAKE2B 33d06d52b56e230042d07f304e065a3059ca08f6ec4e2ebb6f0fbe4d2e5af33d0d50e4b1811ca78da385be40504997b75ad3ec60080c866013f49ff17514cd0f SHA512 745f1db8335689eece8db5f1ca9c4b8a0f56cf6ad13b18d8dfceaf8fbf6c2b7e4244d9d599400ca8d8248fe9a1dcc73ada3135b8950f1532423a1316fd645439
 EBUILD pandoc-bin-2.19.1.ebuild 1015 BLAKE2B a11a083f339b6c6243e7737b521add6a7511b2b4fdad251abfdd4e5e0214ff104b2966686284d5cbde43abf11f614264fda6e2a6819e2ad67a9a8d5c0cae45d6 SHA512 2f950ef147265d555e1c8401702c48521e1edd864f807794d90f9f825335f878c5d1df14dde5f4403d2e776d6cc7a57cc3bc7704fa614880f25cfcdcc4734095
-EBUILD pandoc-bin-2.19.2.ebuild 997 BLAKE2B 200058168bde5c591474a738caf52876e1f060c480faa8527f80d09e534c3f3c00c57390a6b25b72a807cfeab441e3fa239a9fb0730db116d545180bae5e45dc SHA512 4a1a683461d37b851c692128dc91d09ef0a2407fc551f8bcb6cc83302f01b1fc9f36cc32287aa54f527f4abee89fe0d7b3896f90752e3b08a9734734bdd166f5
+EBUILD pandoc-bin-2.19.2.ebuild 996 BLAKE2B ba2fb02c3e8d8ca4f8db72f31897e09e7159d35734500393960eb2dfab0335a0838d18e41bcb5f399ff1315f1e31dfb0c71a22a1c6de756ad5effd2f3db169cc SHA512 0f78e67095c5c5f46619aa9766798e8bce1bbf331f0a4d231608fc372eabea19f2df429b33ef651b20b157ceb110066819b473ad2b416aa532751047b6e5bf97
 EBUILD pandoc-bin-3.0.ebuild 1455 BLAKE2B c0bd3311a40053e563eef1f6fc33f0e34bddd328de8e07a1e17bab1503cc8474b6ed1f8b9a7570244abf7d5cc76689072068f7a2c5c897e10112641f9c7de6ee SHA512 632cc78c68706322abdb859b000c9290c322a4e3364280c280386cd0fff8a98a6261d68b27a9333755e2609919be68a10f3060f76d4befbe5021d75ee4f6aac3
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
diff --git a/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild b/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
index 28e55509b669..231940a71b4c 100644
--- a/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-2.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"  # Upstream provides only AMD and ARM 64-bit binaries
+KEYWORDS="-* amd64 ~arm64"  # Upstream provides only AMD and ARM 64-bit binaries
 IUSE="+pandoc-symlink"
 
 RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index e22d71f1b5d2..fd92d3c04a02 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,5 +1,4 @@
 DIST poppler-data-0.4.11-2-extra.tar.xz 3124 BLAKE2B 8ae0cb7613d36e2ceddb77736b04a61353cf4bcd3ac74e6cc65e7ddf727b65b98aa57c31bc02782cd74318119f0577cb3b187c9192ee0bb47dc8666e908a919b SHA512 3e43bc37b1a9affe4fabf68c3ea3490cbae0892286b3fd01f60f2fd232da68bc863fe0b058821d7d2e4ac4d7427b0ab02f8374abeba2cad704d578a155f46885
 DIST poppler-data-0.4.11.tar.gz 4497282 BLAKE2B 01f0f9f3d933f45683a702c4d538d8fc59874512290f199b601c16f98f9b596ff249fbc992574d046931cc80f3685f94733248450d3a54f2f961951cdeda7c39 SHA512 a5b7ace28d1677e12f7500ab6345b277dc22cd48ace8d472c083933416879edf4da4efe8217b0e11f75a3387ed98d832fe50567884095b6c0e09ebd8802b0f32
 EBUILD poppler-data-0.4.11-r2.ebuild 1136 BLAKE2B 1a40e570acff2653a44df3c18d3e89f4db9eaa06f9cea13082ee7707bcda22ce4edd815c3af56084a952e96662b15f8e39cd3c0528ad2b9a6d297a9577332715 SHA512 8a307d1ad5fdab4fe5382b4b75eae66698e7cbdeef71b4aa41054e361d90a86115ed4dce883c68b6012d843177642374f4d9d9000b162d8c97e50a774d259edc
-EBUILD poppler-data-0.4.11.ebuild 736 BLAKE2B e83fee3787fa33200ea16589379bffef0d70fa06313197441ce7b409d24384c1bcfb2aaff17b0ffe034ae0c6c03354ef67c4d6b168d92474b08da47cf8228e67 SHA512 d14cb205804c76b6f8faa8cb0bfbfff01b53e9195595ebbddfd57a7e632e05e89904f0a95b8d6801172289048ed3c6e38162ab9306574ad51a66f137af6a3757
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/app-text/poppler-data/poppler-data-0.4.11.ebuild b/app-text/poppler-data/poppler-data-0.4.11.ebuild
deleted file mode 100644
index 8fd03b2e77b2..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-SLOT="0"
-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 ~x64-solaris ~x86-solaris"
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# bug #409361
-	dodir /usr/share/poppler/cMaps
-	cd "${ED}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index bc495bf896b7..1924d09fce36 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,14 +1,8 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
-DIST poppler-22.11.0.tar.xz 1845444 BLAKE2B 958eb5e99725e46f3fd79138f4e1197ede9df5be19b6e5b0899b6a8c8b071734b3b41af7681bd857662e7d9c36fde09117418c1db347c5dad9a2fbd07cb1eec9 SHA512 a173681782b4f6c4528140ce73d1f4c0ca89a018eab7197d69f1a76ab3e6115c7c03f82e99a8b3e5729c0f75b82896e59b38762ed460dd29b704ab4a03926e7b
-DIST poppler-22.11.0.tar.xz.sig 833 BLAKE2B 8ebe07b5276272a29b9e7a427c066fb76a84c3ee1b7e259ddffe396c9c7798bb35092c2712e4d2d1f1ca6ec5226cf876717fb6858fe83cca1c39db25e231e1c9 SHA512 dabfbcb6bfde638fce6019a028e0d20951169a21751eb2474e67523800973a65dcb47855c8a908946026e3676cf0b1f782bcdd780fd5da0f035576df54610403
-DIST poppler-22.12.0.tar.xz 1845856 BLAKE2B 73003b19b21ab7ed8ce4de813fcfc4b22dcae19669a107e6618d8784958da55cfa93b2045988e45f7ffae918930560fa9e8afeabb6fae8b2a48ddafdf5d4f4d2 SHA512 5ebfa3920922a94a1ae67aa179c0003df498c018d1c3850568637b966c6cf670ff221b4225e875e1c531d6b7d7e06a63a19b9fbe3ac1f589441aaebf23ca8a09
-DIST poppler-22.12.0.tar.xz.sig 833 BLAKE2B 370e8079f8d703d1c5f674e513dc849fa1747adf440178c25e09b4a075eaa47924ad75821f176d9f692d0167ce08f683bf67b71b8e75c43fe9e1e9addf820d48 SHA512 305ee75a40612018edc44cbdffa126d3033bc900f62636babc8b6638a689e14567830a1d26b5e303ac303cb5e3d9c10bf331493754ab5ef4074fd17521bf06e6
 DIST poppler-23.01.0.tar.xz 1847492 BLAKE2B 8dd85767a0c101b3d7166719374658a233aff491b0990917aacaa6fb3c5d8e51104b3ac45c78dcfb380286ea48067d1db57c2794d99a93cae9f4d64e9ca3dd07 SHA512 a44fd59cdb4dc1c04765990d9666f27538895883fe98a64e7bea30caebeab10875615282307fbd6eacecf83b7a7c8daa81afa1b13ae6c09b80673e3fb8563053
 DIST poppler-23.01.0.tar.xz.sig 833 BLAKE2B 46c3910627fd69930fd428397e739e3fe41c9b835379dfe7abbdf421049a77b33ce1cf6a44bd386278d3610ae2547d119ac6da4c3bfa7f348c51fbce7319a878 SHA512 0cebaac1846e6b3944175bcb28b49592d562738c009a97e048abe9f6677718c97bea2b470ea503b8dd083fc5f154e71d539cf1e3bce08363c6979d268dcdfd3b
-EBUILD poppler-22.11.0-r1.ebuild 3648 BLAKE2B 7e3e4037b01d074a1452c819e1875edd2651830b07cb2dac098c204995d11b406c7c38ee6ab682a8b769859b97f7f6622224a986ff673c969dc11c803beafdf0 SHA512 e34630813662061dc6f78b88037971d698bc051e7d7bf8331a8a09166333fbff0e843d41d4e95cf4de90849c186f882b478d996aae12fe12a94e2aa73c27ef90
-EBUILD poppler-22.12.0-r1.ebuild 3656 BLAKE2B 592491190042f6053f1bc6694ae7a018f10b1f43837dcd762d106042e210155d2d3347450a48e3e8770ffdae7d4066df91ba00ebb59e4689c8bc206a8eb332b9 SHA512 22c526fd8d359fbcd8336f5b25ff9d501a51c4ba5c8a584dbf790a103a3c2737890cc115c6ae0350d0113db3ea5b2414c4f51533b97fdc5d2e57c3508036275f
 EBUILD poppler-23.01.0.ebuild 3691 BLAKE2B b1b52a48b8ca405bf01df7579a4f9414df1cb2115199cb71f290a194ce3598cfbdda71d003afa529c34824876d8619b89c073a34c2f1e8d1feb919cc475f1a06 SHA512 0ea18092d7d254fea35e88cba2e384cbaa45aaa03fe9fa8f9b9d67c3cd70c03b9b72b2e4df7611cdf55c0bb6e938329eb38760dc81447458fadc632db96fa44f
 EBUILD poppler-9999.ebuild 3699 BLAKE2B e56b5203b0b6c8b2a4b48e12d2c8037a965778922f1824e9fe58424746347e1750ecccba016ef5aca025d901d970bae659da15897cc7693a42f4d0c4d9b217a7 SHA512 c5ea1bf14bbcae2ec36ade3fdd47e8fdd3e945149f7786110bb2f148b258965632171f1f245b1f93e788e66bbc5194197bc8954aeb512d4d53790048b77029b2
 MISC metadata.xml 1078 BLAKE2B c5ce2245efedc75eb39a6c649d27698da0ac07b87da3240aeb9fea1435d48c3282a8a3bb9f002c78b79de2a518cb73f3eef563c05f41528bb55ffeca84409e13 SHA512 22c83f7f6a7632fc4fe94223be9e5edac085099bf5c0f6621b0179b16e35b98b0027e467e76c0ca365008d765258e05faf48dbc4b1e8d5eb507f348a533f88f6
diff --git a/app-text/poppler/poppler-22.11.0-r1.ebuild b/app-text/poppler/poppler-22.11.0-r1.ebuild
deleted file mode 100644
index 69735eaee89b..000000000000
--- a/app-text/poppler/poppler-22.11.0-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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="${BROOT}"/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/125"   # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2.8
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-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
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-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)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	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-22.12.0-r1.ebuild b/app-text/poppler/poppler-22.12.0-r1.ebuild
deleted file mode 100644
index 5da7405c5289..000000000000
--- a/app-text/poppler/poppler-22.12.0-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2005-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake 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="${BROOT}"/usr/share/openpgp-keys/aacid.asc
-	inherit verify-sig
-
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/126"   # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	media-libs/fontconfig
-	>=media-libs/freetype-2.8
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-DEPEND="${COMMON_DEPEND}
-	boost? ( dev-libs/boost )
-"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-aacid )"
-fi
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-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
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DBUILD_MANUAL_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_BOOST="$(usex boost)"
-		-DENABLE_ZLIB=ON
-		-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)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	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/xournal/Manifest b/app-text/xournal/Manifest
index 54f6b62c366a..91a035d4989c 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,7 +1,7 @@
 AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
 AUX xournal-0.4.8-c99-fix.patch 1838 BLAKE2B 1a4ab7eb3120add177e0b9292cc849f1636089703b5788d12dde1f9c4cf3224f172c17feec58b40b6a32a41a60cc9405f568809d6eedc50f045b6fa1573f22f7 SHA512 510432cf904ef47a323b160e466393068b3e75b32d26f55b19467219b0d4f5b2ba538feea0e87a9d596347a9c363c2e8802608a6298ee8a4d24db939ebbe02c7
 DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
-EBUILD xournal-0.4.8.2016-r1.ebuild 1183 BLAKE2B d02414c26d1c0970179c44550ab330ac395f3688636e2233910dfc08d15a64153e2d4a9c12b5c8dbe0d814c502b9d5df95ecb130f7ba42c735f4f05a989839c7 SHA512 8b984cae5a8995e6f28d05593dae810d34ec1d11c8e5d3a0e056434914505a923239843fcf5e160c90559e78eaffd069a43e28c144ef713b093610d3d74a4479
+EBUILD xournal-0.4.8.2016-r1.ebuild 1182 BLAKE2B 912faf246f800f7a8157b59de55a505b2c7ea23909736586159fd76943abc8a8f53eac44750308c9bcf41cce7394cfa3f75e996c7a9bb05690ad7a3fca193d4d SHA512 29e95301c7d5864bdcf6efa192a64407f3eeab0ccc8d4650c9fce034a1e4dee42c120a9f029a900e4f25ee6442cdf2c15de6de96cb712eaaa654fdb459fdf6d9
 EBUILD xournal-0.4.8.2016.ebuild 1188 BLAKE2B c3803e8c9ed0cfd1e573568fc3de4351ac53d0e997f6e933d912325dad40e8949491e7ef060a9d2496a96c014df6ae98485e61142f57185c6b5651aa735c1928 SHA512 ad4d4ee2b734862b04997351b9aeeb1472a0562dcdfac9fc030d7759b5db5182756e1ebafead88f53c33b9baa58f9e26b86fdd8e827881c85669e73e037f0cda
 EBUILD xournal-9999.ebuild 1129 BLAKE2B bdbd25f4c7f28f442410e3882cd9a777320054346fcddf50312d71d967b15bca63a03acdd496a87d49c285177f896c0cbed19a4dbf13d2fc6518183e16cad95b SHA512 167eac8e83ad7cab99be20202fb45cda285441d4fc3a56e6ee8f00d04d2308d6f5c656cf4fee6a8d0a05f2656b3024e575a3028fb273c52e61a965fa14d4dc71
 MISC metadata.xml 653 BLAKE2B a3598ff53d87c0684fb4ef3c069c7e9df8da296a9cc748aae4592803fd14e015ef1260acb84546a70bc47fd9d94a1a7e8eb97e9126a65eedf2ce0fd18326f10d SHA512 b3200c92455d820252af3a53b643cb1ce21baa4b1238538a46bf12cc2162b44713cad1e61db5ea1698c8eba7507a2439052924e0cba301cef85cbbb3b0493688
diff --git a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild
index 3ebf59e8631a..74e8cde97c95 100644
--- a/app-text/xournal/xournal-0.4.8.2016-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.8.2016-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 fi