gentoo auto-resync : 27:10:2023 - 08:42:41

5 files changed, 15 insertions, 83 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 50c20cdf275d..ec71d7334caa 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 5207ef62dd29..a4f203089553 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,12 +3,9 @@ AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1
 AUX filezilla-3.60.1-desktop.patch 245 BLAKE2B 6bb06fcc851240d6bfe57c239084b7e9e22a94300cbbec2d4b8e22caf7452ac483f7de6cbea69b091e09dbcb0e9e5f23a1b70c73333fe1e8eb7a73c1365b08ea SHA512 31a1ab2715580519ca1dac30e7c3c88c9f6fcf802091740ce3a56e884a6ba5e3326935f7f55857211effe4646650e71c3051b13f5995a493a0f809be920cf6b4
-DIST FileZilla_3.61.0_src.tar.bz2 4939127 BLAKE2B 2c2096b7cb49223b02bea7ae363dde7b58eea4da3fbe62a228edcc6e82c0909e28ff20b6cf909ac7b36209308c66b99faf7c1c4fd571ecd9248c2c3f905c2e85 SHA512 97469bc038eab32f526859ae5db58eeef6f1a8128f67bc653b6b3707b1aa7c9771ef5caa780daa4d11d20d4e7ed8e5df24ef8bd70ee2353f80d77d5410cfa722
-DIST FileZilla_3.64.0_src.tar.xz 4041200 BLAKE2B 38e9cec621573ff541183256943d055731f2acad95ab60f771e27b5eed6f0e447c8bf4cdf38c2322a340cd5c4a55ffb5a6b75b0de1bfdc0f8003b8aaaed900a1 SHA512 4c4ab1969613e789999bf634d62b612f21be5e221b969941c8097b7cb3525b089f4dd846e6489a3e66df7671732445e7fb8f77fc8d59cb34a78044136a3d2a99
 DIST FileZilla_3.65.0_src.tar.xz 4055316 BLAKE2B 4f702de98baeddda76ba0f3eaa5a06b49e863785980c8a57b84fdf7d3ce49f40b0ae123806c5e76693f19424696daf9ee044813c60bc4ec4216d19f2eccacf48 SHA512 8fb2862eaa7aa4331a095e67335f8e2805936f4866c49f617bdfb819638ecdcbc94e15e8810d90c2eb56e04f0100b8deeb5b691a45012896963ea4ba59644d04
 DIST FileZilla_3.66.0_src.tar.xz 4055872 BLAKE2B b6a66b156d14d012098d63e4bc91bbe3ed9d3b271774f4a169b2c240da67556f52a57b022852942ff3ab068ff4cfbfcc94f2b9681ad9c7cb7dadc362dc22afc0 SHA512 8772987ed0772cb23f2ff15f7a9d8b24d9086b6f24d83c9aa430cbbb7c3e3b8fe209116ae590836e708db1a985539d214cd219413485823a7cc031462e20326d
-EBUILD filezilla-3.61.0.ebuild 1614 BLAKE2B 4e097b16b81010c04974b7a1c14d174895aa38af453bd3d882a11a0173c49ad7f6d7b21f87e2c3248e1ad0fe75cb0353083800d664bb9bb7e493f951681d03b3 SHA512 3642fc3e02ea4297ee53d4aa0933d677eb8a2d8ff8a60706c68cdb5065cf353999f71913ffe49b4907f4e60c15d3301e0b20a4085b39364357ee4ea4cdddf639
-EBUILD filezilla-3.64.0.ebuild 1566 BLAKE2B 65acec9d8e5a0a7b51b1185db53292973960eb435799d8c88a017f00347c33b622908af7e6adc169483da48f48969412e4e8f705e26b7d0193dab78cd28bf2d7 SHA512 aed788b58c51508e04a022ca005743960660831a7a135d4468db3d3716e3beb66f0017cf4b9338dde8b80b971411c8051c79cc587007297c9133fff0bd2e9e72
+EBUILD filezilla-3.65.0-r1.ebuild 1718 BLAKE2B 30618e041e40f0425f3991f435c49de89299384cd062267cbade3a5f27bdb0b9b8c2d83551dd871a62826f26ee59e7bd90386db94df618375084eb7315c66225 SHA512 d202ea85f12e196292ba3a015e314306f798093daff5ad6c20b3561108449246f2c5808f34bf49b775ffcf9bec680caa0f427b5fef0c8651943b5248d15f991d
 EBUILD filezilla-3.65.0.ebuild 1592 BLAKE2B 51ed7e8171707e17661cf31f761ff6bbcbd35f679471c5507a8f33ea1911056c5528e1619266f4ffab677e16838ee4d467563398c29074487505a2b94956062a SHA512 0c9446b9628784dd7a502174b0ca1195f5f78c7274ea903754d4ad20f7860c48ca247875b4405d3baf326bae5f197f3feea9833ae180374d5dfebcb1dcc24b36
-EBUILD filezilla-3.66.0.ebuild 1596 BLAKE2B 1ea1d1a9a606008b2b364060e8925fae6f799133621019dadcfd4ae7cc053ed460d38a6a04d89d915e2063ea52cb1d64e332b57f9eaa5bebd6a90578fc9ecc38 SHA512 fd85014ccc2646fec64e1767310693331d9eea9babd4a929e19bc266594ccf660df479b2b3d6bde32398416a5dbdd84cb2857e9995c18226f0ee74dca8513470
+EBUILD filezilla-3.66.0-r1.ebuild 1718 BLAKE2B 983df2dc2495d710bc153498aeada1ce20504bab4e2836d31feaf211629d342afb1364a79eb6e50c54a025cb4bcb9cf4a9b130af5e03b7b21f31ee80ba2a9801 SHA512 514b051495576bf77ca38b08945b7f4ef5bf42a064c3fbf05350ed6618839b758afa3e79a6b9bfba982daeef0752a095597818d23ffe85781da5263894017b9d
 MISC metadata.xml 449 BLAKE2B 3a9fbf5c444404c3922fac61b0a36429acda9bd582d3b2049e9637088acf1a33af6c9a68052325969037951640ec3b9c8e2d357cbbd06a4655a504cb363e0c58 SHA512 f33dccada194313d97e91f514ca89685a2c643a0fb736e3a90065b246aced161fc45198aa05fea8fb96ff7827ddb8722344158e7d4c4b68c1bd008097fa99b7c
diff --git a/net-ftp/filezilla/filezilla-3.61.0.ebuild b/net-ftp/filezilla/filezilla-3.61.0.ebuild
deleted file mode 100644
index 803b78834864..000000000000
--- a/net-ftp/filezilla/filezilla-3.61.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit autotools wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv x86"
-IUSE="dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=app-eselect/eselect-wxwidgets-0.7-r1
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.39.1:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-ftp/filezilla/filezilla-3.64.0.ebuild b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild
index 3581f5b35428..aeb9ad850153 100644
--- a/net-ftp/filezilla/filezilla-3.64.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit autotools wxwidgets xdg
+inherit autotools flag-o-matic wxwidgets xdg
 
 MY_PV="${PV/_/-}"
 MY_P="FileZilla_${MY_PV}"
@@ -17,15 +17,16 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_sse2 dbus nls test"
 RESTRICT="!test? ( test )"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
 RDEPEND="
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.42.2:=
+	>=dev-libs/boost-1.76.0:=
+	>=dev-libs/libfilezilla-0.44.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
@@ -52,6 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
+	if use x86 && ! use cpu_flags_x86_sse2; then
+		append-cppflags -D_FORCE_SOFTWARE_SHA
+	fi
 	setup-wxwidgets
 
 	local myeconfargs=(
diff --git a/net-ftp/filezilla/filezilla-3.66.0.ebuild b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild
index 489c5e4ccac5..cb61885b28b4 100644
--- a/net-ftp/filezilla/filezilla-3.66.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit autotools wxwidgets xdg
+inherit autotools flag-o-matic wxwidgets xdg
 
 MY_PV="${PV/_/-}"
 MY_P="FileZilla_${MY_PV}"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="dbus nls test"
+IUSE="cpu_flags_x86_sse2 dbus nls test"
 RESTRICT="!test? ( test )"
 
 # pugixml 1.7 minimal dependency is for c++11 proper configuration
@@ -53,6 +53,9 @@ src_prepare() {
 }
 
 src_configure() {
+	if use x86 && ! use cpu_flags_x86_sse2; then
+		append-cppflags -D_FORCE_SOFTWARE_SHA
+	fi
 	setup-wxwidgets
 
 	local myeconfargs=(