gentoo resync : 22.10.2018

3 files changed, 3 insertions, 51 deletions

diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 75613d469830..f3c660e0fc57 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,8 +1,6 @@
 DIST dalli-2.7.6.tar.gz 48481 BLAKE2B 9f83523b75d1c6fa109aba7e288e13924d8c7677c6fa38ffe5ce21dfb22f858f8a3ab8593afceed97e980e5f0172c1f8c58cc96b42f4bde31013f5ffcbb26f8b SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258
-DIST dalli-2.7.7.tar.gz 51532 BLAKE2B a625e333130f2c9ec47a9e3aec892a8e0d5f7248b71f6c666461104e2b29d4a384dd415b00dbe70d24fdd44a3b6835fdebdeb75297d4cd6d48506d146f892d4e SHA512 ed2a3f0b41451ae703060fe6197675ed6096531b91e5210a2fbded7a40a9a5717d47f5611081a488931318fd89888f00a539c67bab3dc600cea12676cab289cc
 DIST dalli-2.7.8.tar.gz 51599 BLAKE2B 935fc1b0ffb2c93c0ef8ab6a82e63b4e272c51ae6c2cbd0c670953c0943942c25b4c795ca7953ad4e53284f6b6e35b44be386ec4dba0c96345256e3b3173152d SHA512 5fa48a01db15fdafa179663b71867dd6a9c2ab7b4b94434f650c1ce37bd71caa2bb22efe032a4eed777538cdc341f22a251d14772aaba62f4a6d9d8c33b6a346
 EBUILD dalli-2.7.6.ebuild 1407 BLAKE2B c1a47e18c933355b7cb917582e8342218da00e1755e92691abae96254d09a43e06c0b27ddaf64df66e9831a8eac04c0297d57007ea4509546b9f529a4fa601b5 SHA512 de044b223df4c284be5b981aeccc401365c47143c7f1b33768278e24f51eda5270ffc482f72eadf9af31b8b5b527becfbcafd810c1b9d1e2d2683560156fdadf
-EBUILD dalli-2.7.7.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
-EBUILD dalli-2.7.8-r1.ebuild 1394 BLAKE2B 2d4ab0d8645dbc28c73283292a230a6996f5c738dbfecb93041b8e5eca91e4da65db955c174d9792dfdb9f81d84edeef72bd9359935daade4d692048ea432552 SHA512 28ba8ae344c0091e8b619a2ca4e6cde828c6f4b46e8798994a46f9cb76ff8bece23576c1b182e2101327ceeda36a80183157da6dd98ec8307a6c705db9a22c93
+EBUILD dalli-2.7.8-r1.ebuild 1390 BLAKE2B fef340fbf6d16192c9173d096f2763ab0e12097b457e0a4249a3c88b5e14f04390a314bee0391c856c14933aa484347f1bc4b32d418e772adf9873e6d0888f01 SHA512 be632a4d5cbb0fa2c5d36a48b67da95ae528e159c48f33bc2f7604e32d513767c939c4ae4d3dac0ea788e7b2665b9d3fa2fce7467802d9006396ee94c0127cc9
 EBUILD dalli-2.7.8.ebuild 1401 BLAKE2B c6119bf16e8b63f85b677507f225b25cccf32c33112dcd2c5374f62d507472d014d7eb0b0445d99de1aa3307f517fa90ab16c6c70478bb954c62868495224a23 SHA512 b898e173732ba03315325018579086522d653d2e3cf7671be74bf762d0789b666e5d0089dc61a3b9511d6e5fc40a246b86f41d0455c0528d51859c3e768894f5
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.7.ebuild b/dev-ruby/dalli/dalli-2.7.7.ebuild
deleted file mode 100644
index 89dc2a156175..000000000000
--- a/dev-ruby/dalli/dalli-2.7.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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_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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-4.2 <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"' \
-		-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
-}
diff --git a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild b/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
index 840fb8fab589..ad86c5b8fe76 100644
--- a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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.4.0 )"