[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, net-ftp/lftp/files/

[Jeroen Roovers]

commit:     3bb3a4a57e46a4310dc1f27f7a398bbb6f6e150b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 09:55:00 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 09:55:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb3a4a5

net-ftp/lftp: Set SLOT dependencies.

Package-Manager: portage-2.2.26

 net-ftp/lftp/files/lftp-4.5.3-autopoint.patch | 10 ----------
 net-ftp/lftp/lftp-9999.ebuild                 | 13 ++++++++-----
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch b/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch
deleted file mode 100644
index 7a68843..0000000
--- a/net-ftp/lftp/files/lftp-4.5.3-autopoint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,7 @@
- AM_ICONV
- 
- ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
-+AM_GNU_GETTEXT_VERSION([0.18.1])
- AM_GNU_GETTEXT([external])
- test "$MSGFMT"  = "no" && MSGFMT  ="$missing_dir/missing msgfmt"
- test "$GMSGFMT" = "no" && GMSGFMT ="$missing_dir/missing msgfmt"

diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild
index f21a9be..58231f6 100644
--- a/net-ftp/lftp/lftp-9999.ebuild
+++ b/net-ftp/lftp/lftp-9999.ebuild
@@ -22,8 +22,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=sys-libs/ncurses-5.1
-	>=sys-libs/readline-5.1
+	>=sys-libs/ncurses-5.1:=
+	>=sys-libs/readline-5.1:=
 	dev-libs/expat
 	sys-libs/zlib
 	convert-mozilla-cookies? ( dev-perl/DBI )
@@ -34,7 +34,7 @@ RDEPEND="
 	)
 	ssl? (
 		gnutls? ( >=net-libs/gnutls-1.2.3 )
-		openssl? ( >=dev-libs/openssl-0.9.6 )
+		openssl? ( dev-libs/openssl:0 )
 	)
 	verify-file? (
 		dev-perl/string-crc32
@@ -58,11 +58,12 @@ DOCS=(
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-4.5.3-autopoint.patch \
 		"${FILESDIR}"/${PN}-4.5.5-am_config_header.patch
 
 	gnulib-tool --update || die
 
+	chmod +x build-aux/git-version-gen || die
+
 	eautoreconf
 	elibtoolize # for Darwin bundles
 }
@@ -81,7 +82,9 @@ src_configure() {
 }
 
 src_install() {
-	default
+	# FIXME: MKDIR_P is not getting picked up in po/Makefile
+	emake DESTDIR="${D}" mkdir_p="mkdir -p"
+
 	local script
 	for script in {convert-mozilla-cookies,verify-file}; do
 		use ${script} || { rm "${ED}"/usr/share/${PN}/${script} || die ;}