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 2B8D913835A for ; Wed, 18 Nov 2020 13:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AEF5E09A8; Wed, 18 Nov 2020 13:19:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CB758E09A6 for ; Wed, 18 Nov 2020 13:19:33 +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 6F16534100D for ; Wed, 18 Nov 2020 13:19:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C030E43B for ; Wed, 18 Nov 2020 13:19:30 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1605705505.bacfdf5fa50b1a049ada083c50ac8d50dfb3fded.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/stlink/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-embedded/stlink/stlink-1.6.0.ebuild dev-embedded/stlink/stlink-9999.ebuild X-VCS-Directories: dev-embedded/stlink/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: bacfdf5fa50b1a049ada083c50ac8d50dfb3fded X-VCS-Branch: master Date: Wed, 18 Nov 2020 13:19:30 +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: caad2dfe-4507-45e6-b610-344db1b6fdf6 X-Archives-Hash: f0c43c7aedbf2ed3bf64cabdf0af1335 commit: bacfdf5fa50b1a049ada083c50ac8d50dfb3fded Author: Jakov Smolic sartura hr> AuthorDate: Wed Nov 18 13:18:25 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Nov 18 13:18:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacfdf5f dev-embedded/stlink: inherit xdg, port to cmake.eclass, fix BDEPEND Closes: https://bugs.gentoo.org/754972 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> dev-embedded/stlink/stlink-1.6.0.ebuild | 9 ++++----- dev-embedded/stlink/stlink-9999.ebuild | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dev-embedded/stlink/stlink-1.6.0.ebuild b/dev-embedded/stlink/stlink-1.6.0.ebuild index 7d2549c15a3..0c5402c06fe 100644 --- a/dev-embedded/stlink/stlink-1.6.0.ebuild +++ b/dev-embedded/stlink/stlink-1.6.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils udev +inherit udev xdg cmake DESCRIPTION="stm32 discovery line linux programmer" HOMEPAGE="https://github.com/texane/stlink" @@ -17,13 +17,12 @@ fi LICENSE="BSD" SLOT="0" -IUSE="" RDEPEND="virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( @@ -33,5 +32,5 @@ src_configure() { -DLIB_INSTALL_DIR:PATH="$(get_libdir)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild index cadef633bb8..0c5402c06fe 100644 --- a/dev-embedded/stlink/stlink-9999.ebuild +++ b/dev-embedded/stlink/stlink-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -inherit cmake-utils udev +inherit udev xdg cmake DESCRIPTION="stm32 discovery line linux programmer" HOMEPAGE="https://github.com/texane/stlink" @@ -11,19 +11,18 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/texane/stlink.git" inherit git-r3 else - SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz" + SRC_URI="https://github.com/texane/stlink/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" fi LICENSE="BSD" SLOT="0" -IUSE="" RDEPEND="virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( @@ -33,5 +32,5 @@ src_configure() { -DLIB_INSTALL_DIR:PATH="$(get_libdir)" ) - cmake-utils_src_configure + cmake_src_configure }