[gentoo-commits] repo/gentoo:master commit in: sys-fs/android-file-transfer-linux/

[Andreas Sturmlechner]

commit:     798a6087a4e115bf467681a7e4e87cc32b4f9b0c
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Feb 28 04:53:51 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 10:39:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798a6087

sys-fs/android-file-transfer-linux: update live, qt6

basic port to qt just works

USE=qt6 -> USE=gui

remove rpath

define PYTHON_EXECUTABLE to prevent using of last version instead of
python_single_target

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../android-file-transfer-linux-9999.ebuild        | 34 +++++++++-------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git 
a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild 
b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
index 1c3a164151be..d97e8e673b92 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
@@ -1,57 +1,45 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-
 inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux";
 
-if [[ "${PV}" = *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
        
EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git";
 else
        
SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="amd64 ~x86"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-
-IUSE="fuse python qt5 taglib zune"
-
+IUSE="fuse gui python taglib zune"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
        sys-apps/file
        sys-libs/readline:0=
        fuse? ( sys-fs/fuse:0 )
+       gui? ( dev-qt/qtbase:6[gui,network,widgets] )
        python? (
                ${PYTHON_DEPS}
                $(python_gen_cond_dep '
                        dev-python/pybind11[${PYTHON_USEDEP}]
                ')
        )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtnetwork:5
-               dev-qt/qtwidgets:5
-       )
        taglib? ( media-libs/taglib:= )
-       zune? (
-               dev-libs/openssl:0=
-       )
+       zune? ( dev-libs/openssl:0= )
 "
-
 DEPEND="${RDEPEND}"
-
 BDEPEND="
        virtual/pkgconfig
-       qt5? ( dev-qt/linguist-tools:5 )
+       gui? ( dev-qt/qttools:6[linguist] )
 "
 
 pkg_setup() {
@@ -60,15 +48,19 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
+               -DCMAKE_SKIP_RPATH=ON
                -DBUILD_FUSE="$(usex fuse)"
                -DBUILD_MTPZ="$(usex zune)"
                -DBUILD_PYTHON="$(usex python)"
-               -DBUILD_QT_UI="$(usex qt5)"
+               -DBUILD_QT_UI="$(usex gui)"
                -DBUILD_SHARED_LIB="ON"
                -DBUILD_TAGLIB="$(usex taglib)"
                # Upstream recommends to keep this off as libusb is broken
                -DUSB_BACKEND_LIBUSB="OFF"
-               $(usev qt5 '-DDESIRED_QT_VERSION=5')
        )
+
+       # prevent using of last version
+       use python && mycmakeargs+=( -DPython_EXECUTABLE="${PYTHON}" )
+
        cmake_src_configure
 }