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

[Andreas Hüttel]

commit:     c87ca5eddea55a56a618e37ac0014f582f9a65b2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 16:57:11 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 16:57:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87ca5ed

net-misc/ipsvd: EAPI bump, bug 605728

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../ipsvd/files/ipsvd-1.0.0-fix-parallel-make.diff  |  4 ++--
 ...{ipsvd-1.0.0-r1.ebuild => ipsvd-1.0.0-r2.ebuild} | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

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 0b29a8e8cbb..2f770e27061 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
similarity index 73%
rename from net-misc/ipsvd/ipsvd-1.0.0-r1.ebuild
rename to net-misc/ipsvd/ipsvd-1.0.0-r2.ebuild
index 4540eca6c7d..2b0e4522e88 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
 }