[gentoo-commits] repo/gentoo:master commit in: net-misc/wireguard/

[Jason Donenfeld]

commit:     e1ed857ea1d24af872e365325afa80d068db1fb1
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 20:59:17 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 20:59:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ed857e

net-misc/wireguard: bump

Package-Manager: portage-2.3.3

 net-misc/wireguard/Manifest                                      | 2 +-
 ...reguard-0.0.20161129.ebuild => wireguard-0.0.20161209.ebuild} | 9 ++++-----
 net-misc/wireguard/wireguard-9999.ebuild                         | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-misc/wireguard/Manifest b/net-misc/wireguard/Manifest
index 43db401..4f227fd 100644
--- a/net-misc/wireguard/Manifest
+++ b/net-misc/wireguard/Manifest
@@ -1 +1 @@
-DIST WireGuard-experimental-0.0.20161129.tar.xz 120540 SHA256 
7bdce3e56aaae91b195b8bbf7afc8d07f68632c997aa702c1ab84745c099d1b7 SHA512 
e16a67b546b39b3a9b24bc914727c4368c76480198e2c5bcd1c9fe3b78c56405d5c0a2ad3c50dda80a472e1e4d2425f82289c82898faaf9fd136081534cd5062
 WHIRLPOOL 
97ca13ce521347c4468fc8d15dbc1c86c5f94c0c9e2845b1b2bd3bfa5810e470e3aeb4353d471a55be08e54449faf5c4416dc91a4dfda1f6358db29650cd6972
+DIST WireGuard-0.0.20161209.tar.xz 124584 SHA256 
caabb9bb471a262e178162c30b8b8524cc3a05e0e9daf23a921870a4106ec886 SHA512 
0edd389ce8af74baa98f57167d4f2fd1a7c9cd03c7c65c65bf186111077b368d2997d76274baada14ea57b1d459034cce4eab80318a0fbcbc6a5dc7769c17d3d
 WHIRLPOOL 
91f32c0a780f7d45e992f63d5cd459989b2b4a5ae96f856ac813343ed5b034514731540dec9ffcf0ec42b9783a75b1991c41c25b3d0a2c237aeeec35c85840ab

diff --git a/net-misc/wireguard/wireguard-0.0.20161129.ebuild 
b/net-misc/wireguard/wireguard-0.0.20161209.ebuild
similarity index 92%
rename from net-misc/wireguard/wireguard-0.0.20161129.ebuild
rename to net-misc/wireguard/wireguard-0.0.20161209.ebuild
index 50d9d1c..0aa291d 100644
--- a/net-misc/wireguard/wireguard-0.0.20161129.ebuild
+++ b/net-misc/wireguard/wireguard-0.0.20161209.ebuild
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://git.zx2c4.com/WireGuard";
        KEYWORDS=""
 else
-       
SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${PV}.tar.xz";
-       S="${WORKDIR}/WireGuard-experimental-${PV}"
+       
SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz";
+       S="${WORKDIR}/WireGuard-${PV}"
        KEYWORDS="~amd64 ~x86 ~mips ~arm ~arm64"
 fi
 
@@ -49,10 +49,9 @@ src_install() {
        dodoc README.md
        dodoc -r contrib/examples
        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src/tools install
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C 
contrib/examples/wg-config install
        if use kmod-src; then
-               dodir /usr/src
-               rm -r "${S}"/src/tools || die
-               mv -v "${S}"/src "${ED}"usr/src/wireguard || die
+               emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
        else
                linux-mod_src_install
        fi

diff --git a/net-misc/wireguard/wireguard-9999.ebuild 
b/net-misc/wireguard/wireguard-9999.ebuild
index 97b0aa0..0aa291d 100644
--- a/net-misc/wireguard/wireguard-9999.ebuild
+++ b/net-misc/wireguard/wireguard-9999.ebuild
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://git.zx2c4.com/WireGuard";
        KEYWORDS=""
 else
-       
SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${PV}.tar.xz";
-       S="${WORKDIR}/WireGuard-experimental-${PV}"
+       
SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz";
+       S="${WORKDIR}/WireGuard-${PV}"
        KEYWORDS="~amd64 ~x86 ~mips ~arm ~arm64"
 fi
 
@@ -49,6 +49,7 @@ src_install() {
        dodoc README.md
        dodoc -r contrib/examples
        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src/tools install
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C 
contrib/examples/wg-config install
        if use kmod-src; then
                emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
        else