Merge updates from master

9 files changed, 14 insertions, 135 deletions

diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 7b05b3369ce8..1e76e77f6d4d 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1,2 +1,2 @@
-DIST chunky_png-1.3.5.gem 350208 SHA256 b6ab1011b2e79bcc973c92deee4110d071d5cd59ed950efcd0aba49a5f57c06d SHA512 3c036da20a77bf3525f2d76711e3dee697360dce59c0aee13e57f6cd6a77e7cde0bc94be15ba3c8792e45652d6825f520f8d16f5bc90ca2315a9b3ce17870494 WHIRLPOOL e7ac53ed0b2f959d0016a87c48140382f07477cb061558ae25120e04bd4947ca399321520b0fe508f4e481763c72ab4ae03a693e62486d58e0c3482b371990fa
 DIST chunky_png-1.3.6.gem 350208 SHA256 378143eb3fefd8ccc579ad8462fb15621607ab12b6bcccc6cff9ae4623092c6b SHA512 334ea571194a3357003ddbdf41c669ae189c6927c43182a8814e5aa5b3cdee2a3adef80cae4453a3d6d186652c78fdde496bf9080a28227d26dd411dbe0d880e WHIRLPOOL 43a92898c4362112b51f443b5f0c326bf6b0810ce3d4b4afdb37b89bb3a0727328339ee6b403e74ab2572b999c091d6b468c4a4dc1795e5220280ff8edaf23da
+DIST chunky_png-1.3.7.gem 350720 SHA256 b013d9382be8b9b10e1ad194e1f8840c406cf89494752ff255f95ce71ff13fdc SHA512 0cd9314ad551128d3d9dd234b3998ed8a96d1a038ed92288485538873be76e5034233e205f16491031ebdade9501593133ea8bfd7b0288bfd83c03de034a5bc7 WHIRLPOOL 20d078d0d86a5881a2b95ac6e54a0aacfe7ae9da6cc28089ae4f72d5b4e53735a11e8865687af30cf61d8b15fa5de5047a64236b8640828f43ee9a2862aecf6e
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild
deleted file mode 100644
index 5291fc28292d..000000000000
--- a/dev-ruby/chunky_png/chunky_png-1.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby library that can read and write PNG images"
-HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
-	rm Gemfile* || die
-
-	# Avoid git dependency
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.5-r1.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
index 1c4f4e1ba2bf..3c993301ef3a 100644
--- a/dev-ruby/chunky_png/chunky_png-1.3.5-r1.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
 
-RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
 
 RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
 
diff --git a/dev-ruby/domain_name/Manifest b/dev-ruby/domain_name/Manifest
index 89f7fce2938f..b9d6793945eb 100644
--- a/dev-ruby/domain_name/Manifest
+++ b/dev-ruby/domain_name/Manifest
@@ -1,5 +1,3 @@
-DIST domain_name-0.5.20160309.gem 113664 SHA256 51d7801d1dc076f29900243c305ebe50a2e30d6d16aca931a5ee8c2af5bf3bca SHA512 e9a9e87fbe8f1e1ee6b14122683593737d7f8efb99f0acd38f3324adecda5a4e8ef72f9c449939fce59ca093ce33daaaea531b9916f151047f393b7d03d56fdb WHIRLPOOL 8338135ae1935a4b5e5b867d856f3d9d5d8e2af25cec12419569b1bcb67b6dbdc0082d0aaf40dddd53146cd9c6a281e12669149c6f4f59333d53992116dcbff4
-DIST domain_name-0.5.20160310.gem 113664 SHA256 da5fa56840cc67d034435880ddfbdd17d765c53d2f049de8a610cfab7f39213c SHA512 d99faf7ae16355091aed8c934f8b505162fb17ca7524b01606d9c5a6dc96a22d4bfe34df5b3f3c05fa064bcb6435f48fc913db6d58f0e82dffea1c9146c4825a WHIRLPOOL a060d785a5527ce17d151721c05c4eba26b13c26532e2023f0f0d47744495820536abbc60776944955af3b405c1ee1986b3ac71cf8fa78294ca8150a05b79a16
 DIST domain_name-0.5.20160615.gem 116224 SHA256 afb018732f1d0b322b213413868cd21011dba62fd77b38ceba2e7a9ee67690b9 SHA512 c21068813f47553a617e28e941e8184d8b98dbf3b298a8899082013e8f83e4dadd49e29fd32137ad485930ef1908b107b0f88391c0ea322c977a1f9d6c8a26c8 WHIRLPOOL 9df0cefda0f38fe37ed3dd81fd83e63c63db1bbe84bbbde57b5c11dd7f4e33d562f397329adb11acbea7ec10dd7329cd599eabbd8f81da6884741a31ba8851ca
+DIST domain_name-0.5.20160826.gem 118784 SHA256 bd177e0e1354fbb96fe66ad5330da417c202f88ee7368f3e2eabf642ee7ee765 SHA512 7e01cd405c099198624a3c904adf43ef6c24673d19de3961bf29bbbba08853de3f6c279c3c7d6cdbd9bd1534a59bbdc8d6adc37f275af123d9d0f94dfb71dd33 WHIRLPOOL 62a1d97aa5ad9b1effebf0f3862313daeeb6b69b07d225be3c808cf0bada6a3a721921a61c80123157db8a0dda9d4cf51980fa55d6dff359a0b0adb41be042e0
 DIST domain_name-0.5.24.gem 104448 SHA256 8cbd6aea8859823f89aefeec49232e9d4377456fd42d08accfbc0cc6b32a55f6 SHA512 46caf0be89c3b2f38f79180c14f4eaa1096f12f80feb881dafb394033d2c6118f481c898310d281d15acd5b9a54473c9d9ee8f0e77dda5b03c40a0d6f137f602 WHIRLPOOL df40be6b18f08f242bafeb985a93692e3286a3889b738790108c7df64eff90dfe28c874b06f7cefd7e8ee295753126ee2d32ceb89dca65c71b95721064301161
-DIST domain_name-0.5.25.gem 112128 SHA256 5b492888a095f2f00027a268932c93d0432bf8ada568a5c601ff53ce6a761b9b SHA512 cdc89ef2cc93d014727e203ffaa3921f3548077bcf4dfacc83a03f887a88393cea01efcf072ca785b375a6b24cdbd69f201f2fbd81a7341595e6ed2a5d2b362c WHIRLPOOL 1f5a9577aab4aea61eb88d590bd52b07cb21c597646ad28fce6631baee3ea527282393ce392a830232081a70c0628c6666e0fb29d5aec640cae44ff887d0261b
diff --git a/dev-ruby/domain_name/domain_name-0.5.20160309.ebuild b/dev-ruby/domain_name/domain_name-0.5.20160309.ebuild
deleted file mode 100644
index f0bb1c3e2148..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.20160309.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.20160310.ebuild b/dev-ruby/domain_name/domain_name-0.5.20160310.ebuild
deleted file mode 100644
index f0bb1c3e2148..000000000000
--- a/dev-ruby/domain_name/domain_name-0.5.20160310.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Domain Name manipulation library for Ruby"
-HOMEPAGE="https://github.com/knu/ruby-domain_name"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/unf-0.0.5-r1:0"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.5
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d; i gem "unf"' test/helper.rb || die
-	rm Gemfile* || die
-
-	# Remove development dependencies
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rdoc\)/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on git.
-	sed -i -e 's/`git ls-files`/""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib:test test/test_*.rb
-}
diff --git a/dev-ruby/domain_name/domain_name-0.5.25.ebuild b/dev-ruby/domain_name/domain_name-0.5.20160826.ebuild
index f0bb1c3e2148..07501804acff 100644
--- a/dev-ruby/domain_name/domain_name-0.5.25.ebuild
+++ b/dev-ruby/domain_name/domain_name-0.5.20160826.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/hamster/hamster-3.0.0.ebuild b/dev-ruby/hamster/hamster-3.0.0-r1.ebuild
index 4e4795864f26..f858af7d6bfd 100644
--- a/dev-ruby/hamster/hamster-3.0.0.ebuild
+++ b/dev-ruby/hamster/hamster-3.0.0-r1.ebuild
@@ -19,6 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
 all_ruby_prepare() {
 	sed -i -e '/codeclimate/I s:^:#:' spec/spec_helper.rb || die
 	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb spec/lib/hamster/vector/insert_spec.rb || die
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 4b90d971e5c4..b34a8da2a051 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -5,6 +5,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Zac Medico <zmedico@gentoo.org> (01 Sep 2016)
+# Needs virtual/pypy* stable
+python_targets_pypy
+python_single_target_pypy
+python_targets_pypy3
+python_single_target_pypy3
+
 # Brian Evans <grknight@gentoo.org> (18 Dec 2015)
 # Needs dev-lang/php:7.0 stable
 php_targets_php7-0