Merge updates from master

5 files changed, 121 insertions, 7 deletions

diff --git a/dev-ruby/activesupport/activesupport-6.0.2.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.2.1.ebuild
index f79f36b8dc73..869cf4ba5602 100644
--- a/dev-ruby/activesupport/activesupport-6.0.2.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
diff --git a/dev-ruby/dalli/dalli-2.7.10-r1.ebuild b/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
new file mode 100644
index 000000000000..3dbf8da372c1
--- /dev/null
+++ b/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
@@ -0,0 +1,50 @@
+# 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/i18n/i18n-1.8.2-r1.ebuild b/dev-ruby/i18n/i18n-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..1835dcefe7e3
--- /dev/null
+++ b/dev-ruby/i18n/i18n-1.8.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-5.1
+	dev-ruby/bundler
+	>=dev-ruby/mocha-1.7.0
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+
+	# Remove optional unpackaged oj gem
+	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
+
+	# Update old test dependencies
+	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby27)
+			versions="6.0"
+			;;
+		*ruby26)
+			versions="5.2 6.0"
+			;;
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/listen/listen-3.2.1.ebuild b/dev-ruby/listen/listen-3.2.1.ebuild
index 57168d556690..0b4e9f473001 100644
--- a/dev-ruby/listen/listen-3.2.1.ebuild
+++ b/dev-ruby/listen/listen-3.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
index 8f4a9e1875a4..c9e69babb1d5 100644
--- a/dev-ruby/thor/thor-0.20.3.ebuild
+++ b/dev-ruby/thor/thor-0.20.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -48,7 +48,7 @@ all_ruby_prepare() {
 
 each_ruby_test() {
 	case ${RUBY} in
-		*ruby26)
+		*ruby27)
 			einfo "Skipping tests due to circular dependencies"
 			;;
 		*)