Merge updates from master

19 files changed, 96 insertions, 124 deletions

diff --git a/app-arch/tar/tar-1.28-r1.ebuild b/app-arch/tar/tar-1.28-r1.ebuild
index 44d55f62decd..b97af126516c 100644
--- a/app-arch/tar/tar-1.28-r1.ebuild
+++ b/app-arch/tar/tar-1.28-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index 9df08b4b9665..3cf0b66dac55 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,3 +1 @@
-DIST arel-helpers-2.1.1.gem 10752 SHA256 692fa104b211ca97c1215ddbfb21710d9b581434a5f37062c9d7d8cbfaaa80d9 SHA512 e9a607f2fb34dfdaf447fa306378aa3c59d31695946f09fdf978101f2218f50dc2ba14483b958644c77a0c03705f4cf05a696b2c280bfd28766ad015d83d72fb WHIRLPOOL 00b71849305660a21e40e9975f2966984ee01c944efee80a71feda66e7ac09937a69c17ea1e25cafe6135969ba87160155e991a8c41a87b3bdd523b39c61fa04
-DIST arel-helpers-2.2.0.gem 11264 SHA256 9af47bee4c9db4aaefaee39583ac281abc3cf3702fa93d27978fd3630d7da56e SHA512 bd2f97975c408301a3bf5c02d8455ad584b26602f29fc4363e029590e1875b086138d2b383762bbac372e5e12183967eadd8b46952272aa90f48c15d21fad06b WHIRLPOOL ceaae68d580a13d71e9ebd84d37cbd1655b2c0e9c6e5fcaf8f9351ac9918b96ecb850e37541e9ef10524bdec5f1557a3ecfc9f3089b037ab9b4539603c4416bc
 DIST arel-helpers-2.3.0.gem 11776 SHA256 592390ebfcf096c2c8173e368abd18c85611371550aa67f8d062155084c2104d SHA512 658494d50fb94b598d015370a118541d4409f1adbc90489793ab219d55444681e0ba52c4525d3c064f8f28311b8ed5dee9a611fd803b2750c99250e37434b7d3 WHIRLPOOL 6643ad194ebdba274d6c981821e851ed38a08623f9950f3c3f84fcba6e97138bb710fc9539003c4dab7ec0b5a9e3ea9d72717602ed8e2eb89e63a3513b9fbc0a
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild
deleted file mode 100644
index 95e0b071f41b..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.1.1.ebuild
+++ /dev/null
@@ -1,33 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
-			dev-ruby/activerecord:4.0
-			dev-ruby/activerecord:4.1
-			dev-ruby/activerecord:4.2 )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild
deleted file mode 100644
index 869e49886722..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.2.0.ebuild
+++ /dev/null
@@ -1,33 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
-			dev-ruby/activerecord:4.0
-			dev-ruby/activerecord:4.1
-			dev-ruby/activerecord:4.2 )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-nav/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.3.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.3.0.ebuild
index ace778dcd73c..2e7f62066bf4 100644
--- a/dev-ruby/arel-helpers/arel-helpers-2.3.0.ebuild
+++ b/dev-ruby/arel-helpers/arel-helpers-2.3.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-ruby_add_rdepend "|| ( dev-ruby/activerecord:3.2
+ruby_add_rdepend "|| (
 			dev-ruby/activerecord:4.0
 			dev-ruby/activerecord:4.1
 			dev-ruby/activerecord:4.2 )"
diff --git a/dev-ruby/extlib/Manifest b/dev-ruby/extlib/Manifest
deleted file mode 100644
index 8f1f267cf0c8..000000000000
--- a/dev-ruby/extlib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST extlib-0.9.16.gem 65024 SHA256 308bb9f4813831baf2746df7e20b1f9500d3749531abc0dc1e3fa1b0de1e7cb1 SHA512 bbad68e431f740d2fca434c26d36e8c0471fc740faf4d342e7a565d0bf68b29abe5ca9d1a1246a3b5120fccead6c9e91dfff10032800317341d993d4b25995e9 WHIRLPOOL 3f72bae90fefef4062f4a99b63df01b540c593fa2d652abe26813624a4d816358bf2d9d7d7de1661e3048a2d5fb066a80045e649f34ba7c3933c3be4eded7e39
diff --git a/dev-ruby/extlib/extlib-0.9.16-r1.ebuild b/dev-ruby/extlib/extlib-0.9.16-r1.ebuild
deleted file mode 100644
index a01761d9b56f..000000000000
--- a/dev-ruby/extlib/extlib-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ruby21 → fails specs.
-USE_RUBY="ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="-f tasks/yard.rake yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="Support library for DataMapper and Merb"
-HOMEPAGE="http://extlib.rubyforge.org"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? ( >=dev-ruby/json-1.4.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/spec/d' spec/spec_helper.rb || die
-
-	# We always use json.
-	sed -i -e 's/json_pure/json/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
deleted file mode 100644
index eb1e47f2edfb..000000000000
--- a/dev-ruby/extlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ruby@gentoo.org</email>
-		<name>Gentoo Ruby Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-ruby/flickraw/Manifest b/dev-ruby/flickraw/Manifest
index 7f12cd0511ad..4649d21f285e 100644
--- a/dev-ruby/flickraw/Manifest
+++ b/dev-ruby/flickraw/Manifest
@@ -1 +1,2 @@
 DIST flickraw-0.9.8.gem 18432 SHA256 de8f0acca7f67ad51e1f83461ab5fcbca98acb6134d4b0dc74b5d32c868ffb09 SHA512 c73b3e1a4049103c7dd62588a18197913ad89ff07f766013085d8bf882f16b01379ee557ddb956b91886b81eb91ebcb287f285f78d3139558e90e9ad89cab4a7 WHIRLPOOL ced91766c4c260bc915b096bf8269f9c82f5e9bd73ed04444080483cc456aaf9c30b7dcdbf9c7630c2c8ddb34231bb7076a0369c00003c72330dcd267e7f92ec
+DIST flickraw-0.9.9.gem 19968 SHA256 30b6a4267477f779da1bae3ec8cee127619bd1bf5d61ed5ba2ca8a38a333fb26 SHA512 c7fac2e7da15f83ad7c2df5cc3a9f6f7dc68420c1976905c0ae8b00f4eeca513783c20aa6eef9b8ee68699aa59c03de6ea6f9c667a27413a0a6d147875c840f2 WHIRLPOOL 3deb579e0ae24e2c0d5db4d392ac2fc2d40daa9d34e05493c20ec40fcdd56617e29f3a0496939be2d07db48ab40f2dde7678f8febcd225fc7f9c22f065b12c56
diff --git a/dev-ruby/flickraw/flickraw-0.9.9.ebuild b/dev-ruby/flickraw/flickraw-0.9.9.ebuild
new file mode 100644
index 000000000000..df7d637e3482
--- /dev/null
+++ b/dev-ruby/flickraw/flickraw-0.9.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+# Tests are against the Flickr API and require an API key.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="-r README.rdoc examples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to access flickr api in a simple way"
+HOMEPAGE="https://github.com/hanklords/flickraw"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index e204ca556e12..6a23a91e16d9 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,3 +1,4 @@
 DIST maxitest-1.5.6.tar.gz 13751 SHA256 629e8c27b35158eb4bbbfecb47ac50434f47d13ceb094bcf657df1389bfd2f3d SHA512 7228c0b39a374a1193be63959b827c5657420b9effe451971e46a3d29c80f71fb684801011d531855340c853400250e149ae1cf0d73bda1800facc2ea072c500 WHIRLPOOL 1878bf3069e4debfc317a3b5bb360be96be05ed22e7c9bbbafcb410018d1a2009c964eec16864ab02dd619bbb657e3bc067bc82d0acd5f3962a797fdde6db918
 DIST maxitest-1.5.7.tar.gz 13880 SHA256 bb36fe20c5d61fc4f2a4f63a390ec4b93e0912e144069ad1699bc85b3152c907 SHA512 89f405e5cba0150a1e019980219a2f3be6af214f57518d665f0bf562e61fac86bfbc34d1476b71387e596d5c58355dd6914ca4abd04e754ceff4b93b6277da7a WHIRLPOOL 4e360a5e0186ba5f78359ecb63438ddbc8aedd26232b9aae8a1aaa2b0c0a0c31a2a7391537abf993b4b7fbcfd329a1b9237980aa381a448c00416100a8278e20
 DIST maxitest-2.0.1.tar.gz 14290 SHA256 6cdb465745f38690599790e7b6b12cedb84baff9a3a3316148f69219b54f304a SHA512 80ec4746faada003a64ecb80f7b5551d67c24a7a51955c955419f0c661c543c0ae14a1dc702c51bb0af182ead06e05b2c8839350f1b892bbb961640d25027a57 WHIRLPOOL d76c28b1d476d34168861b07dcacab7c4397f000bc3f84eccaae29ef884f0afd988ec64568ab11eb45693b3f8f2654da501dd2337d4331e3ec52abf6e5fbb4de
+DIST maxitest-2.0.2.tar.gz 14311 SHA256 25e85f7d2365b5048ae57ebe8bcdaa5a5a04670f07721936a0f199b5297a7f35 SHA512 08e27696206be68a124690fce2be8c59b0a4d235fe201322f8a583b8f43173a8811dda661d22874db9efcf2328ff1a44bfbc18ffaadd3bda8d84493278e8a509 WHIRLPOOL b20622558fcf927fd0db8e8b2b2fbc74e5f326c0cb7be7e3af2896f3b5fe2aaf138e93b524b8b7ace5ef1aa231e83c5f335794668834d6bc9c83a7ef651375e9
diff --git a/dev-ruby/maxitest/maxitest-2.0.2.ebuild b/dev-ruby/maxitest/maxitest-2.0.2.ebuild
new file mode 100644
index 000000000000..116beb1e65a6
--- /dev/null
+++ b/dev-ruby/maxitest/maxitest-2.0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Minitest + all the features you always wanted"
+HOMEPAGE="https://github.com/grosser/maxitest"
+SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/minitest-5.10:5"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	# Remove developer-only gems from the gemspec and avoid git issues
+	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
+		-e 's/git ls-files/find/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/byebug/ s:^:#:' Gemfile || die
+
+}
+
+each_ruby_prepare() {
+	# Use the correct target
+	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
+		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
+		spec/maxitest_spec.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
+}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
index f84a24c766ef..a8c0f705c251 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index c2ce06fe8916..69f613f43737 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -30,7 +30,7 @@ setup-allowed-flags() {
 		-fno-PIE -fno-pie -nopie -fno-unit-at-a-time
 		-g '-g[0-9]' -ggdb '-ggdb[0-9]' '-gdwarf-*' gstabs -gstabs+
 		-fno-ident -fpermissive -frecord-gcc-switches
-		'-fdiagnostics*'
+		'-fdiagnostics*' '-fplugin*'
 		'-W*' -w
 
 		# CPPFLAGS and LDFLAGS
diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
index 69b46450f8a8..c1230ebae00a 100644
--- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild
+++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/POV-Ray/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug +io-restrictions openexr static-libs tiff X"
 
 DEPEND="
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index f9c6a2186923..39a9b36ab8e6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
-DIST youtube-dl-2016.06.25.tar.gz 2218218 SHA256 4b89cb8dd9314f3291509ec9fce99e25ffd2161b745e1fff064ae102bbf6a12f SHA512 ec7362d19d442fefae59df23e1b0cd5f9bafea21e3b47999f93674d2acfc7058ecae4ec15038e7cdd5d6c05f40839bbaa771b01dc5c38ad888214b5fff9497b7 WHIRLPOOL 11be7196c5f8647a61e26e401b783601beca666f53b805e652759ebe7c87f45b6eb06da58841b2aa7d5ab5bf5e4b4449fef13359f4c3ece64f6ed274aa3deea8
 DIST youtube-dl-2016.06.27.tar.gz 2224557 SHA256 6ccb3ab1b2e3d5c231b9fff3bffe7c60b3c4973a8269bbe6a5b6835527109bcf SHA512 e117e6c0cab79acc4225bbf6e4bdaa1d439ca35f6018ac49c20c48fd72a0297f703ba5885f6ce378eefa5f26ac94c080682d1012467971ab72803deca3a576f4 WHIRLPOOL b2693ecb168e0ee6d3eab36f4e7ec8e0ae0e18313c3c60fae80fa601c801a245a8559227705a2ad4b12fa6d3ab9175c5fe8806fe19037790f0ba568ac91dd87a
+DIST youtube-dl-2016.07.01.tar.gz 2237365 SHA256 ffb6f2b9369ed239e2c139167dc60c521747875a2f5c45917c3b88c8ed74dd36 SHA512 a254954fe6b9b147639bad7ffbcf60d8778b6a9b17f2dedaf3be8f9a17f4271899c1650d7646b440dce8912403dca6cd5c59d988971dc631dd494dad1bc020c3 WHIRLPOOL 1c5cbf1d9a87a14efea052343dbf263b7c6b677cae26ff600073acdd9a68fe4e566773f9f918c4885d377bd5e677362ab27dc27a1f443c6bc9dd4451c5009d4f
diff --git a/net-misc/youtube-dl/youtube-dl-2016.06.25.ebuild b/net-misc/youtube-dl/youtube-dl-2016.07.01.ebuild
index 969c3bf49e3d..969c3bf49e3d 100644
--- a/net-misc/youtube-dl/youtube-dl-2016.06.25.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2016.07.01.ebuild
diff --git a/profiles/package.mask b/profiles/package.mask
index f790d466b85e..67a8f3c2aa10 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,22 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (1 Jul 2016)
+# With the release of Rails 5.0 versions older than 4.2 are no longer
+# supported. Mask Rails 3.2 and related packages for removal in 30 days.
+dev-ruby/rails:3.2
+dev-ruby/railties:3.2
+dev-ruby/activerecord:3.2
+dev-ruby/actionmailer:3.2
+dev-ruby/actionpack:3.2
+dev-ruby/activeresource:3.2
+dev-ruby/activemodel:3.2
+dev-ruby/activesupport:3.2
+dev-ruby/coffee-rails:3.2
+dev-ruby/sass-rails:3.2
+dev-ruby/activeldap:3
+=www-apps/redmine-2.6.10
+
 # Aaron Bauman <bman@gentoo.org> (30 Jun 2016)
 # Unpatched security vulnerability per bug #509920.
 # Removal in 30 days
@@ -368,10 +384,6 @@ dev-libs/libtomcrypt
 # Masked for removal in 30 days.
 =app-forensics/chkrootkit-0.49
 
-# Hans de Graaff <graaff@gentoo.org> (14 Mar 2016)
-# Not compatible with ruby21+, no reverse dependencies.
-dev-ruby/extlib
-
 # Ian Stakenvicius <axs@gentoo.org> (06 Mar 2016)
 # Mask old versions of thunderbird as they are no longer supported,
 # but we keep them in the repo for now in case there is a need
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
index 202a380fceff..b686930d3a92 100644
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,