6 files changed, 3 insertions, 79 deletions
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 2e16d17baa37..af08b0589fc3 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 6e5d43302536..1ef8462aacac 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,6 +1,4 @@
 AUX fnord-1.10-gentoo.diff 3204 BLAKE2B 98b868e50712d8048a3f3924d8af93f5a5b34d083cba7b2d64a4f02ccc672e20d8a3eaf5a1c2411537763d85ea74a577de6f8b5bb57bd2c1554e038bcbb00f5a SHA512 93921b050e8b165124b738fcd96c0d828289ee238284088c6859777fd5ca647f9156a0419e4cd6ee65df6e9d944913b8f1e7c6382c358b8c549425cac7414a7b
-DIST fnord-1.10.tar.bz2 33408 BLAKE2B 8401c426fdc6555abfa25d40ca4b94dfc7a34394f913b468c96ae8661144ac0cf1fb1a4c216081e552e9f33ec44571706f5d7772776df3b62cda35664ce54802 SHA512 45c584844de9d26aad0e6ff0a08a27aacb1f27e5a0128f43758622d41183cc92c483ef85cc84421afd2107b4c2838b167ab0788031499b2f18c3df861c05dfbd
 DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
-EBUILD fnord-1.10-r2.ebuild 904 BLAKE2B c9cab64d355dcf0ed031eb7ab7f728ec32dfe78cc4e569f5c09dbe8b44265a8918a1a0d9c48c58013b74a43b02ad553bbf356eacbaa897f6fec4b4497e4167bc SHA512 d950e2e0fbb5dd6e2b779945049caf346545c8e0a6cfc094e9311fc97822173ab1eb60a86e301278c548b1448ea6e696eae5f2cb14aaa216d8da01836ec4864b
-EBUILD fnord-1.11-r1.ebuild 895 BLAKE2B f8910782b5ab9f20ff40fe271f448fab025739ff3855283bbcf5b382dd31c95b1e0650ef949d4c628bf26ae781bd9d5e305be00d0eda16ebd3ab83cc4115263d SHA512 f2f74346e5af18a5e6893be4f2d13ae8c2f68c9fefb0f7ff1a457934023082c8754b6fae9a9a430f5e782fcf88ba971fae74b5a67d73171c2ee108c14b74a34c
+EBUILD fnord-1.11-r1.ebuild 892 BLAKE2B a5fd725db15850e3f9d8e2bed8bbd536db076fe3d60b246158dd6effe74997233b9ec0c2d5b2ec5571d258691c0f695afca98736eafa1d8986583d65e64a8f34 SHA512 95dd4879b81345233b387ff1003a285769ce82529c57805200c3e310599e2f2db979a3a5db0f3559b2b031692a03c9b919fbc04922999ee4c2a67eca916b5791
 MISC metadata.xml 242 BLAKE2B de3429346ad1b5e7b5cc5bb2ca71af997b3702565c6dbab9d02c358724423a4bdc916b0ea48180a2273404e59e4bfca367e1659e4c1e2f70f3cff0b111bd8b6b SHA512 688a7e67d3fcc02afd7795ace015bf7832ba3bc428cf64042b4ad9ea72d815996ea128b0a4cf97e8331dc3ad371c4565963d6c773d161e88cd6b6926b58aecec
diff --git a/www-servers/fnord/fnord-1.10-r2.ebuild b/www-servers/fnord/fnord-1.10-r2.ebuild
deleted file mode 100644
index c28da178d9fe..000000000000
--- a/www-servers/fnord/fnord-1.10-r2.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="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
-}
diff --git a/www-servers/fnord/fnord-1.11-r1.ebuild b/www-servers/fnord/fnord-1.11-r1.ebuild
index d758fdc2ba56..807a0f14ca0a 100644
--- a/www-servers/fnord/fnord-1.11-r1.ebuild
+++ b/www-servers/fnord/fnord-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fefe.de/fnord/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 hppa ppc ~sparc x86"
 IUSE="auth"
 
 DEPEND=""
diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index 369a72d5996f..93b7d5141a6f 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -2,5 +2,4 @@ AUX mongrel2-1.11.0-polarssl-platform-590512.patch 617 BLAKE2B 96493ff66f36c9b80
 AUX systemtls.mak 4506 BLAKE2B 60a448a3f1ed77646003cacb8d5adcf34899532c00fd461a67337f2ded6cc7a6204f72a1b25b3787f692487e502eb313ee0bc7dafb04c902c81d82edfc8fe96b SHA512 9b1fc5bf23d60267d64c08e0f0956deee0c421b03556138f994822abdcb324702bde744559e6629488cb05669b3228078180cb4f30af8fa09c10bc110ce7e3e1
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
 EBUILD mongrel2-1.11.0-r1.ebuild 692 BLAKE2B e1580b2a5cd45234beffa9ab341f6c6b3030fc671186437a952c583eb8924c515aca0f3fd148edcbfa7528021a04aef92bb3e042eb5901d4d82682be35253572 SHA512 421dd70d910b3bcd9a53ec0031a40a2d14c74e3064410d5255eebd556edc8cf6c3134246d4166b6f2a8bc308f2de17428b0738f5bb24245aea73bdb1afb105a4
-EBUILD mongrel2-1.11.0.ebuild 621 BLAKE2B 2fbad1f3aee64c631b02b28225d06ea87309c9591c1d6ce580070731e36c607d5d835812677302210303f46fe5588506c2f6180544efe3876f1709541ef79ca6 SHA512 e5e031ccfadef12fd72a55bac4c7fdf203b06c4cbde2b01abda6287cb179986c361a85a85910ebed94fb52991d3d320a753a6974baee1cfe378c7a8e6982f4e2
 MISC metadata.xml 465 BLAKE2B d368c86e90a8629a284505ca89a2539f4f3b72a9330504c477694b9c850f0b313f4b96f26673afff9bffec2505966c84355e1241e051d00d969625f90a514457 SHA512 81c89b2b259cb5ef69b68b64f9e1bebd13431db578862ecac4a10b607aab0a1b123d46332d905055c11652789bf815f0f2cdc90a2c0c9b6e9748f9e5e5bc88e0
diff --git a/www-servers/mongrel2/mongrel2-1.11.0.ebuild b/www-servers/mongrel2/mongrel2-1.11.0.ebuild
deleted file mode 100644
index 74ba23e4320f..000000000000
--- a/www-servers/mongrel2/mongrel2-1.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A language agnostic web server focused on web applications"
-HOMEPAGE="http://mongrel2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-libs/zeromq
-	>=net-libs/mbedtls-2.1[havege]
-	dev-db/sqlite:3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp "${FILESDIR}/systemtls.mak" Makefile || die
-}
-
-src_install() {
-	emake install PREFIX=/usr DESTDIR="${D}"
-	dodoc README examples/configs/mongrel2.conf
-}