4 files changed, 21 insertions, 207 deletions
diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index e2e96352587d..338a6b4c91e8 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,11 +1,5 @@
 AUX riseup-vpn-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch 747 BLAKE2B 1a29495b1709e626a9a459dfb839860a5f5c60b37957fc8878f5aa2e4d8cd99f0058bbd5fe678b1a74153f9be3e1be4635661a91f45e7da78cb478e3f40be5da SHA512 a58f786835e484f1fb4dad34dd38b0ae46103551c4b0392ad1ee19f598c213d5759f6590812f0b35c1b7a0cac48ea42023264ff8386b2eeec4d50175fbfb9777
-DIST riseup-vpn-0.21.11-deps.tar.xz 180372544 BLAKE2B 3679347cb3bc83850b78d4290649b98e3a376950bb1830a092bc007d4b06c0292a8dbd3a08dd21eaefaba4a95fe4f9ffd5ef5be789a67bffe80c05c89d01bc0c SHA512 3587bf35855ef89987a370df686a4c882a2ae59c9a2893605cf8c102a639a1410a6963f0d7b8d9a316d72ed9f3c443e3aee129423c872be92257fa660d5a4c8e
-DIST riseup-vpn-0.21.11.tar.gz 7595837 BLAKE2B a1cd09741f044d03577128ab88ba6e6d9961a1a39c0e6488d79e73ec9c94b7a0fa44463a07d2e2130fe4adf986d86a693cb3114bae99e4a4bb55d23b90f2c871 SHA512 b4fa6f57f97bfba364c7aa9b2a4fc08561c7753d5471424534884a3279e5ff2bd102cc254c4e15a99f6fa47ef16abf1c691d3d174eda27bbfdac61d192f6fbb1
-DIST riseup-vpn-0.21.11_p20221113-deps.tar.xz 1628980 BLAKE2B 5af75fb2cd71da2fd949f89d1c768c001a268cc7fab0d26a621a02136eaddb8466e4cd1346954b785a5ac695bb816dd791b006b226359204670c47d4a47d25b8 SHA512 f0a8a657ac1aeefcf3d83b970157b600247ef228072c93c5aa1dfe062b8a9f81a4e13c44f51dc9c289f2b76de4eff516b045d3a145a905034b5a3ee263dbd68d
-DIST riseup-vpn-0.21.11_p20221113.tar.gz 7696220 BLAKE2B ba4c968e7b185c98e8995b300ab25ec79103473cafbd647c262d51308c173ba1a48f69b42b8dad2356791711137688a6a9a3a47e68294579be51ecd77b04bac4 SHA512 44157eebd266b99d146f29f621576c181a012d5965c4172fddb93232230f42f128958342891d8137bdedfb3236f132a1c73a9f45cad803b29d520393eb7d8cb4
-DIST riseup-vpn-0.21.11_p20230412-deps.tar.xz 29805564 BLAKE2B 4105bc0461d542b7f87890a50db26fa96302088070f0477c0f8d0707994efecc8f4bc91b5316e1834f98f9890793eea9df9041de78af6785f68e480c0d384124 SHA512 f8a3bd099a1e3733577de892a4939a223f851e949275afea8f5a77b38a529dbf7b9b161bbb4e1518530e97027c612ae352895a79275d287c31cb41ab2477aaca
-DIST riseup-vpn-0.21.11_p20230412.tar.gz 7701340 BLAKE2B 42564c1a3a3401c909f41e2db3f232ed06617630a4f96a28a3d946e6e3c53337cde8401e8a89b0e83824cfb4fe8a670f4aec03eb09cc6c9b1b4e94111e0a04ff SHA512 966b64a8071ebe56d1ec8b43b36c7b168600b445ca6039fa7fc6696329e8eb825c0d3f20e4ff509128acf1b962676eb4dfea5aa6890afc394a0aa218799eb61d
-EBUILD riseup-vpn-0.21.11.ebuild 1811 BLAKE2B 1719e830ea5cbe07d2c6155cdf9050827ddd529a39730b6994014726715375e4e653f1c5f93f7421b5d202d3964febfb85d943b919c272d7a381ea53721da501 SHA512 5e941e24f7eb2e172b3f17df647d6a64494bfd8d2491523f46cdcd123938f6b9cf776742ec210eb77836228c0521c62df4d750aec7f83a173bb2b0a6d4bb09ea
-EBUILD riseup-vpn-0.21.11_p20221113.ebuild 1946 BLAKE2B eebac512b114a8bbdfdf6da6c9411f474b775fd0f57a47c80d2ca582619c09f5389f7a6f9dff0e7309f0d197f5fcb0397a76fd62ccc7ea87f72896efa91b7798 SHA512 66e69fcbb1bf22f269c093e6cf45205f4732f631618d31a3f8b40c1b5f9b8bf4316ae4dec569638a544cb6c1232c02027ef07f7f3c3674afc9e24d093a58de52
-EBUILD riseup-vpn-0.21.11_p20230412-r1.ebuild 1991 BLAKE2B 1b831d9e543672a70a4659a6a54baa4ce80519156a289a58f082c983dab104be79c2d3c6db9af9a608ba9fc92605c917c73b29db36ebedf07c760d703d9d2e4a SHA512 88898c50a7089edc830ec1060f1f917cddc3d350192f356c2ab8ec11f2d9dddf4f7207982f099242be0cf0ebfe12f3ee12ea640e36edb633d58277fd8263cc42
+DIST riseup-vpn-0.24.3-deps.tar.xz 35335684 BLAKE2B 85774c35593e59009b8b8ae3ada8542d2df6206bbd0662f01b6798907246097b847c1fc894e50d912f5a2e66abb74f7fe2e7458762ba09a6ddba8d9f1aa6b2b4 SHA512 febba844bfa5b35e99cce586207320dafc393648904aa543293af941012f17164710b72eb7ca0bc7a7d5025bf67958340606cf6c7ce43ddf4dcf2a59ca98e87e
+DIST riseup-vpn-0.24.3.tar.gz 12270357 BLAKE2B a28d5fe1920614717f7c4a276fbddd24523b7a0a4776bfb7ef49256984e1348b5821854c5547c8a1a72a4c5a07f28c3fd3b5866ed13cb1b3606ec398e4b41478 SHA512 03e916fd3e019b62a09b673aab14f7de9554d2ab5affd793c607f392ed8411c2081db8c223232572fe9b629a4bd68e9994e59c00c4d5ef67b0c8705c11981409
+EBUILD riseup-vpn-0.24.3.ebuild 1787 BLAKE2B d847215657996c4ecd2a32a37af5ec6450f6b5232d7f54a8efd2bda9e4dd43ab2d00f313945a2b4586056b7382c42df75efbc5c57d5959fd02e081b0a0a92f56 SHA512 f616e1ff10503ad7921bb4d138924a7a3a95eb3252ce91fdcd316258acd0c5d14826e24edbd81846345d4139091f3d4e035f144b627fb42e3a5e6894fce9a3f2
 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild
deleted file mode 100644
index 1b90a735e391..000000000000
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20221113.ebuild
+++ /dev/null
@@ -1,89 +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 desktop python-single-r1 go-module qmake-utils virtualx xdg
-
-COMMIT="d7749dca00983fa9240e146ebf036c44cf67b9cd"
-
-DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask"
-HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net"
-SRC_URI="
-	https://0xacab.org/leap/bitmask-vpn/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~andrewammerlaan/${P}-deps.tar.xz
-"
-S="${WORKDIR}/bitmask-vpn-${COMMIT}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test"
-# The tests require internet access to connect to Riseup Networks
-
-# Generated with dev-go/golicense
-LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-BDEPEND="
-	virtual/pkgconfig
-	dev-qt/linguist-tools
-	test? ( dev-qt/qttest:5 )
-"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsvg:5
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	net-vpn/openvpn
-	sys-auth/polkit
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-revert-data-cipher-arg-to-cipher.patch"
-)
-
-src_prepare() {
-	default
-
-	# do not pre-strip
-	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
-
-	# We need qmake and lrelease from  qt5 bin dir
-	export PATH="${PATH}:$(qt5_get_bindir)" || die
-}
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-	virtx emake test_ui
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "build/qt/release/riseup-vpn"
-
-	python_scriptinto /usr/sbin
-	python_doscript "pkg/pickle/helpers/bitmask-root"
-
-	insinto /usr/share/polkit-1/actions
-	newins "pkg/pickle/helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
-
-	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
-	make_desktop_entry "${PN}" RiseupVPN riseup Network
-
-	dodoc -r docs/*
-}
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20230412-r1.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20230412-r1.ebuild
deleted file mode 100644
index 93230e0a0c72..000000000000
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.11_p20230412-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit desktop python-single-r1 go-module qmake-utils virtualx xdg
-
-COMMIT="ec3f27147f2f72cebedf12ae0cc40277b78e998e"
-
-DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask"
-HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net"
-SRC_URI="
-	https://0xacab.org/leap/bitmask-vpn/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~andrewammerlaan/${P}-deps.tar.xz
-"
-S="${WORKDIR}/bitmask-vpn-${COMMIT}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test"
-# The tests require internet access to connect to Riseup Networks
-
-# Generated with dev-go/golicense
-LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-BDEPEND="
-	virtual/pkgconfig
-	dev-qt/linguist-tools
-	test? ( dev-qt/qttest:5 )
-"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5[png]
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	net-vpn/openvpn
-	sys-auth/polkit
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.21.11_p20221113-revert-data-cipher-arg-to-cipher.patch"
-)
-
-src_prepare() {
-	default
-
-	# do not pre-strip
-	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
-
-	# We need qmake and lrelease from  qt5 bin dir
-	export PATH="${PATH}:$(qt5_get_bindir)" || die
-}
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-	virtx emake test_ui
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "build/qt/release/riseup-vpn"
-
-	python_scriptinto /usr/sbin
-	python_doscript "pkg/pickle/helpers/bitmask-root"
-
-	insinto /usr/share/polkit-1/actions
-	newins "pkg/pickle/helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
-
-	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
-	make_desktop_entry "${PN}" RiseupVPN riseup Network
-
-	dodoc -r docs/*
-}
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.11.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.24.3.ebuild
index 1961712e3b0c..35fce6d33f14 100644
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.11.ebuild
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.24.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit desktop python-single-r1 go-module qmake-utils virtualx xdg
 
@@ -15,29 +15,28 @@ SRC_URI="
 "
 S="${WORKDIR}/bitmask-vpn-${PV}"
 
+# Generated with dev-go/golicense
+LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 IUSE="test"
+
 PROPERTIES="test_network"
 RESTRICT="test"
 # The tests require internet access to connect to Riseup Networks
 
-# Generated with dev-go/golicense
-LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
 BDEPEND="
 	virtual/pkgconfig
-	dev-qt/linguist-tools
-	test? ( dev-qt/qttest:5 )
+	dev-qt/qttools[linguist]
 "
 
 DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsvg:5
+	dev-qt/qtbase:6[gui,widgets]
+	dev-qt/qtdeclarative:6[widgets]
+	dev-qt/qtsvg:6
+	media-libs/libglvnd
 "
 
 RDEPEND="${DEPEND}
@@ -52,8 +51,8 @@ src_prepare() {
 	# do not pre-strip
 	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
 
-	# We need qmake and lrelease from  qt5 bin dir
-	export PATH="${PATH}:$(qt5_get_bindir)" || die
+	# We need qmake and lrelease from  qt6 bin dir
+	export PATH="${PATH}:$(qt6_get_bindir)" || die
 }
 
 src_compile() {
@@ -68,13 +67,13 @@ src_test() {
 src_install() {
 	einstalldocs
 
-	dobin "build/qt/release/riseup-vpn"
+	newbin "build/qt/release/bitmask-vpn" riseup-vpn
 
 	python_scriptinto /usr/sbin
-	python_doscript "helpers/bitmask-root"
+	python_doscript "pkg/pickle/helpers/bitmask-root"
 
 	insinto /usr/share/polkit-1/actions
-	newins "helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
+	newins "pkg/pickle/helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
 
 	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
 	make_desktop_entry "${PN}" RiseupVPN riseup Network