[gentoo-commits] repo/gentoo:master commit in: net-misc/linux-eoip/files/, net-misc/linux-eoip/

[gentoo-commits] repo/gentoo:master commit in: net-misc/linux-eoip/files/, net-misc/linux-eoip/

[David Seifert]

commit:     482cab22f07db0dba2bf9117ca8a1f9ef9ee20e4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 16:31:28 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 16:31:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482cab22

net-misc/linux-eoip: Port to EAPI 7

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/linux-eoip-0.5-sbin-automake.patch       | 11 +++++++++++
 net-misc/linux-eoip/linux-eoip-0.5.ebuild          | 22 +++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)

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
new file mode 100644
index 00000000000..e350544fe09
--- /dev/null
+++ b/net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = subdir-objects
+ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
+ 
+-bin_PROGRAMS = eoip vip
++sbin_PROGRAMS = eoip vip
+ 
+ eoip_SOURCES = eoip.c minIni.c
+ vip_SOURCES = vip.c minIni.c

diff --git a/net-misc/linux-eoip/linux-eoip-0.5.ebuild b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
index 715474cb94c..a98facb6429 100644
--- a/net-misc/linux-eoip/linux-eoip-0.5.ebuild
+++ b/net-misc/linux-eoip/linux-eoip-0.5.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
+EAPI=7
 
-inherit eutils autotools-utils vcs-clean
+inherit autotools vcs-clean
 
 DESCRIPTION="Linux support for proprietary MIkrotik EoIP protocol"
 HOMEPAGE="https://code.google.com/p/linux-eoip/"
@@ -14,23 +12,21 @@ SRC_URI="https://linux-eoip.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	dev-libs/lzo:2
-	"
+RDEPEND="dev-libs/lzo:2"
+DEPEND="${RDEPEND}"
 
-RDEPEND="${DEPEND}"
-DOCS=( README )
+PATCHES=( "${FILESDIR}"/${P}-sbin-automake.patch )
 
 src_prepare() {
+	default
 	esvn_clean
-	sed -e 's/bin_PROGRAMS/sbin_PROGRAMS/g' -i Makefile.am
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	insinto /etc
 	doins vip.cfg eoip.cfg
 }