From b99d3eb3e5d017e7812e0605c28beeb800d99619 Mon Sep 17 00:00:00 2001
From: Harri Nieminen <moikkis@gmail.com>
Date: Sun, 3 Dec 2017 18:25:55 +0200
Subject: www-servers/fnord: EAPI 3 -> 6

Closes: https://github.com/gentoo/gentoo/pull/6427
Package-Manager: Portage-2.3.16, Repoman-2.3.6
---
 www-servers/fnord/Manifest             |  2 +-
 www-servers/fnord/fnord-1.11-r1.ebuild | 43 +++++++++++++++++++++++++++++++
 www-servers/fnord/fnord-1.11.ebuild    | 46 ----------------------------------
 3 files changed, 44 insertions(+), 47 deletions(-)
 create mode 100644 www-servers/fnord/fnord-1.11-r1.ebuild
 delete mode 100644 www-servers/fnord/fnord-1.11.ebuild

(limited to 'www-servers/fnord')

diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 5e40e6a020f6..987a39a09f33 100644
--- 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-r1.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
new file mode 100644
index 000000000000..d758fdc2ba56
--- /dev/null
+++ b/www-servers/fnord/fnord-1.11-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs user
+
+DESCRIPTION="Yet another small httpd"
+HOMEPAGE="http://www.fefe.de/fnord/"
+SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="auth"
+
+DEPEND=""
+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_compile() {
+	# Fix for bug #45716
+	use sparc && replace-sparc64-flags
+
+	use auth && append-flags -DAUTH
+
+	emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin fnord-conf fnord
+	einstalldocs
+}
diff --git a/www-servers/fnord/fnord-1.11.ebuild b/www-servers/fnord/fnord-1.11.ebuild
deleted file mode 100644
index fa335779fa4b..000000000000
--- a/www-servers/fnord/fnord-1.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs user
-
-DESCRIPTION="Yet another small httpd"
-HOMEPAGE="http://www.fefe.de/fnord/"
-SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="auth"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	virtual/daemontools
-	sys-apps/ucspi-tcp"
-
-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 auth && \
-		append-flags -DAUTH
-
-	emake DIET="" CC=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install () {
-	dobin fnord-conf fnord || die
-	dodoc TODO README* SPEED CHANGES
-}
-- 
cgit v1.2.3-18-g5258