gentoo resync : 01.12.2017

11 files changed, 63 insertions, 158 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fefd999f8591..30fbaec7a26e 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/badvpn/Manifest b/net-vpn/badvpn/Manifest
index 764cbfe5ad7a..c6cce7fbc89d 100644
--- a/net-vpn/badvpn/Manifest
+++ b/net-vpn/badvpn/Manifest
@@ -14,4 +14,4 @@ EBUILD badvpn-1.999.127.ebuild 2004 BLAKE2B ddae8a9694e56e7c9fe099b809560ebd0343
 EBUILD badvpn-1.999.128.ebuild 2018 BLAKE2B cb5408f8796f123aac915ebcf9b049cded8d45202ac44c72f6996aae2caec303588e2d5540fc9917cec37d55a7624ba28c2301d4e86b07a21fc7c1afacc6cf5b SHA512 961793858377216a5ac12cdd614765572332bf37fbbe1b7bef8a3f17d495d9e70bdc9271d4dee522fe212744a0fec08591426a71a3a13665c4879bac4daac8b3
 EBUILD badvpn-1.999.129.ebuild 2070 BLAKE2B 3e96794c116d82689951ce70c9b3f92d2dcc3e8041dcc7cde40f903ae1bd6ac626586786f302228a6b53a44eed935982f343567ffc59138a84c36db577d4bf02 SHA512 95afb2657387e0598987965e58ede6a274d595bdc1748eb8e22c3d16e39af1206605e34420b7ea51a2ace928ce9a577d65293dec8512fd745b272c4b9b003359
 EBUILD badvpn-1.999.130.ebuild 1976 BLAKE2B fca6b518a9a4f8cd61a89da6541ec1211f48fa9b722d31edc2e90ce5340384ad080c78994642303759d217ec68c29383315080ba605d28c44f9d2a160eb0b090 SHA512 ba1c2e0362eaa4aec4b9b4f2cf782d5a5bca50c821cd95c2b6e7077390459bb047f5d59f31b0fcfc752d4a15d5327dd2dc68d23c24f14e7a90c587f3571d6548
-MISC metadata.xml 1849 BLAKE2B afcd93abc2124518ff0c67550750df5a7da9fdc34b39f4cfff35e22eb395d7c53731c12234d84d471448a63444c9ad1fc9246d1eb23cbc7a1d4819c64213fd91 SHA512 fcec8de10a74e9c1950b1dc3e70b949bd6d5a8cbbcad3295f1b7dd177882959f53842b52e613dba70cf1928e85b8caa97d5b19abdec68804fe7e24bad36e8a08
+MISC metadata.xml 1791 BLAKE2B fa439ee56727dd74ea158a3ebd8f04f0f8e19187f57d3379dd1c853ae000e4fcb207ecc8dd6a57d2333e6067ed1c38b1c0c2c48ff7824c547fb33ad5d4741d34 SHA512 9624a7eced29c9d5fad928ea3d4b435646a50d60c15270bb00a11b13f38e9c048b6721bef070720a9de0c73054931f48ef2c14c81779c4fe58461a0bdf299772
diff --git a/net-vpn/badvpn/metadata.xml b/net-vpn/badvpn/metadata.xml
index e2a7803599c3..c1e45bb31821 100644
--- a/net-vpn/badvpn/metadata.xml
+++ b/net-vpn/badvpn/metadata.xml
@@ -7,25 +7,21 @@
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
-                <email>ambrop7@gmail.com</email>
-                <name>Ambroz Bizjak</name>
-        </maintainer>
-        <doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
+			<email>ambrop7@gmail.com</email>
+			<name>Ambroz Bizjak</name>
+		</maintainer>
+		<doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
 		<bugs-to>https://github.com/ambrop72/badvpn/issues</bugs-to>
 		<remote-id type="github">ambrop72/badvpn</remote-id>
 		<remote-id type="google-code">badvpn</remote-id>
 	</upstream>
 	<use>
-		<flag name="client">Build the badvpn-client program, a daemon that
-			runs on endpoints of the VPN.</flag>
-		<flag name="server">Build the badvpn-server program, a central
-			server that manages the VPN network.</flag>
-		<flag name="ncd">Build NCD, a lightweight scripting language
-			especially suited for network configurations.</flag>
-		<flag name="tun2socks">Build tun2socks, a program which implements
-			a TUN device that forwards TCP traffic through a SOCKS5
-			server.</flag>
-        <flag name="udpgw">Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.</flag>	</use>
+		<flag name="client">Build the badvpn-client program, a daemon that runs on endpoints of the VPN.</flag>
+		<flag name="server">Build the badvpn-server program, a central server that manages the VPN network.</flag>
+		<flag name="ncd">Build NCD, a lightweight scripting language especially suited for network configurations.</flag>
+		<flag name="tun2socks">Build tun2socks, a program which implements a TUN device that forwards TCP traffic through a SOCKS5 server.</flag>
+		<flag name="udpgw">Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.</flag>
+	</use>
 	<longdescription lang="en">
 		BadVPN is an open-source peer-to-peer VPN system. It provides a
 		Layer 2 (Ethernet) network between the peers (VPN nodes). The peers
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 91ab78e4ed35..5d4cd4fb7d1a 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -1,6 +1,5 @@
 AUX 99i2pd 44 BLAKE2B d7a2d45f79ecb34f50eaddc09f318339eedfb2444d0a96d97691c6f3950e63f8f827ec3697ec52f60e29c3e01f232d6c12cf776883672203f01645e5e2d5d994 SHA512 0bd08ff5b1b2ad8d91572efee848a760e2fb46d9c1a5ead3fbdde91d679d832d985905952b393eb523ec9d8f1815bf1512ae61fbc059d10f0773991ac097c23f
 AUX i2pd-2.14.0-fix_installed_components.patch 1033 BLAKE2B dc6a64bc143583184e7b6af1104d5c68dbd96e7a873c6ad335f3b7feba31fb70e155e1117a7f59c1571e8d368048a2a12d664fa170c5378ab553736e47c96d75 SHA512 b4d91487657d1d0b89b8a43eb962e7f87dfb56fdb40fd7e10f4818d1d87cd814833f72c823e808756545c580517b7ce8bf1e11e55d15addd84abc343587f9d66
-AUX i2pd-2.5.1-fix_installed_components.patch 930 BLAKE2B be185334a6ab40f2e49e033986ec4a33e12b12124d6852abe07594582d9ffe890dc42eace2feaa4b3ff72232b1faaeff67047c63345301ab8f67f19fb7d7a9d5 SHA512 974fa4ab13b55cb6d88eb87c94ebf883531c1b0ea87defda350088e917e5ba293c00c3aff17fe6714cbb7fd1179561b4f0c63ccd584ca93ad3d2c64f6f04069b
 AUX i2pd-2.6.0-r3.confd 322 BLAKE2B 1abce31d300785fe0f42eb0c15bc26f723e99bfe4f3d21ef4d83620c064838d0e27f89f287a97404276490b848bd1372a40b915d4830b7755d801c4bda551099 SHA512 083f4c860d7556bd14f2765b098743c25f996ef16de3982430ff27ac7711051738d48709654441099ea8c755b6d9a6e25b52286f7e8c928d3f39f1207a9517a9
 AUX i2pd-2.6.0-r3.initd 1385 BLAKE2B 5c754a7e289f8d102b2690f78fb3e9b805c6eb46208fba8d8200886dcd30e5e7ba682bb9eb493d654bbec03b8fa7ec58cf885f91203db400280c9de4d9c1e377 SHA512 c09d9164fedac748162eeeafabf4776e16869e7ad06ba5f1b008fa57655fbe8f9633804575e44011b61130699e394bd0d8623b13e9614623b8a9b34e5ad6ecd5
 AUX i2pd-2.6.0-r3.logrotate 215 BLAKE2B 07cd3e250996ae2d4632795174750779a199c31107ed82a561b3f1dca84c6a81b6bac178ea06256325a2946876b9e75f9f6c453e5836a23911d5ecd802dc8b59 SHA512 e6080b719cb1616a96b4e4e9ff7074881f88dc699147fd5a201861c5836cf4807a00767a2c370f36e847b0d4ddb2129d8c3c3fc8043325fb8f3d0bc27feca2a3
diff --git a/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch b/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
deleted file mode 100644
index 0416901117c5..000000000000
--- a/net-vpn/i2pd/files/i2pd-2.5.1-fix_installed_components.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/build/CMakeLists.txt.old	2016-02-04 21:30:50.954251000 +0100
-+++ b/build/CMakeLists.txt	2016-02-04 21:34:50.457793484 +0100
-@@ -356,10 +356,6 @@
-   endif ()
- endif ()
- 
--install(FILES ../LICENSE
--  DESTINATION .
--  COMPONENT Runtime
--  )
- # Take a copy on Appveyor
- install(FILES "C:/projects/openssl-$ENV{OPENSSL}/LICENSE"
-   DESTINATION .
-@@ -369,7 +365,6 @@
-   )
- 
- file(GLOB_RECURSE I2PD_SOURCES "../*.cpp" "../build" "../Win32" "../Makefile*")
--install(FILES ${I2PD_SOURCES} DESTINATION src/ COMPONENT Source)
- # install(DIRECTORY ../ DESTINATION src/
- #   # OPTIONAL
- #   COMPONENT Source FILES_MATCHING
-@@ -378,7 +373,7 @@
- #   )
- 
- file(GLOB I2PD_HEADERS "../*.h")
--install(FILES ${I2PD_HEADERS} DESTINATION src/ COMPONENT Headers)
-+install(FILES ${I2PD_HEADERS} DESTINATION "include/${PROJECT_NAME}" COMPONENT Headers)
- # install(DIRECTORY ../ DESTINATION src/
- #   # OPTIONAL
- #   COMPONENT Headers FILES_MATCHING
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index 34da4c192464..903b4c8971ba 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -4,4 +4,4 @@ DIST strongswan-5.6.0.tar.bz2 4850722 SHA256 a14dc0d92634ed52730bfc76a76db30943a
 EBUILD strongswan-5.5.3.ebuild 9280 BLAKE2B b6c402f593f7f7d7b15c5d0fe9dcf05aaddd4a86152e788cfdf62f7a26a93ae98a2f947b3ae5de554aa008fdc369ef4cdf1f9fb73532b2d1ab05becf6526ffc3 SHA512 0131f9d5a852379941bfae1259b3962eb6e1676510e798215b4859277deedc9c6adbce7c6aafc5e07cfc5546663cf036394c27c6a166b8cc098bb9afddc51bbf
 EBUILD strongswan-5.6.0-r1.ebuild 9318 BLAKE2B 5bb221af5a2c6de6a36e2002acb2facab66ab85b6a5b46fb670ef30017db4373b88a1faf8679625be91b3d9880798ea6fc50e7111254ea81f572e3067f8100e7 SHA512 86d45c54b2cd5284466f43806bee421389eea5e93f9b241ee6ff90680feb179005f6ab6af733dd97fd830fb5a0822fca8616e6b53982debf8fc7c2080fa0dfa9
 EBUILD strongswan-5.6.0.ebuild 9284 BLAKE2B 3f4da75ec2607a58c1e163010c2be07d71433392d741ab2d9b045df8873d2965936dec7f457615aadc00085809dba08c3a1fd339275e9d1d4f3a3346fe5662eb SHA512 c3f51e481bd8df4fd5f573a54214a1cd5a9098c5432c8e5926ad371d6bd9105391d2c658d61237ecf651f356dc5dd5f46d6fb91af0e347419c66e9ac48ab4494
-MISC metadata.xml 4110 BLAKE2B 4b3ee1a2bb9f45f3308102a717f1752ad35a857d374193b0dec77606407a958575cae675c94f95700ded05d100a8f4bc9e06b01edd3ecb77d56b2a533ded6071 SHA512 12b0701b187b1d722b59976b94f7745d29d83ec0316b3647f0e70522adbd6068957ef79e9cd485ccc00c10545e894e7e423059deea1387a3aa37696e566f692a
+MISC metadata.xml 3660 BLAKE2B 3d25016e6a4f70aa3f8e5bc1081dd535220084529326af8f69a58906d3c4b9b0b8b4a56f17abd1315adbcdfb515c4dd63395bf1884939fab75f1ad2fcf09e434 SHA512 ec594568c35dc645d790b9582413dc5ca54a8d5ea73059299920854cb1053c22f232bd87d0044ff85108021c3fd4c0fc7ed6c7070fa438a159ad4e8e98048478
diff --git a/net-vpn/strongswan/metadata.xml b/net-vpn/strongswan/metadata.xml
index 9e6793b9791f..72eecce94d3b 100644
--- a/net-vpn/strongswan/metadata.xml
+++ b/net-vpn/strongswan/metadata.xml
@@ -1,109 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>gurligebis@gentoo.org</email>
-    <name>Bjarke Istrup Pedersen</name>
-  </maintainer>
-  <longdescription lang="en">
-    StrongSwan is direct descendant of the discontinued FreeS/WAN project.
-    As an IPsec based VPN solution which is focused on security and ease of
-    use, it fully implements the IKEv1/IKEv2 protocols, MOBIKE, NAT-Traversal
-    via UDP encapsulation (incl. port floating) and Dead Peer Detection. It
-    also fully supports the Linux 2.6 IPsec stack, IPv6, certificates/keys on
-    Smartcards and virtual IP address pools.
-  </longdescription>
-  <use>
-	<flag name="constraints">
-	  Enable advanced X.509 constraint checking plugin.
-	</flag>
-    <flag name="dhcp">
-      Enable server support for querying virtual IP addresses for clients
-      from a DHCP server. (IKEv2 only)
-    </flag>
-    <flag name="eap">
-      Enable support for the different EAP modules that is supported.
-    </flag>
-    <flag name="farp">
-      Enable faking of ARP responses for virtual IP addresses assigned to
-      clients. (IKEv2 only)
-    </flag>
-    <flag name="gcrypt">
-      Enable <pkg>dev-libs/libgcrypt</pkg> plugin which provides 3DES, AES,
-      Blowfish, Camellia, CAST, DES, Serpent and Twofish ciphers along with
-      MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and
-      22-24(4.4+). Also includes a software random number generator.
-    </flag>
-    <flag name="non-root">
-      Force IKEv1/IKEv2 daemons to normal user privileges. This might impose
-      some restrictions mainly to the IKEv1 daemon. Disable only if you really
-      require superuser privileges.
-    </flag>
-    <flag name="openssl">
-      Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic
-      Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES,
-      AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2,
-      MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and
-      22-24(4.4+)
-      <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".
-    </flag>
-    <flag name="pkcs11">
-      Enable pkcs11 support.
-    </flag>
-    <flag name="strongswan_plugins_led">
-      Enable support for the led plugin.
-    </flag>
-    <flag name="strongswan_plugins_lookip">
-      Enable support for the lookip plugin.
-    </flag>
-    <flag name="strongswan_plugins_systime-fix">
-      Enable support for the systime-fix plugin.
-    </flag>
-    <flag name="strongswan_plugins_unity">
-      Enable support for the unity plugin.
-    </flag>
-    <flag name="strongswan_plugins_vici">
-      Enable support for the vici plugin.
-    </flag>
-    <flag name="strongswan_plugins_blowfish">
-      Enable support for the blowfish plugin.
-    </flag>
-    <flag name="strongswan_plugins_ccm">
-      Enable support for the ccm plugin.
-    </flag>
-    <flag name="strongswan_plugins_ctr">
-      Enable support for the ctr plugin.
-    </flag>
-    <flag name="strongswan_plugins_gcm">
-      Enable support for the gcm plugin.
-    </flag>
-    <flag name="strongswan_plugins_ha">
-      Enable support for the ha plugin.
-    </flag>
-    <flag name="strongswan_plugins_ipseckey">
-      Enable support for the ipseckey plugin.
-    </flag>
-    <flag name="strongswan_plugins_ntru">
-      Enable support for the ntru plugin.
-    </flag>
-    <flag name="strongswan_plugins_padlock">
-      Enable support for the padlock plugin.
-    </flag>
-    <flag name="strongswan_plugins_rdrand">
-      Enable support for the rdrand plugin.
-    </flag>
-    <flag name="strongswan_plugins_unbound">
-      Enable support for the unbound plugin.
-    </flag>
-    <flag name="strongswan_plugins_whitelist">
-      Enable support for the whitelist plugin.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
+	<longdescription lang="en">
+		StrongSwan is direct descendant of the discontinued FreeS/WAN project.
+		As an IPsec based VPN solution which is focused on security and ease of
+		use, it fully implements the IKEv1/IKEv2 protocols, MOBIKE, NAT-Traversal
+		via UDP encapsulation (incl. port floating) and Dead Peer Detection. It
+		also fully supports the Linux 2.6 IPsec stack, IPv6, certificates/keys on
+		Smartcards and virtual IP address pools.
+	</longdescription>
+	<use>
+		<flag name="constraints">Enable advanced X.509 constraint checking plugin</flag>
+		<flag name="dhcp">Enable server support for querying virtual IP addresses for clients from a DHCP server. (IKEv2 only)</flag>
+		<flag name="eap">Enable support for the different EAP modules that are supported</flag>
+		<flag name="farp">Enable faking of ARP responses for virtual IP addresses assigned to clients (IKEv2 only)</flag>
+		<flag name="gcrypt">Enable <pkg>dev-libs/libgcrypt</pkg> plugin which provides 3DES, AES, Blowfish, Camellia, CAST, DES, Serpent and Twofish ciphers along with MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+). Also includes a software random number generator.</flag>
+		<flag name="non-root">Force IKEv1/IKEv2 daemons to normal user privileges. This might impose some restrictions mainly to the IKEv1 daemon. Disable only if you really require superuser privileges.</flag>
+		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> plugin which is required for Elliptic Curve Cryptography (DH groups 19-21,25,26) and ECDSA. Also provides 3DES, AES, Blowfish, Camellia, CAST, DES, IDEA and RC5 ciphers along with MD2, MD4, MD5 and SHA1/2 hash algorithms, RSA and DH groups 1,2,5,14-18 and 22-24(4.4+) <pkg>dev-libs/openssl</pkg> has to be compiled with USE="-bindist".</flag>
+		<flag name="pkcs11">Enable pkcs11 support</flag>
+		<flag name="strongswan_plugins_led">Enable support for the led plugin</flag>
+		<flag name="strongswan_plugins_lookip">Enable support for the lookip plugin</flag>
+		<flag name="strongswan_plugins_systime-fix">Enable support for the systime-fix plugin</flag>
+		<flag name="strongswan_plugins_unity">Enable support for the unity plugin</flag>
+		<flag name="strongswan_plugins_vici">Enable support for the vici plugin</flag>
+		<flag name="strongswan_plugins_blowfish">Enable support for the blowfish plugin</flag>
+		<flag name="strongswan_plugins_ccm">Enable support for the ccm plugin</flag>
+		<flag name="strongswan_plugins_ctr">Enable support for the ctr plugin</flag>
+		<flag name="strongswan_plugins_gcm">Enable support for the gcm plugin</flag>
+		<flag name="strongswan_plugins_ha">Enable support for the ha plugin</flag>
+		<flag name="strongswan_plugins_ipseckey">Enable support for the ipseckey plugin</flag>
+		<flag name="strongswan_plugins_ntru">Enable support for the ntru plugin</flag>
+		<flag name="strongswan_plugins_padlock">Enable support for the padlock plugin</flag>
+		<flag name="strongswan_plugins_rdrand">Enable support for the rdrand plugin</flag>
+		<flag name="strongswan_plugins_unbound">Enable support for the unbound plugin</flag>
+		<flag name="strongswan_plugins_whitelist">Enable support for the whitelist plugin</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:strongswan:strongswan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 904d0b7f2885..8429842b4cf2 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -7,9 +7,9 @@ AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77
 DIST tinc-1.0.31.tar.gz 494877 SHA256 d3cbc82e6e07975a2ccc0b369d07e30fc3324e71e240dca8781ce9a4f629519b SHA512 ac694d4ceec19bddebd3d5b9f37eb703a4701b93f65a7bbcdbc0b364f2a4f8b116c85748d06ec7821474de5c4d434caf5448109a0846e15c4a96adb92a0fc622 WHIRLPOOL aec84cd59ca80ca806171003447f946073c8f99fd872eaef1e7fea9d423cd4905d554964920be802e0862f5ab8de7d9d7094792c30403af8b62abca12286e2b1
 DIST tinc-1.0.32.tar.gz 496221 SHA256 4db24feaff8db4bbb7edb7a4b8f5f8edc39b26eb5feccc99e8e67a6960c05587 SHA512 1533305a062782ec788bcb59f4cbfac76ed401ccfe57b5cbd9a3fd9b76a238dbd0f612071c24b157fec4dfc409c79b1b4fbf6e176510b321dcdd79174632028c WHIRLPOOL 1d20dd365ea4c774555f809412befe0857fdd574dbbb92b8cf61764973dfaa67ebe95480913c594de663cc91845b3850b9fe541c006725d60c32d6f403cb6be0
 DIST tinc-1.0.33.tar.gz 486374 SHA256 7f6f5dc6444bc651ac635c81f4745bcce581bbd1d45ed60cbdc4ee11bebb10f4 SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804 WHIRLPOOL 9fa868d3ac0b89e0c4458c00b79149e21baa3a6e9950665da11e91278048f2a8866c23027e39f1cf34e940794d5c6b5427a561c4a0a1e4bbfdce3d2554b6b3d8
-DIST tinc-1.1pre15.tar.gz 704145 SHA256 41dc3e40c5f8be497b779acd6f59ef4572e1430d0d0f0436f2de5cb21a59ef18 SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17 WHIRLPOOL f258704dd6f2f4c5fd184a1f38da93a2bd8e655b07cfed47837e57a049c8be4e9b744f1a10b1932d020aab6c7c5bf043a83d7c9529755f5accca445f95355439
+DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
 EBUILD tinc-1.0.31.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.32.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
-EBUILD tinc-1.1_pre15.ebuild 2390 BLAKE2B f1ebdcdf51349a906664aacfbaee43290da8b082e9ae7c93b42b50dff496aace3a9b96b4d07fc667a9ffee64d4d5ee593c86b8bcaeb4a1b31b116d7e850e9419 SHA512 2b38b15c9450ec74e100478e835e6bca83b717bb3d2d434a99fe937e3e16934b8a3556b5b3c16e931e7a065b934eb26ad86c85099f2673e9ca5644ccfcf81c82
+EBUILD tinc-1.1_pre15.ebuild 2395 BLAKE2B a2823e5cbd4eda68fe675606808458b2e8e77ca5bda77bf7d16d76fbb03c18bbb1bbd01998ff2a649048e958ee0b76370e0e1693c4f0c86c77f2ee6e15063e23 SHA512 debbc0e04ba85bde3ca88d3b60bc7b9523f25ddc13057618bd5bb22520d0af9517395e56cd8d97317e5485ed969400e74d2734a826dc0ef96a71df5262c97f0c
 MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index 72c60c83b61f..a1b29bd75463 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV}
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils multilib python-single-r1
+inherit eutils multilib python-single-r1 systemd
 
 DESCRIPTION="tinc is an easy to configure VPN implementation"
 HOMEPAGE="http://www.tinc-vpn.org/"
@@ -64,7 +64,7 @@ src_configure() {
 		--disable-silent-rules \
 		--enable-legacy-protocol \
 		--disable-tunemu  \
-		--with-systemd=/usr/$(get_libdir)/systemd/system \
+		--with-systemd="$(systemd_get_systemunitdir)" \
 		$(use_enable lzo) \
 		$(use_enable ncurses curses) \
 		$(use_enable readline) \
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 8e230d2427c1..b61befda7eba 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,5 +1,5 @@
 AUX wireguard-openrc.sh 915 BLAKE2B 1185374a61591b0d6917f7c15f2040b9dd0fb76b5fd007f24cd25396a2814bcd323935c5d642ca2120f60fa16e82cf21ecb723741ecfc012f5404714b203e60d SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb
-DIST WireGuard-0.0.20171122.tar.xz 211324 BLAKE2B b665d945350080d98b0ab85a3fc56ae488936eb5b7b4f44593d7262419a768998d4e05195ddba09cfebb5ec9dbfb3430d29ed7ed8c209e90fce2a2b1338bce78 SHA512 5294fca416712c7e14d3b608d1fa3a550a50477ee81f105294d3016ffba46306a5a68730c1c34dabab77d479294ec8ae41d97a8fd57eb5c2c39fd376275df7e4
-EBUILD wireguard-0.0.20171122.ebuild 4779 BLAKE2B f64e60a843e4c5d6a6941b6af9821f5904e9f969dbadb1ec9281fdd81a24c76612899431da0104236ada44df9cb8a0dbd8aac803f864a0a892971a7f3f928fb0 SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f
+DIST WireGuard-0.0.20171127.tar.xz 212408 BLAKE2B a79d04e77c04be96e5dd4c86e038bb43f33ffb8121688f7fbe4d747496feb675fae078c11bf450989472624d3cb56404da4cc9217c10fc75f77b3372d198f3b8 SHA512 31fb30f8a8eca96cee43d95b2ca10c05dd7f17f7f5695da6979e0d949735d5488065431529e580a881e3302cf78415c5132e116dc83ba1c40881de8b99627b95
+EBUILD wireguard-0.0.20171127.ebuild 4779 BLAKE2B f64e60a843e4c5d6a6941b6af9821f5904e9f969dbadb1ec9281fdd81a24c76612899431da0104236ada44df9cb8a0dbd8aac803f864a0a892971a7f3f928fb0 SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f
 EBUILD wireguard-9999.ebuild 4779 BLAKE2B f64e60a843e4c5d6a6941b6af9821f5904e9f969dbadb1ec9281fdd81a24c76612899431da0104236ada44df9cb8a0dbd8aac803f864a0a892971a7f3f928fb0 SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f
 MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20171122.ebuild b/net-vpn/wireguard/wireguard-0.0.20171127.ebuild
index fdc71975143a..fdc71975143a 100644
--- a/net-vpn/wireguard/wireguard-0.0.20171122.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20171127.ebuild