From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019

---
 net-vpn/Manifest.gz                   | Bin 6025 -> 6029 bytes
 net-vpn/nstx/Manifest                 |   2 +-
 net-vpn/nstx/nstx-1.1_beta6-r3.ebuild |  58 +++++++++++++++-------------------
 3 files changed, 27 insertions(+), 33 deletions(-)

(limited to 'net-vpn')

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 723ba2b068b7..e4f616c92932 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/nstx/Manifest b/net-vpn/nstx/Manifest
index 5f105fbbaebe..de789d4f456b 100644
--- a/net-vpn/nstx/Manifest
+++ b/net-vpn/nstx/Manifest
@@ -10,5 +10,5 @@ AUX nstxd.conf 1377 BLAKE2B 8f64605e51a643a72f2917f0caa33362e5681dcb7eb026dfc9c5
 AUX nstxd.init 2287 BLAKE2B bc900dc7bd18bf3867f6aa2b387ad68b5a7617420cf83908bd52b2fa86fbec7058db7c8049d1b1d7e921d4a8495283b5424c4e0cebf63d2fbd0d097cc675a74b SHA512 e04759a4b6695e1f6acfd60dae13045d6b789d6fd5bbce747c3ca792c6885412365578f02b6bdaea01dc58201a82c0a5544dbec2f1791df79704f112a0a81b1a
 DIST nstx-1.1-beta6.tgz 20458 BLAKE2B 66a7870f6e04aea703e75a7fa0e2ecd00d8c35e719aea831f3c5889f17bf606543378f255c7e08b757a50832a5b8471fd3f31ba76b5a1a606506fd456c67ec3f SHA512 93aa795446d1fe38239559c5a82e595ed59b37ab8ab674b1cb80c6a079ecb9e14bef87b670febe77920560239001206da4ce4875092ff5334770eb1f3447d45f
 DIST nstx_1.1-beta6-5.diff.gz 10063 BLAKE2B d851a9f9226bc27a54689d9a863d181f446f90b4afe1633451c35dab244da1e39b008fcc0d1575cf2858b27917f33365bb2979d6de7799a0c6db9181538ec895 SHA512 32cfada863154b83217195d3423ecb9367c7f6e56877feed197dc59fa6497fa295cbb76eeb694e658baa346beb2e288c3a45233dae9419a613d759025829a306
-EBUILD nstx-1.1_beta6-r3.ebuild 1479 BLAKE2B 8cacf5db3c2493e563ec00e2c5790505216a4df1581cc167c64b8bf2278e1d74f7893d2f06e45c93d3b5d3cd0f6d03832b164a928de885855512fb0c1c8d6e39 SHA512 8594c50eb03e2b4a52dc31204b0a2ba009b032e75d99f527df207777e9b15665183f6a81506d5b5c07f3bba64af10f9adc367d19f0aa82ea7848ebc5c4e96d84
+EBUILD nstx-1.1_beta6-r3.ebuild 1196 BLAKE2B 4a389b1776e5a2958b5acc4671c3f7d6dc9b296f6ea9ad7273aa53ce834c08e796605053464e1582861fab3daf4bc9fe6c50a2b24a62461572e406b1ab1dfe93 SHA512 eb1ba6bed94122d8d7dc2efd2172062e82e8a6d497e05ae885c3d63401462ac225c26349231b2d1a93c51ab96d3c94096addce263cb57b4b249c777100886110
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild b/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
index 2da45c3bb953..1bdf06b40b90 100644
--- a/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
+++ b/net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
@@ -1,56 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit versionator toolchain-funcs eutils linux-info
+inherit toolchain-funcs linux-info
 
-MY_PV=$(replace_version_separator 2 - "${PV}")
-MY_P="${PN}-${MY_PV}"
+MY_P="${PN}-${PV/_/-}"
 DEBIAN_PV="5"
-DEBIAN_A="${PN}_${MY_PV}-${DEBIAN_PV}.diff.gz"
+DEBIAN_A="${MY_P/-/_}-${DEBIAN_PV}.diff.gz"
 
 DESCRIPTION="IP over DNS tunnel"
-SRC_URI="http://dereference.de/nstx/${MY_P}.tgz
-		mirror://debian/pool/main/${PN:0:1}/${PN}/${DEBIAN_A}"
 HOMEPAGE="http://dereference.de/nstx/"
-DEPEND="virtual/os-headers"
+SRC_URI="http://dereference.de/nstx/${MY_P}.tgz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEBIAN_A}"
+S="${WORKDIR}/${MY_P}"
+
 KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="GPL-2"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
+LICENSE="GPL-2+"
+IUSE=""
+
+DEPEND="virtual/os-headers"
 
 CONFIG_CHECK="~TUN"
 
-src_unpack() {
-	unpack "${MY_P}.tgz"
-	epatch "${DISTDIR}"/${DEBIAN_A} \
-		"${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch \
-		"${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch \
-		"${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch \
-		"${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch \
-		"${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch \
-		"${FILESDIR}"/${PN}-1.1_beta6_05-respect-ldflags.patch
-}
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_A%.gz}
+	"${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch
+	"${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch
+	"${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch
+	"${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch
+	"${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch
+	"${FILESDIR}"/${PN}-1.1_beta6_05-respect-ldflags.patch
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
-	into /usr
-	dosbin nstxcd nstxd || die
-	dodoc README Changelog || die
-	doman *.8 || die
+	dosbin nstxcd nstxd
+	dodoc README Changelog
+	doman *.8
 
 	newinitd "${FILESDIR}"/nstxd.init nstxd
 	newconfd "${FILESDIR}"/nstxd.conf nstxd
 	newinitd "${FILESDIR}"/nstxcd.init nstxcd
 	newconfd "${FILESDIR}"/nstxcd.conf nstxcd
 }
-
-pkg_postinst() {
-	einfo "Please read the documentation provided in"
-	einfo "  `find /usr/share/doc/${PF}/ -name 'README*'`"
-}
-- 
cgit v1.2.3