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 3DA3F139694 for ; Mon, 15 May 2017 14:23:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3279E0CD0; Mon, 15 May 2017 14:23:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FA28E0CD0 for ; Mon, 15 May 2017 14:23:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BF48B3416D8 for ; Mon, 15 May 2017 14:23:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 583C6745A for ; Mon, 15 May 2017 14:23:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1494858177.b3ffa65c92351e168c1a490d1bab1488dd56bda9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-mobilephone/heimdall/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-mobilephone/heimdall/Manifest app-mobilephone/heimdall/heimdall-1.4.2.ebuild app-mobilephone/heimdall/heimdall-9999.ebuild X-VCS-Directories: app-mobilephone/heimdall/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: b3ffa65c92351e168c1a490d1bab1488dd56bda9 X-VCS-Branch: master Date: Mon, 15 May 2017 14:23:01 +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-Archives-Salt: 74ac58fb-9d89-4cf2-be13-69872610d0e4 X-Archives-Hash: 5121b69421d268a00a8db500f16ee0ea commit: b3ffa65c92351e168c1a490d1bab1488dd56bda9 Author: Lars Wendler gentoo org> AuthorDate: Mon May 15 14:22:38 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 15 14:22:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ffa65c app-mobilephone/heimdall: Bump to version 1.4.2 (bug #618266). Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-mobilephone/heimdall/Manifest | 1 + app-mobilephone/heimdall/heimdall-1.4.2.ebuild | 53 +++++++++++++++++++++++++ app-mobilephone/heimdall/heimdall-9999.ebuild | 54 ++++++++++++-------------- 3 files changed, 79 insertions(+), 29 deletions(-) diff --git a/app-mobilephone/heimdall/Manifest b/app-mobilephone/heimdall/Manifest index 45d58a5529a..81feca9e478 100644 --- a/app-mobilephone/heimdall/Manifest +++ b/app-mobilephone/heimdall/Manifest @@ -1,2 +1,3 @@ DIST heimdall-1.4.0.tar.gz 6565316 SHA256 13f5edff2fc857cf7d82708a2ac9ad1f6d2f5d6a2e5d84587f55f62583d60531 SHA512 ae6c55af97fe95587b89cce90e75fd3b236fd8ac0d506112c9c143fb1d0982aac6d1bef7a6c6635b547148ac4913aeb4215ed9c7c8084fd0912010c5ad9604ee WHIRLPOOL b4c64a755d2f3577f894e22633e11cf60323d028b89e8117fa2c6cbedf7b55d9227cb17017d966d3d48fb56958a11ce87f3334aafedfcae57e6928ef42d8c121 DIST heimdall-1.4.1.tar.gz 6358720 SHA256 f0a6e4b5bf806fe4ab5413dd869817b600bcd339b642ff46ec0c5fe69adf7230 SHA512 2f1f49b0ad7bd5f4359893359b26024fe0cce84afed3878e42d902eb4dee487a44e351247d57e4af143ad728abd6c664df688246fcf7b96b9f3841cd16594296 WHIRLPOOL 13fa7c40f66c17010e0aca9c96e87ed34196ae2fa4c2944c63afba7df619620e154692b3846cafecf5b8cf6896e7f7a92d47e255c87421a57494f5747c6cedee +DIST heimdall-1.4.2.tar.gz 5486693 SHA256 589bef88f2597c8a84fe6fafbe928ddc9687438b5b54edd917d7df48c7e3eff8 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7 WHIRLPOOL ad7bf8b8ff2df4b132a77dc62dba0a3caf551f80cedff80c3715079109255939fc140da493dc6cb40c6dce3c843b3390af2deaefa6bb5b44c5cb8875e8cd2831 diff --git a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild new file mode 100644 index 00000000000..70d3660483e --- /dev/null +++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils 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="git://github.com/Benjamin-Dobell/Heimdall.git + https://github.com/Benjamin-Dobell/Heimdall.git" +fi + +DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices" +HOMEPAGE="http://glassechidna.com.au/heimdall/" + +LICENSE="MIT" +SLOT="0" +IUSE="qt5" + +# virtual/libusb is not precise enough +RDEPEND=" + >=dev-libs/libusb-1.0.18:1= + qt5? ( + dev-qt/qtcore:5= + dev-qt/qtgui:5= + dev-qt/qtwidgets:5= + ) + sys-libs/zlib +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DDISABLE_FRONTEND="$(usex !qt5)" + ) + cmake-utils_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/bin/heimdall + use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend + + insinto "$(get_udevdir)/rules.d" + doins 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 f2707e0a9d0..70d3660483e 100644 --- a/app-mobilephone/heimdall/heimdall-9999.ebuild +++ b/app-mobilephone/heimdall/heimdall-9999.ebuild @@ -1,57 +1,53 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -CMAKE_IN_SOURCE_BUILD="true" - -inherit autotools eutils cmake-utils udev +inherit cmake-utils 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-2 + inherit git-r3 EGIT_REPO_URI="git://github.com/Benjamin-Dobell/Heimdall.git https://github.com/Benjamin-Dobell/Heimdall.git" fi DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices" -HOMEPAGE="http://www.glassechidna.com.au/products/heimdall/" +HOMEPAGE="http://glassechidna.com.au/heimdall/" LICENSE="MIT" SLOT="0" -IUSE="qt5 static-libs" +IUSE="qt5" # virtual/libusb is not precise enough -RDEPEND=">=dev-libs/libusb-1.0.18:1=[static-libs=] - qt5? ( dev-qt/qtwidgets:5 )" +RDEPEND=" + >=dev-libs/libusb-1.0.18:1= + qt5? ( + dev-qt/qtcore:5= + dev-qt/qtgui:5= + dev-qt/qtwidgets:5= + ) + sys-libs/zlib +" DEPEND="${RDEPEND} virtual/pkgconfig" -src_prepare() { - if ! use qt5 ; then - sed '/heimdall-frontend/d' \ - -i CMakeLists.txt || die - fi -} - src_configure() { - cmake-utils_src_configure \ - $(cmake-utils_use_use static-libs STATIC_LIBS) -} - -src_compile() { - cmake-utils_src_compile + local mycmakeargs=( + -DDISABLE_FRONTEND="$(usex !qt5)" + ) + cmake-utils_src_configure } src_install() { - # cmake-utils_src_install doesn't work - dobin "${S}"/bin/${PN} - use qt5 && dobin "${S}"/bin/${PN}-frontend + dobin "${BUILD_DIR}"/bin/heimdall + use qt5 && dobin "${BUILD_DIR}"/bin/heimdall-frontend + + insinto "$(get_udevdir)/rules.d" + doins heimdall/60-heimdall.rules - insinto $(get_udevdir)/rules.d - doins "${S}"/${PN}/60-${PN}.rules - dodoc Linux/README + dodoc README.md Linux/README }