commit: bacfdf5fa50b1a049ada083c50ac8d50dfb3fded Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Wed Nov 18 13:18:25 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> 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 }
