From e41af5cbb8577dac72721bb9a7d4950f183af090 Mon Sep 17 00:00:00 2001 From: Paul Zander Date: Thu, 20 Nov 2025 15:33:01 +0100 Subject: [PATCH] Partial revert "net-libs/libuplink: add 1.10.1" This partially reverts commit 69970b80ec3ebb0334db9981f6b5380f9d8addc0. Duplicates net-ftp/filezilla from ::gentoo. This is prohibited per point 11 of the regulations. So drop it. Leave libuplink there. net-ftp/filezilla::gentoo can be build with EXTRA_ECONF="--enable-storj" in package.env to enable storj support. A bug should be filed to add the support (and net-libs/libuplink) to ::gentoo. Signed-off-by: Paul Zander --- net-ftp/filezilla/Manifest | 1 - .../files/filezilla-3.22.1-debug.patch | 12 --- ...lezilla-3.47.0-disable-shellext_conf.patch | 13 --- .../files/filezilla-3.47.0-metainfo.patch | 11 --- .../files/filezilla-3.52.2-slibtool.patch | 24 ------ .../files/filezilla-3.60.1-desktop.patch | 7 -- net-ftp/filezilla/filezilla-3.69.5.ebuild | 79 ------------------- net-ftp/filezilla/metadata.xml | 24 ------ 8 files changed, 171 deletions(-) delete mode 100644 net-ftp/filezilla/Manifest delete mode 100644 net-ftp/filezilla/files/filezilla-3.22.1-debug.patch delete mode 100644 net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch delete mode 100644 net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch delete mode 100644 net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch delete mode 100644 net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch delete mode 100644 net-ftp/filezilla/filezilla-3.69.5.ebuild delete mode 100644 net-ftp/filezilla/metadata.xml diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest deleted file mode 100644 index 463f4960a5..0000000000 --- a/net-ftp/filezilla/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST FileZilla_3.69.5_src.tar.xz 4167108 BLAKE2B dc3430a9c64720578f78b5bbcfb50775510660472ad98ab5fd1acd460742af7358a37cf029162df8ce395026c6052cb9526d50ed2611c9c01f89df115f63c32e SHA512 ef31535d8c1ca21c37577f30c2960c3cddec35a993d398460f105e2c8cfecb1c517cc092ce4042e4cde49b255afdeb245db1007d88a6bfdc8901afdde991db82 diff --git a/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch b/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch deleted file mode 100644 index 71430db1c7..0000000000 --- a/net-ftp/filezilla/files/filezilla-3.22.1-debug.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- filezilla-3.22.1/configure.ac -+++ filezilla-3.22.1/configure.ac -@@ -36,9 +36,7 @@ - - if test "X$GCC" = Xyes; then - AX_APPEND_FLAG(-Wall, CFLAGS) -- AX_APPEND_FLAG(-g, CFLAGS) - AX_APPEND_FLAG(-Wall, CXXFLAGS) -- AX_APPEND_FLAG(-g, CXXFLAGS) - fi - - # Do this early: Compiler and linker flags to work around a nasty bug in Xcode. diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch deleted file mode 100644 index 55868dce80..0000000000 --- a/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur filezilla-3.47.2.1.orig/configure.ac filezilla-3.47.2.1/configure.ac ---- filezilla-3.47.2.1.orig/configure.ac 2020-03-11 12:24:12.000000000 +0100 -+++ filezilla-3.47.2.1/configure.ac 2020-05-09 16:09:23.832476049 +0200 -@@ -130,9 +130,6 @@ - "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=i686-w64-mingw32 || exit 1 - cd "$OLD_DIR/src/fzshellext/64" || exit 1 - "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1 --else -- cd "$OLD_DIR/src/fzshellext/64" || exit 1 -- "$ac_abs_confdir/src/fzshellext/configure" --disable-shellext || exit 1 - fi - cd "$OLD_DIR" - diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch b/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch deleted file mode 100644 index 309c66815e..0000000000 --- a/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- filezilla-3.47.0/data/Makefile.am -+++ filezilla-3.47.0/data/Makefile.am -@@ -75,7 +75,7 @@ - desktopentrydir = $(datadir)/applications - dist_desktopentry_DATA = filezilla.desktop - --appdatadir = $(datadir)/appdata -+appdatadir = $(datadir)/metainfo - dist_appdata_DATA = filezilla.appdata.xml - - clean-local: diff --git a/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch deleted file mode 100644 index 4eaae857e1..0000000000 --- a/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch +++ /dev/null @@ -1,24 +0,0 @@ -This fixes compilation with slibtool instead of GNU libtool - ---- filezilla-3.52.2/src/engine/Makefile.am -+++ filezilla-3.52.2/src/engine/Makefile.am -@@ -146,6 +146,8 @@ - libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS) - libfzclient_private_la_LDFLAGS += $(IDN_LIB) - -+libfzclient_private_la_LIBADD = $(PUGIXML_LIBS) -+ - dist_noinst_DATA = engine.vcxproj - - CLEANFILES = filezilla.h.gch ---- filezilla-3.52.2/src/interface/Makefile.am -+++ filezilla-3.52.2/src/interface/Makefile.am -@@ -309,7 +309,7 @@ - - if HAVE_DBUS - filezilla_DEPENDENCIES += ../dbus/libfzdbus.a --filezilla_LDFLAGS += ../dbus/libfzdbus.a $(LIBDBUS_LIBS) -+filezilla_LDADD = ../dbus/libfzdbus.a $(LIBDBUS_LIBS) - endif - - filezilla_LDFLAGS += $(WX_LIBS) diff --git a/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch b/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch deleted file mode 100644 index 25b81826b7..0000000000 --- a/net-ftp/filezilla/files/filezilla-3.60.1-desktop.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/data/filezilla.desktop 2020-06-04 13:18:01.000000000 +0300 -+++ b/data/filezilla.desktop 2022-06-16 02:16:03.727229995 +0300 -@@ -14,3 +14,4 @@ - Type=Application - Categories=Network;FileTransfer; - Version=1.0 -+MimeType=x-scheme-handler/ftp; diff --git a/net-ftp/filezilla/filezilla-3.69.5.ebuild b/net-ftp/filezilla/filezilla-3.69.5.ebuild deleted file mode 100644 index 1f885c670d..0000000000 --- a/net-ftp/filezilla/filezilla-3.69.5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" - -inherit autotools flag-o-matic 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/" -# Broken URL behind CDN -SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}/${MY_P}_src.tar.xz" - -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="cpu_flags_x86_sse2 dbus nls storj 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/boost-1.76.0:= ->=dev-libs/libfilezilla-0.51.1:= ->=dev-libs/pugixml-1.7 ->=net-libs/gnutls-3.5.7 -x11-libs/wxGTK:${WX_GTK_VER}=[X] -x11-misc/xdg-utils -dbus? ( sys-apps/dbus ) -storj? ( net-libs/libuplink )" -DEPEND="${RDEPEND} -test? ( >=dev-util/cppunit-1.13.0 )" -BDEPEND=" -virtual/pkgconfig ->=dev-build/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() { -if use x86 && ! use cpu_flags_x86_sse2; then -append-cppflags -D_FORCE_SOFTWARE_SHA -fi -setup-wxwidgets - -local myeconfargs=( ---disable-autoupdatecheck ---with-pugixml=system -$(use_enable nls locales) -$(use_enable storj) -$(use_with dbus) -) -econf "${myeconfargs[@]}" -} - -src_install() { -default - -# no static archives -find "${ED}" -name '*.la' -delete || die -} diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml deleted file mode 100644 index 098d589e4b..0000000000 --- a/net-ftp/filezilla/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - voyageur@gentoo.org - Bernard Cafarelli - - - dlan@gentoo.org - Yixun Lan - - - david-gentoo@reedfam.email - David Reed - - - - Enable Storj decentralized cloud storage integration using libuplink. - - - - filezilla - -