From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 826A8138334 for ; Sun, 3 Mar 2019 13:11:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CE1DE092B; Sun, 3 Mar 2019 13:11:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4240FE092B for ; Sun, 3 Mar 2019 13:11:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99EBC335D0D for ; Sun, 3 Mar 2019 13:11:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD2B4542 for ; Sun, 3 Mar 2019 13:11:12 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1551618665.97e3267240185760244506ad14b13d6f9e3ccc2f.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/lftp/lftp-4.8.4-r1.ebuild net-ftp/lftp/lftp-9999.ebuild X-VCS-Directories: net-ftp/lftp/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 97e3267240185760244506ad14b13d6f9e3ccc2f X-VCS-Branch: master Date: Sun, 3 Mar 2019 13:11:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d3eee0b-dc12-479a-b7a3-b6ce924b3b2d X-Archives-Hash: 41ccacfafd37be36543242002ed03a08 commit: 97e3267240185760244506ad14b13d6f9e3ccc2f Author: Jeroen Roovers gentoo org> AuthorDate: Sun Mar 3 12:26:11 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Mar 3 13:11:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e32672 net-ftp/lftp: EAPI bump Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> .../{lftp-9999.ebuild => lftp-4.8.4-r1.ebuild} | 36 ++++++++++++++-------- net-ftp/lftp/lftp-9999.ebuild | 12 ++++++-- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-4.8.4-r1.ebuild similarity index 77% copy from net-ftp/lftp/lftp-9999.ebuild copy to net-ftp/lftp/lftp-4.8.4-r1.ebuild index 4f73a82a139..5faea52009e 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-4.8.4-r1.ebuild @@ -1,17 +1,20 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils git-r3 libtool +EAPI=7 +inherit autotools libtool xdg-utils DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" HOMEPAGE="https://lftp.tech/" -EGIT_REPO_URI="https://github.com/lavv17/lftp" +SRC_URI=" + ${HOMEPAGE}ftp/${P}.tar.xz +" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="convert-mozilla-cookies +gnutls idn ipv6 libressl nls socks5 +ssl verify-file" +RESTRICT="test" RDEPEND=" >=sys-libs/ncurses-5.1:= @@ -36,22 +39,22 @@ RDEPEND=" virtual/perl-Digest-MD5 ) " - DEPEND=" ${RDEPEND} - dev-libs/gnulib =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig " - DOCS=( BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels README.dnssec README.modules THANKS TODO ) PATCHES=( + "${FILESDIR}"/${PN}-4.0.2.91-lafile.patch "${FILESDIR}"/${PN}-4.5.5-am_config_header.patch + "${FILESDIR}"/${PN}-4.7.0-gettext.patch + "${FILESDIR}"/${PN}-4.7.5-libdir-additional.patch "${FILESDIR}"/${PN}-4.7.5-libdir-expat.patch "${FILESDIR}"/${PN}-4.7.5-libdir-readline.patch "${FILESDIR}"/${PN}-4.8.2-libdir-configure.patch @@ -63,12 +66,12 @@ PATCHES=( src_prepare() { default - gnulib-tool --update || die - - chmod +x build-aux/git-version-gen || die - eautoreconf + elibtoolize # for Darwin bundles + + # bug #536036 + printf 'set fish:auto-confirm no\nset sftp:auto-confirm no\n' >> ${PN}.conf || die } src_configure() { @@ -87,11 +90,18 @@ src_configure() { } src_install() { - # FIXME: MKDIR_P is not getting picked up in po/Makefile - emake DESTDIR="${D}" mkdir_p="mkdir -p" install + default local script for script in {convert-mozilla-cookies,verify-file}; do use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} done } + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 4f73a82a139..ae490e6c7f3 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils git-r3 libtool +EAPI=7 +inherit autotools git-r3 libtool xdg-utils DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program" HOMEPAGE="https://lftp.tech/" @@ -95,3 +95,11 @@ src_install() { use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;} done } + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +}