gentoo resync : 10.11.2019

3 files changed, 2 insertions, 45 deletions

diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index 37b462571bdc..8866b70301a8 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -4,6 +4,5 @@ AUX curlftpfs-0.9.2-fix-escaping.patch 15750 BLAKE2B b39b8619ce93a46da4ea430a2b5
 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
+EBUILD curlftpfs-0.9.2-r4.ebuild 968 BLAKE2B a4d3ecc35d9b0112ea9734c1820f972a354c6e45300e7bc3829eb3fb70e3ea92d9b845e1b1435332a85ce27290842fa5b390e9a7123b41dc3a33e31a991f0af7 SHA512 f945ceec24a1ba399b79e4ba99e2f0992e5d6ef5a3f918e964808868906bbf42580cdd0cc25f6f7660ccb9d43f602703ca3153b72a357632d4088d41ccd9733d
 MISC metadata.xml 340 BLAKE2B 9741e9d58005e0fbfca0c6630eb3a0d1e2963a8ce66e42b61d3c48d5995ecdd99099abe914249460bf4f3bc66a0e73f1472cfa8c17bb403af92076d8c30cb5cb SHA512 4e0ec7a3f4ed5e5e1bf875275776d6d610bca1b6fbb8200e208eff80150df4e98bea430a976deef94405fcbf825aa5ba992b40e30175a30ebccc30d53591eba3
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild
deleted file mode 100644
index c6a181e880b1..000000000000
--- a/net-fs/curlftpfs/curlftpfs-0.9.2-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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
-	>=dev-libs/glib-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit_filesize.patch
-	epatch "${FILESDIR}"/${PN}-0.9.2-darwin.patch
-	epatch "${FILESDIR}"/${PN}-0.9.2-memleak.patch
-	epatch "${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch
-	epatch "${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch
-
-	# automake-1.13.1 obsoletes AM_* bit #469818
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc README
-}
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
index 04a3efebf10f..f88478708ab9 100644
--- a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 RESTRICT="test" # bug 258460