Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/fnord/
Date: Wed, 06 Dec 2017 12:28:48
Message-Id: 1512563316.b99d3eb3e5d017e7812e0605c28beeb800d99619.kensington@gentoo
1 commit: b99d3eb3e5d017e7812e0605c28beeb800d99619
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 3 16:25:55 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 6 12:28:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99d3eb3
7
8 www-servers/fnord: EAPI 3 -> 6
9
10 Closes: https://github.com/gentoo/gentoo/pull/6427
11 Package-Manager: Portage-2.3.16, Repoman-2.3.6
12
13 www-servers/fnord/Manifest | 2 +-
14 .../{fnord-1.11.ebuild => fnord-1.11-r1.ebuild} | 25 ++++++++++------------
15 2 files changed, 12 insertions(+), 15 deletions(-)
16
17 diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
18 index 5e40e6a020f..987a39a09f3 100644
19 --- a/www-servers/fnord/Manifest
20 +++ b/www-servers/fnord/Manifest
21 @@ -1,2 +1,2 @@
22 DIST fnord-1.10.tar.bz2 33408 SHA256 39a878e910d569fbf3909d8efe7ec6dd85c9484711b0d748b51012a15ddf3cc7 SHA512 45c584844de9d26aad0e6ff0a08a27aacb1f27e5a0128f43758622d41183cc92c483ef85cc84421afd2107b4c2838b167ab0788031499b2f18c3df861c05dfbd WHIRLPOOL 316aebcc2b3dd38d4157974599338564898a6df34bc20b5806a9f0a6250b7aa968e2142a91d38134156a7c5325069f69d4f609b7b8fec2048198eefa93d0e218
23 -DIST fnord-1.11.tar.bz2 28845 SHA256 896f734b589b52a145dbb1d268f41ae94eff90529db36658a66eda3aada21d35 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154 WHIRLPOOL b6d644b6689f1b90bec777ae0d85852767ba7f83e69420590645883ce81e2d8f72debf1d993e061fb984a01936ecb001b31f212d281d7847c736cb9b00259a2e
24 +DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
25
26 diff --git a/www-servers/fnord/fnord-1.11.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
27 similarity index 58%
28 rename from www-servers/fnord/fnord-1.11.ebuild
29 rename to www-servers/fnord/fnord-1.11-r1.ebuild
30 index fa335779fa4..d758fdc2ba5 100644
31 --- a/www-servers/fnord/fnord-1.11.ebuild
32 +++ b/www-servers/fnord/fnord-1.11-r1.ebuild
33 @@ -1,9 +1,9 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 +# Copyright 1999-2017 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI="3"
39 +EAPI=6
40
41 -inherit eutils flag-o-matic toolchain-funcs user
42 +inherit flag-o-matic toolchain-funcs user
43
44 DESCRIPTION="Yet another small httpd"
45 HOMEPAGE="http://www.fefe.de/fnord/"
46 @@ -19,28 +19,25 @@ RDEPEND="${DEPEND}
47 virtual/daemontools
48 sys-apps/ucspi-tcp"
49
50 +DOCS=( TODO README README.auth SPEED CHANGES )
51 +PATCHES=( "${FILESDIR}/${PN}"-1.10-gentoo.diff )
52 +
53 pkg_setup() {
54 enewgroup nofiles 200
55 enewuser fnord -1 -1 /etc/fnord nofiles
56 enewuser fnordlog -1 -1 /etc/fnord nofiles
57 }
58
59 -src_prepare() {
60 - epatch "${FILESDIR}/${PN}"-1.10-gentoo.diff
61 -}
62 -
63 src_compile() {
64 # Fix for bug #45716
65 - replace-sparc64-flags
66 + use sparc && replace-sparc64-flags
67
68 - use auth && \
69 - append-flags -DAUTH
70 + use auth && append-flags -DAUTH
71
72 - emake DIET="" CC=$(tc-getCC) \
73 - CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
74 + emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
75 }
76
77 src_install () {
78 - dobin fnord-conf fnord || die
79 - dodoc TODO README* SPEED CHANGES
80 + dobin fnord-conf fnord
81 + einstalldocs
82 }