www-servers/fnord: EAPI 3 -> 6

Closes: https://github.com/gentoo/gentoo/pull/6427
Package-Manager: Portage-2.3.16, Repoman-2.3.6

diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 5e40e6a020f6a49276467c322dab70177cf1aa8e..987a39a09f337de3861cc28499bb1cd3d470eec0 100644 (file)
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,2 +1,2 @@
 DIST fnord-1.10.tar.bz2 33408 SHA256 39a878e910d569fbf3909d8efe7ec6dd85c9484711b0d748b51012a15ddf3cc7 SHA512 45c584844de9d26aad0e6ff0a08a27aacb1f27e5a0128f43758622d41183cc92c483ef85cc84421afd2107b4c2838b167ab0788031499b2f18c3df861c05dfbd WHIRLPOOL 316aebcc2b3dd38d4157974599338564898a6df34bc20b5806a9f0a6250b7aa968e2142a91d38134156a7c5325069f69d4f609b7b8fec2048198eefa93d0e218
-DIST fnord-1.11.tar.bz2 28845 SHA256 896f734b589b52a145dbb1d268f41ae94eff90529db36658a66eda3aada21d35 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154 WHIRLPOOL b6d644b6689f1b90bec777ae0d85852767ba7f83e69420590645883ce81e2d8f72debf1d993e061fb984a01936ecb001b31f212d281d7847c736cb9b00259a2e
+DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154

diff --git a/www-servers/fnord/fnord-1.11.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
similarity index 58%
rename from www-servers/fnord/fnord-1.11.ebuild
rename to www-servers/fnord/fnord-1.11-r1.ebuild
index fa335779fa4b2fae28833d8111f77d05e276ff92..d758fdc2ba56cd84fc79c8fde92d1c39128c6f6a 100644 (file)
--- a/www-servers/fnord/fnord-1.11.ebuild
+++ b/www-servers/fnord/fnord-1.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs user
+inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="Yet another small httpd"
 HOMEPAGE="http://www.fefe.de/fnord/"
@@ -19,28 +19,25 @@ RDEPEND="${DEPEND}
        virtual/daemontools
        sys-apps/ucspi-tcp"
 
+DOCS=( TODO README README.auth SPEED CHANGES )
+PATCHES=( "${FILESDIR}/${PN}"-1.10-gentoo.diff )
+
 pkg_setup() {
        enewgroup nofiles 200
        enewuser fnord -1 -1 /etc/fnord nofiles
        enewuser fnordlog -1 -1 /etc/fnord nofiles
 }
 
-src_prepare() {
-       epatch "${FILESDIR}/${PN}"-1.10-gentoo.diff
-}
-
 src_compile() {
        # Fix for bug #45716
-       replace-sparc64-flags
+       use sparc && replace-sparc64-flags
 
-       use auth && \
-               append-flags -DAUTH
+       use auth && append-flags -DAUTH
 
-       emake DIET="" CC=$(tc-getCC) \
-               CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+       emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install () {
-       dobin fnord-conf fnord || die
-       dodoc TODO README* SPEED CHANGES
+       dobin fnord-conf fnord
+       einstalldocs
 }