From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 net-misc/vmpsd/Manifest                           |  3 +-
 net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch | 11 +++++++
 net-misc/vmpsd/vmpsd-1.4.ebuild                   | 38 ++++++++++++++---------
 3 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch

(limited to 'net-misc/vmpsd')

diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index bf4ee039f581..99bca4dee440 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,5 +1,6 @@
 AUX vmpsd-1.3-64bit.patch 910 BLAKE2B 1f4fc71e6a0e1f7f0c51938d7e25487ac364054f517bba350ed2805c09059674d706fa7b536ec29a5d5ce836ebf72ffae4342dfdf3e883bb88680f032627b7b0 SHA512 45fc49fe1412760ecb45811c01e86406c4103492c5a29b99d8953dcca388c58ad157b4200a2fb9adaf73488746b8d16b168cad9dc5ae95e1e618de7490fb8b7d
+AUX vmpsd-1.4-Wreturn-type.patch 174 BLAKE2B 4d016ef840c7bef378b1350d48809935ee603bc0ac914b62fd377251145cc35bd0b3920193e58c93e2436f7cec58b57e7f1f61c6d5a39cd065952eada48dc9d3 SHA512 bf62ca7d214e5fe0e09ed7f645c36abff299db7cf3360244a881e34048b24a35c17a4d1288a1d97e4c1ef8fd9dd042c400eb9623b2eacae95264332e0910c137
 AUX vmpsd-1.4-snmp-support.patch 2237 BLAKE2B ef6f80dcdd72435d40ff36509c3aa82f71d78312575db02697b7d3dc9c3cceeeee737d8154cbb798deae89a9a24a5070f4d09835fd8d7fa6069f70358f225cc9 SHA512 fd3b9327b07d87d04d9b2f407ceb1e6c1ef64fca0ba63ae040c10e1c46739a487423a3e54fdb228a3210573fbe76faf5a0d4c7f3a4e84eeb80fb74543e42c027
 DIST vmpsd-1.4.tar.gz 92138 BLAKE2B 5fdca60762eb1fca02d95c5022a81b9d28a0266d694dbb40adc1a70e109295ab2f2914f2083f356b372161467df78c35ba28984e6febc4857501e73bd54bb860 SHA512 341a86f8db28f1f7a03b5581ec8f8319a175a2c5dc9c7ff5df880f4416cf048ef9e32afd6600220e48f8713d6c72c4ffae7d1e8d31c73ded466f084711580efd
-EBUILD vmpsd-1.4.ebuild 950 BLAKE2B b77a4a09cfef6a3561990d546377f7cb1c6a8c1c95a8b4bc6b7f1c9064be992e1fc43c7d4f973324bdff3ff3479049c00542df2ef01b32b3449883bd027e5a5e SHA512 705c1ad338c8904df7a81f579e2d063f5f761be18ca7dd39cb14dd13d2d75f13af6aa69cf065995cd5ae8d4e9f4883fb35d4b258a5f4a169b85010666a3a6bcc
+EBUILD vmpsd-1.4.ebuild 899 BLAKE2B 86862067ae11c4e416d7509be78f0e9533dff04b30a2d01b17207e306334b951d836ef2153682d68700e804c8433943dfb755f32a7ff5516e5a5993caf9e44ee SHA512 98e2f90826e246cd4a08693a1c4437e89bd5fd01a1d620f77920f5cb5ea0b51037055b57ef4c113bebde6ea9c7c18a47edddc349a7aa88aeca1cf5d5c97c51c4
 MISC metadata.xml 300 BLAKE2B da1056fac1eedc839ac074dce8ba79accd5a592d9c2c4b517e30c80fd977dd899da89b6b8be113f7ceee4ee908b3b1a246f38a698a5d570bc84e898779d8e5e3 SHA512 02b5627182dd5c4adfa3dbcce0c19c4a5d1dce64061cdb2843e133c168c4e8203c8a37a8da80fb04a0c9fb5a3b6b80be2cb6e8453839db39dc5cf3bd0fe51e03
diff --git a/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch b/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch
new file mode 100644
index 000000000000..e6354c902c12
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.4-Wreturn-type.patch
@@ -0,0 +1,11 @@
+--- a/data.c
++++ b/data.c
+@@ -35,7 +35,7 @@
+ 	exit(1);
+ }
+ 
+-void *xfree(void *p) {
++void xfree(void *p) {
+ 
+ 	if (p == NULL) return;
+ 	vmps_log(DEBUG|SYSTEM, "FREE: %x",p);
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
index e2dd42654288..242eeee574a7 100644
--- a/net-misc/vmpsd/vmpsd-1.4.ebuild
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -1,40 +1,48 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic autotools
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="An open-source VLAN management system"
 HOMEPAGE="http://vmps.sourceforge.net"
 SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="net-analyzer/net-snmp[ucd-compat(+)]
+
+RDEPEND="net-analyzer/net-snmp:=[ucd-compat(+)]"
+DEPEND="
+	${RDEPEND}
 	dev-libs/openssl"
-S=${WORKDIR}/${PN}
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-snmp-support.patch
+	"${FILESDIR}"/${PN}-1.3-64bit.patch
+	"${FILESDIR}"/${PN}-1.4-Wreturn-type.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4-snmp-support.patch
-	epatch "${FILESDIR}"/${PN}-1.3-64bit.patch
-	# Merged upstream
-	#EPATCH_OPTS="-d${S}" \
-	#epatch "${FILESDIR}"/${PN}-1.3-format-sec.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--sysconfdir=/etc/vmpsd \
+		--sysconfdir="${EPREFIX}"/etc/vmpsd \
 		--enable-snmp \
 		LIBS="-lssl"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README INSTALL AUTHORS doc/*txt
+	default
+
+	dodoc doc/*txt external/simple tools/vqpcli.pl
 	newdoc external/README README.external
 	newdoc tools/README README.tools
-	dodoc external/simple tools/vqpcli.pl
 }
-- 
cgit v1.2.3