commit: 1393a4d378f851806bba13ceaaa8997e25b53318 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Mar 2 20:53:55 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Mar 3 17:19:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1393a4d3
net-p2p/transmission: wire up qt6 support Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-p2p/transmission/transmission-4.0.1-r2.ebuild | 18 +++++++++++++++--- net-p2p/transmission/transmission-9999.ebuild | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/net-p2p/transmission/transmission-4.0.1-r2.ebuild b/net-p2p/transmission/transmission-4.0.1-r2.ebuild index 16698fd7a746..f0f1e44f4a54 100644 --- a/net-p2p/transmission/transmission-4.0.1-r2.ebuild +++ b/net-p2p/transmission/transmission-4.0.1-r2.ebuild @@ -24,7 +24,8 @@ HOMEPAGE="https://transmissionbt.com/"; # MIT is in several libtransmission/ headers LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" SLOT="0" -IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test" +IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test" +REQUIRED_USE="?? ( qt5 qt6 )" RESTRICT="!test? ( test )" ACCT_DEPEND=" @@ -37,6 +38,7 @@ BDEPEND=" gtk? ( sys-devel/gettext ) ) qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) " COMMON_DEPEND=" >=dev-libs/libevent-2.1.0:=[threads(+)] @@ -61,6 +63,10 @@ COMMON_DEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) + qt6? ( + dev-qt/qtbase:6[dbus,gui,network,widgets] + dev-qt/qtsvg:6 + ) systemd? ( >=sys-apps/systemd-209:= ) " DEPEND="${COMMON_DEPEND} @@ -75,7 +81,6 @@ src_configure() { -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} -DENABLE_GTK=$(usex gtk ON OFF) - -DENABLE_QT=$(usex qt5 ON OFF) -DENABLE_MAC=OFF -DREBUILD_WEB=OFF -DENABLE_CLI=$(usex cli ON OFF) @@ -93,7 +98,6 @@ src_configure() { -DUSE_SYSTEM_UTP=OFF -DUSE_SYSTEM_B64=OFF -DUSE_SYSTEM_PSL=ON - -DUSE_QT_VERSION=5 -DWITH_CRYPTO=$(usex mbedtls mbedtls openssl) -DWITH_INOTIFY=ON @@ -101,6 +105,14 @@ src_configure() { -DWITH_SYSTEMD=$(usex systemd ON OFF) ) + if use qt6; then + mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 ) + elif use qt5; then + mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 ) + else + mycmakeargs+=( -DENABLE_QT=OFF ) + fi + # Disable assertions by default, bug 893870. use debug || append-cppflags -DNDEBUG diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild index 16698fd7a746..f0f1e44f4a54 100644 --- a/net-p2p/transmission/transmission-9999.ebuild +++ b/net-p2p/transmission/transmission-9999.ebuild @@ -24,7 +24,8 @@ HOMEPAGE="https://transmissionbt.com/"; # MIT is in several libtransmission/ headers LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT" SLOT="0" -IUSE="appindicator cli debug gtk nls mbedtls qt5 systemd test" +IUSE="appindicator cli debug gtk nls mbedtls qt5 qt6 systemd test" +REQUIRED_USE="?? ( qt5 qt6 )" RESTRICT="!test? ( test )" ACCT_DEPEND=" @@ -37,6 +38,7 @@ BDEPEND=" gtk? ( sys-devel/gettext ) ) qt5? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) " COMMON_DEPEND=" >=dev-libs/libevent-2.1.0:=[threads(+)] @@ -61,6 +63,10 @@ COMMON_DEPEND=" dev-qt/qtsvg:5 dev-qt/qtwidgets:5 ) + qt6? ( + dev-qt/qtbase:6[dbus,gui,network,widgets] + dev-qt/qtsvg:6 + ) systemd? ( >=sys-apps/systemd-209:= ) " DEPEND="${COMMON_DEPEND} @@ -75,7 +81,6 @@ src_configure() { -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} -DENABLE_GTK=$(usex gtk ON OFF) - -DENABLE_QT=$(usex qt5 ON OFF) -DENABLE_MAC=OFF -DREBUILD_WEB=OFF -DENABLE_CLI=$(usex cli ON OFF) @@ -93,7 +98,6 @@ src_configure() { -DUSE_SYSTEM_UTP=OFF -DUSE_SYSTEM_B64=OFF -DUSE_SYSTEM_PSL=ON - -DUSE_QT_VERSION=5 -DWITH_CRYPTO=$(usex mbedtls mbedtls openssl) -DWITH_INOTIFY=ON @@ -101,6 +105,14 @@ src_configure() { -DWITH_SYSTEMD=$(usex systemd ON OFF) ) + if use qt6; then + mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=6 ) + elif use qt5; then + mycmakeargs+=( -DENABLE_QT=ON -DUSE_QT_VERSION=5 ) + else + mycmakeargs+=( -DENABLE_QT=OFF ) + fi + # Disable assertions by default, bug 893870. use debug || append-cppflags -DNDEBUG
