8 files changed, 4 insertions, 138 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 944232b1741a..047695cd0d5a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index a01eae4c7c8d..356f3d99a819 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,7 +1,3 @@
-DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
-DIST hyperscan-5.4.1.tar.gz 1848831 BLAKE2B 8be2a05de04a8f32c723e35be16923470ef7dbda830cf0a08c87bfcaff49564f9104f1b48b26a93a7fb157ac74e531841ea43db75bbfe3f836b98e748ccdfd45 SHA512 e9404946287e32604798dc8f9415efe8a47e464cf6e29e5c534ca6074f3674d2d38d4600787d3035ba2898a40e5048fbcd03e23f387ce43f81de4b6c63f70035
 DIST hyperscan-5.4.2.tar.gz 1848851 BLAKE2B a4539df7c6a4b5f097effa67bc777c37ff02aae356953acd4ffe871f621c556f6357c37ad813db144ed50af21881838946b7cb5ef9ea345412de908b84497dac SHA512 328f21133161d16b36ebdc7f8b80a7afe7ca9e7e7433348e9bfa9acb5f3641522e8314beea1b219891f4e95f1392ff8036ebb87780fe808b8b4bd15a535e9509
-EBUILD hyperscan-5.4.0.ebuild 1699 BLAKE2B 698afd47e0c3643338c7bbc051fe4fcc4df86722c295c9a566b54075545112be3110a4272de8b88f35c8adb3e8883fbf901152e545cddd1ac9a93b665fe304c3 SHA512 fbd5e93277f03717d3824849666018cb134610ba57320c2edab1beebba7bbae5548ef28807103789254570a5f2b307f4294715f7eb6710897c802d87a343b044
-EBUILD hyperscan-5.4.1.ebuild 1570 BLAKE2B e34b0c3bd8626ce1c682d1dfc75af1567e09fadaf251b1930178a22b15bca206076bbc1be2b4c79d5855d9217cb6d9c47eeee90e04448bc15484005688af6439 SHA512 17ec09558d9260210550ab750276fa2084a85c07369fca97bc2903622f6106332f3f5a85d4ff90555341cbed222149d6ea4baca2ec9677340f2b549a26175f77
 EBUILD hyperscan-5.4.2.ebuild 1568 BLAKE2B ff9065a10fd7a968702ba3cd7ca8a36a597cfdb76d27382246189f72c9b1de5b58fe5c8a436d52d942b56d7888bf16cb6ada4a5518a3abe5a75f0b41a1bdc000 SHA512 694afad9d8f5cda517b26b82a75a6718a39c4fd0af96003ab381d3542710ea3fb145e4334d0e561e5ef8604b94a43f850c79d997a3125875a1f0b968c7451c42
 MISC metadata.xml 471 BLAKE2B 92184c0b906267d9d424de9107bff13927827c8356d7ed398c9e43c055fab60f93cd9703cdecde00e2a054b2bfd74f0e5efd8c8eb7acb5dd988c9b877f2d30a1 SHA512 c93ebc4f4088dc33ee9f0bad4bda13fa53276fb8eeaae484f260d4694665eca36e63b4fd7427b2dd5c6ae4546ea0ba5361ed3c45865a0d3cd3421c0023d9b4d6
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
deleted file mode 100644
index e4d74772c853..000000000000
--- a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3 static-libs"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ragel
-"
-
-# We can't default this to on as it's against the expectation of
-# how CPU_FLAGS_* work for users.
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_prepare() {
-	# Respect user -O flags
-	sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
-
-	# upstream workaround
-	append-cxxflags -Wno-redundant-move
-	cmake_src_prepare
-}
-
-src_configure() {
-	use cpu_flags_x86_ssse3 && append-flags -mssse3
-	use cpu_flags_x86_avx2  && append-flags -mavx2
-
-	# Temporary, see #772086#c1 and associated PR
-	CMAKE_BUILD_TYPE="Release"
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
-		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
-		-DBUILD_EXAMPLES=OFF
-		-DFAT_RUNTIME=false
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/bin/unit-hyperscan || die
-}
-
-pkg_postinst() {
-	if has_version '<mail-filter/rspamd-3.5'; then
-		elog "There is known issue with <mail-filter/rspamd-3.5 when hyperscan version changes."
-		elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*"
-		elog "See https://github.com/rspamd/rspamd/issues/4409 for more information."
-	fi
-}
diff --git a/dev-libs/hyperscan/hyperscan-5.4.1.ebuild b/dev-libs/hyperscan/hyperscan-5.4.1.ebuild
deleted file mode 100644
index 19e846a09a83..000000000000
--- a/dev-libs/hyperscan/hyperscan-5.4.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake flag-o-matic python-any-r1
-
-DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="
-	https://www.hyperscan.io/
-	https://github.com/intel/hyperscan
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cpu_flags_x86_avx2 cpu_flags_x86_ssse3"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ragel
-"
-
-# We can't default this to on as it's against the expectation of
-# how CPU_FLAGS_* work for users.
-REQUIRED_USE="cpu_flags_x86_ssse3"
-
-src_prepare() {
-	# Respect user -O flags
-	sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
-
-	# upstream workaround
-	append-cxxflags -Wno-redundant-move
-	cmake_src_prepare
-}
-
-src_configure() {
-	use cpu_flags_x86_ssse3 && append-flags -mssse3
-	use cpu_flags_x86_avx2  && append-flags -mavx2
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_AND_SHARED=OFF
-		-DBUILD_EXAMPLES=OFF
-		-DFAT_RUNTIME=false
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}"/bin/unit-hyperscan || die
-}
-
-pkg_postinst() {
-	if has_version '<mail-filter/rspamd-3.5'; then
-		elog "There is known issue with <mail-filter/rspamd-3.5 when hyperscan version changes."
-		elog "Known workaround is to remove hyperscan databases ${EROOT}/var/lib/rspamd/*.hs*"
-		elog "See https://github.com/rspamd/rspamd/issues/4409 for more information."
-	fi
-}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index d0d81ee1a631..21d034aab946 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -2,6 +2,6 @@ DIST libqtxdg-3.10.0.tar.xz 71656 BLAKE2B 345fd1c3b3b117521220fe70487a9e93480003
 DIST libqtxdg-3.11.0.tar.xz 71688 BLAKE2B df5f9ebe6d964a23c89402419e4b6e27812a25d96d065e64c05348fe833e2c27c06e11260c8c58999b232eaf154404549100b81325e02ec7c10eaa40d68ff4cd SHA512 494140fa35e184c128c851f06501b5c62324a796d3f61ed47b750dbdffff756c1a42240d4458797e2f2f01c9b06b997f0fbfc76fe7f99866f7cad084ac1342f7
 DIST libqtxdg-3.9.1.tar.xz 71604 BLAKE2B 73db84890afa5b7177447a01ae2eb92db4bf13c6e3377a0ac7bdda192b15f8cd068db2875c13ba37d7d27a2c28e48d435801625b11ec8f7eb602fa02b5eca841 SHA512 1b05a10649229a34e3b653c37abefbb02c8b456d77aaabed0e47668818ee29730ea049d96bc5c71c9ad83d1c9c87888195bf228dc9817fd27053f0286752978c
 EBUILD libqtxdg-3.10.0.ebuild 1193 BLAKE2B 4e55917b9392fdb96d748631455237e8d2ef203648c8070d62c360e697e569a4daa27bbca9292082bea06e0477aa96fb027623851fe35ce616dbeb06631d4826 SHA512 2f21e6cd7b08d0c8034b95bc9d18013c03fc105acaf118b4d196a46c535ec6c37d6fc7dd9fe9dc3b398548a5ee8475e5fe51509cbcb3331003e0beb5239b6688
-EBUILD libqtxdg-3.11.0.ebuild 1195 BLAKE2B faea145456d0674cb6e04adbf3241432803892ec8ee73758d14033f702a2c0e9cf74ca3a60ee10558713254f623b2b307baddfd9c29cfe66fb84984643929382 SHA512 4263c1d02c7c5cd0c2bef58fe187a43e25e02458638516117016721b01bace149341bf84c4a2212b8a61f307916b805d804ddf82c8db0e8f187f5f3d233614a4
+EBUILD libqtxdg-3.11.0.ebuild 1194 BLAKE2B 7e69f65b177da036b30d0ff27b1b2aeb0c7024c80f7f43c98eb54aa3fc0ef4845cc41dc0bf256dd54cb9da0ebf08a48a83cd2ec973b12a3a80f517ac29fcdf9f SHA512 f0cc49143eb76cadeb2c688de19b0f0fb98e8ab27ec86b4e859777f4d432261791f1cc367bd8413993c77b9f7fe1b04f1333a4d0d6e54b60d813fa2548156e9b
 EBUILD libqtxdg-3.9.1.ebuild 1193 BLAKE2B faa12232e69adbe452b2d222a9a8e59dae921a28514316acedd7935d8a09bcc390737df5ff354bf3722ecef3bf7f4c6d42da4001494068f7e70539ca93c34964 SHA512 c78ab7951f761a5eb56ecc7a38f3724955babceac42f732a8adfa22cd549148946317ee466badc68c5e77b263ebcbdb7a3470e0e15189002ea37c99f95aad80a
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.11.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.11.0.ebuild
index 7fd18a68ab8d..01da5c1f7e5c 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.11.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.11.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index 60720aeba75d..d13d04593a94 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -6,5 +6,5 @@ DIST libunibreak-LineBreakTest.txt 1085570 BLAKE2B 306ab92a18e38e021baa887a16e70
 DIST libunibreak-WordBreakTest.txt 297534 BLAKE2B 261e4582feadfda276c404572ddf33b7b91c9803639cae316e1eaa6dfebfaf748116b345838ee08c05e946efea6ec21de3bcf32eb8b69921051dd06bd04d5ce4 SHA512 54a87ffa10a424b690ed226b411aa66ac5e52c6b34e4f361bfc5dfe14f841ff35d76a98691f62f9257b5c2ced0bfb826a55880f64294d271a06fccb52d20e7d3
 EBUILD libunibreak-4.3.ebuild 1195 BLAKE2B 5bf75bc9bcff1632f31c92b6b1f4d7ed8723c75a8406f37517b33e83e245668b96cc0cbe301107d5c5894dc28d1e73e7e5af4c66eaf99fb4e5742c739fc160a2 SHA512 7f859b573847358cfa86d142d209fe8311e978698c88232698b0612d431d9dbb25d48cbfd8f88fc4b3076c30ae3ef4dec589adb379c59cad12008ba6e10ddfe2
 EBUILD libunibreak-5.0-r1.ebuild 1199 BLAKE2B 46072fd0bd8b3a6618f7902459e221ab6d3b97aea91efa90b426a17f413db17a1faee7651c7e7fd2ab7dce5b2ab265112161407ee33e1ed401b9bd9469dc1576 SHA512 4fea4256e1bd90c8003481975f2570f71b80da48786e07ceb553de86f65b0707ebcfee8b30b503025dcfd2c8763508df859d81004326e6736f83f1f4359b153f
-EBUILD libunibreak-5.1.ebuild 1665 BLAKE2B 3e4543ef2a0cf279ee9b8b005957af4fda4ce6bf7f2fceff43f912fce4299780d852b51ae406eeda8646c83a35ae7e7e2db0c4cd99bb9657a7238fe89c24170d SHA512 00e1c3b79c02d6291b3e99ca678a95b3a0a0cfc4bcc4f5f0cdeff7a072f2cbe1713082dd9c193f655ae3401b274b52175e371f7403822736cc2caa747c747b45
+EBUILD libunibreak-5.1.ebuild 1672 BLAKE2B 5c3640a0bee1160c8a7c8939472b72513b77a5e3c1bca851f13e68e0c48faed448954e0ea5488c0afe9e1365379dccc39164a0818ab34ea7c4ec959d377f6aa2 SHA512 c257a60d3b665ecfb61c6522eee18798f09fd06a2138960ae008dc7d52c1da3cc1309d66aabd59c985f05d930f8d379103e67191091839ee052953b9fad26944
 MISC metadata.xml 641 BLAKE2B 323ca38c518dcc55e98e4cb5b9e0ebe6700c1d5301d6e820cc124312b422e60de44dd5e30d7fc9271f7cd1c07d74c74edcdddd023d1652b00b0be0b1b5eae4c9 SHA512 bca5678a1c2dbc1267c7c206e33a189afb442db796b5fbddad8d061690e70cc1c0661d11ab552c2f982c28c2a4c74c66b417a70bbdf9164da85abcc312a3cc85
diff --git a/dev-libs/libunibreak/libunibreak-5.1.ebuild b/dev-libs/libunibreak/libunibreak-5.1.ebuild
index c914a23956fc..cdc25ae0c2a3 100644
--- a/dev-libs/libunibreak/libunibreak-5.1.ebuild
+++ b/dev-libs/libunibreak/libunibreak-5.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI+="
 
 LICENSE="ZLIB"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="doc +man static-libs test"
 RESTRICT="!test? ( test )"