From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B94D1382C5 for ; Sun, 14 Feb 2021 19:04:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65B73E08F0; Sun, 14 Feb 2021 19:04:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C5A3E08EC for ; Sun, 14 Feb 2021 19:04:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2875D340E11 for ; Sun, 14 Feb 2021 19:04:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 803294C8 for ; Sun, 14 Feb 2021 19:04:40 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1613329470.86b4fa118b04576c7770ecf02fcdf1e0b6ee02fa.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/heimdall/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-mobilephone/heimdall/heimdall-1.4.2.ebuild app-mobilephone/heimdall/heimdall-9999.ebuild app-mobilephone/heimdall/metadata.xml X-VCS-Directories: app-mobilephone/heimdall/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 86b4fa118b04576c7770ecf02fcdf1e0b6ee02fa X-VCS-Branch: master Date: Sun, 14 Feb 2021 19:04:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ecaf9be-d0d2-49bb-96b6-0f4939126b56 X-Archives-Hash: 255136a7b0c9659f215c914132147037 commit: 86b4fa118b04576c7770ecf02fcdf1e0b6ee02fa Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 14 18:52:34 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 14 19:04:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b4fa11 app-mobilephone/heimdall: EAPI-7, cmake.eclass, IUSE=qt5->gui Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-mobilephone/heimdall/heimdall-1.4.2.ebuild | 23 +++++++++++------------ app-mobilephone/heimdall/heimdall-9999.ebuild | 23 +++++++++++------------ app-mobilephone/heimdall/metadata.xml | 8 ++++---- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild index d9c1a516de6..ec8238d43d9 100644 --- a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild +++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils udev +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" @@ -19,31 +19,30 @@ HOMEPAGE="https://glassechidna.com.au/heimdall/" LICENSE="MIT" SLOT="0" -IUSE="qt5" +IUSE="gui" -# virtual/libusb is not precise enough RDEPEND=" >=dev-libs/libusb-1.0.18:1= - qt5? ( + sys-libs/zlib + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - sys-libs/zlib " -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - -DDISABLE_FRONTEND="$(usex !qt5)" + -DDISABLE_FRONTEND=$(usex !gui) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { dobin "${BUILD_DIR}"/bin/heimdall - use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend + use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend insinto "$(get_udevdir)/rules.d" doins heimdall/60-heimdall.rules diff --git a/app-mobilephone/heimdall/heimdall-9999.ebuild b/app-mobilephone/heimdall/heimdall-9999.ebuild index 15242ac0f03..e583714cae2 100644 --- a/app-mobilephone/heimdall/heimdall-9999.ebuild +++ b/app-mobilephone/heimdall/heimdall-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils udev +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" @@ -19,31 +19,30 @@ HOMEPAGE="https://glassechidna.com.au/heimdall/" LICENSE="MIT" SLOT="0" -IUSE="qt5" +IUSE="gui" -# virtual/libusb is not precise enough RDEPEND=" >=dev-libs/libusb-1.0.18:1= - qt5? ( + sys-libs/zlib + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) - sys-libs/zlib " -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( - -DDISABLE_FRONTEND="$(usex !qt5)" + -DDISABLE_FRONTEND=$(usex !gui) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { dobin "${BUILD_DIR}"/bin/heimdall - use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend + use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend insinto "$(get_udevdir)/rules.d" doins heimdall/60-heimdall.rules diff --git a/app-mobilephone/heimdall/metadata.xml b/app-mobilephone/heimdall/metadata.xml index 8fe7397a60b..cbbc2b0edd9 100644 --- a/app-mobilephone/heimdall/metadata.xml +++ b/app-mobilephone/heimdall/metadata.xml @@ -1,8 +1,8 @@ - - - BenjaminDobell/Heimdall - + + + BenjaminDobell/Heimdall +