gentoo auto-resync : 28:12:2024 - 06:30:54

5 files changed, 4 insertions, 108 deletions

diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 98b8c43d2baa..3fb579b68257 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,7 +1,4 @@
-AUX android-file-transfer-linux-4.2-gcc13.patch 641 BLAKE2B 5e3b17588a1d1822fc8eef582aa1abcc821691b3ccaefc4a2b6ef6aee46eac86846ead67614aa624a7d4f7c4a35739f40c3b28ce2507b3ae6718614e29c15aaf SHA512 066f5a7d60c7c26af3e7608111da305c60cc4029ad95e24fb27dc2fd25e9b151b077e611163f9425646acc73bb2025db45895a758f327159741a309ee062eaee
-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
-EBUILD android-file-transfer-linux-4.2.ebuild 1578 BLAKE2B 0fef85680683eafd6f72fb3091162187677d0bba661aaf2a023e85bdf22ef148bbec92795d49636b77d19b2f27e5342921d58923dfa14fdc208e6e00ee49cada SHA512 cbfd7a874d1b5f86b2cc0f10a24886a183de04871218585443e9420703fed2dd19a1f8d01f93107d4077f9c44ad91817a0de8d28fadfa1cf3d480c3fb654c37f
-EBUILD android-file-transfer-linux-4.3.ebuild 1528 BLAKE2B 716e98ba2d90a229458eed6e6069e762365423d19f8c7fe2f707fcd44fcbcb6c0894da678dbbe94e6d9d8ad1bf5eefb0fdda1b86e94cc1905c6d324255d495f1 SHA512 d3ec23c3d4ce500b712199d1e301ac5ae2a2a762dfbb5e50a0c088d15ed5a1d6edb7f7b6b4199ae5d105ec29d4c745e5fb2b6e3ef1f2483ed42b123c6f4e2d45
-EBUILD android-file-transfer-linux-9999.ebuild 1528 BLAKE2B 716e98ba2d90a229458eed6e6069e762365423d19f8c7fe2f707fcd44fcbcb6c0894da678dbbe94e6d9d8ad1bf5eefb0fdda1b86e94cc1905c6d324255d495f1 SHA512 d3ec23c3d4ce500b712199d1e301ac5ae2a2a762dfbb5e50a0c088d15ed5a1d6edb7f7b6b4199ae5d105ec29d4c745e5fb2b6e3ef1f2483ed42b123c6f4e2d45
+EBUILD android-file-transfer-linux-4.3-r1.ebuild 1530 BLAKE2B c9dfcf091c8cee97078beccb63bb1c9887ba0d62360d48af6602e84206a9de2e7b17eea27a7fc337b4b5d0564faedb419c8b64b9e64d42ad369894ff6a2fa7ab SHA512 acabcbf34b50b0bbc282ef521f57b44bd749ea160a10a74e2efe8ef6172ad08833edbbfe1376c7f34f89d9be711d9af5c6608bd4a8222fb57ae83e3f711f62a7
+EBUILD android-file-transfer-linux-9999.ebuild 1530 BLAKE2B c9dfcf091c8cee97078beccb63bb1c9887ba0d62360d48af6602e84206a9de2e7b17eea27a7fc337b4b5d0564faedb419c8b64b9e64d42ad369894ff6a2fa7ab SHA512 acabcbf34b50b0bbc282ef521f57b44bd749ea160a10a74e2efe8ef6172ad08833edbbfe1376c7f34f89d9be711d9af5c6608bd4a8222fb57ae83e3f711f62a7
 MISC metadata.xml 646 BLAKE2B 83f126f158295a2d70be8d70dec4d5846e258a60660d8e3c76acb9f103d3c2fbdd149ab327135eeace0334812c311194faa611863aba431601a35a725dfdeeb0 SHA512 598733dd286ba4f69f329b8d35c78906bfb2817aa77ddbe12e22654973fdd1ff8f71533dd5daf777c32ced75963f3e0dd84881f4e4a69b6bc16f4e95ad767f3a
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 ae4c96bbe345..000000000000
--- 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-r1.ebuild
index 83e13978794a..1c3a164151be 100644
--- 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-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
 	)
-	taglib? ( media-libs/taglib )
+	taglib? ( media-libs/taglib:= )
 	zune? (
 		dev-libs/openssl:0=
 	)
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 83e13978794a..1c3a164151be 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
@@ -41,7 +41,7 @@ RDEPEND="
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
 	)
-	taglib? ( media-libs/taglib )
+	taglib? ( media-libs/taglib:= )
 	zune? (
 		dev-libs/openssl:0=
 	)
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 d1b957cd4df8..000000000000
--- 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 <sam@gentoo.org>
-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 <memory>
- #include <mutex>
- #include <exception>
-+#include <stdexcept>
- #include <string>
- 
- namespace mtp