src_prepare/src_prepare-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sys-boot/rpi-imager: EAPI 8, qtconcurrent dep, proper CMAKE_BUILD_TYPE

Browse Source 
Closes: https://gitlab.com/src_prepare/src_prepare-overlay/-/issues/34
Signed-off-by: Maciej Barć <xgqt@riseup.net>
This commit is contained in:
Maciej Barć 2021-11-10 20:21:56 +01:00
parent 03abd7e812
commit 8b3a64491c
No known key found for this signature in database
GPG Key ID: 031C9FE65BED714A
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys-boot/rpi-imager/rpi-imager-1.6.1.ebuild
View File

@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
inherit xdg cmake inherit xdg cmake
@ -12,7 +12,7 @@ if [[ "${PV}" == *9999* ]]; then
inherit git-r3 inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/${PN}.git" EGIT_REPO_URI="https://github.com/raspberrypi/${PN}.git"
else else
SRC_URI="https://github.com/raspberrypi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/raspberrypi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64" KEYWORDS="~amd64"
fi fi
@ -23,6 +23,7 @@ IUSE="debug"
RDEPEND=" RDEPEND="
app-arch/libarchive app-arch/libarchive
dev-qt/qtconcurrent:5
dev-qt/qtcore:5 dev-qt/qtcore:5
dev-qt/qtdeclarative:5 dev-qt/qtdeclarative:5
dev-qt/qtgui:5 dev-qt/qtgui:5
@ -37,9 +38,12 @@ DEPEND="
" "
src_configure() { src_configure() {
local mycmakeargs=( local CMAKE_BUILD_TYPE
-DCMAKE_BUILD_TYPE=$(usex debug Debug Release) if use debug; then
) CMAKE_BUILD_TYPE="Debug"
else
CMAKE_BUILD_TYPE="Release"
fi
cmake_src_configure cmake_src_configure
} }

14
sys-boot/rpi-imager/rpi-imager-9999.ebuild
View File

@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=8
inherit xdg cmake inherit xdg cmake
@ -12,7 +12,7 @@ if [[ "${PV}" == *9999* ]]; then
inherit git-r3 inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/${PN}.git" EGIT_REPO_URI="https://github.com/raspberrypi/${PN}.git"
else else
SRC_URI="https://github.com/raspberrypi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/raspberrypi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64" KEYWORDS="~amd64"
fi fi
@ -23,6 +23,7 @@ IUSE="debug"
RDEPEND=" RDEPEND="
app-arch/libarchive app-arch/libarchive
dev-qt/qtconcurrent:5
dev-qt/qtcore:5 dev-qt/qtcore:5
dev-qt/qtdeclarative:5 dev-qt/qtdeclarative:5
dev-qt/qtgui:5 dev-qt/qtgui:5
@ -37,9 +38,12 @@ DEPEND="
" "
src_configure() { src_configure() {
local mycmakeargs=( local CMAKE_BUILD_TYPE
-DCMAKE_BUILD_TYPE=$(usex debug Debug Release) if use debug; then
) CMAKE_BUILD_TYPE="Debug"
else
CMAKE_BUILD_TYPE="Release"
fi
cmake_src_configure cmake_src_configure
} }