commit: 3a735de9ed82e5950e53b88e27c9ec38796ca0c1 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Fri Sep 8 08:41:55 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Sep 9 16:06:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a735de9
dev-qt/qtpositioning: tighten deps, add IUSE=nmea At the base this hardly needs anything beside QtCore. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtpositioning/metadata.xml | 1 + ...ning-6.5.2-r1.ebuild => qtpositioning-6.5.2-r2.ebuild} | 15 ++++++++++----- dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild | 15 ++++++++++----- dev-qt/qtpositioning/qtpositioning-6.9999.ebuild | 15 ++++++++++----- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml index 307f4190be2e..2d5119ff80c9 100644 --- a/dev-qt/qtpositioning/metadata.xml +++ b/dev-qt/qtpositioning/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="geoclue">Use enhanced location information from <pkg>app-misc/geoclue</pkg></flag> + <flag name="nmea">Build plugin for parsing NMEA (National Marine Electronics Association) sentences</flag> <flag name="qml">Build QML bindings</flag> </use> <upstream> diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild similarity index 79% rename from dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild rename to dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild index 1a70305f545f..5bc8b82de998 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.5.2-r1.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.5.2-r2.ebuild @@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="geoclue +qml" +IUSE="geoclue nmea +qml" DEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,widgets] - ~dev-qt/qtserialport-${PV}:6 + ~dev-qt/qtbase-${PV}:6 geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " RDEPEND=" @@ -27,11 +30,13 @@ RDEPEND=" src_prepare() { qt6-build_src_prepare - # would use $(cmake_use_find_package geoclue Qt6DBus) but doing - # this side-disables gui+qml if do have qtbase[dbus] + # unfortunately cmake_use_find_package would break things with qtbase use geoclue || sed -e 's/TARGET Qt::DBus/FALSE/' \ -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die } src_configure() { diff --git a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild index 1a70305f545f..5bc8b82de998 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.5.9999.ebuild @@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="geoclue +qml" +IUSE="geoclue nmea +qml" DEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,widgets] - ~dev-qt/qtserialport-${PV}:6 + ~dev-qt/qtbase-${PV}:6 geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " RDEPEND=" @@ -27,11 +30,13 @@ RDEPEND=" src_prepare() { qt6-build_src_prepare - # would use $(cmake_use_find_package geoclue Qt6DBus) but doing - # this side-disables gui+qml if do have qtbase[dbus] + # unfortunately cmake_use_find_package would break things with qtbase use geoclue || sed -e 's/TARGET Qt::DBus/FALSE/' \ -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die } src_configure() { diff --git a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild index 1a70305f545f..5bc8b82de998 100644 --- a/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild +++ b/dev-qt/qtpositioning/qtpositioning-6.9999.ebuild @@ -11,12 +11,15 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64" fi -IUSE="geoclue +qml" +IUSE="geoclue nmea +qml" DEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,widgets] - ~dev-qt/qtserialport-${PV}:6 + ~dev-qt/qtbase-${PV}:6 geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) + nmea? ( + ~dev-qt/qtbase-${PV}:6[network] + ~dev-qt/qtserialport-${PV}:6 + ) qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) " RDEPEND=" @@ -27,11 +30,13 @@ RDEPEND=" src_prepare() { qt6-build_src_prepare - # would use $(cmake_use_find_package geoclue Qt6DBus) but doing - # this side-disables gui+qml if do have qtbase[dbus] + # unfortunately cmake_use_find_package would break things with qtbase use geoclue || sed -e 's/TARGET Qt::DBus/FALSE/' \ -i src/plugins/position/CMakeLists.txt || die + use nmea || + sed -e 's/TARGET Qt::Network/FALSE/' \ + -i src/plugins/position/CMakeLists.txt || die } src_configure() {