gentoo resync : 08.07.2021

3 files changed, 3 insertions, 54 deletions

diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index c9b60862102e..9f3f5122dbce 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,6 +1,5 @@
 DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a85753f10b8fbd786ec3573f13df096e1537d9a31f3801632406f28d918de5971cb28ec31d6eb8387d0c74f1 SHA512 1b6308ef37d729d85741306c10bf87c9b9733f83f0b4bf089f3eced36c48cddd9a77d2fb44a77778844d1cafaa3cec5110a9c90f6a67dee08a96e163e6ccaf65
 DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
-EBUILD dalli-2.7.10-r1.ebuild 1569 BLAKE2B c338dcbfcc866ef1c188d76e1b23c9c3818f7743794b0cd2d0853ab6694b9b2ee7c7d1309dd0a57ed1ae18158a57f082311ecb3603dd12ccca344135623d2b51 SHA512 39989fb31d37a878773ee056dbc3ae9bb4415c92201d14aa4778076ec7540a55f9498fe525859d4239c8671c6d16e347b35b99b5dd3b8119d364638217482dab
 EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
-EBUILD dalli-2.7.11.ebuild 1575 BLAKE2B 4f3f039c7aecef10166a75fac7737b6333a5ab453024cb08b2122e2d1dc1b75c9da290f9d2b6ef57b7afe2a72901421a82c5ac334d7b4566b34471200beebde1 SHA512 2d32d3b7f32669a571b7a52b09f42409972df0454ce344622e5b9ccee822f31d2d715a506c787cec76aec32b82e2b3babfea6208909e358238c67b2938786544
+EBUILD dalli-2.7.11.ebuild 1574 BLAKE2B 5c873d42d667a2683c29a5eba6338330cf95eb5d5e854a0b9ec03dc94ca7c339538784dd58c9cc768bb8e2d5d216a4afc185289dbaeb5371dc52e9213a7c905c SHA512 af31e416ebf86d7db1e7ced950178d2e6489d44a98e2179949fd352ef8ad38c5bf322d6e9336a7a492ef767bbe97ebe477001664f5ab40d2878fb9cb46087f0f
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.10-r1.ebuild b/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
deleted file mode 100644
index 3dbf8da372c1..000000000000
--- a/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-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="~amd64 ~arm ~arm64 ~hppa ~x86"
-IUSE=""
-
-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-5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	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
-	# number, so we only need to depend on activesupport and avoid
-	# 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
-}
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
index 4dc53f6b7530..a738b11f04d1 100644
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 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="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"