gentoo resync : 18.11.2017

3 files changed, 7 insertions, 5 deletions

diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 6a61a35b2396..df1e3d748a15 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -2,13 +2,13 @@ AUX 99i2pd 44 SHA256 ecc85329d663182165bf6b5f672237a9f4f129f39f168d38c876345f3b8
 AUX i2pd-2.14.0-fix_installed_components.patch 1033 SHA256 ca441afc8782660a4638eb7dc730304dc78a8255411b5a24e87f6ec2073158db SHA512 b4d91487657d1d0b89b8a43eb962e7f87dfb56fdb40fd7e10f4818d1d87cd814833f72c823e808756545c580517b7ce8bf1e11e55d15addd84abc343587f9d66 WHIRLPOOL 8a6c3b5f65dc643da08a0cfe7fb3b990f66c706399c932a6a8aae9d5030ccccec8ba36361e565ef0926a09542ed1a0776a5f8a73d195d6458c8900c370b583ff
 AUX i2pd-2.5.1-fix_installed_components.patch 930 SHA256 82ca45cb7a9836bafabd1c9a36b45e6ac4f0f7d36ebeeb53ed7ee9acca1d8c89 SHA512 974fa4ab13b55cb6d88eb87c94ebf883531c1b0ea87defda350088e917e5ba293c00c3aff17fe6714cbb7fd1179561b4f0c63ccd584ca93ad3d2c64f6f04069b WHIRLPOOL 78fc32e19a83df48ad8a0726a42bbbd2402d82e7d9370eb4dc2eb3907678ee8ba547dd0ec5512ed966136d76e8f01b56ef211c75402c0949f0f7ed2d81fff109
 AUX i2pd-2.6.0-r3.confd 322 SHA256 7418efe4fa996231485039c9c23244f892d6fdf51e9c9941e64459e42d779e35 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9 WHIRLPOOL 910beb68c933e0ad180b2c40a675871c345322bb8902566a4ea0eb1d983b8c8a86e1ebd53af8b47a1060bc176678cf172b43356cec8f96b544ca02402bc47007
-AUX i2pd-2.6.0-r3.initd 1386 SHA256 65df95b69c72d4ea37bea3465aab8cdc3ee814ce756bd0a1eeeb85a7c54cbd2f SHA512 8c894dc2c0dcc5318fe9551d2b314412509542f4b7784966ae69744eca8f9ccd3650ccb63321de67cf2b9dfe456295866e3d05d54e718e0e9c0c22ecfd5c2f5e WHIRLPOOL 6aec2b9351455d8081b857d7b9e31a66bbc7468b2bff56a94a209fa3f26744882f9f52027ab860a1080e8ee020551db29608f8447a495b445b21696b50bcb505
+AUX i2pd-2.6.0-r3.initd 1385 SHA256 87dcea661b59a7f495867e9773d6594ab35db4938dd61e6c6cbd0853a916d434 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5 WHIRLPOOL b0d469d8eed8b34b1eef00adbc336151b44f847418fc29553037e051d20e8759f2ff017df342871656dc9075d515dbf6eb96f1d416de6eeee73454ab9cd083ec
 AUX i2pd-2.6.0-r3.logrotate 215 SHA256 1e0a53c5d6997513c02a3530e5bbec2c866b5afbc0f7861943d7ea79c30f8e33 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3 WHIRLPOOL a52c160d313c9c66c48f9bbe6c7c91e08202b92bd708d7fca043bfb48e1089638a11e942836aa0ae8718b714315ce6aaa8e2c87523ebe6c937614b0dec84de22
 AUX i2pd-2.6.0-r3.service 638 SHA256 4281eeb7a174798d2dc419fe52f3e0c84053802e540e362d7601f609aff4bc8e SHA512 8e35123ea30325e9f1de3d488d96a35b6e983e006084e983ab116aa5febd64feacb7643f3d9c3c7c7865375518e1acef060b4b02e9b052036f8d42f9dcc47a87 WHIRLPOOL e3c4d0148527a0764a260d97f295d98a6fbd20d08ff2fdaef3e38e359a8a3233ba7989986031f1554f2f7c5c7fe350769bf5cf4dcd0a77c03d5d2329ca11d685
-DIST i2pd-2.13.0.tar.gz 3131893 SHA256 9fbf9750503dd565ba5b31b16e1de959bda59530f088d40b14618d3ef238b065 SHA512 146e68559f44bcc8447857a0deb8be4a59d1b8032826af368355f9e9309b619a3575f99fed2b45071784c728a2265cb6446e816baf797b71aeffa09d1cbdd004 WHIRLPOOL 62b65f1b0cd8f9bf04bbaae61604e664f1b7f6f8eea30b9b41227659f6237e2739d3943ad91852462b229b0b4a718213b96aed63758680af135598224ca2d50f
 DIST i2pd-2.14.0.tar.gz 1906272 SHA256 3cb5751d9584449721e2f3ae878411b652863fa7093994f1d8cce1fd3b40bf71 SHA512 39e6cc0ed0456b93c9a7462e5630d7be87c3dda91887bef7aec50b404212f1cef02b94488ded1918eaf4264d9be5da767dab4652cf2b8470fadfa89886e42e7b WHIRLPOOL fcfb403889f33a0cce4ed9d9508b59c5deeade85230aec4929b0ee3a00ec57d9c3bf9644e13796e158bd1cd893f69b0cb9f86dba25543e0348ed743188dd3d2c
 DIST i2pd-2.15.0.tar.gz 1834673 SHA256 87649a1963b1d1b8f9424c0bccbdf6bbde0bb87db8dcf0b5c61f4c7f13181b86 SHA512 78f3b14ef7c4896528c6bd54adfcd251f3a94a0e9315924e8a9b58e3e6d0cc2c9334026d2faa9bff9da5dd3c4195e84473161ed7911c5e0155a79f456033f077 WHIRLPOOL 69c69fde4db194ee8a932a955b7e8088370a39782e96db9e730efabf4cf904b9a01ada732ce043064b8e950b1b9e995909da31889ebdb9a141d6a9e1a366d2a0
-EBUILD i2pd-2.13.0.ebuild 2930 SHA256 9da807abfe5c4d07e10861d15ff07bad896bb0959758c9855fc699b7706e8146 SHA512 8569fd009989de3fd5f6417f6a89a1bd2a3fd24670f39912def0aba1e3c810226d9247ee8de5a0999363402b26922bdafd9467555c0666a886b762bbdf17a923 WHIRLPOOL 2919b4402c29cf1045cb3f69519f36db81bd1780388258655636e455e7e3f192d1ea7b6f1bb37b438ce3a747b815a61ddfd0066c4332107697425e23c047a0f0
+DIST i2pd-2.16.0.tar.gz 1872885 SHA256 0a8fbc76422ba3452d281f31dbd55bc2e3da3b6bb2bc689b3b93c8039b6edfcd SHA512 ac005e68ca77eb44da801b6ddb97859a1dee61009e5940c109001026eedf9b664c3c1737e17b5f7da6b690f9557d998f1f67c0996a7a6e7473e966068ec9a55b WHIRLPOOL 4bb301d981441de364a9a9ac59b70fe606ac98d720273a0aa71965bd9212259ca7823a2cf00f9e2b58f1aee8be305c92db8797e3ddcadad5a809baca92a1cc16
 EBUILD i2pd-2.14.0.ebuild 2931 SHA256 f4d8c5656fa9427c9143d30ddb5824febff447d05cd8501f67bc50447fb43a89 SHA512 f5b09b0992cfea75109b10223968169c185e539b416c92ffdcbffdd5300703dc9f379b550652a68a3cbb2c35ce41b2efd3503d74f1f5864977f1fb80e6c95a8a WHIRLPOOL 0a106ed00ecb7ed34b1ba49f78097b56194449ddc3db142a4827363598bf4ae1dba132f118b0d4a51dc8ccd161269e69686a7abfa62680d6c892071f4b7a7d22
 EBUILD i2pd-2.15.0.ebuild 2931 SHA256 f4d8c5656fa9427c9143d30ddb5824febff447d05cd8501f67bc50447fb43a89 SHA512 f5b09b0992cfea75109b10223968169c185e539b416c92ffdcbffdd5300703dc9f379b550652a68a3cbb2c35ce41b2efd3503d74f1f5864977f1fb80e6c95a8a WHIRLPOOL 0a106ed00ecb7ed34b1ba49f78097b56194449ddc3db142a4827363598bf4ae1dba132f118b0d4a51dc8ccd161269e69686a7abfa62680d6c892071f4b7a7d22
+EBUILD i2pd-2.16.0.ebuild 2931 SHA256 f4d8c5656fa9427c9143d30ddb5824febff447d05cd8501f67bc50447fb43a89 SHA512 f5b09b0992cfea75109b10223968169c185e539b416c92ffdcbffdd5300703dc9f379b550652a68a3cbb2c35ce41b2efd3503d74f1f5864977f1fb80e6c95a8a WHIRLPOOL 0a106ed00ecb7ed34b1ba49f78097b56194449ddc3db142a4827363598bf4ae1dba132f118b0d4a51dc8ccd161269e69686a7abfa62680d6c892071f4b7a7d22
 MISC metadata.xml 878 SHA256 bdbbcda7e96f504a10142047e6ff580a2d3a67aafac8d69a18402d0c001668dd SHA512 9aa7d6f8b88b8432c0e2b4df77292471fb6254622031fead20ea0c8eee0dfcf0bd9bda19a309d6526c30d412c45093dd2e9898c9a8270e6ada3f723dbb665c76 WHIRLPOOL e1431581efe813cf99cafe0307980da74236c39d8bfeac82f9c55dd752b9aacd2cee3db0885114d7676167f5fa36d7ba2ce4811137fd6b41a096a84eabdad3b8
diff --git a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
index 09c83927b206..b09b4454e96d 100644
--- a/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
+++ b/net-vpn/i2pd/files/i2pd-2.6.0-r3.initd
@@ -11,8 +11,10 @@ user="${I2PD_USER}:${I2PD_GROUP}"
 start_stop_daemon_args="
     --user \"${user}\"
     --pidfile \"${I2PD_PID}\"
-    --progress --retry 'SIGTERM/20/SIGKILL/20'
+    --progress
 "
+retry="SIGTERM/20/SIGKILL/20"
+
 I2PD_PID_DIR=$(dirname "${I2PD_PID}")
 
 extra_started_commands="graceful"
diff --git a/net-vpn/i2pd/i2pd-2.13.0.ebuild b/net-vpn/i2pd/i2pd-2.16.0.ebuild
index fdde4874845b..de35d0cc72b1 100644
--- a/net-vpn/i2pd/i2pd-2.13.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.16.0.ebuild
@@ -38,7 +38,7 @@ CMAKE_USE_DIR="${S}/build"
 
 DOCS=( README.md contrib/i2pd.conf contrib/tunnels.conf )
 
-PATCHES=( "${FILESDIR}/${PN}-2.5.1-fix_installed_components.patch" )
+PATCHES=( "${FILESDIR}/${PN}-2.14.0-fix_installed_components.patch" )
 
 src_configure() {
 	mycmakeargs=(