1 |
commit: 85d2785d46a2f30eb4ebe0fc4f29d4bfeb2b01c8 |
2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 31 07:24:47 2016 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 31 07:24:47 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=85d2785d |
7 |
|
8 |
net-dialup/openl2tp: EAPI 6 bump |
9 |
|
10 |
- update to EAPI 6 |
11 |
- switch to openrc-run |
12 |
|
13 |
.../openl2tp/files/{openl2tpd.initd-2 => openl2tpd.initd} | 4 ++-- |
14 |
net-dialup/openl2tp/metadata.xml | 6 +++--- |
15 |
.../{openl2tp-1.8-r5.ebuild => openl2tp-1.8-r6.ebuild} | 13 ++++++------- |
16 |
3 files changed, 11 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/net-dialup/openl2tp/files/openl2tpd.initd-2 b/net-dialup/openl2tp/files/openl2tpd.initd |
19 |
similarity index 96% |
20 |
rename from net-dialup/openl2tp/files/openl2tpd.initd-2 |
21 |
rename to net-dialup/openl2tp/files/openl2tpd.initd |
22 |
index c584897..67489cc 100644 |
23 |
--- a/net-dialup/openl2tp/files/openl2tpd.initd-2 |
24 |
+++ b/net-dialup/openl2tp/files/openl2tpd.initd |
25 |
@@ -1,5 +1,5 @@ |
26 |
-#!/sbin/runscript |
27 |
-# Copyright 1999-2012 Gentoo Foundation |
28 |
+#!/sbin/openrc-run |
29 |
+# Copyright 1999-2016 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
userpc="yes" |
33 |
|
34 |
diff --git a/net-dialup/openl2tp/metadata.xml b/net-dialup/openl2tp/metadata.xml |
35 |
index 71b0433..6cc232d 100644 |
36 |
--- a/net-dialup/openl2tp/metadata.xml |
37 |
+++ b/net-dialup/openl2tp/metadata.xml |
38 |
@@ -1,9 +1,9 @@ |
39 |
<?xml version="1.0" encoding="UTF-8"?> |
40 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
41 |
<pkgmetadata> |
42 |
-<maintainer> |
43 |
- <email>bircoph@g.o</email> |
44 |
- <name>Andrew Savchenko</name> |
45 |
+<maintainer type="person"> |
46 |
+ <email>bircoph@g.o</email> |
47 |
+ <name>Andrew Savchenko</name> |
48 |
</maintainer> |
49 |
<use> |
50 |
<flag name='client'>Enable l2tp client</flag> |
51 |
|
52 |
diff --git a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r6.ebuild |
53 |
similarity index 93% |
54 |
rename from net-dialup/openl2tp/openl2tp-1.8-r5.ebuild |
55 |
rename to net-dialup/openl2tp/openl2tp-1.8-r6.ebuild |
56 |
index 3bfd672..328868d 100644 |
57 |
--- a/net-dialup/openl2tp/openl2tp-1.8-r5.ebuild |
58 |
+++ b/net-dialup/openl2tp/openl2tp-1.8-r6.ebuild |
59 |
@@ -1,10 +1,10 @@ |
60 |
-# Copyright 1999-2013 Gentoo Foundation |
61 |
+# Copyright 1999-2016 Gentoo Foundation |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
# $Header: $ |
64 |
|
65 |
-EAPI=4 |
66 |
+EAPI=6 |
67 |
|
68 |
-inherit base linux-info |
69 |
+inherit linux-info |
70 |
|
71 |
DESCRIPTION="Userspace tools for kernel L2TP implementation" |
72 |
HOMEPAGE="http://www.openl2tp.org/" |
73 |
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/openl2tp/${P}.tar.gz" |
74 |
|
75 |
LICENSE="GPL-2" |
76 |
SLOT="0" |
77 |
-KEYWORDS="amd64 x86" |
78 |
+KEYWORDS="~amd64 ~x86" |
79 |
IUSE="+client doc +examples rpc server -stats" |
80 |
|
81 |
REQUIRED_USE="|| ( client server )" |
82 |
|
83 |
CDEPEND=">=net-dialup/ppp-2.4.5 |
84 |
- sys-libs/readline |
85 |
+ sys-libs/readline:= |
86 |
" |
87 |
DEPEND="${CDEPEND} |
88 |
sys-devel/bison |
89 |
@@ -71,7 +71,6 @@ src_compile() { |
90 |
|
91 |
src_install() { |
92 |
emake ${myconf} DESTDIR="${D}" install |
93 |
- dodoc CHANGES INSTALL README |
94 |
|
95 |
if use examples; then |
96 |
docinto event_socket |
97 |
@@ -86,7 +85,7 @@ src_install() { |
98 |
dodoc -r ipsec |
99 |
fi |
100 |
|
101 |
- newinitd "${FILESDIR}"/openl2tpd.initd-2 openl2tpd |
102 |
+ newinitd "${FILESDIR}"/openl2tpd.initd openl2tpd |
103 |
# init.d script is quite different for RPC and non-RPC versions. |
104 |
use rpc || sed -i s/userpc=\"yes\"/userpc=\"no\"/ "${D}/etc/init.d/openl2tpd" || die "sed failed" |
105 |
newconfd "${FILESDIR}"/openl2tpd.confd openl2tpd |