[gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/

[David Seifert]

commit:     3f24e176e56280d542f58e3b61f0d323abd06293
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 09:54:11 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 09:54:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f24e176

net-ftp/filezilla: Port to EAPI 7

* Remove wrong pkg_pretend (actually requires C++17 nowadays)
* Remove .la files
* Move setup-wxwidgets to src_configure
* Clean up metadata blocks

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...la-3.53.1.ebuild => filezilla-3.53.1-r1.ebuild} | 47 +++++++---------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/net-ftp/filezilla/filezilla-3.53.1.ebuild 
b/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
similarity index 66%
rename from net-ftp/filezilla/filezilla-3.53.1.ebuild
rename to net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
index c8f67f39ebe..db6302c5e6e 100644
--- a/net-ftp/filezilla/filezilla-3.53.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.53.1-r1.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
 inherit autotools flag-o-matic wxwidgets xdg
 
-MY_PV=${PV/_/-}
+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 ~ia64 ~ppc ~ppc64 ~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
+RDEPEND="
+       >=app-eselect/eselect-wxwidgets-0.7-r1
        >=dev-libs/nettle-3.1:=
        >=dev-db/sqlite-3.7
        >=dev-libs/libfilezilla-0.26.0:=
@@ -30,16 +33,11 @@ RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
        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 )
-       test? ( >=dev-util/cppunit-1.13.0 )"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
+       nls? ( >=sys-devel/gettext-0.11 )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-3.22.1-debug.patch
@@ -48,24 +46,14 @@ PATCHES=(
        "${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 )
 
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if ! test-flag-CXX -std=c++14; then
-                       eerror "${P} requires C++14-capable C++ compiler. Your 
current compiler"
-                       eerror "does not seem to support -std=c++14 option. 
Please upgrade your compiler"
-                       eerror "to gcc-4.9 or an equivalent version supporting 
C++14."
-                       die "Currently active compiler does not support 
-std=c++14"
-               fi
-       fi
-}
-
 src_prepare() {
-       setup-wxwidgets
        default
        eautoreconf
 }
 
 src_configure() {
+       setup-wxwidgets
+
        local myeconfargs=(
                --disable-autoupdatecheck
                --with-pugixml=system
@@ -75,14 +63,9 @@ src_configure() {
        econf "${myeconfargs[@]}"
 }
 
-pkg_preinst() {
-       xdg_pkg_preinst
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-}
+src_install() {
+       default
 
-pkg_postrm() {
-       xdg_pkg_postrm
+       # no static archives
+       find "${ED}" -name '*.la' -delete || die
 }