gentoo resync : 15.12.2019

7 files changed, 11 insertions, 109 deletions

diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0e876a6b73cc..a9fb5fde2151 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,13 +1,7 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
-DIST libfilezilla-0.16.0.tar.bz2 413535 BLAKE2B ea6ce80e272efea3fcef2fbd1f0ecca1248c314eea49631b4a98d257cfe1ebe505de011c021874ab0158883077d0af61929689ffb2b92528ef50502d84c933a7 SHA512 ea3302ae0c51582d6715fa3dd06d330a2ac820c3229b4dcab4a3470021dba667b6aea1a5b13168d720d7218cc8513e40c97990ed6573d0ea46d76e6ef50c2e6e
-DIST libfilezilla-0.17.1.tar.bz2 517778 BLAKE2B d678675b2fafe80e2f0e54af372220194870460c1eeaeb91ae6709ad8addcfbb6326819bbaf1d3782e391b07172f94783b0d8a3405f54bad3f818c72426b5047 SHA512 c9c88bf3cbeb5284c3e55571b40b07f780cb23aeb802284d385a2564bf46396875a34739f9819b0c3f89923950f19a13f6454940434a987bb91b2f23b898f774
-DIST libfilezilla-0.18.0.tar.bz2 526221 BLAKE2B f2bc8610a2bba6e296a0bcdd0ae52f4c03dae14c5ff85db89c15fdbd4981bb1cc0001072b59ccd543968c96f08ccf7f59c14ae7ec24c9c539a653bb321908a81 SHA512 745039ca0123516bc58a7057117386fdaed8956b7612b331ffd10f3c7b6c739c47c9c90261ccaf5f7862662775f6b0b467891731ae30c5976d36a0cfb0102455
-DIST libfilezilla-0.18.1.tar.bz2 526448 BLAKE2B e4d709096db184072b9038cc85265fc8a16049ac2c460a45717d8386dfb36ffac17b75141565de2cfb1f37b08bc0c23aac348181ac34ef7ecd8014e543f1fdaf SHA512 b1077a48575ec6bd99cb01a21171fdec4ea662bb4ecb568cb547c6401164854588801cdc4ae80d62809534d2b04d42dcc3f7325bf57af0e2e737a4ca9f15032e
 DIST libfilezilla-0.18.2.tar.bz2 526968 BLAKE2B 81b27c18e9c04e2277dbe7a2fa2bfe3c1fa7c1f9c27eaf5cc02f309a15e9b61e71e5a67aa359c7bb36b27335f008cfb58641adcb42745ac00b9ac9eb2c649cde SHA512 6f165a008ea8e3090554070685ef042b5304a8e7fdeb9f16c81a01c00b5fcb3d4acd356cfaf3fc1189c04db0b726dd005c592f6c7c6b06a527d8b82e7890257b
-EBUILD libfilezilla-0.15.1.ebuild 892 BLAKE2B e93ea6ffe19681a690f1fc9df8f811b1245c35a6e5cfbf6f553fe88355382c7ff362aeb97a3f323c56faf5a4855c2e582a162bd8ccf961022a776dc23cfe024e SHA512 fb897a916e059235c8daef7eefd6a52a67623a7b7048a5f132cc91190c514209663808d525ed5f0607ad82a8b208238d3d78e57a154aadff0cab9e9b474b93dd
-EBUILD libfilezilla-0.16.0.ebuild 894 BLAKE2B b8e4add077c17fefc6ac06c0430ab72daaa389fa41477b62176512919b91dd20b7d82775d9af0c0ad520f992bdd9402d35db91c7dd570d9ee604ba477281a0b6 SHA512 054e46acaa485b9b2b109fb5a5d9046de22a3ee1db8f585e784d0e8e9a9e37eda4b7b8589f9446acfa216341c5f53328c1cb514954711d3ff11ddadce03558e2
-EBUILD libfilezilla-0.17.1.ebuild 924 BLAKE2B dca7cc4d3375a4efa42c56b80fbc9cdf08b9bd7b15f7df34fd3dc95cef57c6d00b6b4131a51d43032b761907cc50b3b362c9718b136f419d5760e1b824fe73c7 SHA512 9e075a5b597f488808284ed653d4a5f6251a58bba203ef9933331598bf6eff70c85301a5cd75fe77ecd8d8c56a90a2183fa6b82b46d45e72de2ac4c048d28537
-EBUILD libfilezilla-0.18.0.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
-EBUILD libfilezilla-0.18.1.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
-EBUILD libfilezilla-0.18.2.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
+DIST libfilezilla-0.19.1.tar.bz2 539952 BLAKE2B a581964a34c9104543eb06579e1f1b816b0f47e6ef3af0de9aa0b7528665ca0ac17ddf3c5327a434b8e344bdde5602f1b7a71b7cc755367e750c88de06329335 SHA512 1342a199e4bdc211437deaa4ff34fe7f7de476a664b1ea4dc8df0482db98eb6c21e03f9c7b510bc00c81f6dacd7fdec2fa721554fe6e71c5bb2763618759b1a1
+EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 0f9101255067d3dd17f4048716b25ac12e9270db414208ee23911d644140f0d8a1bf446f07a6b67f3aab679403a87a0a3e7c569922cbe4ffcf7c9c0ef9d846a1 SHA512 5a6b773f29312f2b7557ba02404124040c4272328c51df45a00eef2ba8ec6ec72517116d501ddb7307b30b0216dabb94c42690bbc72fd96ac436c8684e423215
+EBUILD libfilezilla-0.18.2.ebuild 1051 BLAKE2B 06f0455b9a48fd2b1eb8f1a6437260efc74ca81b07f18124db2c99311c5ae3bbe416226f70c72f9732c71ceab52041138dd8a64ef3bd923d07658db409330080 SHA512 428fd7bc6c28d76db19f568edb3cd4f3e6528320e62f6da78408a57d34fdb31d4aad2f91da49f33634e29fbc6f7d443b01998a53d9ee599090094bd7940c5558
+EBUILD libfilezilla-0.19.1.ebuild 1080 BLAKE2B d046a5ab623d32c7dfa351fd168e4041650f9248e1099698dd04b8ddaede2eee71ca34078827b4f723d6b2abc02889985e6759073e054f1470453aa96aaeb736 SHA512 b4d226e728d68cbb97faaf22282869d59d506e91a0014a0164a35f1df394e53f58ed91cfbf0a7595f0c32177d3fd618bb75c1085d9260339df9e1228dc84acaa
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
index 742bc805a500..feb0bb75f49d 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/nettle:0="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
deleted file mode 100644
index 18821af9ca46..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-libs/nettle:0="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild
deleted file mode 100644
index e0aef7739c68..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild
deleted file mode 100644
index 7ed54fcee7d1..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
index 7ed54fcee7d1..1d6a0fa81fe4 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.5.7:=
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.19.1.ebuild
index 7ed54fcee7d1..b2a9ba95a24a 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.19.1.ebuild
@@ -9,10 +9,12 @@ HOMEPAGE="https://lib.filezilla-project.org/"
 SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-SLOT="0"
+SLOT="0/2" # libfilezilla .so version
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.5.7:=