wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-20 00:08:58 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

dev-util/rpi-imager: followup fixes

Browse Source 
- change Qt USE flags per policy [1]
- similar change for ssl USE flags
- cleanup potentinally non-functional USE flags
- fix RDEPEND
- optfeature sys-fs/udisks for non-root operation

[1] https://wiki.gentoo.org/wiki/Project:Qt/Policies

Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
This commit is contained in:
Takuya Wakazono 2024-07-22 19:17:17 +09:00
parent f88eabef66
commit 3958f7bf10
No known key found for this signature in database
GPG Key ID: 91CA2604719DDA61
2 changed files with 25 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-util/rpi-imager/metadata.xml
View File

@ -5,6 +5,10 @@
<email>martin-kokos@protonmail.com</email>
<name>Martin Mokry</name>
</maintainer>
<maintainer type="person">
<email>pastalian46@gmail.com</email>
<name>Takuya Wakazono</name>
</maintainer>
<upstream>
<remote-id type="github">raspberrypi/rpi-imager</remote-id>
</upstream>

61
dev-util/rpi-imager/rpi-imager-1.8.5.ebuild
View File

@ -3,7 +3,7 @@
EAPI=8
inherit cmake xdg
inherit cmake optfeature xdg
DESCRIPTION="Raspberry Pi Imaging Utility"
HOMEPAGE="
@ -17,51 +17,21 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gnutls qt5 qt6 zlib lzma zstd brotli bzip2 xz dbus gnutls openssl -telemetry"
REQUIRED_USE=" || ( qt5 qt5 ) || ( gnutls openssl )"
RDEPEND="
app-crypt/p11-kit
dev-libs/double-conversion
dev-libs/glib
dev-libs/gmp
dev-libs/icu
dev-libs/libffi
dev-libs/libpcre2
dev-libs/libtasn1
dev-libs/libunistring
dev-libs/libxml2
dev-libs/nettle
media-gfx/graphite2
media-libs/freetype
media-libs/harfbuzz
media-libs/libglvnd
media-libs/libpng
net-dns/c-ares
net-dns/libidn2
net-libs/libpsl
net-libs/nghttp2
sys-apps/acl
x11-libs/libX11
x11-libs/libXau
x11-libs/libxcb
x11-libs/libXdmcp
"
IUSE="gnutls qt6 telemetry"
RDEPEND="
app-arch/libarchive:=
app-arch/xz-utils
net-misc/curl
sys-apps/util-linux
zlib? ( sys-libs/zlib )
lzma? ( app-arch/lzma )
zstd? ( app-arch/zstd )
brotli? ( app-arch/brotli )
bzip2? ( app-arch/bzip2 )
xz? ( app-arch/xz-utils )
dbus? ( sys-apps/dbus )
sys-libs/zlib
gnutls? ( net-libs/gnutls:= )
!gnutls? ( dev-libs/openssl:= )
qt6? (
dev-qt/qtbase:6[concurrent,dbus,gui,network,widgets]
dev-qt/qtdeclarative:6[svg]
)
qt5? (
!qt6? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
@ -73,13 +43,8 @@ RDEPEND="
dev-qt/qtwidgets:5
)
"
DEPEND="${RDEPEND}"
BDEPEND="
gnutls? ( net-libs/gnutls:= )
!gnutls? ( dev-libs/openssl:= )
net-misc/curl
app-arch/libarchive:=
qt6? ( dev-qt/qttools:6[linguist] )
!qt6? ( dev-qt/linguist-tools:5 )
"
@ -87,13 +52,15 @@ BDEPEND="
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package gnutls GnuTLS)
$(cmake_use_find_package qt6 Qt6)
$(cmake_use_find_package !qt6 Qt5)
$(cmake_use_find_package zlib ZLIB)
$(cmake_use_find_package lzma LibLZMA)
-DENABLE_TELEMETRY=$(usex telemetry)
-DENABLE_CHECK_VERSION=NO
)
cmake_src_configure
}
pkg_postinst() {
xdg_pkg_postinst
optfeature "running as a non-root user" sys-fs/udisks
}