gentoo resync : 18.08.2019

3 files changed, 23 insertions, 15 deletions

diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 6f6c2bd5ba8d..739eef628839 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,12 +1,12 @@
 AUX filezilla-3.22.1-debug.patch 349 BLAKE2B 2a38aba4ddc49cbe97d3d6ce1348d94588a3bb2821ad1643e5e5d43cd18adfe5911309a24822368fd38176aaf2af99d7b098864bc5ae2d6f94ffb481a4d25340 SHA512 009946fbb676698e404b1c91bb6b14767234751cbecb7faa097692b382a65af7ab31b54f1aac81fdb72c1492db4698d24f5fa9b1966f69bffa1f4b6073283e00
 DIST FileZilla_3.39.0_src.tar.bz2 4995713 BLAKE2B d89aaa1f57187cd926ae1c4dd34624b404baa291334c652293d2dcfaedc4a5dffb401f8727b5d5d1fb483bdd503f35124efb75bdd7dd750d68e517fcb57fb8c0 SHA512 a0360634517ffd07878082abae024dbb4896035edcbd9abe6d8adfc9d37b73d01d95f6c5ca031175d88b6e4badefafcc43b5ddce3d9dbddde4deab5f0cc97e83
-DIST FileZilla_3.40.0_src.tar.bz2 4997647 BLAKE2B 88ff2461d33369c435645f1dd5afa98c566141bf825e74898f870bd4c09cc7b47a70f605afbaf7be28855385812a28ea24303b6ec7f0ba605a793160c3b76027 SHA512 7aeb0c340111a47c435e8d8cbf379e83d2fc6c0a94038e085664df34c2fe1f8ef8496ea894f5e4cfd576d034e8935fe29661bb9eff9f22416032f45f5a66db2f
-DIST FileZilla_3.41.2_src.tar.bz2 4994803 BLAKE2B 34f8331d3dfe3bdf483d234a0473074e17954b7d16abb7276ee6276221091f085c802d8cb0d397e00159b408d2737f5e23f2e50ad19d344c82472c09eea4dcd1 SHA512 c4b8284896942ba46f8f88fc5d60c6893c719e28ab94463848060850b6f9b2f4d3d13f580551dc3b21ab25ffc0cb1f43a2750500b5be2117952e14512a7ee40c
 DIST FileZilla_3.42.1_src.tar.bz2 4987250 BLAKE2B 8cc6fd0a0cec336f34793520fe4be52a36a91ba5a4a3d41092d78c00a25899f73abd03f8d6339da40bc98a618dbae98063de2844a83cacb1431fc53f3b962383 SHA512 0dc9b3a6347803f60a71c56bb759700fb2b1b019dc29794aa639ce892ccd1ae53041112987f9d5e8e75ec7e07702a5aac8e1c131796bbc5f210d75d286276deb
 DIST FileZilla_3.43.0_src.tar.bz2 4544635 BLAKE2B 13c99918dd7674fe3f2f0217b39ebe7aa89effe411e3cf90e08c9177278ce143ac84a021e49be0bc0772af29a5c34c33b03ce93d54f0b9918e4ea1001875ea48 SHA512 12c518616508e1cbd7ab60f1b94f8c876c885bc4399674c4b2df34235141fde1297a1edc686078c0f93b040ea6e42984c22ace00c4da201c7f99b4c9b71f5bc1
+DIST FileZilla_3.44.1_src.tar.bz2 4606669 BLAKE2B 407697467d7f9511b1b4e2e11505cf8815dd950609eabf242e283918e577d70f9b732fef930bbe97ba60fdffa484d77e0f7d74bb3ade8d1fcd0296ce91384301 SHA512 fa2e8c65621c7c6003e45f99f5153177e507ca34dde49d86d6f59e8b985abdeb80b779d71e554fc6acb891a695a0ef4c275bf0950af1b4cb67ff5ddb4c51e3b7
+DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbfa28fb516c3e1aafd887679ed6f1a80ba835dc43403c32b1344854f00f5b56f7e27c72bbca197cfadc92e69d92ebb0b1458 SHA512 9d4678a3a06f0ecac5ecfbae33f83df5f07e26da4f4a7e922fe5b00a5e59d5728af028667f6fa56210a23ecaa1c2a661d1874b218c2511a783644ed2b03e36ad
 EBUILD filezilla-3.39.0.ebuild 1802 BLAKE2B f15137701d47484e96588c8f306511d913e6fb23077e5a72680adbbde91a004ae59bc6f4b084df90a782fcd9fd852845ca0ddbf7457e7f0088631643bca5175d SHA512 f858b3d7b283a215e4a2eeba84f8a1f64959eff1b7c55e14f3eae219cfe3688f3ce319b7c3b924ac6d1c8e49f85397c2e91f85f5726ae325abe04b0d76af8d17
-EBUILD filezilla-3.40.0.ebuild 1804 BLAKE2B 2ed7f491b4667124b32cf4045d2ee681d5b662e44e134ec00f1297eb320025c655d2ddd36a9341e5fb66dd3d96a1b76f5dc4b39f6eb4cbfef313458e7cdb5f36 SHA512 51ce67a0f1b896c8aa2098f1d7b3021482ec2eb1c7c2039ccb57efd2fe3773f8225300c29b7a59d0f5ff134b4464ee51a072c1f4f57dcffd069e360d471a314f
-EBUILD filezilla-3.41.2.ebuild 1857 BLAKE2B 31fdd12cd442bc32b70f8b1625ff41e0a97d0e1706bd1f5ab7d1c1d39ee9ba1add619acfc9068e8b8baf500ab5d11af042b254fa660db184f75a26ac6009903b SHA512 b1cbdef23ac4f5eb596fa809584e10285b151b4b2beb3817f2b8f44424ee13047a3dab5c8e2372dc5f89c87b5601e2bf66ee74b0dbd6dd2744487eae8863c6be
 EBUILD filezilla-3.42.1.ebuild 1856 BLAKE2B b8f950120a699ed5b773f58dbae9b82d93cf5b5e4f2a030a28ee0e796db51c4dee1da5e363eeb70c14d280acfd33d7a4cc00be410e57eb0b040c9bf244d98141 SHA512 1d207f94ce3a81463bdb79f6d027643c06b0c92bb9697e0bba3217f481a458cf7627e2454d66196de77ca28edcf2cf27f599bdcb5f6635ba74e0912373766eba
 EBUILD filezilla-3.43.0.ebuild 1856 BLAKE2B 2ad0b83621a4f350b915bfa058a85bbf478d219bbd10bea8ad0358f1a887b23ee871f2fb922219f74f993d3e4a93fe2d0ce2bb487298df26c561b6353b9b4220 SHA512 e4e992bfed08b5df44658debd65c3f7730ca1cd5dc5264506143af885313761237a749f86a2ad5c0cfb44b5a0bc499eec9f8d36fe53bbc3b30599ec5dd260f11
+EBUILD filezilla-3.44.1.ebuild 1856 BLAKE2B 31c76c3b6c5bfa13797d2daece233435da356a336335d241650f5970e88226a7ad59f388eeb8c3e1dbf49387df2d1c48c1a3f8bde8655ddacbb8469d4e2281cb SHA512 1bf3f77d126b977ffc61914f3d32263854d1a18c2f1c4b1fd3e7d9d750566f2784e4f437cc6364e47fde79066ab9bc3d478cf3c52aa6f82077d60081c396f70b
+EBUILD filezilla-3.44.2.ebuild 1856 BLAKE2B 6b03d65184c14aea243d18e362a8700abf4092cd2836efd59f50070f482d1df7d6465a88d7bd3c02759f310fe434109e5bc5ebf35358e199a35afa155ce0dee8 SHA512 253d2f5cd8f0b74730307951808173a899a03a262f7708b42e324015664fa441bbee948f07f6d7d919352df50446a4aaf386309acce21e0f96f0381bb299b20e
 MISC metadata.xml 562 BLAKE2B ef75eb5e07f57db7de0a8e90dc2ad86c84b65776c674a1e282443029101d05c3292bf0d5786ab97d846de984aedc6ed59640a256dcce29c65aef537adf18c348 SHA512 a69afbf6f03dec20a4ec61e39bcfbc964e09e0d74496b383a348764a61d83e54fea2cd715a4bcc239ca0f3ed0c2e1c5d46dcfeb99f7cc4feea488663a0931544
diff --git a/net-ftp/filezilla/filezilla-3.41.2.ebuild b/net-ftp/filezilla/filezilla-3.44.1.ebuild
index 7d792e1d1c53..564462ccd07d 100644
--- a/net-ftp/filezilla/filezilla-3.41.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.44.1.ebuild
@@ -23,10 +23,10 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.15.1
-	<dev-libs/libfilezilla-0.16.0
+	>=dev-libs/libfilezilla-0.18.0
+	<dev-libs/libfilezilla-0.19.0
 	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.4.15
+	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
diff --git a/net-ftp/filezilla/filezilla-3.40.0.ebuild b/net-ftp/filezilla/filezilla-3.44.2.ebuild
index 17ac010ad2c7..2b4fb7350c29 100644
--- a/net-ftp/filezilla/filezilla-3.40.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.44.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit autotools flag-o-matic gnome2-utils wxwidgets
+inherit autotools flag-o-matic wxwidgets xdg
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -23,10 +23,10 @@ IUSE="dbus nls test"
 RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
-	>=dev-libs/libfilezilla-0.15.1
-	<dev-libs/libfilezilla-0.16.0
+	>=dev-libs/libfilezilla-0.18.1
+	<dev-libs/libfilezilla-0.19.0
 	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.4.15
+	>=net-libs/gnutls-3.5.7
 	>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
 	x11-misc/xdg-utils
 	dbus? ( sys-apps/dbus )"
@@ -62,15 +62,23 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_with dbus) $(use_enable nls locales) \
-		--with-pugixml=system \
+	local myeconfargs=(
 		--disable-autoupdatecheck
+		--with-pugixml=system
+		$(use_enable nls locales)
+		$(use_with dbus)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_pkg_postrm
 }