From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 net-misc/linux-eoip/Manifest                       |  3 ++-
 .../files/linux-eoip-0.5-sbin-automake.patch       | 11 +++++++++++
 net-misc/linux-eoip/linux-eoip-0.5.ebuild          | 22 +++++++++-------------
 3 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 net-misc/linux-eoip/files/linux-eoip-0.5-sbin-automake.patch

(limited to 'net-misc/linux-eoip')

diff --git a/net-misc/linux-eoip/Manifest b/net-misc/linux-eoip/Manifest
index 51247c378625..56405153ae58 100644
--- a/net-misc/linux-eoip/Manifest
+++ b/net-misc/linux-eoip/Manifest
@@ -1,3 +1,4 @@
+AUX linux-eoip-0.5-sbin-automake.patch 246 BLAKE2B 0ecd83c8d11a22dfd3e7204c08c2851cf642e310f77634dd7c2cb6e6a6eb7175a6553b9297e61cea2d479f122d135853ae00a6182891b6960830696fd5d66f80 SHA512 8c658c75a137104bf3bf903dd87b44635885ed35ba5c17bb4e33b0b7201b73cbf9d9be5de9afa0cd49fb1a01c987c1461f17ed87606b6376105de56dc5048993
 DIST linux-eoip-0.5.tgz 657013 BLAKE2B a6e49d2c342c94b354e1bb35950b3cfd815c8063854a836c1a8bded7ff8b0c745f8d244f34b671843e48a8867f4a0e2df808412066871d0cc1986ec19631ce25 SHA512 a8ed24a0bc4bf6dc97b125ece4ec6b46d20ee1aa09a21f7127854394c085143d4cf1d973e544869bbe6da6de86df7ee6c6901ca1e0dcf9c1610d5d35fdeea7c0
-EBUILD linux-eoip-0.5.ebuild 706 BLAKE2B 26c86fff637f352e3528714109273eb7fcb09975bac17b95280aee632e2daa931897226ed5a9b4f6c1077c78a547bf729c5ce17e6674bc7b1d585ffd63181b5d SHA512 ce42632e8e60a0442eea4685906c437624d90ba692f72e3a3be22ee9591b00aa67c99e290bc4bd24b5480c209c43960864505ad9f49c38bbf066fe25af247a4d
+EBUILD linux-eoip-0.5.ebuild 584 BLAKE2B ce4f3da6a401f16f4de230f8d27276f1df55e50423f3eec2dbd1fc5d9a5a9fb2cf8f5e6c2e050d1b3ee930b64014fd26a440904045c4c75e0c94ac8f00d64c23 SHA512 11eeb55509c520b82a13d5eaa5e6d55b35da170121fe928415c04ea3f92b989e9f5ddc2bbdfb32a8b989dc3ced29478f8132b8760aca0f3fb582e03bd3e05184
 MISC metadata.xml 374 BLAKE2B b86ee967f256dbc5d33fe73314a2ac75e75b74e363457a2183c32d0a887d063067eb6f07565f430a99a563c6e6f37b7aa0e303c1fead29ee4fcbaf069f1e9ebb SHA512 04c13ccf8492060efa30661a15a80d93655aaf5dafc3135734b3f229912ea5dd52ab0b51fe370e05881a26d6c65514bf5edf9ee547a6ed1b0bf4763dd89fef42
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 000000000000..e350544fe09f
--- /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 715474cb94c2..a98facb6429e 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
 }
-- 
cgit v1.2.3