From bf8fce062497714dc970b7558bacb8a915da8386 Mon Sep 17 00:00:00 2001
From: vzvu3k6k <vzvu3k6k+gitlab@gmail.com>
Date: Sat, 16 Jul 2022 12:19:08 +0000
Subject: [PATCH] sys-boot/rpi-imager: fix 9999 and add 1.7.2

---
 sys-boot/rpi-imager/Manifest                |  1 +
 sys-boot/rpi-imager/rpi-imager-1.7.2.ebuild | 56 +++++++++++++++++++++
 sys-boot/rpi-imager/rpi-imager-9999.ebuild  | 30 +++++++----
 3 files changed, 77 insertions(+), 10 deletions(-)
 create mode 100644 sys-boot/rpi-imager/rpi-imager-1.7.2.ebuild

diff --git a/sys-boot/rpi-imager/Manifest b/sys-boot/rpi-imager/Manifest
index 7850674..d5d6fa0 100644
--- a/sys-boot/rpi-imager/Manifest
+++ b/sys-boot/rpi-imager/Manifest
@@ -1,2 +1,3 @@
 DIST rpi-imager-1.6.1.tar.gz 9119480 BLAKE2B 36d702c0488620aec133ba7e2b3cfda4bd569a2e3868fb08541e3a616c2c47148c8bfc813c5e2586263661a47abad47b013af40b3fdaf160c4bc14c74d60cae7 SHA512 a7782d4ec868a5c293489b196bdbe047588489adca5e8a6e1cecf8c2bb8a696e755a512ced15a059f49091d12b17dacc22ca7f92f309707f066296796165dc6b
 DIST rpi-imager-1.6.2.tar.gz 9129361 BLAKE2B e38bc750f03043ff0d1ac01cab782d20c3d72b441ae4b3cffa21d4b4e65d6821f26933b712101a80c18ea5db99515cc040827ebfc5a3bafca173e48a37f5e38c SHA512 1424d391072b8cbbd29d116512e7add632da5a9151caf1ef8724c8fa5f17c553fbfba0339ecbd93d51a9fa7d785eae99060e8e373ae3cc7ab6e783b4dffecf18
+DIST rpi-imager-1.7.2.tar.gz 20213200 BLAKE2B 63f865dff61c8152d609e724045756c0a9f454971dc5ba3ff310f1bbeecbbcfe06b9319e8e566122c6df8e6194b3bf0953d419ab511ed13ad6f133dabc4e068d SHA512 204873dea379061c7f0f783259108a9129fd133ded549d4bf550ab41ecff6f08782264c0351505fb337a0a6de43f6656b35c5a8eba452b7933ee7742324eea41
diff --git a/sys-boot/rpi-imager/rpi-imager-1.7.2.ebuild b/sys-boot/rpi-imager/rpi-imager-1.7.2.ebuild
new file mode 100644
index 0000000..279dd03
--- /dev/null
+++ b/sys-boot/rpi-imager/rpi-imager-1.7.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg cmake optfeature
+
+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/${PN}.git"
+else
+	SRC_URI="https://github.com/raspberrypi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+CMAKE_USE_DIR="${S}/src"
+
+BDEPEND="
+	dev-qt/linguist-tools
+"
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/openssl
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	net-misc/curl
+	sys-fs/udisks:2
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CHECK_VERSION=OFF
+		-DENABLE_TELEMETRY=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "writing to disk as non-root user" sys-fs/udisks
+}
diff --git a/sys-boot/rpi-imager/rpi-imager-9999.ebuild b/sys-boot/rpi-imager/rpi-imager-9999.ebuild
index 328dd81..d159a25 100644
--- a/sys-boot/rpi-imager/rpi-imager-9999.ebuild
+++ b/sys-boot/rpi-imager/rpi-imager-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit xdg cmake
+inherit xdg cmake optfeature
 
 DESCRIPTION="Raspberry Pi Imaging Utility"
 HOMEPAGE="https://github.com/raspberrypi/rpi-imager"
@@ -16,34 +16,44 @@ else
 	KEYWORDS="~amd64"
 fi
 
-RESTRICT="mirror"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="debug"
+CMAKE_USE_DIR="${S}/src"
 
+BDEPEND="
+	dev-qt/linguist-tools
+"
 RDEPEND="
 	app-arch/libarchive
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	net-misc/curl
 	sys-fs/udisks:2
+	|| (
+		dev-libs/openssl
+		net-libs/gnutls
+	)
 "
 DEPEND="
 	${RDEPEND}
 "
 
 src_configure() {
-	local CMAKE_BUILD_TYPE
-	if use debug; then
-		CMAKE_BUILD_TYPE="Debug"
-	else
-		CMAKE_BUILD_TYPE="Release"
-	fi
+	local mycmakeargs=(
+		-DENABLE_CHECK_VERSION=OFF
+		-DENABLE_TELEMETRY=OFF
+	)
 
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	optfeature "writing to disk as non-root user" sys-fs/udisks
+}