gentoo resync : 02.01.2018

5 files changed, 3 insertions, 66 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 81cabdbebb3b..2e16d17baa37 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
index 74306986be70..7f3609f944cc 100644
--- a/www-servers/boa/Manifest
+++ b/www-servers/boa/Manifest
@@ -7,6 +7,5 @@ AUX boa.rc6 816 BLAKE2B 2ec091bedbe7b32c554191a78dd5d46bc50bba21c1ee85b867611247
 AUX boa.service 131 BLAKE2B a77133453d32a7798704019470156e54842878f125f3bdab28f71ed804aa4b910621328b7b486a4b24dceaf1e82012a09de59977a460263c57e0e8aaa13f5329 SHA512 62628a38bd679e10b0f5d3712d206fe292d4adf0ed4af9387b7e923ce0c2efad060f139a8cf5d0aad89485ee4ba94565387e6cf0858e779538d24705aa01ee99
 AUX mime.types 5488 BLAKE2B c87384f25be47bc2640029ff51b7e10b830a3544c89072f8033bb23018920ef9d98b2db7f8c6d71e4bb5157f3858c49d682d0eb8708273a4ede0afffa7f86239 SHA512 5498bc2cf93640f04240b96ff6ac297d9900d44180a9fc6d4a763f5c97c140f46e0a16efb736be6e295b9448915c80830854eb2c705f37b04633fed6352262bd
 DIST boa-0.94.14rc21.tar.gz 199950 BLAKE2B 763c3f9d3b4a0442d16372121b9d1a584dbfc43848c3cd89a8f33e4728dc2924fc32161dd8b756d74fcaa6ddbc5839b59a3cc4b88353892d79eb455a09687700 SHA512 ca8e5c2c29f0b6cd4fd2f7268682dc345c1d37f4de099319e22d63d822a72195659d707e148f2e2725edec88d90208fc40702f15ab2cacadc9957f1a0437d798
-EBUILD boa-0.94.14_rc21-r1.ebuild 1200 BLAKE2B a88bb29e08db5b77345b857bf5f7e399a64339c3eef9815cfd1efd22b1b6a4276d0e88b8c76bb22254b099e7d81a9f9b03bee06d9f17a23c55ac747dbc284909 SHA512 1167ac6fb017b9b21b3d90b36afb3cc34fb4b270169e5e0747847f171b3161bb49ed6c5c36934ad5a180fd792f70b3bae2902ee117b98dcd7413311b69929337
 EBUILD boa-0.94.14_rc21-r2.ebuild 1202 BLAKE2B 7b22623c7d6aab6b5a5accbf2f845dc6b66e5494dfabc8a7542220b47fbf58017c1f183df62ca6f9d4cb7072ac289725c8787efd1a2b7129ff461d62c28abca7 SHA512 8251a496b079e459a3e00f333f6b75d3a35b1c94e980a33e777411320e7d0bd001f46dde3abf2ab377f6f5cfa041db0f226a75b438d38107224a8494a34293fc
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/www-servers/boa/boa-0.94.14_rc21-r1.ebuild b/www-servers/boa/boa-0.94.14_rc21-r1.ebuild
deleted file mode 100644
index 1b0652fa298e..000000000000
--- a/www-servers/boa/boa-0.94.14_rc21-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-MY_P=${P/_/}
-DESCRIPTION="A very small and very fast http daemon"
-SRC_URI="http://www.boa.org/${MY_P}.tar.gz"
-HOMEPAGE="http://www.boa.org/"
-
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	doc? ( virtual/latex-base )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-texi.patch
-	epatch "${FILESDIR}"/${P}-ENOSYS.patch
-}
-
-src_compile() {
-	default
-
-	use doc || sed -i -e '/^all:/s/boa.dvi //' docs/Makefile
-	emake docs
-}
-
-src_install() {
-	dosbin src/boa
-	doman docs/boa.8
-	doinfo docs/boa.info
-	if use doc; then
-		dodoc docs/boa.html
-		dodoc docs/boa_banner.png
-		dodoc docs/boa.dvi
-	fi
-
-	keepdir /var/log/boa
-	keepdir /var/www/localhost/htdocs
-	keepdir /var/www/localhost/cgi-bin
-	keepdir /var/www/localhost/icons
-
-	newinitd "${FILESDIR}"/boa.rc6 boa
-	newconfd "${FILESDIR}"/boa.conf.d boa
-
-	systemd_dounit "${FILESDIR}"/boa.service
-
-	exeinto /usr/lib/boa
-	doexe src/boa_indexer
-
-	insinto /etc/boa
-	doins "${FILESDIR}"/boa.conf
-	doins "${FILESDIR}"/mime.types
-}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2d2fad63dc65..7e27b986ccb5 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -47,7 +47,7 @@ DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4
 DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e361acc559edb270ad075c937ab5630e537a67ad8ed134a7ec5809ae63e38791ac25ceab3e26160469be8cc2e82c SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 EBUILD nginx-1.12.1.ebuild 37447 BLAKE2B 1b51a2bd6e51b6120b099c9fdac42ed4655c09efe440388c53f0a1445e14be56b242f6ad6f73c213ec836761274cc3ff18fd19abeea7863bd12eab23697c6d25 SHA512 dad602d21ce679a674455f478efad66d1532862d277e65797279c476d24242c4f4b04bd03168a14eee171148d3d2d6488b80a86b001036b087a02630d9ad6642
-EBUILD nginx-1.12.2-r1.ebuild 37151 BLAKE2B b45ef0236cebc897ee5e448a2d3b4aa18069a2acdf2d2a26b0d0c99fea8b993353a1d04660da946a0df4c663ce5e5e8dd7c8b799bd1fe7f289559fa062f4fcfc SHA512 cb9bbe27bc6990905a782426d993a19985cb6ab0b61f120c9e138f081fb11748cbdb958ffa781f863c8aa4c1115544b9203cad3781481067215d8d71f7e5db5e
+EBUILD nginx-1.12.2-r1.ebuild 37150 BLAKE2B 65fed3395350ccd46c82c77e42ca5b0407127832fae1b3a3b660fd5d6f13adc6aef65cd340d41c5a0212241881f23843f1cf849dfc46c972f3741e0facc2d5a8 SHA512 59897652e9dfd97468de4b447cbd080917f65d12507ffd2ec0037227c69b029242c8710aa20c041a6f3abe93d8ffd1e8678c131059b612697e1af1d6b702b31c
 EBUILD nginx-1.13.7.ebuild 37167 BLAKE2B 48231e7da06b4d249a7ed44108e5d8aa8922a612d6b5327b253635e569755c9f1b622e470c86feac2a27b8fe58048409afee222e2163fb2aad55a216139d16ff SHA512 077d4d564d804555d6dff74e525276435669db3e011b9f54da8401321c3cc275106d375b95ab649bf203c38132cd55e70fa203bc7da20a0af84cd87ead877171
 EBUILD nginx-1.13.8.ebuild 37167 BLAKE2B 2dbdb6a067079729fe7f138035ae48a1bf701e27e466081e89469be458087671773beebf79e935bfd1bea6628843b5b228d633628609beb6fa1473094d2d58dd SHA512 f6f3cfa0edafa058b1ca894ff2722928f66039715c1da70f0d6c1287bd1764b7b2674a1d1576cc389749f570801994ec41cf0b28615d566ecd5b7cddf36b18b3
 MISC metadata.xml 1309 BLAKE2B 9da8c2589e775e0ed57a344ba2d6c5e9d29908c253fd77306b2ea2f7392d9bda64ec18ee9120640e5d22e3624b79131377b3020e7e35a9603916ee8c6e8d663e SHA512 ea27337d56750dfa1c7a478eb0bdb4318cb03e181e16cee304e6beeb3261abde75cddb68a4249ceb97089d3e6740bcae10ff3441ac9f5e8a074409080313ca73
diff --git a/www-servers/nginx/nginx-1.12.2-r1.ebuild b/www-servers/nginx/nginx-1.12.2-r1.ebuild
index cacb3fe4c7f5..40d650b17fe8 100644
--- a/www-servers/nginx/nginx-1.12.2-r1.ebuild
+++ b/www-servers/nginx/nginx-1.12.2-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"
@@ -172,7 +172,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
 	nginx_modules_http_push_stream? ( GPL-3 )"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Package doesn't provide a real test suite
 RESTRICT="test"