gentoo resync : 10.02.2020

3 files changed, 3 insertions, 108 deletions

diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 33434da86a94..4f592b4ba56b 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,4 +1,3 @@
-DIST wireguard-tools-1.0.20200121.tar.xz 92804 BLAKE2B 206a6f3da102c4473c160f584de834704ea31e2f2dc842a8c5c28d66cf4ffe40746aca22d8efe336ab4c0433ef673a06468816b7e6cc51e80740acdb38782eaf SHA512 cd22467916c59ab53440e072fee6d0b01f2f9ee06fc3b71de4e74bc3aab05caf25519e5f723d9d160c491f917b7f064ee6b491c74edb52d7d2c29a08d86e41c2
-EBUILD wireguard-tools-1.0.20200121.ebuild 3418 BLAKE2B a1b7cec18e18dc7377bf13e9a7df742c8b0e7d4d2f7286d4ee0d9d11351f31c8af870c175f7d47b0659b56ce0eb9b7902b875084d9128cd57f3f2daa81d56298 SHA512 416381574733ed505be1342e21bb39c7a9a49c6120f873bef46b304e9d9d0f79680aa805b052af0e9adad1544806e2130a714d693a6d1edf2c1d5abb028504dc
-EBUILD wireguard-tools-9999.ebuild 3418 BLAKE2B af103c528778ada99dcf4817b6c5e2412796ff5b2b0e5cfb82158c529ce2207da3e90f31fba0bf4c782ae5db493e828ae8b87ee6b53dddc842c4a4f341a71106 SHA512 eacad7bc249b59de795f3f7b2e9c11e3d39dce0c4b73ec67bd9e9a5ced69d27997cca7bd1054d52c902ee28b1b690ae9bbf8ec236ec5a443ab8f5d3a174562ab
+DIST wireguard-tools-1.0.20200206.tar.xz 92288 BLAKE2B 028717e09177ecd5836af32917ab62b645c027e72dbe69c1874db2a54675f957cb6cd551cf03f0a29e5c328abd9f3c33db001f680f3980a958aa1b47a673944d SHA512 c1ea44afb105ce11595f761d1c44298341fc9f919a01d17b77c9f1ee2ff314a75c59277c2561278016a64abc7c6ea970e04539658bfd1998f65328bc21139512
+EBUILD wireguard-tools-1.0.20200206.ebuild 3403 BLAKE2B 29b7e4db6a051734bc4f0710bdd8debad1030a5cc0271a78c370348cd17de6fbed5530e6fef29272ef135d13d9e61aa1880c2b555fead5ba433a13ba1fe85505 SHA512 b77f69da29a67d82d40a02e7501048fd4605de3d15339d9e1053e4d92ebe21f2bfb91e9084ee4ec7a4d9159ed31b37a2c474a0a13e97c3eb906c9a16b38beff5
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200121.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200206.ebuild
index 5600d6cff472..641da7119c1f 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200121.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200206.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="+wg-quick"
 
 BDEPEND="virtual/pkgconfig"
-DEPEND="net-libs/libmnl"
+DEPEND=""
 RDEPEND="${DEPEND}
 	wg-quick? (
 		|| ( net-firewall/nftables net-firewall/iptables )
diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
deleted file mode 100644
index bd16ac3af082..000000000000
--- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info bash-completion-r1 systemd
-
-DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+wg-quick"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="net-libs/libmnl"
-RDEPEND="${DEPEND}
-	wg-quick? (
-		|| ( net-firewall/nftables net-firewall/iptables )
-		virtual/resolvconf
-	)
-	!<virtual/wireguard-1
-"
-
-wg_quick_optional_config_nob() {
-	CONFIG_CHECK="$CONFIG_CHECK ~$1"
-	declare -g ERROR_$1="CONFIG_$1: This option is required for automatic routing of default routes inside of wg-quick(8), though it is not required for general WireGuard usage."
-}
-
-pkg_setup() {
-	use wg-quick || return 0
-	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
-	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
-	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
-	if has_version net-firewall/nftables; then
-		wg_quick_optional_config_nob NF_TABLES
-		wg_quick_optional_config_nob NF_TABLES_IPV4
-		wg_quick_optional_config_nob NF_TABLES_IPV6
-		wg_quick_optional_config_nob NFT_CT
-		wg_quick_optional_config_nob NFT_FIB
-		wg_quick_optional_config_nob NFT_FIB_IPV4
-		wg_quick_optional_config_nob NFT_FIB_IPV6
-	elif has_version net-firewall/iptables; then
-		wg_quick_optional_config_nob NETFILTER_XTABLES
-		wg_quick_optional_config_nob NETFILTER_XT_MARK
-		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
-		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
-		wg_quick_optional_config_nob IP6_NF_RAW
-		wg_quick_optional_config_nob IP_NF_RAW
-		wg_quick_optional_config_nob IP6_NF_FILTER
-		wg_quick_optional_config_nob IP_NF_FILTER
-	fi
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dodoc README.md
-	dodoc -r contrib
-	emake \
-		WITH_BASHCOMPLETION=yes \
-		WITH_SYSTEMDUNITS=yes \
-		WITH_WGQUICK=$(usex wg-quick) \
-		DESTDIR="${D}" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
-		PREFIX="${EPREFIX}/usr" \
-		-C src install
-}
-
-pkg_postinst() {
-	einfo
-	einfo "After installing WireGuard, if you'd like to try sending some packets through"
-	einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
-	einfo "test example script:"
-	einfo
-	einfo "  \$ bzcat ${ROOT}/usr/share/doc/${PF}/contrib/ncat-client-server/client.sh.bz2 | sudo bash -"
-	einfo
-	einfo "This will automatically setup interface wg0, through a very insecure transport"
-	einfo "that is only suitable for demonstration purposes. You can then try loading the"
-	einfo "hidden website or sending pings:"
-	einfo
-	einfo "  \$ chromium http://192.168.4.1"
-	einfo "  \$ ping 192.168.4.1"
-	einfo
-	einfo "If you'd like to redirect your internet traffic, you can run it with the"
-	einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
-	einfo "purposes. It is for quick testing only."
-	einfo
-	einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
-	einfo
-}