[gentoo-commits] repo/gentoo:master commit in: app-mobilephone/heimdall/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     85faca572fced4fcf82dc3964ac4461f4700b88a
Author:     ScardracS <marco <AT> scardovi <DOT> com>
AuthorDate: Wed Mar 17 11:56:41 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 23 12:32:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85faca57

app-mobilephone/heimdall: updated links and RDEPEND

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-mobilephone/heimdall/Manifest                   |  1 +
 ...eimdall-9999.ebuild => heimdall-1.4.2-r1.ebuild} | 21 +++++++++------------
 app-mobilephone/heimdall/heimdall-9999.ebuild       | 21 +++++++++------------
 app-mobilephone/heimdall/metadata.xml               | 11 +++++++++--
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest
index 1f7c3601646..db7aa53c6f4 100644
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@@ -1 +1,2 @@
 DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
+DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7

diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
similarity index 58%
copy from app-mobilephone/heimdall/heimdall-9999.ebuild
copy to app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
index e583714cae2..e4026eb2373 100644
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2-r1.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/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild
index e583714cae2..e4026eb2373 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 cbbc2b0edd9..499a4a303ee 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>