diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-06-03 22:40:18 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-06-04 15:30:39 -0400 |
| commit | a137dbfdd800ce2d4a352f70aba32f949d49b601 (patch) | |
| tree | f2bd4a54441b159a0891ee1d809d1a9fcc0de39c /dev-qt/qtconnectivity | |
| parent | profiles/features/musl: drop net-wireless/neard mask (diff) | |
| download | gentoo-a137dbfdd800ce2d4a352f70aba32f949d49b601.tar.gz gentoo-a137dbfdd800ce2d4a352f70aba32f949d49b601.tar.bz2 gentoo-a137dbfdd800ce2d4a352f70aba32f949d49b601.zip | |
dev-qt/qtconnectivity: update live for 6.8+ branch
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qtconnectivity')
| -rw-r--r-- | dev-qt/qtconnectivity/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild | 22 |
2 files changed, 18 insertions, 5 deletions
diff --git a/dev-qt/qtconnectivity/metadata.xml b/dev-qt/qtconnectivity/metadata.xml index 84c08090ba58..052592031909 100644 --- a/dev-qt/qtconnectivity/metadata.xml +++ b/dev-qt/qtconnectivity/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Qt Project</name> </maintainer> <use> + <flag name="neard">Use <pkg>net-wireless/neard</pkg> to access NFC devices</flag> <flag name="nfc">Enable support for the Near Field Communication protocol</flag> </use> <upstream> diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild index de07cbfd1ffe..45b30ae3f8c0 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.9999.ebuild @@ -11,20 +11,29 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" fi -IUSE="+bluetooth nfc smartcard" -REQUIRED_USE="|| ( bluetooth nfc )" +IUSE="+bluetooth neard nfc smartcard" +REQUIRED_USE=" + || ( bluetooth nfc ) + nfc? ( ?? ( neard smartcard ) ) +" -RDEPEND=" +DEPEND=" ~dev-qt/qtbase-${PV}:6[network] bluetooth? ( ~dev-qt/qtbase-${PV}:6[dbus] net-wireless/bluez:= ) nfc? ( + neard? ( ~dev-qt/qtbase-${PV}:6[dbus] ) smartcard? ( sys-apps/pcsc-lite ) ) " -DEPEND="${RDEPEND}" +RDEPEND=" + ${DEPEND} + nfc? ( + neard? ( net-wireless/neard ) + ) +" CMAKE_SKIP_TESTS=( # most hardware tests are auto-skipped, but some still misbehave @@ -48,7 +57,10 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(usev nfc $(qt_feature smartcard pcsclite)) + $(usev nfc " + $(qt_feature neard) + $(qt_feature smartcard pcsclite) + ") ) qt6-build_src_configure |