From a89533cad2c3c3afa77292cd30f2b7aa6c4a0978 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 28 Dec 2024 00:57:42 +0100 Subject: [PATCH] sys-fs/android-file-transfer-linux: drop 4.2, 4.3 Signed-off-by: Andreas Sturmlechner --- sys-fs/android-file-transfer-linux/Manifest | 1 - .../android-file-transfer-linux-4.2.ebuild | 78 ------------------- .../android-file-transfer-linux-4.3.ebuild | 74 ------------------ ...ndroid-file-transfer-linux-4.2-gcc13.patch | 23 ------ 4 files changed, 176 deletions(-) delete mode 100644 sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild delete mode 100644 sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild delete mode 100644 sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index a2e492cb87203..f13b6ac99d0c1 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,2 +1 @@ -DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 DIST android-file-transfer-linux-4.3.tar.gz 827232 BLAKE2B 3737b804cc9c7a2883d7a9a1e4a65379d53f89104dc4f0d82959ed8eba35ffa1998677a4ef441f2c35389dec9e3b31822e8843994ad7d7669cc49e4593b41fe9 SHA512 f5e51ad1532be44916df51dda5f6f7423a5b0d8ebd733a0a3f0424f684b9f84fc5996fb5effd45009eb1c60d873f79e8ecc47a9dc09ff429b4a458807a79ca8c diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild deleted file mode 100644 index ae4c96bbe3451..0000000000000 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -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 - 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" -fi - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="fuse python qt5 taglib zune" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-apps/file - sys-libs/readline:0= - fuse? ( sys-fs/fuse:0 ) - 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= - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2-gcc13.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_FUSE="$(usex fuse)" - -DBUILD_MTPZ="$(usex zune)" - -DBUILD_PYTHON="$(usex python)" - -DBUILD_QT_UI="$(usex qt5)" - -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') - ) - cmake_src_configure -} diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild deleted file mode 100644 index 83e13978794a2..0000000000000 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 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 - 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" -fi - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="fuse python qt5 taglib zune" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-apps/file - sys-libs/readline:0= - fuse? ( sys-fs/fuse:0 ) - 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= - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_FUSE="$(usex fuse)" - -DBUILD_MTPZ="$(usex zune)" - -DBUILD_PYTHON="$(usex python)" - -DBUILD_QT_UI="$(usex qt5)" - -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') - ) - cmake_src_configure -} diff --git a/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch b/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch deleted file mode 100644 index d1b957cd4df8b..0000000000000 --- a/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://github.com/whoozle/android-file-transfer-linux/pull/330 - -From 4e3df60538ac047d6ab2bd030d0da47e6e630a88 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 18 Apr 2023 11:00:58 +0100 -Subject: [PATCH] Fix build with GCC 13 - -GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some -are no longer transitively included. - -See https://gnu.org/software/gcc/gcc-13/porting_to.html. - -Bug: https://bugs.gentoo.org/894788 ---- a/mtp/types.h -+++ b/mtp/types.h -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - namespace mtp