gentoo resync : 03.02.2018

3 files changed, 10 insertions, 32 deletions

diff --git a/www-servers/adsf/Manifest b/www-servers/adsf/Manifest
index 130ff04826fe..584eda014740 100644
--- a/www-servers/adsf/Manifest
+++ b/www-servers/adsf/Manifest
@@ -1,7 +1,5 @@
-DIST adsf-1.2.1.tar.gz 162912 BLAKE2B 2503f8e85940e417956e3fcd5b1c12030f1a76c8b12391bce4cfb4ac9c717e50516b825846b51c301a31c6bfb04341547df3c80fa607bb9785d3c150c92c5640 SHA512 88cdc903f21bb3e86fbbfec88ae9650a4676d5d57c526befd1f483bb5281501f28e2ffb6fda8e2b06f891b8f4bbd15a3e6a1c90a96e3eef1c6b4a13a39f1b8cd
-DIST adsf-1.3.0.tar.gz 164989 BLAKE2B fcfbe3f883f1e194fc69266d1a617cbd1a71d9c9f60f8997fb057602871dd3032d4fd69a460481e7e62dc4da9440da5a9e8509a021e9856fc72036573b9839b3 SHA512 41f72c6bbcfee5ef9e803ca18e6746c9190e5d6c4e695b5939ce232b920a58bfcf608c619ac76c9c5a208ca473fb9ad9869636ef3c57079747b50b879b6db156
 DIST adsf-1.3.1.tar.gz 165956 BLAKE2B 08e449c39670ea4e09d69e244c346f0fe689130d83e8faf7806b65e1449d115305be1b45668ac5c27db772cab554c9eb2029b4a9d42bd25165532b2d67df09a1 SHA512 7e923a84d57eda40f0220fac84f0a259780504ce615361a962eda5d7c2dbfe335b57a91b70b7c84b9b30132398594da37c85b84379670cc5116607017bf6a85e
-EBUILD adsf-1.2.1.ebuild 604 BLAKE2B e10a6e4ddd4e5a32f99f78ae8a7c5e777b7f79405c880c7048c225c3bbb48c391aa0148adb24a3f046a2846e34c9c667a4d5ac18f4f1006e697b1f7ab0e535c8 SHA512 6446ecc1d9bba35030c5f7e0650c43d534cdc495997265dc6ff2b902067abb60e7e8ff6571d1a2186490ddf823bca05cdc2edd5372fbb1a11ea60bb9f16b6e2c
-EBUILD adsf-1.3.0.ebuild 734 BLAKE2B e697c7ee9c70d9d5ebdc527b45f3adb70e6ec77b6fdf395620c39af0c34e88ffc846716dc7eb73de29bfc04a937ec149e05d75d871b5b9d660bbf36f64e3e820 SHA512 13ecc36f5432b984e565834649b74edda503c683e4afe9c168f44eba0ba81ef00671cb00a3dde4f17f9a09562879f17ce6bb0f1da218c719427f3faec8a4ae9e
+DIST adsf-1.4.0.tar.gz 170180 BLAKE2B 2a5c741351908ad37d964b755a4a9a5d8f3137099de6437ac854eb9027792fd7b63c0a26d08b46e971ed8357ff78a0b67a120d7d29d6bd035e78d5a62d04bb5a SHA512 b656d9163706e71e01ce157638cc1f64af4c3c267a9d8b290a9d8069ac9ac470ccb15338275fadb4ae821dfaa172851b1d8fe187b555d40bc428f7f179964667
 EBUILD adsf-1.3.1.ebuild 730 BLAKE2B 3a1970bd82694d015478bcf79da58426b58d713c8b5440e69d7790d7d33c826da1b20e371304a0b69967246fc727dbbc5c634483fe6dce54bb5799aaa673fbe0 SHA512 851cfd74af2bfba18604437db7a75e6d2eb017e0b7cf5242ed7fe1324f27884bdcc3887175d86d643109ea9230d351f71f2bf627b26feedd107e96a1ec26d034
+EBUILD adsf-1.4.0.ebuild 917 BLAKE2B f59ab428982e745fc1dd223f63d29ca36c350a53e39276e18695c827a21f1cb426b1e55b52bbea0c7b7ab555a1c7712165da29a20f35b4e6b525bab61add41ed SHA512 007b923132018edbd1c54255cb47876ba0c207e953f0ddd856974c2bcf5b883d5214a72245877e533b6a02bd2ab336056638c9beb6d65f1244a5cee2d0f9d7d2
 MISC metadata.xml 295 BLAKE2B 300607324d7aca3f9af7cf195244b3426a78be1ab6875fc10e645d50e8aad1e4fc6abbaa555cd94248db86afc83bfdd5d58fa78cbf74d0c56b1cfa303dc87b75 SHA512 640f33b2433c2259e00d0fa1daca377084010d7fc28da599ea0d3d4264567691bd4d0ad3033f1c1d852d1cdcf179b88c1e22c75e5955e344c9dfca1e82a79e9c
diff --git a/www-servers/adsf/adsf-1.2.1.ebuild b/www-servers/adsf/adsf-1.2.1.ebuild
deleted file mode 100644
index e00cf36cec99..000000000000
--- a/www-servers/adsf/adsf-1.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog 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="http://nanoc.stoneship.org/"
-SRC_URI="https://github.com/ddfreyne/adsf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/www-servers/adsf/adsf-1.3.0.ebuild b/www-servers/adsf/adsf-1.4.0.ebuild
index 7add16bc1943..206630297375 100644
--- a/www-servers/adsf/adsf-1.3.0.ebuild
+++ b/www-servers/adsf/adsf-1.4.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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="ChangeLog NEWS.md README.md"
+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="http://nanoc.stoneship.org/"
+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"
@@ -24,6 +25,9 @@ ruby_add_rdepend ">=dev-ruby/rack-1.0.0:*"
 ruby_add_bdepend "test? ( dev-ruby/rack-test )"
 
 all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^)/ s:^:#:' test/helper.rb || die
+	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
 }