Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

9 files changed, 18 insertions, 18 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 570a6007a8e0..fd1cda9938a9 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index ffb316aa54d0..7f8e55f55432 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -8,8 +8,8 @@ DIST mock_msg.h 1356 BLAKE2B da7585cfeee89c0a4d3aa6326de6e2324804ed2a57a0e8bf7c2
 DIST openvpn-2.4.4.tar.gz 1390194 BLAKE2B 52aa5b9d301b4b5a14acf685f4d4c520d5ec1aa06755262a8504a4c3bb5ee1b8435f68eb4278f25b900f9ae182f31688ef36e4e839ec7a211ad6aba0f76a897a SHA512 3c3cb77397569e21c5af52b065b081714ce53e2dd0b890c881de8e57220dc23d97cd61eaf5a6bf8e5e89186414c4c93da22a3ab65f4b61f80b04d862b4116e76
 DIST openvpn-2.4.5.tar.gz 1430930 BLAKE2B 3ff1324b18fdc24109085a4958401e6d5636b5dc47d30e21392c17410625215bb20473409410ed74995a1b4bb2650ed62217b64b9184805a15ac1ff64a7a8a73 SHA512 a2e3e23bb5374e26d5af393f75686af1962980838c46aee062bc65cc9ffb6f1d20c2c261d1f9abae56ff84a5d22da4a5edb21e39943b33f4a205f809190383c6
 DIST openvpn-2.4.6.tar.gz 1431971 BLAKE2B 1ab0746a845fc56bf738c1730cc187c27f61d5bb763df149640978f0bf87450a01e3e40372265440f1aae4e1c58b6d9a1ee1f2aade970d19fd8e8813e0b487a7 SHA512 cdd70bfd03177bc6cb70d0d614e40389df00816b7097740b4cda9d7bee094d1463fdb5afeaf604c52c7b3167d1edb098a2e095e131a8b9fed0ed8b29da90cbe8
-EBUILD openvpn-2.4.4.ebuild 4671 BLAKE2B 40962a19add6aca1a388cd121852d79496e8b1a496f78e0a86fe1b7498b445bb3a367f89e35d56d061dcd29d086ffd5f9e26eb92f05a66f4cac588a53609f951 SHA512 a02edb8f48fbe348d58cfbe35dfc07c7886844a64c6955f2ad0c317b92a6e86ec19cd44e140e4d1ca7bb326fd888ac1610c4533478cacf2fcf495286b031753f
-EBUILD openvpn-2.4.5.ebuild 4724 BLAKE2B a9d07e27b4c23da4d00831a0986389ce0c308bdee95680b6a6c5244e87f95d8742b7ed99ab02af086582ec78a837b3199ef00b3c0c1262117af596c151537883 SHA512 d06e458407309246c87a93a1beb29431dd7621560a3704ab04a27f22303e880e6a9da165f7e9293f1aa443e60752e939b0d4f15803f509b3e78a830f05b653f1
-EBUILD openvpn-2.4.6.ebuild 4731 BLAKE2B c1ba02f4fb33f4f91e620b2e40c8b1775b337e4b74b00850c4ee0fdbcdbec0318fcedf2978e32baf79bdb3e4fe9fc82fb5dcb29b30be78c0502b70be588c66f9 SHA512 8cec9657b2f2753a1f25544e326006b91c21386557d479f6e0708bdc5f9e59e86b7e912f5990e76c30a31897d34b8c0ea2f22b6792238132456066eea772984f
-EBUILD openvpn-9999.ebuild 4474 BLAKE2B 2f86c306a76bb95d5c9dd0815c4cfb3148d39e8c4364b727d6c6115c5942d87eed921ef7cdf98b82ee2244d1e18444ef2c3a09295dee07548ae5bcb6713d43bb SHA512 7aa03b7ff2999dcaad84837c554618c5eccc4e5ed6e0ea93705410148526143a27b4245968c9b7c5d531a95bdd74fa7d81de0ae312f3b6b54bf46dc7a7ab45ef
+EBUILD openvpn-2.4.4.ebuild 4669 BLAKE2B a76f11fb5271cee7dedeb624dd47d74cb53b52b4867738a9bb0d304001c84017c7c0f1cd119b4cb1eb8b870195267605bf4a5a8db66ac97d9b886bae3bd9f474 SHA512 d3a7b1362d77855d111eea2ca5922b3f43b3d6a0e2b169e4d8c518e6bb047b9329125766dc485d9967e7a5c72fc37888de69a0f37675085aed43e22f56f7df09
+EBUILD openvpn-2.4.5.ebuild 4722 BLAKE2B 0208bbd968a1337d41e030356af4f2794ddad6c99d9be6ee21c2b06aa69e3661b5aa441bb9cfbc7f043b01da826790e1cab7dab25a89917d4905eda88df59426 SHA512 055145e05b51204de47213c7fb51da0f1e7f575695a6d5bb2a0332eb99d398ff251ff55e0f427cd04794e84c7898d1cd4d157427628b2f2074df7eade520a35b
+EBUILD openvpn-2.4.6.ebuild 4729 BLAKE2B fc13544f455ba20496efd0fb26451c88f223850ed4e5ae7846f2a61e0be972acbdc689b6f1de4829b7d76f4d70c73040e4154e974c7a94f0d121165553e427e5 SHA512 b992dfb974064a62677e84846ca177c597c034b56c246ba0ec90a0a8f2ba73c8d0649b5d1feedd85798f7de22cff12e4936d2caeabc7e175f85dc2d30ad64d50
+EBUILD openvpn-9999.ebuild 4473 BLAKE2B f26cdcc07aee889c11213b91e7e35d34933195b4ec9523ca20ed9f711f3f939785f769e5c8ea94ac6bc58e6ec6b894ec2037f3153a8fd9cc906fc176d6ad6b8e SHA512 700392c91522915cb00d9282eb7f53f237b40d78c3d5702dfccd6255e86b7b1a86355fdc45902fcba572cbcbf5ee87239b0b4197557934413884b633b7fdc4fa
 MISC metadata.xml 1045 BLAKE2B 14b6e8113ca48e9c0511ace61b4df0d42d7875b8f6d54f7c4c60bb2f217c8ac15b2d806e7d30897a99caa326214e48386c7bf9839dcabc86831522ca435815c5 SHA512 5d86b34f307c95414b5ae0fddc6ea730dd5058f5198fc14d45f632bb7c4b6d8adf26b7b5971d4ba3ed5b8ff2267fb64d0ab7abc8c19c899929f235563cdceaec
diff --git a/net-vpn/openvpn/openvpn-2.4.4.ebuild b/net-vpn/openvpn/openvpn-2.4.4.ebuild
index 16fa5b91ead4..886ed244e119 100644
--- a/net-vpn/openvpn/openvpn-2.4.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.4.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools flag-o-matic user systemd linux-info
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://swupdate.openvpn.net/community/releases/${P}.tar.gz
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
 	test? ( https://raw.githubusercontent.com/OpenVPN/${PN}/v${PV}/tests/unit_tests/${PN}/mock_msg.h )"
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-vpn/openvpn/openvpn-2.4.5.ebuild b/net-vpn/openvpn/openvpn-2.4.5.ebuild
index ce60c5a55f98..d93cd5da7e51 100644
--- a/net-vpn/openvpn/openvpn-2.4.5.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.5.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools flag-o-matic user systemd linux-info
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://swupdate.openvpn.net/community/releases/${P}.tar.gz
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
 	test? ( https://raw.githubusercontent.com/OpenVPN/${PN}/v${PV}/tests/unit_tests/${PN}/mock_msg.h )"
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-vpn/openvpn/openvpn-2.4.6.ebuild b/net-vpn/openvpn/openvpn-2.4.6.ebuild
index 36c8bc9602d9..40d83109d70e 100644
--- a/net-vpn/openvpn/openvpn-2.4.6.ebuild
+++ b/net-vpn/openvpn/openvpn-2.4.6.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools flag-o-matic user systemd linux-info
 
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://swupdate.openvpn.net/community/releases/${P}.tar.gz
+SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
 	test? ( https://raw.githubusercontent.com/OpenVPN/${PN}/v${PV}/tests/unit_tests/${PN}/mock_msg.h )"
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 4f6a5737ccd7..8a34713832c5 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic user systemd linux-info git-r3
 DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
 EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
 EGIT_SUBMODULES=(-cmocka)
-HOMEPAGE="https://openvpn.net/"
+HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 4414e3d27fe5..67cf01ba62ae 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.20180531.tar.xz 269880 BLAKE2B 36e9907742b26ecc57a98c54560dd23a0680fe113ed310bd41b3f454913366438d85deebfa7568ed7cb33b9fd2ca914157f0a4198ecc532d3e24e5e74a878d66 SHA512 1dfcdcf41adffdc42dcdbb0a84478b28574613b7834c7d1ccd17f176bac1d664afe824c850baf7d34213380ddffdfd66ddc5cbf7861904dc8359d2005ff07dff
-EBUILD wireguard-0.0.20180531.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
-EBUILD wireguard-9999.ebuild 4813 BLAKE2B 572b4fb9a67607cf967292f35e7372bac6a62e8dacf0696be88807fd475f8f951f2e0e092321e873185c7ead515443fffae63d85ae0c7a093c0cc12d6b65dad7 SHA512 37c0ba9d224038d9ebda711df6121c65352103461754a9b033d9c59cad5203d45e6bf4fe3a80154908521f9396f3a50d0f808e9e64786fa8fc1c1e647de538af
+DIST WireGuard-0.0.20180524.tar.xz 268996 BLAKE2B 44721a2654c2ee274abf95e3aaf060c50c72fb3eb158e53f0ce252ca4a0d6d7e18a562e42560a3032008721d2485284439908d2ccedc333a0bb8900e7472d5a5 SHA512 0e961333459bd4523c5190d73e8ec5473f79cf65717429b675e055695ba3f5d30fd93b7801f2ad64cce0a8118df40233ef6318de5248a811ecc24d0bfdccfdf9
+EBUILD wireguard-0.0.20180524.ebuild 4779 BLAKE2B f00789a53e3f1bd2e4d875288ee35f08570d9c36d47194796483c4837c870c23214d01bfc0b44233b78116190d631cb1b659fa6778a3b30746384521a1fe4508 SHA512 9b1dd9ab6126da583ceec9b6969a8cae8afe27a748bc61f9bd1ff2141cf093b481158c0619e2cdb89b56d9c1a707768d43c242b81fe957548949affbd9abbe8e
+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.20180531.ebuild b/net-vpn/wireguard/wireguard-0.0.20180524.ebuild
index 3a4681c656a9..b8f4649d874e 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180531.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180524.ebuild
@@ -41,7 +41,7 @@ src_compile() {
 	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
 	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
 	use module && linux-mod_src_compile
-	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
+	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools
 }
 
 src_install() {
diff --git a/net-vpn/wireguard/wireguard-9999.ebuild b/net-vpn/wireguard/wireguard-9999.ebuild
index 3a4681c656a9..fdc71975143a 100644
--- a/net-vpn/wireguard/wireguard-9999.ebuild
+++ b/net-vpn/wireguard/wireguard-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_compile() {
 	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
 	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
 	use module && linux-mod_src_compile
-	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools CC="$(tc-getCC)" LD="$(tc-getLD)"
+	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools
 }
 
 src_install() {