Merge updates from master

7 files changed, 5 insertions, 114 deletions

diff --git a/dev-cpp/gulrak-filesystem/Manifest b/dev-cpp/gulrak-filesystem/Manifest
index 39209b25579e..71409438b065 100644
--- a/dev-cpp/gulrak-filesystem/Manifest
+++ b/dev-cpp/gulrak-filesystem/Manifest
@@ -1,2 +1 @@
-DIST gulrak-filesystem-1.5.12.tar.gz 209661 BLAKE2B 9eb0bce08659396f3ef254b0ad772ae9ad29654aef3c90ab1f9eee1c4f830544ad947680e072fcf7d3c251a3afb77447617610c49931d50743444a6b88b4745d SHA512 2cba74921104fa84547288ff983260ce1e81967df6a7d2a334074826c355c72945ad64e6979cd302a23c5e3a398990706b01fc573c046512e9f508edca9da12c
 DIST gulrak-filesystem-1.5.14.tar.gz 211137 BLAKE2B 9734907da65e0f390e461d76c7b1c7e8ffa1a0f7f01e5952d69d9d6b6cc3c85e20f5e4495235f2589635fb665040bf2ee4def4d3bdcb0f3453a00ee8c4e8ac3f SHA512 6eae921485ecdaf4b8329a568b1f4f612ee491fc5fdeafce9c8000b9bf1a73b6fa4e07d0d4ddf05be49efe79e9bddfbcc0aba85529cb016668797a8d89eb9b82
diff --git a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild b/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
deleted file mode 100644
index e35c0185bc92..000000000000
--- a/dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Header-only single-file std::filesystem compatible helper library"
-HOMEPAGE="https://github.com/gulrak/filesystem"
-SRC_URI="https://github.com/gulrak/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P#*-}"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "s:-Werror::g" cmake/GhcHelper.cmake test/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGHC_FILESYSTEM_BUILD_EXAMPLES=OFF
-		-DGHC_FILESYSTEM_BUILD_TESTING=$(usex test)
-		-DGHC_FILESYSTEM_WITH_INSTALL=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	docinto examples
-	use examples && dodoc examples/*.cpp
-}
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index e7ed5e2a55f8..41c60b489672 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -1,2 +1 @@
-DIST firehol-3.1.6.tar.xz 1484424 BLAKE2B aea45aa424b7b43ed0576916f52a785601a21489263c1b5c6abbf3b2b97db80bf2a2420ae8176cd55e335ab93c18a8209a47f467dba80a63cf2c319b3e3e27d8 SHA512 5ffa7e59d3f10a6c7d3f5b5ef9d93f1b2138063374a10cb0c1ac4e75578d6cf7755e154b51febf546563ba003f100af13f89bca3843b66a8d22b8fc2da3fadfe
 DIST firehol-3.1.7.tar.xz 1457932 BLAKE2B 9a861f2e9c900bce45d0dbd12f4546bc14eb4d74aea27a8d4cb0e5bfe8bea92d9bff3ccf008d46bd64212d689123273c99d0b0faaaadd34f0e1d85e22ee757c9 SHA512 b05cec806c2c8fc410bf9c7a30e3ad1d9f1c06fd2d501a7e5434010f6bb38722aac5b64de9b4285d2c71cacbf6b2f3c758685da5a70c05621df52879eb5148c2
diff --git a/net-firewall/firehol/firehol-3.1.6-r3.ebuild b/net-firewall/firehol/firehol-3.1.6-r3.ebuild
deleted file mode 100644
index d68ed4f8bcc6..000000000000
--- a/net-firewall/firehol/firehol-3.1.6-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="iptables firewall generator"
-HOMEPAGE="https://firehol.org/ https://github.com/firehol/firehol"
-SRC_URI="https://github.com/firehol/firehol/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ipv6 ipset"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~x86"
-
-RDEPEND="net-firewall/iptables
-	sys-apps/iproute2[-minimal,ipv6(+)?]
-	sys-apps/kmod[tools]
-	net-misc/iputils[ipv6(+)?]
-	net-misc/iprange
-	net-analyzer/traceroute
-	app-arch/gzip
-	ipset? (
-		net-firewall/ipset
-	)"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~IP_NF_FILTER \
-		~IP_NF_IPTABLES \
-		~IP_NF_MANGLE \
-		~IP_NF_TARGET_MASQUERADE
-		~IP_NF_TARGET_REDIRECT \
-		~IP_NF_TARGET_REJECT \
-		~NETFILTER_XT_CONNMARK \
-		~NETFILTER_XT_MATCH_HELPER \
-		~NETFILTER_XT_MATCH_LIMIT \
-		~NETFILTER_XT_MATCH_OWNER \
-		~NETFILTER_XT_MATCH_STATE \
-		~NF_CONNTRACK \
-		~NF_CONNTRACK_IPV4 \
-		~NF_CONNTRACK_MARK \
-		~NF_NAT \
-		~NF_NAT_FTP \
-		~NF_NAT_IRC \
-	"
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--disable-vnetbuild \
-		$(use_enable ipset update-ipsets) \
-		$(use_enable doc) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/firehol.confd firehol
-	newinitd "${FILESDIR}"/firehol.initd firehol
-	newconfd "${FILESDIR}"/fireqos.confd fireqos
-	newinitd "${FILESDIR}"/fireqos.initd fireqos
-}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index f64c9250830a..9852281f33d4 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,6 @@
-DIST vivaldi-stable_7.0.3495.15-1_amd64.deb 120892368 BLAKE2B 32455bfa6762d5a1ff76ecae000f9650470e610094e6589e97dc15e53cad7a0e0f6a474ba58d9b30c73ec830dd323dbb3ab2221a90b6690882c5b977b20e7981 SHA512 b43e04258a861eb1220b2495a4e120dc364d7e2269ec0cb1cb7c84c259b5b292c409e8ef6746dfc1de43d9169b3c78edf4c452e8ecd2331655b30c6de84ed239
-DIST vivaldi-stable_7.0.3495.15-1_arm64.deb 112942544 BLAKE2B 928beea38e2a76e3d547469d9119d81fe9a8467891468849017fb70034f1a9f7bbd85ab0dff89301288ec12d61f905601b93d89e2b58bd724c09f55109b1def9 SHA512 6b8a9ada4d7ab27d705fb3cde61e6e2eb0df288e2c0bae2ec60c814037be1461ac1155f2b7a5a560e915a224d98ab420148f95a43afbb129fc672d26ed8fa8d9
-DIST vivaldi-stable_7.0.3495.15-1_armhf.deb 113982572 BLAKE2B 517f9fbc4218dc8db7356553f98b616d6a14d8a7cdf3aa6dd4ff06213efd70b845337781485a5981b9c85609a7bce01effb69a34c3e4468d9aa38b8e26865061 SHA512 a048c8f279690a9b5a003c84c11867ae1a95b7f45965c94d53d1d4731a498704ea870813cca6a21c55387cc84152d8f7c21a45be0a94f4663770a7934d24446c
 DIST vivaldi-stable_7.0.3495.18-1_amd64.deb 120944332 BLAKE2B 57dd825fca6385859698b11a7307415858560d3af9c2cf7069ae5f03031f3c2cf890c16db19e8344076c593c0cc392234c1ca58cd41d7d98fd0c0890413ee2a6 SHA512 678e965af99f477a95b52b2276091a52f244a9cb1f96f69d9078e66d7e4aa298d89c18ee016719cc1827fab6c0ca35f6b25444dd31aa3012035df7cbb789de8d
 DIST vivaldi-stable_7.0.3495.18-1_arm64.deb 112827716 BLAKE2B 3070b350f593a26aececaa351648f2810b3636e45f43905ce1cad293994fa74847bad0e876851d1ac2826060134a2d9edf696436f1bcaf2f8225a9c215732eb3 SHA512 75180bae0a0cc7ebc79b848282084737fd29ba1e4e0d80ce0739876041f04ebb1ca385a14b7e0c33cce5b4a270e999923b5e236924a31d29a47a967baa27a8b1
 DIST vivaldi-stable_7.0.3495.18-1_armhf.deb 113958620 BLAKE2B 8cb77b2d64c074a154bc1c0a16e0f9e4ddf2d89933096dd216e5ec0293427c5ddd777cb34aba0641806c20915c729f4d10b84a7f2eadefdb3dde7e1418b579b0 SHA512 d8e2d3cd77627ed6c14b1ded8ee4b004a28a25fbd4f33633576e6eb5b13c260c2d278e526a15d42587bfb45dda2a2b2267b4b0299b136f50bd8396e8888f33d6
+DIST vivaldi-stable_7.0.3495.23-1_amd64.deb 120947796 BLAKE2B a4022b67bfeb394716b6d4d1d56703791076e7cd3040f187128ce6c2ea226cb9f4f7da0a6313bb71dc1f2cda0627bd70c84d767bf25e40b2ea6da73c42411bae SHA512 7a325aff7fe53c4eaab654b72ba3d64cc3e3e83b4171a95600a6b11ce30a5ce52ae4241c3b3e9b43b25c1dfac470acb25039509c6daa9e005dff119c5e2266ae
+DIST vivaldi-stable_7.0.3495.23-1_arm64.deb 112832528 BLAKE2B cb77135ef961509083d590ed392ccff58f1af32c13a21113e3568bc41e62dea35f5f7bfa844f725c29b710d96539f5fbbb9a0472c6ebba521489f4a270bb2ca7 SHA512 231d413b80c81a38fb23a37ffa389104d4e909d32a79741a0a4a98278acaf489acab343d01340954626b61c5dd9ca907b52417863f9fe84e0a352a0b2cffda52
+DIST vivaldi-stable_7.0.3495.23-1_armhf.deb 113976328 BLAKE2B e24282354059087f9d5219acf0afdcfac3c7889903614f13dfd8aaceedd33073ada94f586671ea66fa40f3bee523ef9dad014b8c45c3b45fbb0a7865cbaaa88d SHA512 1cec7ea372ef0d289745ea5cd1c89ceafaaecdadfe21f04b57dead08ac9c281e70ff19fe66fee41c7bdeee8a2ca3682b19b075c27e4c975488c008fd62696199
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.18.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.18.ebuild
index 8063fc01d0e9..73ea8c901c06 100644
--- a/www-client/vivaldi/vivaldi-7.0.3495.18.ebuild
+++ b/www-client/vivaldi/vivaldi-7.0.3495.18.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
+KEYWORDS="-* amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"
diff --git a/www-client/vivaldi/vivaldi-7.0.3495.15.ebuild b/www-client/vivaldi/vivaldi-7.0.3495.23.ebuild
index 73ea8c901c06..8063fc01d0e9 100644
--- a/www-client/vivaldi/vivaldi-7.0.3495.15.ebuild
+++ b/www-client/vivaldi/vivaldi-7.0.3495.23.ebuild
@@ -108,7 +108,7 @@ SRC_URI="
 S="${WORKDIR}"
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="ffmpeg-chromium gtk proprietary-codecs qt5 qt6 widevine"
 RESTRICT="bindist mirror"
 #REQUIRED_USE="ffmpeg-chromium? ( proprietary-codecs )"