gentoo resync : 13.10.2019

4 files changed, 51 insertions, 7 deletions

diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index 0cc1284cd039..37b462571bdc 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -1,8 +1,9 @@
-AUX curlftpfs-0.9.2-64bit_filesize.patch 626 BLAKE2B 1459bd10a3adcdf14e71a25287ab743009db22d2ace0c82c5a241b17b719faa7a50c3e93f7b52f8dce3ca88dcf283041901e7ae92ec764158d238414e89ee4d4 SHA512 3b23ee31c5008fffec3032c9ab440a584d672a3936f8fae943af31e5936964e8b5641f5778f56b5c656e9af26156d0a1f31e49ef8c4eb526ec8a83ff7076fcb7
-AUX curlftpfs-0.9.2-darwin.patch 517 BLAKE2B 5e2683e09303c0e9e51604fddd0da6c482d1fb5172b5cf173aa4713773787dcbf2e1f9f4951e10ad4dd8f4959ca720dd70eadaa59f92195d46e6dbf448b61b91 SHA512 81e77c00c6b13b2f023ad1230fbd2c48bcf902454207e7b221d507086df1facffd603e1e1ab615b28a3d44d886941a509c0d1246279cceea197286073d6a322d
+AUX curlftpfs-0.9.2-64bit_filesize.patch 626 BLAKE2B 7233a142fe0f046f4bfaa4066938deb09867ecea8231beef23e86a87e85c9cb4132e12ca7a37e7e42deec3b51a6d1f4128654d1a92d65c67606d34b1ff59946b SHA512 8bf99bc1f646dc5a401ca6148f3559f10ea9c6ad324e825fec6261f0597c6a0a4e859e5e2f4e1ed4a796a95944e49553c35d7fc959198796c30642ddc1ca2545
+AUX curlftpfs-0.9.2-darwin.patch 486 BLAKE2B 055384a64f8bb4812468872546f485eb4b119d610b8af5c127a119e095777551e4dee2fd0a832e8d7acbe3cb394c8baefabcd59ec33273a570d35d3abbbd2519 SHA512 988c995c4ca90fb21784b29780f3cce9f5e61dd79e67d80686e4201271902ca73be391892b22e21c631822092f06790e315603f34ec73081125c54a93dbcacbe
 AUX curlftpfs-0.9.2-fix-escaping.patch 15750 BLAKE2B b39b8619ce93a46da4ea430a2b53e36e9dbaef59622d9916c3a1a91d88b970e12c30e9a5c9e82dd8ed8e4624560b6808605762d90b74ba8c1a7e162898bff9b2 SHA512 9373aabf3748de309196d27fe26367ac0b8625df69a095d5ea67a1033b1c5db19820f3a5e5040e4fbdb38e55b24c620f351a21906fc3ad3d681bb08c7cef1e72
 AUX curlftpfs-0.9.2-memleak-nocache.patch 1810 BLAKE2B 70e63ca6b41a479bf88aa3d7cb8846a8dec2e09949f8a7e0ffead6be1a2f6cc50f6512f426eb7f8c03fef85984da2ea97808fa64029a56a26be2f37e599d910f SHA512 b53ed1acfea1aa539c0f69ab7dd961a635ded7299500337a7453fa2445e61590ec39a9010ac105d230880b09a90d388b8564295a185e5b44f3398903a6d1d5d4
 AUX curlftpfs-0.9.2-memleak.patch 834 BLAKE2B 1dff269ccf7e6fb3a4c10034ba124a22df2bc25f9f38352d21ef1164c8c375de9cecd36c03d050c6a524434d678dad26141ef8999f90282a56f03d1bdff5ae5a SHA512 dee0eac27bd09208f44d20d3c0627499da0664601abfb0cb5a3a979c988c71713ef00850f2b72e71c38a9dac09698e55cfbc6249bb1e2196a07a783b0fcd49bc
 DIST curlftpfs-0.9.2.tar.gz 365503 BLAKE2B 2175d5ecd0846a78038a813f76db99a911dff6e52aa170e59ae19d895961b0e9f5ba7b888288408daabc3a6c2b58590ab8b1c5424ea6b4b3875c460b089d6ddb SHA512 df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067
 EBUILD curlftpfs-0.9.2-r3.ebuild 1002 BLAKE2B 0f6849945dadc03f0e23c22c230aee90f515bc3ecb41781908b5bd0990c3b775175ab80689ddcdccb9d87fa41f43b98a18a7857116cbbd705a40bf28db4a6fc6 SHA512 219c9666751af37c4dedc86b95e975daf5f627fbbcb278b7a1cc7a767d8b29fdf7f26f5ce927159e435daee709cd719e0e344dcebf1f3abbfcebc8a837917ff3
+EBUILD curlftpfs-0.9.2-r4.ebuild 971 BLAKE2B f7d8ce139dcc97a77cddedfac016d5d94e4300c5109cb690841296becfe8444e67138895c99c032e1b8ae37e4d786d3a46fbc55c0ca8c052f402863b94874342 SHA512 d88705e880828980f6179c9a8ead0f3cb4439ffeeac71a3d2ffacd685fbc4dd174572263808b034f18dcde31ea39aaf556ae59334b9fe0298cf8c6ff2bb57500
 MISC metadata.xml 340 BLAKE2B 9741e9d58005e0fbfca0c6630eb3a0d1e2963a8ce66e42b61d3c48d5995ecdd99099abe914249460bf4f3bc66a0e73f1472cfa8c17bb403af92076d8c30cb5cb SHA512 4e0ec7a3f4ed5e5e1bf875275776d6d610bca1b6fbb8200e208eff80150df4e98bea430a976deef94405fcbf825aa5ba992b40e30175a30ebccc30d53591eba3
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
new file mode 100644
index 000000000000..04a3efebf10f
--- /dev/null
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="File system for accessing ftp hosts based on FUSE"
+HOMEPAGE="http://curlftpfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RESTRICT="test" # bug 258460
+
+RDEPEND=">=net-misc/curl-7.17.0
+	>=sys-fs/fuse-2.2:0=
+	>=dev-libs/glib-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit_filesize.patch
+	"${FILESDIR}"/${PN}-0.9.2-darwin.patch
+	"${FILESDIR}"/${PN}-0.9.2-memleak.patch
+	"${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch
+	"${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch
+)
+
+src_prepare() {
+	default
+
+	# automake-1.13.1 obsoletes AM_* bit #469818
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
index 38b6f33a2ba5..256c74923708 100644
--- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
@@ -1,5 +1,5 @@
---- ftpfs.c.old	2009-11-28 14:28:05.000000000 +0300
-+++ ftpfs.c	2009-11-28 14:28:19.000000000 +0300
+--- a/ftpfs.c	2009-11-28 14:28:05.000000000 +0300
++++ b/ftpfs.c	2009-11-28 14:28:19.000000000 +0300
 @@ -503,7 +503,7 @@
    
    curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
index fd0bd1f0cfe5..81265920531b 100644
--- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
@@ -1,8 +1,7 @@
 https://sourceforge.net/tracker/?func=detail&atid=816359&aid=2799820&group_id=160565
 
-diff -ur configure.ac configure.ac
---- configure.ac	2008-04-23 15:37:42 +0400
-+++ configure.ac	2009-06-02 09:46:05 +0400
+--- a/configure.ac	2008-04-23 15:37:42 +0400
++++ b/configure.ac	2009-06-02 09:46:05 +0400
 @@ -18,6 +18,11 @@
  	AC_MSG_ERROR(["We need libcurl with support for FTP protocol."])
  fi