[gentoo-commits] dev/bircoph:master commit in: net-dialup/openl2tp/, net-dialup/openl2tp/files/

[gentoo-commits] dev/bircoph:master commit in: net-dialup/openl2tp/, net-dialup/openl2tp/files/

[Andrew Savchenko]

commit:     85d2785d46a2f30eb4ebe0fc4f29d4bfeb2b01c8
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 07:24:47 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 07:24:47 2016 +0000
URL:        https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=85d2785d

net-dialup/openl2tp: EAPI 6 bump

- update to EAPI 6
- switch to openrc-run

 .../openl2tp/files/{openl2tpd.initd-2 => openl2tpd.initd}   |  4 ++--
 net-dialup/openl2tp/metadata.xml                            |  6 +++---
 .../{openl2tp-1.8-r5.ebuild => openl2tp-1.8-r6.ebuild}      | 13 ++++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/net-dialup/openl2tp/files/openl2tpd.initd-2 b/net-dialup/openl2tp/files/openl2tpd.initd
similarity index 96%
rename from net-dialup/openl2tp/files/openl2tpd.initd-2
rename to net-dialup/openl2tp/files/openl2tpd.initd
index c584897..67489cc 100644
--- a/net-dialup/openl2tp/files/openl2tpd.initd-2
+++ b/net-dialup/openl2tp/files/openl2tpd.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 userpc="yes"

diff --git a/net-dialup/openl2tp/metadata.xml b/net-dialup/openl2tp/metadata.xml
index 71b0433..6cc232d 100644
--- a/net-dialup/openl2tp/metadata.xml
+++ b/net-dialup/openl2tp/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>bircoph@gentoo.org</email>
-  <name>Andrew Savchenko</name>
+<maintainer type="person">
+	<email>bircoph@gentoo.org</email>
+	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
   <flag name='client'>Enable l2tp client</flag>

diff --git a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r6.ebuild
similarity index 93%
rename from net-dialup/openl2tp/openl2tp-1.8-r5.ebuild
rename to net-dialup/openl2tp/openl2tp-1.8-r6.ebuild
index 3bfd672..328868d 100644
--- a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild
+++ b/net-dialup/openl2tp/openl2tp-1.8-r6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=6
 
-inherit base linux-info
+inherit linux-info
 
 DESCRIPTION="Userspace tools for kernel L2TP implementation"
 HOMEPAGE="http://www.openl2tp.org/"
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+client doc +examples rpc server -stats"
 
 REQUIRED_USE="|| ( client server )"
 
 CDEPEND=">=net-dialup/ppp-2.4.5
-	sys-libs/readline
+	sys-libs/readline:=
 	"
 DEPEND="${CDEPEND}
 	sys-devel/bison
@@ -71,7 +71,6 @@ src_compile() {
 
 src_install() {
 	emake ${myconf} DESTDIR="${D}" install
-	dodoc CHANGES INSTALL README
 
 	if use examples; then
 		docinto event_socket
@@ -86,7 +85,7 @@ src_install() {
 		dodoc -r ipsec
 	fi
 
-	newinitd "${FILESDIR}"/openl2tpd.initd-2 openl2tpd
+	newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd
 	# init.d script is quite different for RPC and non-RPC versions.
 	use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ "${D}/etc/init.d/openl2tpd" || die "sed failed"
 	newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd