[gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-l2tp/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     adcc03ee7b5281d4788974d59b77a3438a0784ea
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  9 03:36:28 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct  9 03:45:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adcc03ee

net-dialup/rp-l2tp: EAPI6->8, adjust license

This is GPL-2+ but still need GPL-2 for the init script which is our
own thing and would rather be represented separately.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
index 7d468429c0ac..4f1409b76517 100644
--- a/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
+++ b/net-dialup/rp-l2tp/rp-l2tp-0.4-r4.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="User-space implementation of L2TP for Linux and other UNIX systems"
 HOMEPAGE="https://sourceforge.net/projects/rp-l2tp/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
+LICENSE="GPL-2+ GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo.patch"
@@ -20,18 +21,20 @@ PATCHES=(
 )
 
 src_prepare() {
-	tc-export AR CC RANLIB
 	default
+
+	tc-export AR CC
 }
 
 src_install() {
 	emake RPM_INSTALL_ROOT="${D}" install
-
 	einstalldocs
+
 	newdoc l2tp.conf rp-l2tpd.conf
+
 	docinto libevent
-	dodoc libevent/Doc/*
-	docompress -x "/usr/share/doc/${PF}/libevent"
+	dodoc -r libevent/Doc/.
+	docompress -x /usr/share/doc/${PF}/libevent
 
-	newinitd "${FILESDIR}/rp-l2tpd-init" rp-l2tpd
+	newinitd "${FILESDIR}"/rp-l2tpd-init rp-l2tpd
 }