gentoo resync : 27.03.2021

5 files changed, 70 insertions, 16 deletions

diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index e99b208d124a..b3af2ebb9969 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 0f02d6f858fa..1c924d3b10fe 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1,4 +1,6 @@
 DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
+DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
+EBUILD heimdall-1.4.2-r1.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
 EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
-EBUILD heimdall-9999.ebuild 1056 BLAKE2B d03ca39689d7807d9478e14761d4fd4e18c71720038706d81c162a12ad95deb48b3647564f66052f5fad5d5f1a54d45571c58c85fca106b780014dfea374feab SHA512 0a824daa2b387832764b2243652c6efadc40724fbeb2893290eb87575bd73cfe4e9a96c5abb70980e62eb2ab0a53b0e968c6275fed251ec2ac8040f79aed52df
-MISC metadata.xml 255 BLAKE2B 78e757fc09b4330ab3b0b18ca84e305285598818ae326f66a1cc80cfd1de83af4abfb4174fc6b8ad0ff385f730b1cb6208b99a0ecef91aad5837196937ad31ca SHA512 7ad2bd23ece0c6c258d52c460d6f33570eece2ebda7f3526556e2428afc85936284bb1fdbd82b38cea5654b12f5530e026bc5f0cd5b8a3a83a3c9750eb6ea91a
+EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
+MISC metadata.xml 484 BLAKE2B 735cec9feaeda05021f60068a46ab3156e6fe08c8e6c6abbb986170817db5d2c09b704f34c25b5c3da3549999ac28af0150a267b60a24555bf3beb0c34966865 SHA512 7425925defbe15e76ec54212daa8d1e6d45035102962fe4dcc9bd976f0610e2b535c52974b498cdbf55298f20095ee41c2f3545407534841c01fa40a6f89de2c
diff --git a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..e4026eb23735
--- /dev/null
+++ b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+fi
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="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
+}
diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index e583714cae2f..e4026eb23735 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@@ -6,30 +6,30 @@ EAPI=7
 inherit cmake udev
 
 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-v${PV}"
+	S="${WORKDIR}/Heimdall-${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
+	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
 fi
 
-DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
-HOMEPAGE="https://glassechidna.com.au/heimdall/"
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
 
 LICENSE="MIT"
 SLOT="0"
 IUSE="gui"
 
 RDEPEND="
-	>=dev-libs/libusb-1.0.18:1=
 	sys-libs/zlib
+	virtual/libusb:1=
 	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
-	)
-"
+	)"
+
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -43,9 +43,6 @@ src_configure() {
 src_install() {
 	dobin "${BUILD_DIR}"/bin/heimdall
 	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
-
-	insinto "$(get_udevdir)/rules.d"
-	doins heimdall/60-heimdall.rules
-
+	udev_dorules heimdall/60-heimdall.rules
 	dodoc README.md Linux/README
 }
diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml
index cbbc2b0edd97..499a4a303ee2 100644
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
+		<remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
 	</upstream>
 </pkgmetadata>