gentoo resync : 01.01.2018

3 files changed, 15 insertions, 14 deletions

diff --git a/net-misc/ipsvd/Manifest b/net-misc/ipsvd/Manifest
index b05a0dfdf0e5..63ab95b81545 100644
--- a/net-misc/ipsvd/Manifest
+++ b/net-misc/ipsvd/Manifest
@@ -1,4 +1,4 @@
-AUX ipsvd-1.0.0-fix-parallel-make.diff 1442 BLAKE2B 00162fdc454576fbe2be4ef489b42e5abf9744c236b968a6b933ead874f0099ef540fffa1963cbc864da29fa0e925799780a94dba017544baadabdfc0ec0d854 SHA512 f28e2f8f5bb857cf20df144aa45172c9b28b4b78c71eb27fe3a082395edcf01b526cb47a9a6bc74e53c157d87e28be311607a30576f433385e1a83ed0d3b7b3a
+AUX ipsvd-1.0.0-fix-parallel-make.diff 1449 BLAKE2B 0d90bda1f86bbc0ee5aaa3136b3e72b55d660198178eb40fd5dc715f55d738289ae0c24f50c8e7038e69bdae0c45c61c61ba723228b790c699edd91686d52c08 SHA512 7e6906eb0814d841752e3b8ec36320ec7bac5c8cc0481bfc8630e77ffddd883a5c54b8d8495df4e99f3d9486b66dcb06094f5619a064c3f9b065780a10deb624
 DIST ipsvd-1.0.0.tar.gz 77903 BLAKE2B a69154465ac5e6bb8246863f0b602b2a5705b54eab76b63e3f555597470dee97531d34abb72f190d6b3536c5c75de8c97e45138d7d38e06bd8018d92c2df1a42 SHA512 cbdb461bd5952d3533e1cbf23b4820cea12ec9f96b7c47796304260d8bf201764b95602364102d92e3feb7bf4275d22d8d6447f09a6788cf5cf17371be34b736
-EBUILD ipsvd-1.0.0-r1.ebuild 953 BLAKE2B 3d2ebe7ee417102627f3c8a7d8797b7f9ad51d829b423e484ffefc4b31db91b1a041568fb05ecc7280265bb60f43e875207a249e5603041815236ed051be205d SHA512 0315f73e2428837fcde43d7e16dba645ad5bc02a601fbc00627a98cc9a59c402102b09ca99ad552f0fe264cc54374119089eec7d2099374cdbfb0f4b70b59310
+EBUILD ipsvd-1.0.0-r2.ebuild 897 BLAKE2B 821e8bc31a2d2f9bc6d7f77dc6e7279efbd3eb01c1dc497011daf1e7d598da9ba46e995be45ac36dd2e1a8f4aae00b577fedef53071ad22e0cf675ed208e477f SHA512 731ff9d0543b03567409136828a1f037c06f1a5e682ca44395ca82f352ff1a411698d74d1c897e197a8002e54258f888d13fb5c2d33b01cc9cd1b5cea23d57e3
 MISC metadata.xml 1213 BLAKE2B 3f6fe32492e8941ec6ea1c6fc3ccd515ab473841124121a4ab384b0adc23b84b4973025dae944bc98d325e5d6322787a49fad9f9a5f127df0913475bb471166f SHA512 c80b068e9fb9ec3d63bb13c41386f119b448bcfaa3a7173483ef46c13fb8fd1c142cb4e4eeaaf73d25331326e5a8002d9545ae235bee244d9b272ea710adc456
diff --git a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
index 0b29a8e8cbb1..2f770e27061d 100644
--- a/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
+++ b/net-misc/ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-01-21 00:43:02.000000000 +0100
-+++ Makefile	2011-01-21 00:47:27.000000000 +0100
+--- a/src/Makefile	2011-01-21 00:43:02.000000000 +0100
++++ b/src/Makefile	2011-01-21 00:47:27.000000000 +0100
 @@ -61,7 +61,7 @@
  check-ipsvd-cdb: load check-ipsvd-cdb.o uint32_unpack.o unix.a byte.a
  	./load check-ipsvd-cdb uint32_unpack.o unix.a byte.a
diff --git a/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild b/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
index 4540eca6c7df..2b0e4522e88a 100644
--- a/net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
+++ b/net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="ipsvd is a set of internet protocol service daemons for Unix"
 HOMEPAGE="http://smarden.org/ipsvd/"
@@ -19,10 +19,9 @@ RDEPEND=""
 
 S="${WORKDIR}/net/${P}"
 
-src_prepare() {
-	cd "${S}"/src
-	epatch "${FILESDIR}"/${P}-fix-parallel-make.diff
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-parallel-make.diff
+)
 
 src_configure() {
 	cd "${S}"/src
@@ -36,14 +35,16 @@ src_configure() {
 
 src_compile() {
 	cd "${S}"/src
-	emake || die "make failed"
+	emake
 }
 
 src_install() {
-	dobin src/{tcpsvd,udpsvd,ipsvd-cdb} || die "dobin"
+	dobin src/{tcpsvd,udpsvd,ipsvd-cdb}
 	dodoc package/{CHANGES,README}
 
-	dohtml doc/*.html
 	doman man/ipsvd-instruct.5 man/ipsvd.7 man/udpsvd.8 \
 		man/tcpsvd.8 man/ipsvd-cdb.8
+
+	insinto html
+	dohtml doc/*.html
 }