gentoo resync : 28.04.2021

4 files changed, 64 insertions, 114 deletions

diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index dbb8a3e39bfc..101f187c1323 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,7 +1,5 @@
 AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
 AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
-DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B 6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7
 DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
-EBUILD sstp-client-1.0.10-r1.ebuild 1420 BLAKE2B cb9b8c161923f4ff3d193788b4e520a739f30bb37a01ede3d31ae2ece04c06f7b59bd9956bec6cb998854d544b3baca226c62d970eff750f42c8327fb9bdbf3f SHA512 009fe28e314d9450e2b6b4f44671396cd9edbd219c04281d960a4387f3669f530106a32f31311512f68fd8f6713be0695b542c84f1f46e28c9df86fe24901844
-EBUILD sstp-client-1.0.12.ebuild 1323 BLAKE2B 523d5bb199731c93af80ba3392a838c81884f059c8aac60e206159c94fe07f5dca9a52f25a8da64731a14368e36eed500b8425f290758eadd03fbf2702793bc6 SHA512 b9b48275716bb750d07b652ab8f02f3544965d2787ecc96fadcd2bd02b621d042bc5f129b62095b8bf9e703ae3c831d4f46465d8c06b2284dfae03cfe6860409
+EBUILD sstp-client-1.0.12-r1.ebuild 1325 BLAKE2B 0965f2f89c3905ba02070d0a9fdec51b154e54a37d8c520067ae6f646af38a0ce534437aad6e11a2432ee6d4b5623d53272c4e4521adcd8cd8232cf197d055fe SHA512 e953a85ad8a62922b246bae364095c2894fad0d4355f5bcf14c8c84812d054317ece4c67af445d065f9bc1f288a6f62da66b4a845aad81d602b5c88fc635c2fc
 MISC metadata.xml 248 BLAKE2B 0170675aa541587a716c3683adf2383e443a45bcf2538380f3a4003ebb1e1af8c878dcb47792b835c8ff299f484a18bbc68cf7a0e058d8bb8d39d4767778c69c SHA512 5836901dac3fc4a340424cc221c2742fc9dde2c234c2cbc0d1cd9c45a8f9192c7658f49a5d5dae5221c2aa0cfed34ff0642ab0519e495991bf47fc4dd6d4a1f7
diff --git a/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild
deleted file mode 100644
index 9bf1d84c1aca..000000000000
--- a/net-misc/sstp-client/sstp-client-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info multilib user
-
-DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
-HOMEPAGE="http://sstp-client.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="static"
-
-RDEPEND=">=dev-libs/libevent-2.0.10
-	dev-libs/openssl:0
-	net-dialup/ppp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK"
-DOCS=( AUTHORS ChangeLog DEVELOPERS INSTALL NEWS README TODO USING )
-
-pkg_setup() {
-	enewgroup sstpc
-	enewuser sstpc -1 -1 -1 sstpc
-}
-
-src_prepare() {
-	# set proper examples dir, --docdir overriding in src_configure does not work
-	sed -i -e "/^docdir/s:@PACKAGE@:${PF}/examples:" Makefile.am || die 'sed on Makefile.am failed'
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local PPPD_VER="$(best_version net-dialup/ppp)"
-	PPPD_VER=${PPPD_VER#*/*-} 		# reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*}		# main version without beta/pre/patch/revision
-	econf \
-		--enable-ppp-plugin \
-		--enable-group=sstpc \
-		--enable-user=sstpc \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
-		--with-runtime-dir="/run/sstpc" \
-		$(use_enable static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild b/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild
new file mode 100644
index 000000000000..9fb40250d367
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.12-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="static"
+
+DEPEND="
+	dev-libs/libevent:=
+	dev-libs/openssl:0=
+	net-dialup/ppp:=
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/sstpc
+	acct-user/sstpc
+"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=(
+	"${FILESDIR}/${P}-remove-network-test.patch"
+	"${FILESDIR}/${P}-fix-example.patch"
+)
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER=${PPPD_VER#*/*-}	# reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*}	# main version without beta/pre/patch/revision
+
+	local myeconfargs=(
+		--enable-ppp-plugin
+		--enable-group=sstpc
+		--enable-user=sstpc
+		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+		--with-runtime-dir="/run/sstpc"
+		$(use_enable static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-misc/sstp-client/sstp-client-1.0.12.ebuild b/net-misc/sstp-client/sstp-client-1.0.12.ebuild
deleted file mode 100644
index 767cbdd4709c..000000000000
--- a/net-misc/sstp-client/sstp-client-1.0.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info user
-
-DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol (SSTP)"
-HOMEPAGE="http://sstp-client.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="static"
-
-RDEPEND=">=dev-libs/libevent-2.0.10
-	dev-libs/openssl:0=
-	net-dialup/ppp:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK"
-
-PATCHES=( "${FILESDIR}/${P}-remove-network-test.patch"
-	  "${FILESDIR}/${P}-fix-example.patch"
-)
-DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
-
-pkg_setup() {
-	enewgroup sstpc
-	enewuser sstpc -1 -1 -1 sstpc
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local PPPD_VER="$(best_version net-dialup/ppp)"
-	PPPD_VER=${PPPD_VER#*/*-}		# reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%[_-]*}		# main version without beta/pre/patch/revision
-	econf \
-		--enable-ppp-plugin \
-		--enable-group=sstpc \
-		--enable-user=sstpc \
-		--with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
-		--with-runtime-dir="/run/sstpc" \
-		$(use_enable static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}