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

2024-06-01 Thread Pacho Ramos
commit: 4a2bbee6e9c5f3c668fb82b034c06c758378b2f9
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun  1 10:43:37 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun  1 10:45:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2bbee6

net-ftp/gftp: Fix desktop file

Closes: https://bugs.gentoo.org/843473
Signed-off-by: Pacho Ramos  gentoo.org>

 net-ftp/gftp/gftp-2.9.1b-r1.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/net-ftp/gftp/gftp-2.9.1b-r1.ebuild 
b/net-ftp/gftp/gftp-2.9.1b-r1.ebuild
index fd7704a41e9c..ef3270996d03 100644
--- a/net-ftp/gftp/gftp-2.9.1b-r1.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b-r1.ebuild
@@ -34,6 +34,12 @@ PATCHES=(
"${FILESDIR}"/"${P}"-fix-socklen-type.patch
 )
 
+src_prepare() {
+   gnome2_src_prepare
+   # https://github.com/masneyb/gftp/issues/181
+   sed -i -e 's/Icon=gftp.png/Icon=gftp/' docs/gftp.desktop || die
+}
+
 src_configure() {
gnome2_src_configure \
$(use_enable gtk gtkport) \



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

2024-06-01 Thread Pacho Ramos
commit: d5911404bfb048c250e0150fce3ca0bcbdb2e42d
Author: NHOrus  yahoo  com>
AuthorDate: Fri Apr 26 09:19:22 2024 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun  1 10:45:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5911404

net-ftp/gftp: C99 porting, fix pointer type

Closes: https://bugs.gentoo.org/919288
Signed-off-by: NHOrus  yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36430
Signed-off-by: Pacho Ramos  gentoo.org>

 .../gftp/files/gftp-2.9.1b-fix-socklen-type.patch  | 11 ++
 net-ftp/gftp/gftp-2.9.1b-r1.ebuild | 46 ++
 2 files changed, 57 insertions(+)

diff --git a/net-ftp/gftp/files/gftp-2.9.1b-fix-socklen-type.patch 
b/net-ftp/gftp/files/gftp-2.9.1b-fix-socklen-type.patch
new file mode 100644
index ..f5bcdca11bbf
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.9.1b-fix-socklen-type.patch
@@ -0,0 +1,11 @@
+--- a/lib/gftp.h   2024-04-26 09:08:32.404275437 +
 b/lib/gftp.h   2024-04-26 09:11:56.292057323 +
+@@ -361,7 +361,7 @@
+   int wakeup_main_thread[2]; /* FD that gets written to by the threads to 
wakeup the parent */
+ 
+   void *remote_addr;
+-  size_t remote_addr_len;
++  socklen_t remote_addr_len;
+   int ai_family;
+   int ai_socktype;
+   unsigned int use_udp : 1; /* does this use UDP protocol? */

diff --git a/net-ftp/gftp/gftp-2.9.1b-r1.ebuild 
b/net-ftp/gftp/gftp-2.9.1b-r1.ebuild
new file mode 100644
index ..fd7704a41e9c
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.9.1b-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="a free multithreaded file transfer client"
+HOMEPAGE="https://github.com/masneyb/gftp";
+SRC_URI="https://github.com/masneyb/gftp/releases/download/${PV}/${P}.tar.xz";
+
+# Override gnome.org.eclass's S= (bug #904064)
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk ssl"
+
+RDEPEND="
+   dev-libs/glib:2
+   sys-libs/ncurses:0=
+   sys-libs/readline:0
+   gtk? ( x11-libs/gtk+:2 )
+   ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   # https://github.com/masneyb/gftp/issues/178
+   "${FILESDIR}"/"${P}"-fix-socklen-type.patch
+)
+
+src_configure() {
+   gnome2_src_configure \
+   $(use_enable gtk gtkport) \
+   $(use_enable ssl)
+}
+
+src_install() {
+   gnome2_src_install
+   dodoc docs/USERS-GUIDE
+}



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

2023-04-18 Thread Matt Turner
commit: a86c62eebc4e367ecb14429029313f3a98459059
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 18 18:10:47 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 18 18:10:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c62ee

net-ftp/gftp: Fix S= setting

Closes: https://bugs.gentoo.org/904064
Signed-off-by: Matt Turner  gentoo.org>

 net-ftp/gftp/gftp-2.9.1b.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
index 331582efd380..184fb036ccd4 100644
--- a/net-ftp/gftp/gftp-2.9.1b.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -26,6 +26,9 @@ BDEPEND="
virtual/pkgconfig
 "
 
+# Override gnome.org.eclass's S= (bug #904064)
+S="${WORKDIR}/${P}"
+
 src_configure() {
gnome2_src_configure \
$(use_enable gtk gtkport) \



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

2022-07-20 Thread Sam James
commit: 07cb18614600dc61b0852700de28d109afc800ab
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 21 00:13:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 21 00:13:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07cb1861

net-ftp/gftp: Stabilize 2.9.1b ppc, #853958

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

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

diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
index 0e1764a2b2a4..331582efd380 100644
--- a/net-ftp/gftp/gftp-2.9.1b.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/masneyb/gftp";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="gtk ssl"
 
 RDEPEND="



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

2022-07-05 Thread Sam James
commit: aec1058ae71ff23fc30e1250f684db595b2ee0a4
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  6 01:24:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  6 01:24:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec1058a

net-ftp/gftp: Stabilize 2.9.1b x86, #853958

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

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

diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
index 9f7ea06da710..283ef7691cd2 100644
--- a/net-ftp/gftp/gftp-2.9.1b.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/masneyb/gftp";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk ssl"
 
 RDEPEND="



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

2022-07-02 Thread Sam James
commit: 81dca9b87cbee5a4e58d1c8fdf9254d1d803894d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  2 20:47:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  2 20:47:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dca9b8

net-ftp/gftp: Stabilize 2.9.1b amd64, #853958

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

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

diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
index 4cbd3b794981..9f7ea06da710 100644
--- a/net-ftp/gftp/gftp-2.9.1b.ebuild
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/masneyb/gftp";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="gtk ssl"
 
 RDEPEND="



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

2022-05-09 Thread Matt Turner
commit: d44581b8b23949a88fb2ef5ec4f24657293d18ff
Author: Matt Turner  gentoo  org>
AuthorDate: Mon May  9 21:38:01 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May  9 22:08:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44581b8

net-ftp/gftp: Version bump to 2.9.1b

Closes: https://bugs.gentoo.org/716034
Closes: https://bugs.gentoo.org/724934
Signed-off-by: Matt Turner  gentoo.org>

 net-ftp/gftp/Manifest   |  1 +
 net-ftp/gftp/gftp-2.9.1b.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index de386d45d8c5..42af85eeff46 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1 +1,2 @@
 DIST gftp-2.0.19.tar.bz2 1687167 BLAKE2B 
b7cd5409c7dfe4672a383417554c39a848b9afa341de498eea76bd02a2099559f14d7d0ceebe13d52842c311a4b242a0d558aa017dd7062a3369a7c2c3af19a0
 SHA512 
59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172
+DIST gftp-2.9.1b.tar.xz 872308 BLAKE2B 
3588321689a1c6d8e0585e0439507f774b30e05630f774d7909f32fd66c289a961602b84cde97377de47d0c63fe4cf5452ec1e0b986c578958a6080cf5814fc8
 SHA512 
31d0aa4d3c5adf3d9ac2c2517402f9bdcab5fb1187df521a978acf41c1997a120797056dd1ca7bedc32e0dec0ac7c06c1790e47821660277fb6572205ce0fe93

diff --git a/net-ftp/gftp/gftp-2.9.1b.ebuild b/net-ftp/gftp/gftp-2.9.1b.ebuild
new file mode 100644
index ..4cbd3b794981
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.9.1b.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="a free multithreaded file transfer client"
+SRC_URI="https://github.com/masneyb/gftp/releases/download/${PV}/${P}.tar.xz";
+HOMEPAGE="https://github.com/masneyb/gftp";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk ssl"
+
+RDEPEND="
+   dev-libs/glib:2
+   sys-libs/ncurses:0=
+   sys-libs/readline:0
+   gtk? ( x11-libs/gtk+:2 )
+   ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_configure() {
+   gnome2_src_configure \
+   $(use_enable gtk gtkport) \
+   $(use_enable ssl)
+}
+
+src_install() {
+   gnome2_src_install
+   dodoc docs/USERS-GUIDE
+}



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

2022-02-16 Thread Arthur Zamarin
commit: 6a1845b8d1590227ebec050e47ee7ba4556c4144
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb 16 21:44:12 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb 16 21:44:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1845b8

net-ftp/gftp: Keyword 2.0.19-r3 arm64, #833403

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

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

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 15a2379d9b76..8d4fab840477 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="gtk ssl"
 
 RDEPEND="



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

2022-02-15 Thread Yixun Lan
commit: 9083c037a49bff1d03e6225810e04c955d5c384e
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Feb 16 04:33:57 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Feb 16 04:34:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9083c037

net-ftp/gftp: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

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

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index dbc107fb71fc..15a2379d9b76 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.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=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gftp.org";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86"
 IUSE="gtk ssl"
 
 RDEPEND="



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

2021-05-02 Thread Mikle Kolyada
commit: 47898e5037f95c2cd03cb4127291b9f9d7621417
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 14:37:38 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 14:40:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47898e50

net-ftp/gftp: remove libressl support

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

 net-ftp/gftp/gftp-2.0.19-r3.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index a79b3a00b48..dbc107fb71f 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gftp.org";
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk libressl ssl"
+IUSE="gtk ssl"
 
 RDEPEND="
dev-libs/glib:2
@@ -20,8 +20,8 @@ RDEPEND="
sys-libs/readline:0
gtk? ( x11-libs/gtk+:2 )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= ) )
+   dev-libs/openssl:0=
+   )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig



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

2020-02-17 Thread Sergei Trofimovich
commit: 0d6e4b3e3caf745256cfb81d8bf718658796af06
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb 17 20:42:21 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb 17 20:42:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6e4b3e

net-ftp/gftp: backport glibc-2.30 fix, bug #692230

Fix found by Stephan Hartmann!

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/692230
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch | 27 +
 net-ftp/gftp/gftp-2.0.19-r3.ebuild  |  5 -
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch 
b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
new file mode 100644
index 000..ee1d596a03c
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-glibc-2.30.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/692230
+https://github.com/masneyb/gftp/commit/371c494a34c1820544d6563fb7ef5ca51a0ee199
+
+From 371c494a34c1820544d6563fb7ef5ca51a0ee199 Mon Sep 17 00:00:00 2001
+From: Brian Masney 
+Date: Thu, 21 Jul 2016 05:05:18 -0400
+Subject: [PATCH] fixed compiling on some versions of Linux. Patch picked up
+ from the Fedora Project at
+ https://github.com/repoforge/rpms/blob/master/specs/gftp/gftp-stropts.patch
+
+---
+ lib/pty.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/pty.c b/lib/pty.c
+index f7cb1f9..f9d609b 100644
+--- a/lib/pty.c
 b/lib/pty.c
+@@ -61,7 +61,7 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
+ 
+ #elif HAVE_GRANTPT
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || 
defined(__linux__))
+ #include 
+ #endif
+ 

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 57a51c790a9..a79b3a00b48 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,9 @@ PATCHES=(
 
# https://bugzilla.gnome.org/show_bug.cgi?id=740785
"${FILESDIR}/${P}-desktop.patch"
+
+   # https://bugs.gentoo.org/692230
+   "${FILESDIR}"/${P}-glibc-2.30.patch
 )
 
 src_configure() {



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

2017-01-22 Thread Pacho Ramos
commit: 161e516d2d3aec717dde4248dfbb72d06ba14a6b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jan 22 16:02:57 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jan 22 16:03:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161e516d

net-ftp/gftp: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-ftp/gftp/gftp-2.0.19-r2.ebuild | 39 --
 1 file changed, 39 deletions(-)

diff --git a/net-ftp/gftp/gftp-2.0.19-r2.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r2.ebuild
deleted file mode 100644
index 6107322..
--- a/net-ftp/gftp/gftp-2.0.19-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2";
-HOMEPAGE="http://www.gftp.org";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gtk ssl"
-
-RDEPEND="dev-libs/glib:2
-sys-devel/gettext
-sys-libs/ncurses
-sys-libs/readline:0
-gtk? ( x11-libs/gtk+:2 )
-ssl? ( dev-libs/openssl:0 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   # Fix SIGSEGV for gftp_expand_path function
-   epatch "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
-}
-
-src_configure() {
-   econf $(use_enable gtk gtkport) $(use_enable ssl)
-}
-
-src_install() {
-   emake DESTDIR="${D}" install
-   dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
-}



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

2016-08-28 Thread Pacho Ramos
commit: 50ee74fa6478babeca26b44dfc9fbcdb8500da05
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Aug 28 10:17:14 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Aug 28 10:17:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ee74fa

net-ftp/gftp: The file is used from Help menu to show the license

Package-Manager: portage-2.3.0

 net-ftp/gftp/gftp-2.0.19-r3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
index 904c1c4..b1311f7 100644
--- a/net-ftp/gftp/gftp-2.0.19-r3.ebuild
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -45,5 +45,4 @@ src_configure() {
 src_install() {
gnome2_src_install
dodoc docs/USERS-GUIDE
-   rm -f "${ED}"usr/share/gftp/COPYING
 }



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

2016-08-28 Thread Pacho Ramos
commit: 92f21a15729321069c11c483e47bd32bfd1ac0c1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Aug 28 10:15:15 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Aug 28 10:15:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f21a15

net-ftp/gftp: Support libressl (#565380 by Marek Behun), fix .desktop file 
(#530800 by Kévin Bernard-Allies).

Package-Manager: portage-2.3.0

 net-ftp/gftp/files/gftp-2.0.19-desktop.patch | 26 +++
 net-ftp/gftp/gftp-2.0.19-r3.ebuild   | 49 
 2 files changed, 75 insertions(+)

diff --git a/net-ftp/gftp/files/gftp-2.0.19-desktop.patch 
b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch
new file mode 100644
index ..878a77b
--- /dev/null
+++ b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch
@@ -0,0 +1,26 @@
+@@ -, +, @@ 
+ 
+ * the Encoding key is now deprecated, and UTF-8 is the default value.
+ * As the value of Icon is not an absolute path, there should be no extension.
+ * The Application category is deprecated.
+ docs/gftp.desktop | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+--- a/docs/gftp.desktop
 a/docs/gftp.desktop
+@@ -1,5 +1,4 @@ 
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=gFTP
+ Comment=Download and upload files using multiple file transfer protocols
+ Comment[fr]=Télécharge des fichiers en utilisant le protocole FTP
+@@ -8,8 +7,8 @@ Exec=gftp %u
+ Terminal=false
+ X-MultipleArgs=false
+ Type=Application
+-Icon=gftp.png
+-Categories=Application;Network;
++Icon=gftp
++Categories=Network;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gftp
+ X-GNOME-Bugzilla-Component=general

diff --git a/net-ftp/gftp/gftp-2.0.19-r3.ebuild 
b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
new file mode 100644
index ..904c1c4
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.19-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Gnome based FTP Client"
+SRC_URI="http://www.gftp.org/${P}.tar.bz2";
+HOMEPAGE="http://www.gftp.org";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gtk libressl ssl"
+
+RDEPEND="
+   dev-libs/glib:2
+   sys-devel/gettext
+   sys-libs/ncurses:0=
+   sys-libs/readline:0
+   gtk? ( x11-libs/gtk+:2 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= ) )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   # Fix SIGSEGV for gftp_expand_path function
+   "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
+
+   # https://bugzilla.gnome.org/show_bug.cgi?id=740785
+   "${FILESDIR}/${P}-desktop.patch"
+)
+
+src_configure() {
+   gnome2_src_configure \
+   $(use_enable gtk gtkport) \
+   $(use_enable ssl)
+}
+
+src_install() {
+   gnome2_src_install
+   dodoc docs/USERS-GUIDE
+   rm -f "${ED}"usr/share/gftp/COPYING
+}