gentoo resync : 24.12.2018

2 files changed, 13 insertions, 9 deletions

diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index f3c660e0fc57..57594600e28d 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,6 +1,6 @@
-DIST dalli-2.7.6.tar.gz 48481 BLAKE2B 9f83523b75d1c6fa109aba7e288e13924d8c7677c6fa38ffe5ce21dfb22f858f8a3ab8593afceed97e980e5f0172c1f8c58cc96b42f4bde31013f5ffcbb26f8b SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258
 DIST dalli-2.7.8.tar.gz 51599 BLAKE2B 935fc1b0ffb2c93c0ef8ab6a82e63b4e272c51ae6c2cbd0c670953c0943942c25b4c795ca7953ad4e53284f6b6e35b44be386ec4dba0c96345256e3b3173152d SHA512 5fa48a01db15fdafa179663b71867dd6a9c2ab7b4b94434f650c1ce37bd71caa2bb22efe032a4eed777538cdc341f22a251d14772aaba62f4a6d9d8c33b6a346
-EBUILD dalli-2.7.6.ebuild 1407 BLAKE2B c1a47e18c933355b7cb917582e8342218da00e1755e92691abae96254d09a43e06c0b27ddaf64df66e9831a8eac04c0297d57007ea4509546b9f529a4fa601b5 SHA512 de044b223df4c284be5b981aeccc401365c47143c7f1b33768278e24f51eda5270ffc482f72eadf9af31b8b5b527becfbcafd810c1b9d1e2d2683560156fdadf
+DIST dalli-2.7.9.tar.gz 51971 BLAKE2B ddf0286cd4edd1298d0cc759b5e5de1e60bb1ea1f8fbfdab559a09e716a0384c2bf5c70c6922d1b0d15df1af4de83eee16965a6d6f0543fbd5a0850464fb9f11 SHA512 38d4bb0a9c15175cdb77e40a0131c4e2caecc5b39b6fa15604aff8f1808429d2bf021f8817e9c2448007d5fb1dc50ea61c679a5a47ca54869d71391ec522f419
 EBUILD dalli-2.7.8-r1.ebuild 1390 BLAKE2B fef340fbf6d16192c9173d096f2763ab0e12097b457e0a4249a3c88b5e14f04390a314bee0391c856c14933aa484347f1bc4b32d418e772adf9873e6d0888f01 SHA512 be632a4d5cbb0fa2c5d36a48b67da95ae528e159c48f33bc2f7604e32d513767c939c4ae4d3dac0ea788e7b2665b9d3fa2fce7467802d9006396ee94c0127cc9
 EBUILD dalli-2.7.8.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
+EBUILD dalli-2.7.9.ebuild 1572 BLAKE2B 2a0dd07b2372178d3e19c574fed05ca873b5a3999cfb980a016a3c896fcd2c059dd7c1e541798550ea3553734e2d782680cef7901103affe736e896528a552a2 SHA512 4dc4c553810b8a6646a9eb39b09fcdd17640a9ee188d637d889717f6b17b4099ae036a54357b766b1f16348af33059901b6426ba9699e4d4a9c273a66ea89e34
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.6.ebuild b/dev-ruby/dalli/dalli-2.7.9.ebuild
index 995b081f9ea8..dcd9944f6e06 100644
--- a/dev-ruby/dalli/dalli-2.7.6.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 
@@ -18,16 +18,16 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
+DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
 
 ruby_add_bdepend "test? (
 		dev-ruby/minitest:5
 		>=dev-ruby/mocha-0.13
 		dev-ruby/rack
-		>=dev-ruby/activesupport-4.1 <dev-ruby/activesupport-5.1
+		dev-ruby/activesupport:5.2
 		dev-ruby/connection_pool )"
 
 all_ruby_prepare() {
@@ -35,7 +35,7 @@ all_ruby_prepare() {
 
 	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
 
-	sed -i -e '1igem "minitest", "~> 5.0"; gem "activesupport", "< 5.1"' \
+	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "~>5.2.0"' \
 		-e '/bundler/ s:^:#:' test/helper.rb || die
 
 	# Drop rails dependency which is only used to display the version
@@ -43,4 +43,8 @@ all_ruby_prepare() {
 	# complicated circular dependencies.
 	sed -i -e '/rails/I s:^:#:' \
 		-e '14irequire "active_support"' test/helper.rb || die
+
+	# Fix test compatability with memcached 1.5.4 and higher
+	# https://github.com/petergoldstein/dalli/pull/672
+	sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
 }