Merge updates from master

13 files changed, 106 insertions, 204 deletions

diff --git a/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild b/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
new file mode 100644
index 000000000000..ee59e09ee553
--- /dev/null
+++ b/dev-ruby/gettext-setup/gettext-setup-0.34-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem to ease i18n"
+HOMEPAGE="https://github.com/puppetlabs/gettext-setup-gem"
+SRC_URI="https://github.com/puppetlabs/gettext-setup-gem/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-gem-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" dev-vcs/git"
+DEPEND+=" test? ( dev-vcs/git )"
+
+ruby_add_rdepend "
+	>=dev-ruby/fast_gettext-1.1.0:0
+	>=dev-ruby/ruby-gettext-3.0.2
+	dev-ruby/locale
+"
+
+all_ruby_prepare() {
+	sed -i -e 's/1.1.0/1.1/' \
+		-e "/'gettext'/ s/, '< 3.3.0'//" \
+		-e "s/spec.version.*$/spec.version = '${PV}'/" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/simplecov/,/^end/ s:^:#: ; 1irequire "date"' spec/spec_helper.rb || die
+
+	# Avoid spec with specific locale requirements
+	sed -i -e '/can clear the locale/,/^    end/ s:^:#:' spec/lib/gettext-setup/gettext_setup_spec.rb || die
+}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 86777ad95df3..08d58421dee0 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,9 +1,8 @@
 DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
 DIST i18n-0.9.5.tar.gz 61494 BLAKE2B 2a7bb401d5e75022ba6c40c6ee08809bc8728fe9aa22f308c4d532e6c042df57970b7fbfa574494072d8e5d0e125a01498c1964780d2ad9588b0a57da299a520 SHA512 356ce1290b207ce1b3dbed4d0ae542d027e74c43f453359ebf401755a5a55fd1fd815a2f046a634246e41f54c5360174dac1076be9cb7bf82f893f0dafdbd4bb
-DIST i18n-1.6.0.tar.gz 64957 BLAKE2B c74bc8f712939ecf4a8850b047180dd6390494da778567de73a225c40a28dce7a12e63041ca90b3ac0ade9bb88be36e26a00404afe74abb8e0ca686084ac4952 SHA512 653a5368618fb938f5663edb79178ddff24fce1549d5085d5302a40ff82124ce64ffdef6c5626f07731c7cd617665906a741e2581d79c5cc161301b69cf66b0e
-DIST i18n-1.7.0.tar.gz 65125 BLAKE2B 0ead0a8208f89b778d5273e231b79e024417f211531ed25367086dd74483667a7b229ed4e023fe5cd09371977d42f5fe5e3af88c636283e373ad5ddf7cefa3b8 SHA512 f25eb48904a7c51d6e81b1959176a06397354fadd84e8da9a1704165d96b7b3eba16823186deb29eb1254332fa88f0c44529e389d7085fdc5e3adf96562db4ee
 DIST i18n-1.7.1.tar.gz 66346 BLAKE2B 4fc0ba1130e2a1c5c9c603ff06ab076ef2d9ee57e968bce8dca4f2c5ee70079af5e38e69700f4df65101c141ef3b38e2cabd478dbeb274b17504f4f818fae161 SHA512 bc6c3587f084bb582a22647eb27ac53ccfbedbf8fe16f2a5605221f8033cbb920a557b5c7fe8247d407630ae5d245db55484a4da9396f519b705878371672e99
 DIST i18n-1.8.0.tar.gz 66404 BLAKE2B 2712ccb3d08edd9058b12bbb1e7ae665f752e76a89a65a2ca67f02ae7af0ce16203941722247c9df6ae078749132f46cd52eadc686d5237534ffb67ad99f74d8 SHA512 a83f19d66532772bdbebcfdfbfa43d13cf333c1f26eb347c14dabc6325765d20222a989f32cdc3063ff138c68c7b19727c7ebb0684f120f7e5ce53c14b21316c
 DIST i18n-1.8.1.tar.gz 66350 BLAKE2B f5e44810f31b00c0b6dfdd8c56d76011eaaafc8504ba252250eb45aa3e25c181333af12c13c401ea531dfbf72174bd8e3fa98f9e2575a87be6b2b243e014dc58 SHA512 8bdf4864f649b33d6f71a4bfeeabcaaa4f7baaea7765831c72c1d5c3a139af5be478786997e7829e4dce09152ca885a01ac78938dc8da93f2fac86f0635ca3f4
 DIST i18n-1.8.2.tar.gz 66623 BLAKE2B 2bc2a6174ae9b6a3342d925d29501e9cf959bf78f683a446330ab40064f39bbba5a715acf6b3baa2a1250308823880f9f91ec09aed03686f3d5bcbc314ef5807 SHA512 20cc06ab63c1e4343a49e2d979399dd599dc14e9a0faed260874d2c44419ca9b7262eb95b9949ed5cf0439b79854f5d810fe1731823b625449065666102340d3
 DIST i18n-1.8.3.tar.gz 67360 BLAKE2B 8122904d2d4167c4502ce01c4d7c72949a5f7af0f0efb73bd98341cd8ebe35649acdda53e04f376fbc4efaecbe1a984a7efd13e2dce5953aacc1d66a84b8f2e9 SHA512 d122eba8af72b7b6fc737775a188862c7dcea280e783323a6cc624dbfb87618db45b01a93fcb8cdf08973e012d0e2089f5debec68be75c64deee0136436cf0ec
+DIST i18n-1.8.4.tar.gz 67620 BLAKE2B c2f00d1cf723fb7fa12a867ab98f954674727454710bee005c6ade31b53fffbe6914ed3bd888e7153a29713c09b7a1572b519c20b0d1eeb54ce3f618d4c509cb SHA512 3c782d2e1f5cd8ea6aebc80fb469182216e8d0f87126aed1bc432aa41ab190514985f185278d5349ad35e4a13c4a56dbd750c89a83899fb2ac700f40a48385c0
diff --git a/dev-ruby/i18n/i18n-1.6.0.ebuild b/dev-ruby/i18n/i18n-1.6.0.ebuild
deleted file mode 100644
index 865fb025f66c..000000000000
--- a/dev-ruby/i18n/i18n-1.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-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 ~ppc ~ppc64 ~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 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby26)
-			versions="5.2"
-			;;
-		*ruby23|*ruby24|*ruby25)
-			versions="5.1 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/i18n/i18n-1.7.0.ebuild b/dev-ruby/i18n/i18n-1.8.4.ebuild
index a6ca426bc748..e0716b086e27 100644
--- a/dev-ruby/i18n/i18n-1.7.0.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.4.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="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="test"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -18,7 +18,7 @@ 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~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"
@@ -36,16 +36,22 @@ all_ruby_prepare() {
 	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
 
 	# Update old test dependencies
-	sed -i -e 's/12.2.1/12/' -e 's/1.7.0/1.7/' gemfiles/* || die
+	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"
+			versions="5.2 6.0"
 			;;
-		*ruby24|*ruby25)
-			versions="5.1 5.2"
+		*ruby25)
+			versions="5.2 6.0"
+			;;
+		*ruby24)
+			versions="5.2"
 			;;
 	esac
 
diff --git a/dev-ruby/image_processing/image_processing-1.11.0.ebuild b/dev-ruby/image_processing/image_processing-1.11.0.ebuild
index 80e6c6be3000..04f40b5f8a59 100644
--- a/dev-ruby/image_processing/image_processing-1.11.0.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.11.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( media-gfx/imagemagick[jpeg,tiff] )"
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 61adbe190e25..9cb4e7bcf086 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,5 +1,3 @@
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
-DIST net-ssh-git-6.0.0.tgz 218503 BLAKE2B 5cd2126513233eaf169fd0eab4876e7c0c4b61f7cb3df19d7e369403fbba39ee68f4ade61ec58ed9124c460af5d39bc93ccf32a320ea19d02fc3d34bb8413f37 SHA512 18dd1f694e6b57f6f22c356a0726f5eb8aff9921f097b50f072c2829c4bda8fa697c5e71a49da862beca59a703a3146b29b80f8b5dfed3a3b661e05bc68b3387
-DIST net-ssh-git-6.0.2.tgz 219657 BLAKE2B c514237e6edf4a9f7581850a1a5ecce352fd5f56c633587ddc26571c6bff06172f177168d8e55d053615050fff5d7f0946c4aafc0e31890ea630b741c99b27ee SHA512 f6fa4ab3b009429e08d76bf412bb0a93083c17d58ad6e24cef7d4152915dca2d335a533223ff57b65c9053a7ed5df4905e3231d50b0d52ea03f6403a6c1cdec4
 DIST net-ssh-git-6.1.0.tgz 220190 BLAKE2B a5ae0f15cf3dac8934de0b3216541415cc947214ea33d57770b5f2bf2594fa5b29b8dd9a417233de0ed243a12cdc547e5e87861767c5bbc65adb90cdbe58a484 SHA512 1d92ad19cb8bf80aec4ada23c49b91588c722551695cb0dd7b2954001fd71b4b4c030f8317b86766451847273c6116baa041c03e2415df2b0f81b20551dd8566
diff --git a/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild b/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild b/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild
deleted file mode 100644
index 124bde4b5785..000000000000
--- a/dev-ruby/net-ssh/net-ssh-6.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="ed25519 test"
-
-ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-all_ruby_prepare() {
-	# Avoid bundler dependency
-	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
-
-	sed -e "s:require_relative ':require './:" \
-		-e 's/git ls-files -z/find -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-src_test() {
-	# prevent tests from trying to connect to ssh-agent socket and failing
-	unset SSH_AUTH_SOCK
-	if ! use ed25519; then
-		export NET_SSH_NO_ED25519=true
-	fi
-	ruby-ng_src_test
-}
diff --git a/net-im/pidgin/pidgin-2.14.1.ebuild b/net-im/pidgin/pidgin-2.14.1.ebuild
index 6c9c09eeaabf..0cb7b6ada843 100644
--- a/net-im/pidgin/pidgin-2.14.1.ebuild
+++ b/net-im/pidgin/pidgin-2.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools gnome2-utils flag-o-matic toolchain-funcs multilib perl-module python-single-r1 xdg
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 0937db69241c..78c2d8855af4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org) (2020-07-20)
+# Mask old obsolete slots for removal in 30 days.
+# Use a newer slot of the same package instead.
+dev-ruby/i18n:0.9
+dev-ruby/net-ssh:4
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-07-19)
 # Unmaintained upstream and broken by ECM 5.72.0, masked for removal in 30 days.
 media-video/plasma-mediacenter
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 2fbc943ae771..5489c3027001 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,4 @@ DIST patch-5.8-rc2.patch 65398003 BLAKE2B 536bc4d8537587ce0324036d4649ac7c4ba2a3
 DIST patch-5.8-rc3.patch 65933507 BLAKE2B a0af229faa03bcc91edd27fd09a157dda245a7e703c2c754e2917d6acbf94827db805432580760850f4b48aa3b6ae3a2431483d074eeb1a2648cb22a463f1bd5 SHA512 ddc163b322e75c40b2f4cd81e1c2e68cf1ebc9200095759948c353b75bd9dadeba4ffa704025ecbd95d8ebe9e7d2f561f2eb0f0d47dbf03d372b86bfddb31ed0
 DIST patch-5.8-rc4.patch 66103533 BLAKE2B fdb7c4989bcb8d04e484c0024251678e57fb58864319f0956ecf233054ec33ec76ec5807b4bd85217e3a39bf7ced7fff94362ae6952149ac5b8a3e8460a1509c SHA512 88ef2caba06276bfd9795f2530ece2c3fed646e3d445a58fce77bc354777924c66c09098951959289228506e6aa884f8faf026d84c619caf3082702debac994f
 DIST patch-5.8-rc5.patch 66428755 BLAKE2B 633a56e00102522fd7100052613fb76ddf20c416402e52fb5bf30bd6b0e9f1c99c56b94c20e1a98da51400e14e956a4b4e5f2e5acd5b095545924e77882a4a7e SHA512 041c7ea7b9093b0b93e27201016527e959d122bdeda7eed3aa8f289c72af6ea4e3aa415a2806c534a812a2bd6f1e90719a974eb1fd3693e60c0bc9c5e924e025
+DIST patch-5.8-rc6.patch 66670137 BLAKE2B af076caefbb7862fb79d7df6f72e4f06de24bea66620d8a7f2844af1f771a72352e2d30c67758ed17684734444900b88f198006523d007bc2f3b8594a91e8347 SHA512 4bae58d19119a329e2c4da99546d3a5aa8cc7a1e0be6687a3fb19b559e8bed146e5fd1b4f96abe9d1ebfc8febe9e726dbd6a92c87b9cca2bfab52aa47bfd60e1
diff --git a/sys-kernel/git-sources/git-sources-5.8_rc6.ebuild b/sys-kernel/git-sources/git-sources-5.8_rc6.ebuild
new file mode 100644
index 000000000000..9412304f02dc
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.8_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.7"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}