gentoo resync : 25.01.2018

26 files changed, 310 insertions, 239 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 3d811d24ea39..de471c4892eb 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 56666781caa8..10bcad168222 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,4 +1,6 @@
 AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8400aecbf027cfe04a9f4b140bd6a5f31c593995abb5cb7c819a3c4e81bc677e2495009718813d63059dfa6d SHA512 88ef81df293bd05dce54aefeda2d0a2c1fd26842ddf26a138760aa365b22637d9d782d41d93967d0a81c6404fd133159d096397c77a2e1ac71787686dc384602
+AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
+AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
@@ -10,5 +12,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoin-qt-0.13.0.ebuild 3357 BLAKE2B 059d39373790811281935c9c334ecbbce1482b151671fcf38ee725b5015d0a3e40b2b308441b516854e2a8e0de322a3dd0246058186f27fcfe7b7a6167a6caa3 SHA512 e497fedd35c0f5fd8658b0d66e02eb7ef465a5243c41623094905e63f58e2d3c553313602242d67a9b3c1810f588c6aae7cdc0aafa98ee7a48248e1f960c7b1b
 EBUILD bitcoin-qt-0.13.1-r1.ebuild 3439 BLAKE2B e515048dcd52c352a363c8aa6eb17373e95fc0f238ea7d11c482f1571fbb1cedd232a52985f2111508b87fb94a0561710187cca3056c3bc6696402b2337282df SHA512 3532a46a44b4cd323968b1ca3984c752b89ea4f728003ccd709218bcc55a8f9aa9efdfcda2de8dd82f5047833aa9c4bffa182f8b56f0af85802da6dea5085b1b
 EBUILD bitcoin-qt-0.13.2.ebuild 3513 BLAKE2B 2cd862f6138b273d3db66ecafaaa43e2984dc05a6826d39b81c45d9982f33c65f00b26912c4161f383576aa9aad7b41dc003b1f22343b4cdd250568285efdd64 SHA512 067c72153669280b7d62f908cc911df53e86e14c165fd3a3af5a93f3e496cf2f334e534bffa1e07be9af466db1b5e82bb8a5c892fd9317e88228205e5a22f5bf
-EBUILD bitcoin-qt-0.15.1.ebuild 7090 BLAKE2B 5042ca2f8225671ff830f6d978567b209981cf74af3f79e3a1eaa4fce18efc739604a9e13fc875800f71602970d827de1bf30c9aef3c701122c8bd47f29470b6 SHA512 2f3ff434ebb82f91031b700d08a7ce432019c714ae56f07b16dd0b05aded01ee47b5f64408975fd22ff79955e1152b147471d876d50328e8ec8dae04b0fb6706
+EBUILD bitcoin-qt-0.15.1.ebuild 7202 BLAKE2B 9a65506221f561f06813ce42461eb2ac22346a3638b666de75637dc53ad8e0efb9c72673e1bbfc44b314066d433083bc2e3e69a722c81440ded40993eb8182e4 SHA512 5ebade519185819820de91e3611f3352b6b24b1348e9cdb02b6a76f50f78cc8b358faa2bc0e93abc8c9c02c42f4001bee9b22caa0bccaef18390288d24f688d5
 MISC metadata.xml 6592 BLAKE2B 1674ae2f00b2b07a14167db1225de76b811502edd43dd9a2254de519893e389e82804e86ebaa565ae6891f1deff0bf7af68aa6b7783854d20454cffb5b172af2 SHA512 96c2b6c1b6d04706746e2ac8f7272bb08bc7176c016c66e37d6b0b59b0192c8f51d999a00693418b70c90be8ae076a9a9b50e9d050a5d77c5e02d5192db69709
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 64339edd7ca2..75bc2d1f74f2 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -124,11 +124,13 @@ src_prepare() {
 	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
 
 	eapply "$(KNOTS_PATCH syslibs)"
+	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
 
 	if use knots; then
 		eapply "$(KNOTS_PATCH f)"
 		eapply "$(KNOTS_PATCH branding)"
 		eapply "$(KNOTS_PATCH ts)"
+		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
 	fi
 
 	eapply_user
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
new file mode 100644
index 000000000000..3d953d9c0a94
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Jan 23 03:37:10 2018 +0000
+
+    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+     ++data->eof;
+ }
+ 
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+     .ScriptBegin = script_tests_debugger_ScriptBegin,
+     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+     .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+ 
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
new file mode 100644
index 000000000000..60fc9d849054
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+ check-local:
++if BUILD_BITCOIN_TX
+ 	@echo "Running test/util/bitcoin-util-test.py..."
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 5955ce3ee3f1..4d56a77f8f2f 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,5 +1,7 @@
 AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f
 AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888
+AUX bitcoind-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d
+AUX bitcoind-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f
 AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1
 AUX bitcoind.service 869 BLAKE2B 65628a2c6effef34e4cf8fd10bc50b02bbfa8c49e486266bab8e9b7be19a57969d75e6ce6ff82dc2e2f3ddae29fceee9e61a076cbf5ac6666d772514c88c2093 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea
 AUX bitcoind.service-r1 719 BLAKE2B 69a97909ccd6e1cef79f9c9835d8f9b63451d3bcc9ac9136f4a4695976b00ec71559b73811a027046e26373da506125b94439c031ca6cfcccd268b3217c7ac17 SHA512 43f0224d2a60f19b62f1b805be73efe91882339ed02267f8852d4154ddd634beefef6130101d92fc771c56477daf6aedab0bd751ee614bc8b9bf3a042697d76f
@@ -14,5 +16,5 @@ DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b
 EBUILD bitcoind-0.13.0.ebuild 1922 BLAKE2B 4dbcdb8ace05ce867da8cce4f74f561639376ddc9a2b70d057af2766b7e7f2f2e3f1a11594e4c9d204ce4bbaf287175912dc3353cf0e20aadf3c30ed2cda6912 SHA512 231f04e06fe2a9820f66147ba971c96901f506bb74878006c36bb5f459a41387fbd5df328f36c447235af8f81a28e62ab6280a4eeea88bf7261c57d3f2660549
 EBUILD bitcoind-0.13.1.ebuild 1919 BLAKE2B edbfe9ccb5f7d3f5526f531b51ff117bbb85f3b7bdf651badc7fcacbc5ba29e8ffb2f4ffff1f56f015fd0a5383b74f811e91dc6a214264f431edc25527548efd SHA512 da9c7226dcc905263be4f82330217e8680e5917b7d15620d89ecd0e13e6328fa4d5c8a282950e9824d3c0c6d6e1677c5baaf3c87515aa7c6515afa2d4e921098
 EBUILD bitcoind-0.13.2.ebuild 1924 BLAKE2B 5c1ce54380441d7e082772510f6b03d2c8983566ee662af7601e9abf0cfd5c981f183be12a9d87e0b0daf0b07943f3c1c18ff1d079f2ffe00c3912068e3a37a2 SHA512 cfdff039da31701c29cdefc2f66c47a3715468c4e5da90d2bfb30bca8d4ec778b498b671df2a28820f4017a32e0f5d8f4d5b78174c0e7bcf92cfbbbc48d5238b
-EBUILD bitcoind-0.15.1.ebuild 4928 BLAKE2B ca4aab401dae803f3e841e07262d876e729723b30df973e3673cf1381b73eabb43e2238beae940c6d34538b229d9cbe5802d7ce393178d94ac79970f5ed39a97 SHA512 059ee69a975fd402e2c4fcca43bcd9fc9488db63f376950a45627082e4bc648cae31b96c5e8dded00f40a4c77daf563f7b6d14dac0953fe7ae76d5362d612d37
+EBUILD bitcoind-0.15.1.ebuild 5040 BLAKE2B dd9c35a79d762e2efb6923c70f885727e549a10740f887c37dce320c34d4260092d0025390ed7095c84d47bc3c5730e847924607a1cdb97f7b9c1abd41773569 SHA512 9bc238b9f958668c90dd5d396fce7a391acf033490712718b67e06750f3a9be1c900da057e2f05018231ef8c8c65f48a857d9bfd46fa645e90a80374f88e1d62
 MISC metadata.xml 1218 BLAKE2B e01b34ede70163c5a9793bd1d2109ec21b9aaed014d22e4c1f8d16800d6ffe65e37a67c6697ae04fa64e6a540d034a553e332866dd3e0f086a4dd90c527d48f7 SHA512 02bf23ba23c56f439491c168f8801e1d325aff4f98113b9be486a2e6289135f0fa650c135af4a2967cc634a6a85a15f145d1ea6e05e959c4e4f6a5ddbac1399e
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
index 3ada285926eb..3d8c5eb306c1 100644
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,11 +74,13 @@ src_prepare() {
 	sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
 
 	eapply "$(KNOTS_PATCH syslibs)"
+	eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
 
 	if use knots; then
 		eapply "$(KNOTS_PATCH f)"
 		eapply "$(KNOTS_PATCH branding)"
 		eapply "$(KNOTS_PATCH ts)"
+		eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
 	fi
 
 	eapply_user
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
new file mode 100644
index 000000000000..3d953d9c0a94
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Jan 23 03:37:10 2018 +0000
+
+    Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+     ++data->eof;
+ }
+ 
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+     .ScriptBegin = script_tests_debugger_ScriptBegin,
+     .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+     .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+ 
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
new file mode 100644
index 000000000000..60fc9d849054
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ 	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+ 
+ check-local:
++if BUILD_BITCOIN_TX
+ 	@echo "Running test/util/bitcoin-util-test.py..."
+ 	$(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 1b6a38ea0910..c0ce413d5eab 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -2,5 +2,5 @@ AUX noninteractive-build.patch 513 BLAKE2B cc4042e4f82541eef27584d0e3122b217c5a8
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
 DIST pybitmessage-0.6.2.tar.gz 1053815 BLAKE2B 28ed1a836771318f59986532aaa8b87c0c6d195988f02fc977c3b21b423145cc5b732bc1d4ed9978c26c0edb1c040844c9c00ec4db6418ae1e938bae335ed118 SHA512 4aaa0f6b1cc04de01154bb5c90416901e51abb4465c62269ab07abb7da980ac07f2f548ae7a3780da9f3efe89d3b841b004996c5e33bc2638e58efcbecc8baef
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.2-r2.ebuild 1924 BLAKE2B e780f16d0f1e643938f76e3ade2d8762ccf368c173dfef7ae288b8a1cecd94bc09498bc0584735cbcae8151b78e4dcc8f71728c73a79b9e8dd045f0e3dff6b65 SHA512 03938e00b3ccff7fb61f602416584f024a862717ee99e4f7f13083da58771451f418b7169653669163d8a7c5348718c40564970a1fc8ab3c3d78322611117154
+EBUILD pybitmessage-0.6.2-r2.ebuild 1716 BLAKE2B b4445af49eb0f40bd7a3425031ffa94ee88ebf5e00a48db22a7ce13fd99a403af909d4ff24bb8db1510a9d6744d8c3553273e13a95c2e3b60c0e7f547b5f7188 SHA512 e77e1c10e68a1e622137f7a1d312b609a2c28c8b29995393534203484023b97e8aa948dd33c3eeaaa74989201f1a65a5724d1b748d7913d74ac2752b22c18ee9
 MISC metadata.xml 1125 BLAKE2B 91ce6c7afd6e759f0f7d5a049653cf970f7cf28d5061e9ccc9866dbf88c5a60cb3e518564ceb01551a830c419cdf47f905a4a744a73205725f50d966d022fe54 SHA512 04950f304ca8c087baa7dc370ff08da07bae555481798848d2ddddda33de318be83fc6a648428ff72419af857dd9bd1bdf0b43866b40e149f33dd834e9c7d9cb
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
index df49b8e4e32a..10ef7b3f1fbb 100644
--- a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl ncurses opencl qt4 sound"
+IUSE="libressl ncurses opencl sound"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
@@ -42,7 +42,6 @@ RDEPEND="${DEPEND}
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pyopencl[${PYTHON_USEDEP}]
 	)
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )
 	sound? ( || (
 		media-sound/gst123
 		media-sound/alsa-utils
@@ -58,12 +57,6 @@ src_install () {
 	dodoc README.md
 
 	# The man page is not installed because it's basically empty.
-
-	if use qt4 ; then
-		newicon -s 24 desktop/icon24.png "${PN}.png"
-		newicon -s scalable desktop/can-icon.svg "${PN}.svg"
-		domenu "desktop/${PN}.desktop"
-	fi
 }
 
 pkg_preinst() {
diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest
new file mode 100644
index 000000000000..de2e357d2f59
--- /dev/null
+++ b/net-p2p/resilio-sync/Manifest
@@ -0,0 +1,11 @@
+AUX resilio-sync-user.confd 299 BLAKE2B 0e534911629f22010329ae441140649cff373d102d7191f057b7e72d5217bdb335457271b780ca5f4d3b3ca989a8c33d9d796491ac15347a5bdfa08b9cf6c7b5 SHA512 a156516938e5b69199c8a0de8d62ff969b8a938e5a2fd2983c0ecfc080682b1a5abeb21cf8193fc9f96954fa2a9658519e37758d6812b21971026af9b7be54ce
+AUX resilio-sync-user.initd 768 BLAKE2B b4dd9bab04ac242e258b5fd8412a2292f515535caf2845f2b2795584666924725c2c34684d6a6dfe50677b2ecc86e18a7a2c801467f8d352767138aa986f4aab SHA512 a46d90b7f85fc0d5ec88bded35cef42e105cbf8df1f65032dc79bada56ac8c50d42206fea0c5fa6cb82c4ee56eaa27f2059d283501d84ba90503b3ac6a9f9ef5
+AUX resilio-sync-user.service 324 BLAKE2B 5cec927346956c5219470021fdc73bf2be5486499e917453fd5fad94717e4ad6fc5467948b11b551b5f4cdc94d6ffbfbbd4a65fe21e62a4831f610437b92574c SHA512 95621e4df7de0f26da8c057432302a98927db47b4bf9484efe00cb0649020099050feba22a107b01e4c3998ff7d05edb77bdd1ba1f8899839c92984725427504
+AUX resilio-sync.confd 296 BLAKE2B c7fef752df5dcd4e903ebef2bc6da2780c9f19f5f690c505b8abd493081a1bc18a9ae18bba1700df15467786b2c50ca5b12e60cf1eef70a4169d7fc7e17a7897 SHA512 5db62947a34c3c5cedec1b4902b8291bfc46c10490f355ed1612a0f37854f3927d3e4550d1a920cd567a4a69403a80b3dd4150c8bd38906123be6542cd35459f
+AUX resilio-sync.initd 470 BLAKE2B dc58640afc6ec0706aeb82da3161c2aacb144c1b422ff3d59ac01fe7360c0c44c9c52410567225cfb7139244fff3f1a4f449766a8ce03cb53fdf1d0b22a94d55 SHA512 89def45c14bc058826879384be99c49de0be9991bbc3283c43ebcc0a788a213519551219c431c55aa046fbf773a0c8ff57f998be2db89e86f2829a468b4a9e0b
+AUX resilio-sync.service 380 BLAKE2B bab5ea03b7f0db9845a29334f56839dec68fe1d8caf32015445b5b039389f87f729367748f839667b0eb933f95d4389e7c4e0481fb70fd1936b416eacc897a50 SHA512 af50f438111808426f6d80b7bfc77daf665e583540485831c7f51300e3f4768316d0cac2712d9564f1ffcccd7cfe21c48e3c72ba595776057038c230bb3cbdd8
+AUX resilio-sync.tmpfile 41 BLAKE2B fb3e9001a32e45cd230f4efef60509f20f52253ad575fb2b1493bae9846ad46210eed639c7a3f9e4a4fa7c901b42a9a7756f8583c204a4bb847e6eb96a2af323 SHA512 d9d54076785ce601023980e3fe5e2eab42e5eaf3b0bdb9caefe508e0d5fda8d32faf1338c6b901deb29488401de74228023016d72d7b0ec9db362b4c2d87edd2
+DIST resilio-sync_2.5.12-1_amd64.deb 10467196 BLAKE2B e900ac4e8b3862b29674db09d469013a5d12791c090bfd6ecae8f95af6f8ff2f990b8b9cab176b301b7625d6fcee1fcbe33b497f09bca045497a6765ccbb313c SHA512 4056df3d2cbafdb881f1d2929fca13efd258fb7af2cbdc390eae4820af1f5b2b46d410daf2a1ad1233d105edc46c4d5a8e9259e4557c0695b3392884429d95f9
+DIST resilio-sync_2.5.12-1_i386.deb 10333948 BLAKE2B 7a7a6e2bf8375bf5428c27053c22de98e598de07d8709f870152a8b9e2d7254a954b3ceebad69bebf286ef29b3d44b9955f33c4f396a7831041c34b9bd585dd2 SHA512 c15276bbe8818e30cab254a7b1f1222e3a25912d99a05287441548ea3ee3de8964d23a5aed56fd547ee3369f9943129cf7d3a5bd410ce28a9fbd45e13def56b4
+EBUILD resilio-sync-2.5.12.ebuild 2254 BLAKE2B 0ea135eea705a61e3dbe009f941c35ef7ac6809f05aa8fa1c07e42b96f959fc68fd3191cf39198b33d6f0d2db203b2dee21baa6c7c5a5741fee808e526581b78 SHA512 3f77265365a3be3f59ac1f82b7921f28e6c3a868eb191ba066b77624f31dd52b3d2b78dcdff8245df4efdca0ecb5f1bb734d80d7f40d4cdc8ea0891a31846940
+MISC metadata.xml 889 BLAKE2B e1ace94f1fe08c07df2825107b7f73a028894f551c5fb9a6a5986ee0fcecb29204ec19a87231153cdb16de672178eec045fabf01923bf16cb6c0307a024bdeca SHA512 cafa6e1e9a127ddc8ae14b5d52502caf5a297cb397e0770c3e7ef0bd810c4b12c197061ab1429a549054ab8c9674c9ef9d29639825f4f899892d57de41a21707
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.confd b/net-p2p/resilio-sync/files/resilio-sync-user.confd
new file mode 100644
index 000000000000..040da8bdf843
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+#OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+#USER="rslsync"
+#GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.initd b/net-p2p/resilio-sync/files/resilio-sync-user.initd
new file mode 100644
index 000000000000..efcaa2d7778c
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+USER="${RC_SVCNAME##*.}"
+command="/usr/bin/rslsync"
+name="Resilio Sync for $USER"
+description="Resilio Sync"
+command_user="${USER:-rslsync}:${GROUP:-rslsync}"
+pidfile="${PIDFILE:-/home/$USER/.config/resilio-sync/resilio-sync.pid}"
+config=${CONFIG:-/home/$USER/.config/resilio-sync/config.json}
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ "$USER" = "resilio-sync-user" ]; then
+		eerror "You are not supposed to run this script directly."
+		eerror "Create a symlink for this script:"
+		eerror "  ln -s $RC_SVCNAME /etc/init.d/$RC_SVCNAME.<user>"
+		return 1
+	fi
+}
diff --git a/net-p2p/resilio-sync/files/resilio-sync-user.service b/net-p2p/resilio-sync/files/resilio-sync-user.service
new file mode 100644
index 000000000000..6c82440ac679
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync-user.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=http://help.getsync.com/
+After=network.target network-online.target
+
+[Service]
+Type=forking
+Restart=on-failure
+PIDFile=%h/.config/resilio-sync/resilio-sync.pid
+ExecStart=/usr/bin/rslsync --config %h/.config/resilio-sync/config.json
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/resilio-sync/files/resilio-sync.confd b/net-p2p/resilio-sync/files/resilio-sync.confd
new file mode 100644
index 000000000000..08c4255fe296
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.confd
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/resilio-sync
+
+# Various options.
+# run `rslsync --help` for valid cmdline options
+OPTS="--log /var/log/resilio-sync/resilio-sync.log"
+
+# User and group daemon runs as
+USER="rslsync"
+GROUP="rslsync"
+
+# Resilio Sync config file
+#CONFIG="/etc/resilio-sync/config.json"
diff --git a/net-p2p/resilio-sync/files/resilio-sync.initd b/net-p2p/resilio-sync/files/resilio-sync.initd
new file mode 100644
index 000000000000..b9f0380a773a
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/rslsync"
+name="Resilio Sync"
+description="Resilio Sync"
+command_user="${USER:-rslsync}::${GROUP:-rslsync}"
+pidfile="/run/resilio-sync/resilio-sync.pid"
+config=${CONFIG:-/etc/resilio-sync/config.json}
+command_args="--config $config ${OPTS}"
+start_stop_daemon_args="-q"
+retry="10"
+
+depend() {
+	need net
+	provide resilio-sync
+}
diff --git a/net-p2p/resilio-sync/files/resilio-sync.service b/net-p2p/resilio-sync/files/resilio-sync.service
new file mode 100644
index 000000000000..32f24a95aa84
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Resilio Sync service
+Documentation=http://help.getsync.com/
+After=network.target network-online.target
+
+[Service]
+Type=forking
+User=rslsync
+Group=rslsync
+UMask=0002
+Restart=on-failure
+PermissionsStartOnly=true
+PIDFile=/var/run/resilio-sync/resilio-sync.pid
+ExecStart=/usr/bin/rslsync --config /etc/resilio-sync/config.json
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/resilio-sync/files/resilio-sync.tmpfile b/net-p2p/resilio-sync/files/resilio-sync.tmpfile
new file mode 100644
index 000000000000..d0f6e0adc420
--- /dev/null
+++ b/net-p2p/resilio-sync/files/resilio-sync.tmpfile
@@ -0,0 +1 @@
+d	/run/resilio-sync	0755	rslsync	rslsync
diff --git a/net-p2p/resilio-sync/metadata.xml b/net-p2p/resilio-sync/metadata.xml
new file mode 100644
index 000000000000..35827ed4235b
--- /dev/null
+++ b/net-p2p/resilio-sync/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	Resilio Sync is a proprietary peer-to-peer multiplatform file synchronization tool
+	It can sync files between devices on a local network, or between remote devices
+	over the Internet via a modified version of the BitTorrent protocol.
+	</longdescription>
+	<use>
+		<flag name="pax_kernel">Use paxctl to mark binaries</flag>
+	</use>
+	<upstream>
+		<doc>https://help.getsync.com/</doc>
+		<bugs-to>https://help.getsync.com/hc/en-us/requests/new?ticket_form_id=91563</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
new file mode 100644
index 000000000000..908b87b2209d
--- /dev/null
+++ b/net-p2p/resilio-sync/resilio-sync-2.5.12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_URI="http://linux-packages.resilio.com/${PN}/deb/pool/non-free/r/${PN}/${PN}_${PV}-1_@arch@.deb"
+
+inherit pax-utils readme.gentoo-r1 systemd tmpfiles unpacker user
+
+NAME="rslsync"
+QA_PREBUILT="usr/bin/${NAME}"
+
+DESCRIPTION="Resilient, fast and scalable file synchronization tool"
+HOMEPAGE="https://getsync.com/"
+SRC_URI="amd64? ( ${BASE_URI/@arch@/amd64} )
+	x86? ( ${BASE_URI/@arch@/i386} )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+DOC_CONTENTS="You may need to review /etc/${PN}/config.json\n
+Default metadata path is /var/lib/${PN}/.sync\n
+Default web-gui URL is http://localhost:8888/\n\n"
+
+pkg_setup() {
+	enewgroup ${NAME}
+	enewuser ${NAME} -1 -1 /var/lib/${PN} ${NAME}
+}
+
+src_unpack() {
+	unpacker_src_unpack
+
+	unpack usr/share/man/man1/${PN}.1.gz
+}
+
+src_install() {
+	dobin usr/bin/${NAME}
+	use pax_kernel && pax-mark m "${ED%/}"/usr/bin/${NAME}
+
+	doman ${PN}.1
+
+	dodir /var/log/${PN}
+	keepdir /etc/${PN} /var/lib/${PN}/ /var/lib/${PN}/.sync
+	fperms 0700 /etc/${PN} /var/lib/${PN} /var/lib/${PN}/.sync /var/log/${PN}
+	fowners -R ${NAME}:${NAME} /etc/${PN} /var/lib/${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-user.initd ${PN}-user
+	newconfd "${FILESDIR}"/${PN}-user.confd ${PN}-user
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_douserunit "${FILESDIR}"/${PN}-user.service
+	newtmpfiles "${FILESDIR}"/resilio-sync.tmpfile resilio-sync.conf
+
+	readme.gentoo_create_doc
+
+	# Generate sample config
+	"${ED%/}"/usr/bin/${NAME} --dump-sample-config > \
+		"${ED%/}"/etc/${PN}/config.json || die "generate config failed"
+	fowners ${NAME}:${NAME} /etc/${PN}/config.json
+	# Uncomment config directives and change their values
+	sed -i \
+		-e "/storage_path/s|//| |g" \
+		-e "/pid_file/s|//| |g" \
+		-e "/storage_path/s|/home/user/.sync|/var/lib/${PN}/.sync|g" \
+		-e "/pid_file/s|resilio/resilio|${PN}/${PN}|g" \
+		"${ED%/}"/etc/${PN}/config.json || die "sed failed for config.json"
+}
+
+pkg_postinst() {
+	tmpfiles_process resilio-sync.conf
+	readme.gentoo_print_elog
+}
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 53eeadb30c8a..49d4d44be9e6 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -1,6 +1,5 @@
 AUX build.xml 2275 BLAKE2B a4aea605301da5ad6af89915c686caabd9ee0f0d3b56f3ee46e2eae74adc86d88de4462228e0387b43b1d5b897c3d6b2e8939822000e86631c22ec5230e31461 SHA512 bdec7c10548ed2fda57235d14f0ae67e00e548a84b88855b5b683c947015b52bcf7011fb5952b4225370db54541614c0402fe6c77e723d310358a502837b40a3
 AUX vuze-4.1.0.0-pre 1850 BLAKE2B 3013871146bd43e7bcd0e7bd92c44ca5d06ebca634ed836918f89c1620095a200c81de2ce76c30a4cef5b3f659995c14532b410c8c39679ee821196009aba821 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a
-AUX vuze-5.3.0.0-disable-osx.patch 1841 BLAKE2B aa87ad0364dd7e604a004749cd432954847b0d487bde7e56e0c6273017fc7dbefbe322884ff3dc0520cf415f9be87c18611503aa0041cc6030f9eed04b8edf0d SHA512 f5c60b188eb5e4c48dfd73c9de03c4eb0884dfb36f147d6ef4be6d2e26602d7de6f80de4be4a64d94c1d9ad9cdbbd928b1cd4e00f09c57e8eb72d7d0f623e1c7
 AUX vuze-5.3.0.0-disable-shared-plugins.patch 1069 BLAKE2B d2594d617396bee9506cf8060c61d7d97b4e5780b34ebed656cffa3d70cf69d27a50056d77d8527af716246a31918d81c626f931aa9b7a78bb3c823d2da79f7f SHA512 ee9e6513b2dd1d4e986f4c57fd5ace3593f98f7eaeb5e454fc7b5fb3c6876b86b85b511981c951ead96b1a106abb18a2e01047b2063d55c98300ed6356c0460b
 AUX vuze-5.3.0.0-disable-updaters.patch 1726 BLAKE2B 8a1d7ec1196ee27019f513d51290a0d5dae1f1ada84e21617f42d8e6bd9a42020be84eb962489f371c611f3af2edb2fb9c0bbd7d986a10ea31103a64fe3ada82 SHA512 743d48eeeac4534fc66463c0989a88d97117d988227b6cce77abdaa97c9cb9813aa1228f81a607af09e07fdf95ce02a3981f7f083fba0d9875d0951b8bbf29a3
 AUX vuze-5.3.0.0-java5.patch 618 BLAKE2B d939b9708bc4fa2902d1b5f78ceb4d707ff59e421cc9b2308178d57e78dede189eeb0723bea8ac22a3b6502f59533f72a1207be59e36cca7c568d2e0c52ce120 SHA512 0ecddf69a7fdd72860262cc73dd4a0852ba8e31d73dfc7ad1d96ad18eaa41ec23ca977207d6bff32e183d95c1a6918909ef3cab697d0c9d754345613544eb90c
@@ -12,10 +11,8 @@ AUX vuze-5.6.0.0-invalid-characters.patch 1121 BLAKE2B 4a4dc12ee00fc60198a1533e4
 AUX vuze-5.7.2.0-disable-osx.patch 2278 BLAKE2B 760b82f75b310d01b94891a3c1528fe48200e7c8fdc04baecb18965316e3ffb347c9b131540f7a30061751fd1b449d924536f9d8f77bde7743c88579b33e9be5 SHA512 39797193297d61c1e91bfdcbf6e4fa6acb523c067ac96a0de99d5f79fab69b327688f87f8c8f24c0d7967c4c1017bde478ecc10aa117f96f0b891dc10a21420a
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_4812_source.zip 9530217 BLAKE2B af55951a9d8b86a03483e6e9ebc6f63cd7a7305587d36ef863257b7b86e911f7012e73f532b3b4648000cfff5fa2fd2cd1848f0742791232ceee54f158a9c219 SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf
-DIST Vuze_5600_source.zip 10398501 BLAKE2B 3c6a1a8967bb3a603dfcb248cc5d5dd8aaf4a7efdfba9efa529fa98f0ad945574ffe574084d223fadb3710e6aa690d86dd8d67ea77febbe6a28b730f97ba313e SHA512 dfe557cb1f50be935c78ee4431bc14db5f0107eebab8545cf925de8b0d48bb91ca77f7feab54a5fd91aaaf50bd3c68c1519cf49c2eb4d145ff7794bf9f22cfd7
 DIST Vuze_5720_source.zip 10709515 BLAKE2B e2824c3486cbf942ba644563cf8a0b47d99f42cdba6c0fe2d93e47c5717f1331df632a4a100b6679f3f456697f70837202e84bf2fa89c362186353af98a36173 SHA512 073af0c68219884aaf1b860fcc04cf75edaf662f1e82fe6c49f615b928b00d1a50d25f348c6bf5a922fa1c5a53c7bce5f75b7a0c065602675bcb6d80c1c92edf
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 BLAKE2B 4acaf56539798102e498c2678c8f3239ecc141909738dd1a84fca5cb38516fb363da6ff87d65b08fe04b550d8aafc9f33fa2d404b70f5e34a3129a43080794b5 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d
-EBUILD vuze-4.8.1.2-r1.ebuild 4273 BLAKE2B 64e39bf87b9c1f63d085f23a171b2256acc5961459ebdc29709d874f2c8f70a0607fa2522698ab637bbbee750189cbdb715238faab68d878f43e1799a1ea5fe3 SHA512 c27b01e4d5ec5751d5af4d62170572a43744fa04d934bf820c7a53d84735adda38967bfcc525521ec6e2dd2ab9f0d4de346ce7099b8f64ebafd0ddf0cc44c8c1
-EBUILD vuze-5.6.0.0.ebuild 4407 BLAKE2B 4d5c0c06f211b4a90a4e2ae3ffe58c8df9335e9340ac58038a51ad8c2210d35ffc28ffcd73ec4d51b8220fb975d8b22e56ad60e18b34ccca7419cd6d036855fe SHA512 a94743bace7557aec51eec202edc89fc828924e790b5591494ca73f10ced30c2378f36bb4d512d49e6c0f34e17bad295ce8a5777b9219a9e819e50c49fce6b5d
-EBUILD vuze-5.7.2.0.ebuild 4407 BLAKE2B 3117c769ed08349f132ae7d1e4bf498a6beb9abf30797b9d7f3926a3c7cbb4a3a99dfa831ddbf0d4197ca43bc120715e528b232ed279fb69f659fb1345c278b5 SHA512 2015dda515c61e65b554dd1d7ad1b56773bc717e3e927e937d04b4ef6bf37c7e48a6ea267c9647e8044093d555a3649467c25003562bc670f3a96aa0d416dd53
+EBUILD vuze-4.8.1.2-r1.ebuild 4009 BLAKE2B cf4c682b9aa7523e63d5d652b963bacbc3592bee5e8787d8d8d7e0090e9683b8f23c4f8757a5a495d7a581cd61f9e7843eea4325ca20ec347989d50988e96246 SHA512 b161e31d14594bd795bb02a6b0a83b09e6ca6db10b8e8078f8422c202575d8fe3d03c2e111ada4fcb806062e71f7acde163c31c63e8f0c29fd8221223edd6a26
+EBUILD vuze-5.7.2.0.ebuild 4202 BLAKE2B 566b413c98b31d0e6af8e825e7512dedee93aa895fe65e82b96b9807843d38db49ccb7b6fc038768eec1278bb164107308f6ebc37910811e7e8003d5c5555274 SHA512 30018294bf0a93e9970c031ea21ff5923324cf61938a993a0bac7b3f149e67ea519f4a38d99b6e821566fbc5a0f2caafa1600352d4454a9efbccf91ca18a96e0
 MISC metadata.xml 415 BLAKE2B 919790264b1d38dbb5ffe76b2611851a7d601980ed82c3008d4c762431e9ec4ce58def0fc824f85fb694aead62190e11cba7b57149259f1e59b26c0736e605a6 SHA512 d81c0a6171fcd95b06d63b6d6680a22451326ecff7e4a82e8d581cc2da95663bc35b9f2a4e56c0d10aa915e5f1ee238f5b2bc33ee06944ef1250def695367c7d
diff --git a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch b/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
deleted file mode 100644
index 070dae2d7562..000000000000
--- a/net-p2p/vuze/files/vuze-5.3.0.0-disable-osx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-+++ b/org/gudy/azureus2/ui/swt/mainwindow/SWTThread.java
-@@ -229,57 +229,6 @@ public class SWTThread {
- 			}
- 		});
- 
--		if (Constants.isOSX) {
--			
--			// On Cocoa, we get a Close trigger on display.  Need to check if all
--			// platforms send this.
--			display.addListener(SWT.Close, new Listener() {
--				public void handleEvent(Event event) {
--					event.doit = UIFunctionsManager.getUIFunctions().dispose(false, false);
--				}
--			});
--
--			String platform = SWT.getPlatform();
--			// use reflection here so we decouple generic SWT from OSX specific stuff to an extent
--
--			if (platform.equals("carbon")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CarbonUIEnhancer");
--
--					Constructor<?> constructor = ehancerClass.getConstructor(new Class[] {});
--
--					constructor.newInstance(new Object[] {});
--
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			} else if (platform.equals("cocoa")) {
--				try {
--
--					Class<?> ehancerClass = Class.forName("org.gudy.azureus2.ui.swt.osx.CocoaUIEnhancer");
--
--					Method mGetInstance = ehancerClass.getMethod("getInstance", new Class[0]);
--					Object claObj = mGetInstance.invoke(null, new Object[0] );
--
--					Method mHookAppMenu = claObj.getClass().getMethod("hookApplicationMenu", new Class[] {});
--					if (mHookAppMenu != null) {
--						mHookAppMenu.invoke(claObj, new Object[0]);
--					}
--
--					Method mHookDocOpen = claObj.getClass().getMethod("hookDocumentOpen", new Class[] {});
--					if (mHookDocOpen != null) {
--						mHookDocOpen.invoke(claObj, new Object[0]);
--					}
--					
--				} catch (Throwable e) {
--
--					Debug.printStackTrace(e);
--				}
--			}
--		}   
--
- 		if (app != null) {
- 			app.runInSWTThread();
- 			runner = new Thread(new AERunnable() {
diff --git a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
index 0c35e7b02cd3..760aa1db034d 100644
--- a/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
+++ b/net-p2p/vuze/vuze-4.8.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -129,12 +129,6 @@ pkg_postinst() {
 	elog "Using this config file you can start the console UI."
 	elog
 
-	if ! has_version dev-java/swt:3.7[webkit]; then
-		elog
-		elog "Your dev-java/swt:3.7 was built without webkit support. Features such as Vuze HD Network will not work."
-		elog "Rebuild swt with USE=webkit (needs net-libs/webkit-gtk:2) to use these features."
-	fi
-
 	fdo-mime_desktop_database_update
 }
 
diff --git a/net-p2p/vuze/vuze-5.6.0.0.ebuild b/net-p2p/vuze/vuze-5.6.0.0.ebuild
deleted file mode 100644
index 561de94cf7ae..000000000000
--- a/net-p2p/vuze/vuze-5.6.0.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-RDEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-lang:2.1
-	dev-java/json-simple:0
-	dev-java/log4j:0
-	dev-java/swt:3.8[cairo]
-	>=virtual/jre-1.6:*"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.6:*"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}"
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-java_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-osx.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-commons.patch
-	epatch "${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-commons-lang-entities.patch
-	epatch "${FILESDIR}"/${PN}-5.6.0.0-invalid-characters.patch
-#	epatch "${FILESDIR}"/${P}-use-jdk-cipher-only.patch # bcprov
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.8,json-simple,log4j,commons-cli-1 commons-lang-2.1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-5.7.2.0.ebuild b/net-p2p/vuze/vuze-5.7.2.0.ebuild
index 65d8f1b6371f..01f5c404a7cd 100644
--- a/net-p2p/vuze/vuze-5.7.2.0.ebuild
+++ b/net-p2p/vuze/vuze-5.7.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -36,14 +36,6 @@ DEPEND="${RDEPEND}
 
 PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
 
-pkg_pretend() {
-	if ! has_version dev-java/swt:3.8[webkit]; then
-		echo
-		ewarn "dev-java/swt:3.8 was built without webkit support."
-		ewarn "Web features such as Vuze HD Network will be disabled."
-	fi
-}
-
 src_unpack() {
 	mkdir -p "${S}" && cd "${S}"
 	unpack ${A}