10 files changed, 245 insertions, 63 deletions
diff --git a/sys-boot/etcher/Manifest b/sys-boot/etcher/Manifest
index cb6dd8e0..f9d0c6cf 100644
--- a/sys-boot/etcher/Manifest
+++ b/sys-boot/etcher/Manifest
@@ -1 +1 @@
-DIST balenaEtcher-1.18.4-x64.AppImage 99670655 BLAKE2B 1459743b180afbb9e57d32b9b5e808cf875378b0ec93f5af02a04c1b270ebbea46a240ff0a76afa984ab43965cb630198b845f331fda07ca90e962f18c706880 SHA512 dd349cbe15be7df164cf0423c720bf800fd26fbe56532ba3cb743879ff638a082f1cf2281c444131b1f270b9d5a3f1ced91a1b91747569eecdce603356c46a60
+DIST balena-etcher_1.19.21_amd64.deb 110310096 BLAKE2B 796cafc828029caddc0b0b2258712cf2656628366f268689e3d33ea9d721fd17560f3f3364e80c09c866af237459b839f505401e3045079b029244e703e575d7 SHA512 9b553544e26c392ae83a9bba4a5ee81fd85e1bdda89765bd06367563cab2e94a69fdf209a8e2da84dc87413c351b0783ed42c8fa7b402e62369c55e2d132faf9
diff --git a/sys-boot/etcher/etcher-1.18.4-r1.ebuild b/sys-boot/etcher/etcher-1.18.4-r1.ebuild
deleted file mode 100644
index 338618ae..00000000
--- a/sys-boot/etcher/etcher-1.18.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="balenaEtcher"
-
-inherit eutils xdg-utils
-
-DESCRIPTION="Flash OS images to SD cards & USB drives, safely and easily."
-HOMEPAGE="https://etcher.io/"
-SRC_URI="https://github.com/balena-io/${PN}/releases/download/v${PV}/${MY_PN}-${PV}-x64.AppImage"
-
-LICENSE="GPL2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/nss
-	media-libs/alsa-lib
-	sys-apps/lsb-release
-	x11-libs/gtk+:2
-	x11-libs/libXtst
-	x11-libs/libnotify"
-RDEPEND="${DEPEND}"
-
-RESTRICT="mirror strip"
-
-S="${DISTDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	newbin ${MY_PN}-${PV}-x64.AppImage ${MY_PN}
-	domenu ${FILESDIR}/${MY_PN}.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
-
diff --git a/sys-boot/etcher/etcher-1.19.21-r1.ebuild b/sys-boot/etcher/etcher-1.19.21-r1.ebuild
new file mode 100644
index 00000000..3c90b087
--- /dev/null
+++ b/sys-boot/etcher/etcher-1.19.21-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+BINTRON_NAME="balena-etcher"
+BINTRON_HOME="/opt/balenaEtcher/"
+
+CHROMIUM_LANGS="
+	af am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fi fil fr gu he hi hr hu id it ja kn ko lt
+	lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk ur vi zh-CN zh-TW
+"
+
+inherit bintron-r1 unpacker
+
+DESCRIPTION="Flash OS images to SD cards & USB drives, safely and easily."
+HOMEPAGE="https://etcher.balena.io"
+SRC_URI="https://github.com/balena-io/etcher/releases/download/v${PV}/balena-etcher_${PV}_amd64.deb"
+S="${WORKDIR}/usr/lib/balena-etcher"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+suid"
+
+RESTRICT="mirror strip test"
+
+RDEPEND="
+	virtual/libudev
+"
+
+QA_PREBUILT="/opt/balenaEtcher/*"
+
+src_prepare() {
+	bintron-r1_src_prepare
+
+	# Weird symlink
+	rm balenaEtcher || die
+}
+
+src_install() {
+	bintron-r1_src_install
+
+	for i in balena-etcher chrome_crashpad_handler chrome-sandbox libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so libvulkan.so.1 ; do
+		fperms 0755 "${BINTRON_HOME}"/$i || die
+	done
+
+	for i in etcher-util sudo-askpass.osascript-en.js sudo-askpass.osascript-zh.js ; do
+		fperms 0755 "${BINTRON_HOME}"/resources/$i || die
+	done
+
+	use suid && fperms 4711 "${BINTRON_HOME}"/chrome-sandbox
+}
diff --git a/sys-boot/etcher/files/balenaEtcher.desktop b/sys-boot/etcher/files/balenaEtcher.desktop
deleted file mode 100644
index b839fc2e..00000000
--- a/sys-boot/etcher/files/balenaEtcher.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=balenaEtcher
-Exec=balenaEtcher %U
-Terminal=false
-Type=Application
-Icon=etcher-electron
-StartupWMClass=balenaEtcher
-Comment=Flash OS images to SD cards and USB drives, safely and easily.
-MimeType=x-scheme-handler/etcher;
-Categories=System;
diff --git a/sys-boot/grub/grub-2.04-r14.ebuild b/sys-boot/grub/grub-2.04-r15.ebuild
index 77562671..1056e6b9 100644
--- a/sys-boot/grub/grub-2.04-r14.ebuild
+++ b/sys-boot/grub/grub-2.04-r15.ebuild
@@ -10,7 +10,7 @@ fi
 GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_{8,9,10}} )
+	PYTHON_COMPAT=( python{2_7,3_{10,11,12}} )
 	inherit python-any-r1
 fi
 
diff --git a/sys-boot/rpi-imager/Manifest b/sys-boot/rpi-imager/Manifest
new file mode 100644
index 00000000..5b7690b7
--- /dev/null
+++ b/sys-boot/rpi-imager/Manifest
@@ -0,0 +1 @@
+DIST rpi-imager-1.8.5.tar.gz 22455707 BLAKE2B a3268674a9d8345c23b765beef041404185eb31a25cefc2adee0d6de7910aa526c1b1f0073e4fd959ae3aa04764c9890355835295dab40149d07e37b0869a890 SHA512 574d4310234344be7502ecb6e01802f658455bc329a8080c88173c020c3e291478f5145b45c9ed68136ff1dafbaf8b842de2f8f086888cab806e931660f1d3b8
diff --git a/sys-boot/rpi-imager/files/1.7.3-move-DRIVELIST_FILTER_SYSTEM_DRIVES-to-cmake-arg.patch b/sys-boot/rpi-imager/files/1.7.3-move-DRIVELIST_FILTER_SYSTEM_DRIVES-to-cmake-arg.patch
new file mode 100644
index 00000000..d7e151bd
--- /dev/null
+++ b/sys-boot/rpi-imager/files/1.7.3-move-DRIVELIST_FILTER_SYSTEM_DRIVES-to-cmake-arg.patch
@@ -0,0 +1,37 @@
+# Expose drivelist filtering as cmake variable
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -134,6 +134,17 @@ else()
+     add_definitions(-DTELEMETRY_ENABLED_DEFAULT=false)
+ endif()
+ 
++if(DEFINED DRIVELIST_FILTER_SYSTEM_DRIVES)
++    if(DRIVELIST_FILTER_SYSTEM_DRIVES)
++        # Hide system drives from list
++        add_definitions(-DDRIVELIST_FILTER_SYSTEM_DRIVES=true)
++    else()
++        add_definitions(-DDRIVELIST_FILTER_SYSTEM_DRIVES=false)
++    endif()
++else()
++    add_definitions(-DDRIVELIST_FILTER_SYSTEM_DRIVES=true)
++endif()
++
+ if(ENABLE_CHECK_VERSION)
+     add_definitions(-DCHECK_VERSION_DEFAULT=true)
+ else()
+--- a/src/config.h
++++ b/src/config.h
+@@ -19,9 +19,6 @@
+ /* Hash algorithm for verifying (uncompressed image) checksum */
+ #define OSLIST_HASH_ALGORITHM             QCryptographicHash::Sha256
+ 
+-/* Hide system drives from list */
+-#define DRIVELIST_FILTER_SYSTEM_DRIVES    true
+-
+ /* Update progressbar every 0.1 second */
+ #define PROGRESS_UPDATE_INTERVAL          100
+ 
+-- 
+2.38.2
+
diff --git a/sys-boot/rpi-imager/files/rpi-imager-1.8.5-expose-DRIVELIST_FILTER_SYSTEM_DRIVES.patch b/sys-boot/rpi-imager/files/rpi-imager-1.8.5-expose-DRIVELIST_FILTER_SYSTEM_DRIVES.patch
new file mode 100644
index 00000000..0935599f
--- /dev/null
+++ b/sys-boot/rpi-imager/files/rpi-imager-1.8.5-expose-DRIVELIST_FILTER_SYSTEM_DRIVES.patch
@@ -0,0 +1,50 @@
+https://github.com/raspberrypi/rpi-imager/commit/a44b9ae85601a0bf9317c8717813fd0e6ac14d3e
+https://github.com/raspberrypi/rpi-imager/pull/816
+https://github.com/raspberrypi/rpi-imager/issues/534
+https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/343
+
+From a44b9ae85601a0bf9317c8717813fd0e6ac14d3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?MrSm=C3=B6r?= <66489839+MrSmoer@users.noreply.github.com>
+Date: Fri, 9 Feb 2024 11:08:00 +0100
+Subject: [PATCH] Exposing 'DRIVELIST_FILTER_SYSTEM_DRIVES' as a cmake variable
+
+Makes the filtering-behaviour userconfigureable during compile-time.
+This way its easier to configure the imager for flashing SATA or NVME
+Drives installed in your system (because of lack of adapters),
+or if the drives are (accidentally) labled as systemdrives by drivelist.
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -4,6 +4,7 @@
+ cmake_minimum_required(VERSION 3.9.4)
+ OPTION (ENABLE_CHECK_VERSION "Check for version updates" ON)
+ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
++OPTION (DRIVELIST_FILTER_SYSTEM_DRIVES "Filter System drives from displayed drives" ON)
+
+ project(rpi-imager LANGUAGES CXX C)
+ set(IMAGER_VERSION_MAJOR 1)
+@@ -164,6 +165,13 @@ else()
+     add_definitions(-DCHECK_VERSION_DEFAULT=false)
+ endif()
+
++if(DRIVELIST_FILTER_SYSTEM_DRIVES)
++   # Hide system drives from list
++   add_definitions(-DDRIVELIST_FILTER_SYSTEM_DRIVES=true)
++else()
++   add_definitions(-DDRIVELIST_FILTER_SYSTEM_DRIVES=false)
++endif()
++
+ # Because dependencies are typically not available by default on Windows, build bundled code
+ if (WIN32)
+     # Target Windows 7 (needed for drivelist module)
+--- a/src/config.h
++++ b/src/config.h
+@@ -19,9 +19,6 @@
+ /* Hash algorithm for verifying (uncompressed image) checksum */
+ #define OSLIST_HASH_ALGORITHM             QCryptographicHash::Sha256
+
+-/* Hide system drives from list */
+-#define DRIVELIST_FILTER_SYSTEM_DRIVES    true
+-
+ /* Update progressbar every 0.1 second */
+ #define PROGRESS_UPDATE_INTERVAL          100
+
diff --git a/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild b/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild
new file mode 100644
index 00000000..86c25ee0
--- /dev/null
+++ b/sys-boot/rpi-imager/rpi-imager-1.8.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake optfeature python-any-r1 xdg
+
+DESCRIPTION="Raspberry Pi Imaging Utility"
+HOMEPAGE="https://github.com/raspberrypi/rpi-imager"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/rpi-imager.git"
+else
+	SRC_URI="https://github.com/raspberrypi/rpi-imager/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="qt6 +filter-drivelist test"
+RESTRICT="test !test? ( test )" # requires network and extra permissions to write
+
+RDEPEND="
+	app-arch/libarchive:=
+	app-arch/xz-utils
+	net-libs/gnutls:=
+	net-misc/curl
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtquickcontrols2:5
+		dev-qt/qtwidgets:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,network,widgets]
+		dev-qt/qtdeclarative:6
+	)
+"
+DEPEND="
+	${RDEPEND}
+	!qt6? (
+		dev-qt/qtsvg:5
+	)
+	qt6? (
+		dev-qt/qtsvg:6
+	)
+"
+BDEPEND="
+	!qt6? ( dev-qt/linguist-tools )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/jsonschema[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/urllib3[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	#https://github.com/raspberrypi/rpi-imager/pull/816
+	"${FILESDIR}/rpi-imager-1.8.5-expose-DRIVELIST_FILTER_SYSTEM_DRIVES.patch"
+)
+
+CMAKE_USE_DIR="${S}/src"
+
+python_check_deps() {
+	python_has_version "dev-python/jsonschema[${PYTHON_USEDEP}]" \
+		&& python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" \
+		&& python_has_version "dev-python/urllib3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CHECK_VERSION=OFF
+		-DENABLE_TELEMETRY=OFF
+		-DDRIVELIST_FILTER_SYSTEM_DRIVES=$(usex filter-drivelist)
+		$(cmake_use_find_package !qt6 Qt5)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	epytest tests
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "writing to disk as non-root user" sys-fs/udisks:2
+}
diff --git a/sys-boot/unetbootin-static/unetbootin-static-625-r4.ebuild b/sys-boot/unetbootin-static/unetbootin-static-625-r5.ebuild
index 55afc01a..9375d8ed 100644
--- a/sys-boot/unetbootin-static/unetbootin-static-625-r4.ebuild
+++ b/sys-boot/unetbootin-static/unetbootin-static-625-r5.ebuild
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-
-inherit eutils
+EAPI=8
 
 DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS distributions"
 HOMEPAGE="http://unetbootin.sourceforge.net"