Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/linux-eoip/files/, net-misc/linux-eoip/
Date: Sat, 29 Aug 2020 16:32:33
Message-Id: 1598718688.482cab22f07db0dba2bf9117ca8a1f9ef9ee20e4.soap@gentoo
1 commit: 482cab22f07db0dba2bf9117ca8a1f9ef9ee20e4
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 29 16:31:28 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 29 16:31:28 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482cab22
7
8 net-misc/linux-eoip: Port to EAPI 7
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 .../files/linux-eoip-0.5-sbin-automake.patch | 11 +++++++++++
14 net-misc/linux-eoip/linux-eoip-0.5.ebuild | 22 +++++++++-------------
15 2 files changed, 20 insertions(+), 13 deletions(-)
16
17 diff --git a/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch b/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch
18 new file mode 100644
19 index 00000000000..e350544fe09
20 --- /dev/null
21 +++ b/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch
22 @@ -0,0 +1,11 @@
23 +--- a/Makefile.am
24 ++++ b/Makefile.am
25 +@@ -1,7 +1,7 @@
26 + AUTOMAKE_OPTIONS = subdir-objects
27 + ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
28 +
29 +-bin_PROGRAMS = eoip vip
30 ++sbin_PROGRAMS = eoip vip
31 +
32 + eoip_SOURCES = eoip.c minIni.c
33 + vip_SOURCES = vip.c minIni.c
34
35 diff --git a/net-misc/linux-eoip/linux-eoip-0.5.ebuild b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
36 index 715474cb94c..a98facb6429 100644
37 --- a/net-misc/linux-eoip/linux-eoip-0.5.ebuild
38 +++ b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
39 @@ -1,11 +1,9 @@
40 # Copyright 1999-2020 Gentoo Authors
41 # Distributed under the terms of the GNU General Public License v2
42
43 -EAPI=4
44 -AUTOTOOLS_AUTORECONF=1
45 -AUTOTOOLS_IN_SOURCE_BUILD=1
46 +EAPI=7
47
48 -inherit eutils autotools-utils vcs-clean
49 +inherit autotools vcs-clean
50
51 DESCRIPTION="Linux support for proprietary MIkrotik EoIP protocol"
52 HOMEPAGE="https://code.google.com/p/linux-eoip/"
53 @@ -14,23 +12,21 @@ SRC_URI="https://linux-eoip.googlecode.com/files/${P}.tgz"
54 LICENSE="GPL-2"
55 SLOT="0"
56 KEYWORDS="~amd64 ~x86"
57 -IUSE=""
58
59 -DEPEND="
60 - dev-libs/lzo:2
61 - "
62 +RDEPEND="dev-libs/lzo:2"
63 +DEPEND="${RDEPEND}"
64
65 -RDEPEND="${DEPEND}"
66 -DOCS=( README )
67 +PATCHES=( "${FILESDIR}"/${P}-sbin-automake.patch )
68
69 src_prepare() {
70 + default
71 esvn_clean
72 - sed -e 's/bin_PROGRAMS/sbin_PROGRAMS/g' -i Makefile.am
73 - autotools-utils_src_prepare
74 + eautoreconf
75 }
76
77 src_install() {
78 - autotools-utils_src_install
79 + default
80 +
81 insinto /etc
82 doins vip.cfg eoip.cfg
83 }