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

2022-10-05 Thread Mike Gilbert
commit: 7eb723a20d8a20ef2db6e92e1c88606d78f0f27c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Oct  5 23:50:51 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Oct  5 23:50:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eb723a2

net-ftp/ftp: update HOMEPAGE, SRC_URI

Signed-off-by: Mike Gilbert  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index b99d583cb14b..5032f7bf92e0 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -13,8 +13,9 @@ DEB_PN="${MY_PN}-ssl"
 DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
 
 DESCRIPTION="Standard Linux FTP client"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html;
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/netkit;
+SRC_URI="http://ftp.linux.org.uk/pub/linux/Networking/netkit/${MY_P}.tar.gz
+   ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz

https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2;
 S="${WORKDIR}"/${MY_P}



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

2022-08-11 Thread Yixun Lan
commit: 2fa6b73678658e54d9ba391a6431fb83b30caaea
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Aug 11 14:01:44 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Aug 11 14:01:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa6b736

net-ftp/ftp: Keyword 0.17.34.0.2.5.1 arm64, #850538

Signed-off-by: Yixun Lan  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index bbdb45b4f87b..b99d583cb14b 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="



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

2022-06-24 Thread Sam James
commit: 6cfdad620208e2b48ab0c22785ba9cf3c646cee6
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 25 04:27:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 04:29:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfdad62

net-ftp/ftp: fix musl build; modernise

Closes: https://bugs.gentoo.org/832430
Thanks-to: Cristian Othón Martínez Vera  cfuga.mx>
Signed-off-by: Sam James  gentoo.org>

 .../ftp-0.17.34.0.2.5.1-musl-glob-brace.patch  | 14 ++
 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 30 ++
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch 
b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch
new file mode 100644
index ..386af410e913
--- /dev/null
+++ b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/832430
+
+See e.g. 
https://patchwork.kernel.org/project/selinux/patch/20180517051117.48454-5-ja...@perfinion.com/
 too.
+--- a/ftp/cmds.h
 b/ftp/cmds.h
+@@ -61,3 +61,7 @@
+ void do_umask(int argc, char *argv[]);
+ void idle_cmd(int argc, char *argv[]);
+ void setpassive(void);
++
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
+

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index a25ce7b145e0..bbdb45b4f87b 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit edo flag-o-matic toolchain-funcs
 
 PATCH_VER="3"
 MY_PN="netkit-ftp"
@@ -11,11 +11,13 @@ MY_PV="$(ver_cut 1-2)"
 MY_P="netkit-${PN}-${MY_PV}"
 DEB_PN="${MY_PN}-ssl"
 DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
+
 DESCRIPTION="Standard Linux FTP client"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html;
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz

https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2;
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,22 +26,23 @@ IUSE="ipv6 readline ssl"
 
 RDEPEND="
>=sys-libs/ncurses-5.2:=
-   readline? ( sys-libs/readline:0= )
-   ssl? ( dev-libs/openssl:0= )
+   elibc_musl? ( sys-libs/obstack-standalone )
+   readline? ( sys-libs/readline:= )
+   ssl? ( dev-libs/openssl:= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="sys-apps/grep"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
local p
for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do
-   eapply "${WORKDIR}/debian/patches/${p}"
+   eapply "${WORKDIR}"/debian/patches/${p}
done
 
eapply "${WORKDIR}"/patch
+   eapply "${FILESDIR}"/${PN}-0.17.34.0.2.5.1-musl-glob-brace.patch
 
+   # Drop bashism from configure
sed -i \
-e 's:echo -n:printf %s :' \
configure || die
@@ -48,15 +51,20 @@ src_prepare() {
 }
 
 src_configure() {
-   append-lfs-flags #101038
+   # bug #101038
+   append-lfs-flags
tc-export CC
-   # not an autoconf script
-   ./configure \
+
+   # Not an autoconf script
+   edo ./configure \
--prefix=/usr \
$(use_enable ipv6) \
$(use_enable readline) \
-   $(use_enable ssl) \
-   || die
+   $(use_enable ssl)
+
+   if use elibc_musl ; then
+   sed -i -e '/^LIBS=/ s/$/ -lobstack/' MCONFIG || die
+   fi
 }
 
 src_install() {



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

2022-04-10 Thread Yixun Lan
commit: 38bb010f68304fcdd3bfa6d6d376f91cfc155d76
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Apr 10 13:39:40 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Apr 10 13:39:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bb010f

net-ftp/ftp: keyword 0.17.34.0.2.5.1 for ~riscv

Signed-off-by: Yixun Lan  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index d722a0bce751..a25ce7b145e0 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="



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

2021-12-11 Thread Conrad Kostecki
commit: 9dfd65fbf61b939b03a423fec88e9fec92810bd9
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sat Dec 11 20:51:31 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Dec 11 21:32:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dfd65fb

net-ftp/ftp: drop 0.17.23.0.2.1

Closes: https://bugs.gentoo.org/551736
Closes: https://bugs.gentoo.org/646152
Closes: https://bugs.gentoo.org/713246
Signed-off-by: Conrad Kostecki  gentoo.org>

 net-ftp/ftp/Manifest |  2 --
 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 60 
 2 files changed, 62 deletions(-)

diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 58a4a0349d67..18a3af575f76 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,5 +1,3 @@
-DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B 
d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a
 SHA512 
6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
 DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B 
d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5
 SHA512 
083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 
451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20
 SHA512 
ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
-DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 
7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d
 SHA512 
c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 
30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d
 SHA512 
6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
deleted file mode 100644
index 875892a83db6..
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch toolchain-funcs flag-o-matic versionator
-
-PATCH_VER="2"
-MY_PN="netkit-ftp"
-MY_PV="$(get_version_component_range 1-2)"
-MY_P="netkit-${PN}-${MY_PV}"
-DEB_PN="${MY_PN}-ssl"
-DEB_PV="$(get_version_component_range 1-3)+$(get_version_component_range 
4-5)-$(get_version_component_range 6)"
-DESCRIPTION="Standard Linux FTP client"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html;
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
-   mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.gz
-   mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 readline ssl"
-
-RDEPEND="
-   >=sys-libs/ncurses-5.2:=
-   readline? ( sys-libs/readline:0= )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" epatch 
"${WORKDIR}"/debian/patches
-   EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-   sed -i \
-   -e 's:echo -n:printf %s :' \
-   configure || die
-}
-
-src_configure() {
-   append-lfs-flags #101038
-   tc-export CC
-   # not an autoconf script
-   ./configure \
-   --prefix=/usr \
-   $(use_enable ipv6) \
-   $(use_enable readline) \
-   $(use_enable ssl) \
-   || die
-}
-
-src_install() {
-   dobin ftp/ftp
-   doman ftp/ftp.1 ftp/netrc.5
-   dodoc ChangeLog README BUGS
-}



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

2021-12-05 Thread Sam James
commit: c59728b345388f5466c524c5af0d5d1f4402ff02
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  6 01:16:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 01:16:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59728b3

net-ftp/ftp: Stabilize 0.17.34.0.2.5.1 arm, #828258

Signed-off-by: Sam James  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index ea885db96204..d722a0bce751 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="



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

2021-12-05 Thread Arthur Zamarin
commit: dfcdf1df0d71f2fec9a2d671dc3073b34afe4c18
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec  5 18:20:24 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec  5 18:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfcdf1df

net-ftp/ftp: Stabilize 0.17.34.0.2.5.1 sparc, #828258

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index 404c3d24370a..8d93ef4b2e4a 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="



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

2021-12-04 Thread Sam James
commit: a75d91d1a4f6444e710a17bfe3be3fb93140b79e
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  5 03:32:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  5 03:32:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75d91d1

net-ftp/ftp: Stabilize 0.17.34.0.2.5.1 amd64, #828258

Signed-off-by: Sam James  gentoo.org>

 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
index 5c394dd064b5..404c3d24370a 100644
--- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="ipv6 readline ssl"
 
 RDEPEND="



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

2021-09-27 Thread Sam James
commit: 74fca1f794ce6bf84cb6354cc31d5f307508e155
Author: Hank Leininger  korelogic  com>
AuthorDate: Tue Dec 29 01:12:10 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 28 03:34:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fca1f7

net-ftp/ftp: version bump, EAPI bump, fix segv

Sync to a more recent Debian version
(netkit-ftp-ssl_0.17.34+0.2-5.1.dsc), and fix longstanding segv
when the server goes away. Updated Gentoo patches for the current
Debian version. Tested with gcc-10.

Signed-off-by: Hank Leininger  korelogic.com>
Closes: https://bugs.gentoo.org/662684
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/18862
Signed-off-by: Sam James  gentoo.org>

 net-ftp/ftp/Manifest   |  2 ++
 net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild | 66 ++
 2 files changed, 68 insertions(+)

diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 248624ad48c..58a4a0349d6 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,3 +1,5 @@
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B 
d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a
 SHA512 
6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
+DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B 
d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5
 SHA512 
083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 
451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20
 SHA512 
ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 
7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d
 SHA512 
c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
+DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 
30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d
 SHA512 
6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718

diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild 
b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
new file mode 100644
index 000..5c394dd064b
--- /dev/null
+++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+PATCH_VER="3"
+MY_PN="netkit-ftp"
+MY_PV="$(ver_cut 1-2)"
+MY_P="netkit-${PN}-${MY_PV}"
+DEB_PN="${MY_PN}-ssl"
+DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)"
+DESCRIPTION="Standard Linux FTP client"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html;
+SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
+   mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz
+   
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ipv6 readline ssl"
+
+RDEPEND="
+   >=sys-libs/ncurses-5.2:=
+   readline? ( sys-libs/readline:0= )
+   ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/grep"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   local p
+   for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do
+   eapply "${WORKDIR}/debian/patches/${p}"
+   done
+
+   eapply "${WORKDIR}"/patch
+
+   sed -i \
+   -e 's:echo -n:printf %s :' \
+   configure || die
+
+   default
+}
+
+src_configure() {
+   append-lfs-flags #101038
+   tc-export CC
+   # not an autoconf script
+   ./configure \
+   --prefix=/usr \
+   $(use_enable ipv6) \
+   $(use_enable readline) \
+   $(use_enable ssl) \
+   || die
+}
+
+src_install() {
+   dobin ftp/ftp
+   doman ftp/ftp.1 ftp/netrc.5
+   dodoc ChangeLog README BUGS
+}



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

2021-05-02 Thread Mikle Kolyada
commit: dadfe93da43c3c530b8d6ac3898ef8bb3fa45b84
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 14:35:58 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 14:40:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadfe93d

net-ftp/ftp: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index fce7464edfd..875892a83db 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -20,14 +20,14 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="ipv6 libressl readline ssl"
+IUSE="ipv6 readline ssl"
 
 RDEPEND="
>=sys-libs/ncurses-5.2:=
readline? ( sys-libs/readline:0= )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= ) )
+   dev-libs/openssl:0=
+   )
 "
 DEPEND="${RDEPEND}"
 



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

2021-04-16 Thread David Seifert
commit: 0d3639692039200fb2ec90429be229a7bf6bd362
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 16 10:13:03 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Apr 16 10:13:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d363969

net-ftp/ftp: explicitly inherit epatch

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 00e51fb882e..fce7464edfd 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs flag-o-matic versionator
+inherit epatch toolchain-funcs flag-o-matic versionator
 
 PATCH_VER="2"
 MY_PN="netkit-ftp"



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

2019-06-03 Thread Andreas K. Hüttel
commit: 8ff686597be364967b477b66ac8ac2c84324c98b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Jun  4 05:17:10 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Jun  4 05:17:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff68659

net-ftp/ftp: remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 net-ftp/ftp/Manifest   |  1 -
 net-ftp/ftp/ftp-0.17-r7.ebuild | 50 --
 2 files changed, 51 deletions(-)

diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 950f6ba958c..248624ad48c 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,4 +1,3 @@
-DIST netkit-ftp-0.17-patches-1.tar.bz2 17549 BLAKE2B 
433125d12c77222eebb585074ec955650355368f3052ecbc358df95a42689e11664cb2ea6acc4779adb95ffbd480f6727e1835a031110c2fbfc64bc015f1bc4d
 SHA512 
0344316cade2cfe35a9987582e0e381177d412f9be296d1ba4b917699f5112ec48c90e8480a009acf9ba7f14fb5f42a76d9d3551db7d9f8a036eb3ce8fce2113
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B 
d7febb30807dab2dd66b6fe1991675b37cdea63703769f228895d7722f46b56dd2f5a7774d92740ff3f9ff7797a64660a580cb231582d2b9b912da35c209746a
 SHA512 
6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 
451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20
 SHA512 
ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 
7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d
 SHA512 
c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228

diff --git a/net-ftp/ftp/ftp-0.17-r7.ebuild b/net-ftp/ftp/ftp-0.17-r7.ebuild
deleted file mode 100644
index 2115b700038..000
--- a/net-ftp/ftp/ftp-0.17-r7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-PATCHLEVEL=1
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P=netkit-${P}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Standard Linux FTP client"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html;
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz
-   mirror://gentoo/${MY_P}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ipv6"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-   ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-   >=sys-apps/sed-4"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   EPATCH_DIR="${WORKDIR}"/patch \
-   EPATCH_SUFFIX="patch" \
-   epatch
-   append-lfs-flags #101038
-}
-
-src_compile() {
-   ./configure \
-   --prefix=/usr \
-   $(use_enable ssl) \
-   $(use_enable ipv6) \
-   ${EXTRA_ECONF} \
-   || die "configure failed"
-   emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "make failed"
-}
-
-src_install() {
-   dobin ftp/ftp || die
-   doman ftp/ftp.1 ftp/netrc.5
-   dodoc ChangeLog README BUGS
-}



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

2018-05-10 Thread Mikle Kolyada
commit: 3a6ea39f33e0a00e6bb2c7a0575d2dcdd28706e8
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May 10 17:18:59 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May 10 17:18:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a6ea39f

net-ftp/ftp: Mark stable wrt bug #643866

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index d8513d33158..c107e4e7ccc 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-04-22 Thread Matt Turner
commit: 53424f65d973ef688d033583883adf368a0c19fa
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 22 20:28:40 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 22 20:28:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53424f65

net-ftp/ftp-0.17.23.0.2.1: alpha stable, bug 643866

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 9931966d580..d8513d33158 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-03-15 Thread Mikle Kolyada
commit: 53cadb993cecef662003227f1408f50258672ca1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Mar 15 14:32:54 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Mar 15 14:32:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cadb99

net-ftp/ftp: arm stable wrt bug #643866

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 4d7b24b1e2f..9931966d580 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-15 Thread Tobias Klausmann
commit: 3f373f165116cb72dda0b3b077c10aaf061a519c
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Jan 15 19:02:38 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Jan 15 19:02:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f373f16

net-ftp/ftp-0.17.23.0.2.1-r0: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/643866

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 7644d3a32d4..4d7b24b1e2f 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-10 Thread Sergei Trofimovich
commit: cc7ec177ccd7e4952509804a7563d52d4bcb705a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jan 10 22:24:46 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan 10 22:24:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7ec177

net-ftp/ftp: stable 0.17.23.0.2.1 for hppa, bug #643866

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 7881679eb22..7644d3a32d4 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-10 Thread Sergei Trofimovich
commit: f100235d7c1ffda529ee7e0eea2bd69c05db5044
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Jan 10 19:51:38 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jan 10 21:22:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f100235d

net-ftp/ftp: stable 0.17.23.0.2.1 for ia64, bug #643866

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index ef69ed73c8e..7881679eb22 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-08 Thread Sergei Trofimovich
commit: a398ec7fe3e8b8ad12857740c88f877087dd1383
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jan  8 22:23:57 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan  8 22:24:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a398ec7f

net-ftp/ftp: stable 0.17.23.0.2.1 for ppc/ppc64, bug #643866

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 54a26df5326..416ac160cb1 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-08 Thread Sergei Trofimovich
commit: 7867d93e26566992f6030538697bd00b1398abca
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jan  8 18:57:00 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan  8 22:04:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7867d93e

net-ftp/ftp: stable 0.17.23.0.2.1 for sparc, bug #643866

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="sparc"

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index c158c31e7f8..54a26df5326 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc 
~x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2018-01-08 Thread Thomas Deutschmann
commit: 5ee28ca56e3692fed28e8cd6b6b4a76c45ad023f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Jan  8 22:16:50 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Jan  8 22:48:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee28ca5

net-ftp/ftp: x86 stable (bug #643866)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 416ac160cb1..ef69ed73c8e 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="



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

2016-10-09 Thread Pacho Ramos
commit: a2f655954c5ab339342e4e390b08d02f524164d6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  9 15:48:25 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  9 16:18:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f65595

net-ftp/ftp: Support libressl (#565378)

Package-Manager: portage-2.3.1

 net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild 
b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 1fcb673..2cc43cf 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,11 +21,15 @@ 
SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
-IUSE="ipv6 readline ssl"
+IUSE="ipv6 libressl readline ssl"
 
-RDEPEND=">=sys-libs/ncurses-5.2:=
+RDEPEND="
+   >=sys-libs/ncurses-5.2:=
readline? ( sys-libs/readline:0= )
-   ssl? ( dev-libs/openssl:0= )"
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= ) )
+"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}