gentoo resync : 11.02.2018

10 files changed, 42 insertions, 8 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index bb1f8e6f6168..30ea9541ede5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index 584eda014740..0fc2b1a9a60e 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,5 +1,7 @@
 DIST adsf-1.3.1.tar.gz 165956 BLAKE2B 08e449c39670ea4e09d69e244c346f0fe689130d83e8faf7806b65e1449d115305be1b45668ac5c27db772cab554c9eb2029b4a9d42bd25165532b2d67df09a1 SHA512 7e923a84d57eda40f0220fac84f0a259780504ce615361a962eda5d7c2dbfe335b57a91b70b7c84b9b30132398594da37c85b84379670cc5116607017bf6a85e
 DIST adsf-1.4.0.tar.gz 170180 BLAKE2B 2a5c741351908ad37d964b755a4a9a5d8f3137099de6437ac854eb9027792fd7b63c0a26d08b46e971ed8357ff78a0b67a120d7d29d6bd035e78d5a62d04bb5a SHA512 b656d9163706e71e01ce157638cc1f64af4c3c267a9d8b290a9d8069ac9ac470ccb15338275fadb4ae821dfaa172851b1d8fe187b555d40bc428f7f179964667
+DIST adsf-1.4.1.tar.gz 170221 BLAKE2B 41a87135b74e62c9d39c64839e7802b3decc47bee04cdd93eb0e1bec6361a654378e9c310bbd18a0bddeb834f444ff67aa0f8efe21dd7ffc94c876db3230b469 SHA512 b0334102308b6ecaead6db1f7b28c3bc27a9ac853fd055e9695e9bcf36ba25db890cae57a91195d398debdfd84b5d6c7ce9142d6bd5bdd30220170210b3cdf6f
 EBUILD adsf-1.3.1.ebuild 730 BLAKE2B 3a1970bd82694d015478bcf79da58426b58d713c8b5440e69d7790d7d33c826da1b20e371304a0b69967246fc727dbbc5c634483fe6dce54bb5799aaa673fbe0 SHA512 851cfd74af2bfba18604437db7a75e6d2eb017e0b7cf5242ed7fe1324f27884bdcc3887175d86d643109ea9230d351f71f2bf627b26feedd107e96a1ec26d034
 EBUILD adsf-1.4.0.ebuild 917 BLAKE2B f59ab428982e745fc1dd223f63d29ca36c350a53e39276e18695c827a21f1cb426b1e55b52bbea0c7b7ab555a1c7712165da29a20f35b4e6b525bab61add41ed SHA512 007b923132018edbd1c54255cb47876ba0c207e953f0ddd856974c2bcf5b883d5214a72245877e533b6a02bd2ab336056638c9beb6d65f1244a5cee2d0f9d7d2
+EBUILD adsf-1.4.1.ebuild 917 BLAKE2B f59ab428982e745fc1dd223f63d29ca36c350a53e39276e18695c827a21f1cb426b1e55b52bbea0c7b7ab555a1c7712165da29a20f35b4e6b525bab61add41ed SHA512 007b923132018edbd1c54255cb47876ba0c207e953f0ddd856974c2bcf5b883d5214a72245877e533b6a02bd2ab336056638c9beb6d65f1244a5cee2d0f9d7d2
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.4.1.ebuild b/www-servers/adsf/adsf-1.4.1.ebuild
new file mode 100644
index 000000000000..206630297375
--- /dev/null
+++ b/www-servers/adsf/adsf-1.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="../NEWS.md ../README.md"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Dead Simple Fileserver is a static file server that can launch in a directory"
+HOMEPAGE="https://github.com/ddfreyne/adsf/"
+SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${P}/adsf"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
+
+ruby_add_bdepend "test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.command_name/ s:^:#:' \
+		-e '/websocket/ s:^:#:' test/helper.rb || die
+	sed -i -e '/test_receives_update/,/^  end/ s:^:#:' test/test_server.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+	rm -f test/test_version.rb || die
+}
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index fb84eb27de2a..29be09f20c0a 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -2,6 +2,6 @@ DIST puma-3.10.0.tar.gz 158843 BLAKE2B 94f206c2b1334b2b63da3962b0a9077cd2e9671c7
 DIST puma-3.11.0.tar.gz 207387 BLAKE2B b95af60358a9e6877eec34b4cab80c00512e6f9c518f302d6373eee3042b4f439d655aafc719461f7d286fea565e82e6f7ad541a7b0a17d3c2f49067f3e11dd1 SHA512 55e7be6a6c8abc7c8bba4c793b9515150d989358259bbd6546cd8a52d9e6cfb0b7e20c3f813790359ae141865f991d0daadf043e884e2cbc1a1bdfabadca8a16
 DIST puma-3.11.2.tar.gz 207895 BLAKE2B f7a36112f70e63467569354f5ee5e81e1a62ab457099228f7c43c25bd51a8f8aa6de7e02c71222d23c3dc6b5e726c3210e46052d03ae376d533332942b1daa2f SHA512 a10fc17585f38ea31c213cfde109fb21415257d2a6ab8863091baee49e94916b20ffc47f8aa961ab2b2d5d0672a0ad4a279bc9b2549062842accb6cd39cf922c
 EBUILD puma-3.10.0.ebuild 1984 BLAKE2B 679d465e8f473d20e1b103a797013fad2e64f5888e840af4bb4cd7bbdca8fd684253824eb59e81d81d3cbf8d36db7dd971c200a29b41eab0a7c3a1579ecde8dc SHA512 71dba8b8bfdcb5ec415d903e8bf90617cd40ae027fe0459036818b3af239225f3989031fd3bf51e417f18c4b411d54355c2d4c1df0e27f335f7881e3c061b4ba
-EBUILD puma-3.11.0.ebuild 1976 BLAKE2B bbfa885fbc2070cfad87d4bbc68f48500066f235b644204fc4e73eb1681da23fcd3710ff64ea0add865df0eff0966092651febf7c623b3fb6b3dc0dd6fa02dc1 SHA512 ab5c53b27ec80f7e1228c4c6c525e1a47651cb57e8027f31f86a23b2e5ac45a7b8dcbfa0dd75d1adc9e34eeecb485f2449b6dce05b7e41cd63cfe5ca88372b8c
-EBUILD puma-3.11.2.ebuild 1977 BLAKE2B 2d736f65e0aeff4cbdd80e791b0af0e6538fa322875857ceb7fb6b91df9596ec005790b895f0d9ebe26dc61e18d8a17e74a9d50a77e79e259f4fa5b107964249 SHA512 c5821fd5f0e3da4018eceb825beeabd00f4a02a9d9dcf48ee01d912501392115ff4f6e96c6ba62ff3bad5f4f40071351ad5c8ca19438cd2f6d1900924b2c05f2
+EBUILD puma-3.11.0.ebuild 1981 BLAKE2B 551ee97b62d61b86559eaedf5915dbd6c908371e205f3c8cb7a81cab95c8ff2ded7e983e415801e71f1c3ce591ba576b434a4516ea817620f075ec945f1015be SHA512 39de9305d6f2c80ffaaf23b4aca6820fdaac6dc8882fe0a1100577cdb146637d059dafecdb4d91ed3ced4735d475d8b481daa5f59fc42950b9c5bbd38236cd96
+EBUILD puma-3.11.2.ebuild 1982 BLAKE2B 00fdb81016412328fa0c5dc641f23ac6a8f8705f8174eb2acf2dd320247c73b1c0ae84c89cfef5aab711b5952c6f4c8c7ac09621a92d172676120b114c645db3 SHA512 8e592cd1add76497f61e6cc90bc5125fc0156e6e0efca11945cb0a63b30a06c5fc77f3ce3e59377db6a751eef778ddd53cf1954fc9a23762982b3e6fc3944be6
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.11.0.ebuild b/www-servers/puma/puma-3.11.0.ebuild
index c9409bdf937d..508ebe0afee9 100644
--- a/www-servers/puma/puma-3.11.0.ebuild
+++ b/www-servers/puma/puma-3.11.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/puma/puma-3.11.2.ebuild b/www-servers/puma/puma-3.11.2.ebuild
index 658c82f7e47c..412f4c48422f 100644
--- a/www-servers/puma/puma-3.11.2.ebuild
+++ b/www-servers/puma/puma-3.11.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 5783bd941d3a..d511b255284d 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -4,6 +4,6 @@ AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
 DIST uwsgi-2.0.15.tar.gz 794926 BLAKE2B 0bda44697d3e5f5fedb977d757fb418bb7064e0a5995448513c2c427d2c2694cf7242f76f516208d0ed5f6d3db3b1a157bb6992a714fea3a370d3a767fc67e60 SHA512 1a2a82cf99d3e6dfe62fa18fd6f04afd1dc727d61287a1c9f47f1448e76a4858dfd59286118c94672c84ff22bcd8444c0c1568ae46993fdbdb9414ad60474bf4
-EBUILD uwsgi-2.0.15-r2.ebuild 12848 BLAKE2B b85660cc15fcb6673389974e1dcaefef4a57169be0d216a0a862b6776f551bcd5409eb25316d8bd6a619ac305b8739c4d409ce12e71297ff5f51cecad000609c SHA512 eac54b30cb1b5caa87adc87e0c64dcb5492c15e1acb24c7fffa676e69269e752b83785e5c9c09d9ee6fc85da052e0d9cce7952fc828ef7445d47b1a7eb35373c
+EBUILD uwsgi-2.0.15-r2.ebuild 12847 BLAKE2B 716cc240f85411eff6f76e6795c6c2264ed178262a29210d8560226098cbfa0a04b95c9120259593b04fa20065a8f5e016d185e2d557c0036c166b33ee2ba2a3 SHA512 fd115a50f1b0077812a0e4b88a5940add6b12f6a744188920e814539f4be5a775b00b7fca4af9e0e703ae64580cbe0bb54ea7292434aa43d01ef06afb9fa3f86
 EBUILD uwsgi-2.0.15.ebuild 12659 BLAKE2B a9780429463f47ea09054cfb9029df521b434d1055054389270644ec9384afec9c660822c655ef8fe36c242d21266fcd71524e96ef4af2ced55457792cbe1a59 SHA512 d870f86ca5225ae9807fbf679f77a1d44b01bbced6700a743b5bc734e7092752209066c1839a03514a60a8c7277626fa8e047fbfc949dc148c730582b40ef432
 MISC metadata.xml 1597 BLAKE2B ddee6196349d4be8f3b5ba5a370eeae27bbc834d41e9f3803a2e6aef0966b01f4decbefe0cc4df3f174dde6fe8189120218a598d67dbcde20bf4fc20ad535871 SHA512 6f31168a12d1c3a95cb140624584214fcefda352b4c4904425d633a6d94a74d30186e7fa25c19b6f97cc0ca6ab0a8253cdbcedd11df3be2a32400a6292f2877b
diff --git a/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
index 85b336d9b687..247957d8aec5 100644
--- a/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.15-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 5424d7b493fd..5a829e513984 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -13,4 +13,4 @@ DIST varnish-5.1.3.tar.gz 2643223 BLAKE2B 85bae87785da1284d7d916b8948a0984eea9cf
 EBUILD varnish-4.0.5.ebuild 2057 BLAKE2B b8d25dd7ec55f98d56044228dfb7f533238951cbe517bfa016cc46e6851f4d4f8b092d5b13e1a991238b59cef04f23c2f976ffd56b2b7cc43c287bc5c8a32de6 SHA512 6cb433aa628f972b7d86ecc2f0ae537f65cac24c57842c4f22e2805e0038755b06db38bb9079f6a89647c6a5819373dbea487dd0db0a5364edbb882a94572d4f
 EBUILD varnish-4.1.8.ebuild 2215 BLAKE2B c0cc21b894e808455d9be3e87bcbd3433b52173b2a1a93b4f223669e8a4b78f1826f0761396c82622f43567ad87bdd33db7fa1df1faac6970c1bb71f765e5ff6 SHA512 54616f3283bba6d40e78e943231d8e5408eca16bbda42dc4ea2816182cbcc7a86164a4e2fa3d0b35bc3705329d80fbe0e6b52ec9cf5cab0f7c4083d440ab6dd7
 EBUILD varnish-5.1.3.ebuild 2220 BLAKE2B f593bdcfa9e591ed51da968c5df8a88d9aec424906d180ff7b10141ae891a9b50043e07ab34ea53cfd0ade228a520df2a8b5c7e3a6a3a4921b1217a629c67323 SHA512 e6c7189739a6dfd2ab7413899c0c76cbde4f04a622288891e9b1d4beb4c65f22bac6f90f4d94955cb4c226bfd5bdf32240b2a7146c768d7811233679ea7528b4
-MISC metadata.xml 1308 BLAKE2B 0fcdb1970c97b7269146e898f103142443524a801c97f9acb9d7676ab535fdf8ce7a90863918af093a00a12bf3f439d400d66feddfb403a9705c2c17bb578258 SHA512 fa3f9a9c23cfb4aba84af4c2bad5deca139017b26543ca9a2c2164358beff13d2d91c6863902e9832661790253985859faec6773e70bd9eea86190ba77560356
+MISC metadata.xml 1258 BLAKE2B 7022b186f4fcffa296f034811c1bc037c29f6d21b990d2c80771cca9243ed8406341908a2ee32ded7ac97573b6a809798cadbb9aa6c9ad9f100a7b7e251fb720 SHA512 052377552103c4ee337e931cc84d5e86d1381473484bb2f1133143219cb3d9ba9b4a78cdd411f3523c424f7637df51bbd2b9c0c9a22520314152f811644f04b7
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index fa6c19836485..e9d6ec501f29 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -8,7 +8,6 @@
 	<maintainer type="person">
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
-		<description>Secondary maintainer</description>
 	</maintainer>
 	<use>
 		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>