gentoo resync : 29.12.2022

4 files changed, 75 insertions, 13 deletions

diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 33c0294c7953..adf537d5f999 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,4 +1,6 @@
 DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
+DIST heimdall-2.0.1.tar.gz 83642 BLAKE2B 29cd784a4ea4c25f9670d27c306ca95d60d7ad8a11175d2ee835a0cf1e7fc5eb179aa4e49c5e05e280ed5ce475a9e66e56b48444dd4b3b93ea8cb173e3d18060 SHA512 f6df4551702a7ad7688018d60569b8b94f20be4f78a9b4bf5f6e89396ed43cd7519617ef1f420b41bbfeec8b51ae636759a7b90443d3d5945cd8744b43e2d0ef
 EBUILD heimdall-1.4.2-r1.ebuild 1039 BLAKE2B 32343fcb22532f8c4c2b1e34d738b490db4c40b416a1e8605940577c9ecceaa251d290bf165f89b3925a06844d27157a2384388723e20a44b684455942640173 SHA512 3dff78eb3eedef7f3dd8d7e96945ee9073cc194911dbf10e97091a236ffe1895b3414f54c3dae61157bf9f23bc3d839e2b322b1c6222980e821e5d01480e1e3f
-EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
-MISC metadata.xml 257 BLAKE2B c8d6a583dfe72114b8cde3a88bbf779d8b8d5e1b641461cccdfd51a9fd3830a2442a194bc3c226cb9b093784a7f24190f36bab14e05290f16dc59af5347ddfcd SHA512 ff3dc036060236d97851e807048824827b0f6357f43820882bef939a1947c37624be8fd1b58e128c201bba23e70622148457c7a7ec705d72319baa69f7deb189
+EBUILD heimdall-2.0.1.ebuild 1090 BLAKE2B dbde0738588d9304dbbacedc3ebb776b47187f110b6f434d13fe5fd2a38094dd888aff45c536ae04946b5cfb4aba36ecbb343bb1694305ab21912449a42ccca8 SHA512 47f9c5ecaf1b53d85b5b1fcb52d15afa5bceed7ef76a9a8f7ae07876faa890e0b9716d7c64972042ca98696bb22a69542622abfcb0c9add2310d4fecd0893a8a
+EBUILD heimdall-9999.ebuild 1089 BLAKE2B 3114b156ed756368d0fa9c2260f6442c0541175b00878ac3691235825d9efddc50c29d4e6d6a53ec7ac9b298bd2a80973a08f55ced47008af1e5d6ec38352b1e SHA512 a7f5a35a9c19b7a4d3f118f31d9671e6f7159b9ff43c08192871a0c128ade97aa9bd4b4fd8bff1c5b64e2472dd6a46a999aa760808f522c628129830daae01a1
+MISC metadata.xml 402 BLAKE2B da916fb8cefb8316321f382f91e28788f62fbc2343b4351481db904ed1f0fa546926cee1ac01ad4be9327affa3c1a3a71edefafe686f25e65f0e7d66f741108c SHA512 f585cb919895ed2c10951f379552bdeafcd5f39b756a93a294d82e8f538b9de1a5e05a97209e62063335ffde24aa4cc2e0077efc91a4b1db4ef705476c8fe812
diff --git a/app-mobilephone/heimdall/heimdall-2.0.1.ebuild b/app-mobilephone/heimdall/heimdall-2.0.1.ebuild
new file mode 100644
index 000000000000..38bb0affc58e
--- /dev/null
+++ b/app-mobilephone/heimdall/heimdall-2.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake udev
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+	S="${WORKDIR}/Heimdall-v${PV}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~grimler/Heimdall"
+fi
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="https://git.sr.ht/~grimler/Heimdall https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gui"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/libusb:1=
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FRONTEND=$(usex !gui)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/heimdall
+	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+	udev_dorules heimdall/60-heimdall.rules
+	dodoc README.md Linux/README
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index e4026eb23735..b1c61d9f7b06 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-${PV}"
+	SRC_URI="https://git.sr.ht/~grimler/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm64"
+	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+	EGIT_REPO_URI="https://git.sr.ht/~grimler/Heimdall"
 fi
 
 DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
-HOMEPAGE="https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
+HOMEPAGE="https://git.sr.ht/~grimler/Heimdall https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
 
 LICENSE="MIT"
 SLOT="0"
@@ -46,3 +46,7 @@ src_install() {
 	udev_dorules heimdall/60-heimdall.rules
 	dodoc README.md Linux/README
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
index 05a9dfaa474c..4d2bceb85363 100644
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
-	</upstream>
+	<maintainer type="person" proxied="yes">
+		<email>duje.mihanovic@skole.hr</email>
+		<name>Duje Mihanović</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>