Merge updates from master

15 files changed, 47 insertions, 53 deletions

diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild
index 7891fa27662b..4b797548ec12 100644
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
 else
 	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 6e849e353aec..4df93edfc85e 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.2.1.ebuild
index 9e7faeb02180..a1129dcdc409 100644
--- a/dev-libs/msgpack/msgpack-3.2.1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.2.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild
index 9df40a41a5da..22b6e120a8d1 100644
--- a/dev-libs/unibilium/unibilium-2.0.0.ebuild
+++ b/dev-libs/unibilium/unibilium-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-lua/mpack/mpack-1.0.4.ebuild b/dev-lua/mpack/mpack-1.0.4.ebuild
index 314cdc9708b0..2e8a8290a194 100644
--- a/dev-lua/mpack/mpack-1.0.4.ebuild
+++ b/dev-lua/mpack/mpack-1.0.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/libmpack-${PV}/binding/lua"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="luajit test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 3dc3c5352155..7ad4b1018653 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,2 +1,3 @@
 DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
 DIST dogpile.cache-1.0.1.tar.gz 339926 BLAKE2B bb6bf3c4908920bdbf4b5b2f23f1bae2f201eb0ee2e05e7e403f732f244aede94c01acc337c519b41157ac0090770694a7794c3530b001455f046d32db1351d1 SHA512 bd50ea84d8a8b3573d5fbd8953110180fc91d703383f7574a40731cf7e0bb6ceb9165ef93e5598f14d5509d39791c05e9e8607014dfad417fa826502c0240902
+DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
new file mode 100644
index 000000000000..40848b853c59
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-ruby/mustermann/mustermann-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
index abcb85b22d19..da2b84ef7cbc 100644
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ b/dev-ruby/mustermann/mustermann-1.1.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/ruby2_keywords-0.0*"
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 8574d78cebeb..4c7bd875b75f 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,3 +1,2 @@
 DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db7c0b7d76d20f1f845be11f7187795d3a989629ff849e2e1bd0454fd56bc7be6b692d9840838861bafdb4c SHA512 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43
-DIST mysql2-0.5.2.gem 99328 BLAKE2B 0f1a0d4657e5933e14d445ceefc6ff605a8b07bc01686dd0a67e018c45857a92d25914e4f0aae1116ed1479583636cdbca2aaeb127b856b38052264d579991bf SHA512 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566
 DIST mysql2-0.5.3.gem 74240 BLAKE2B 9de25a34173ab952f6842f01d9207405c8bc6ed5937fdf66de4062129fc20f425635956f6d12f78466c8c341c49916f7d00df845f84a4101d34a98b1585b9919 SHA512 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
diff --git a/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild b/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
deleted file mode 100644
index f53de26ac483..000000000000
--- a/dev-ruby/mysql2/mysql2-0.5.2-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
-
-MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config="${config}" || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild
index d146654b3767..6b28fe2f28a6 100644
--- a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.2.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/ruby/ruby2_keywords"
 
 LICENSE="Ruby"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild b/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
index 6e6c7c7a0854..cd9ab9f497c6 100644
--- a/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
+++ b/games-misc/lolcat/lolcat-100.0.1-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/games-misc/lolcat/lolcat-100.0.1.ebuild b/games-misc/lolcat/lolcat-100.0.1.ebuild
index 43a1f78591e2..bcf2f20639c1 100644
--- a/games-misc/lolcat/lolcat-100.0.1.ebuild
+++ b/games-misc/lolcat/lolcat-100.0.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/games-misc/lolcat/lolcat-90.8.8-r1.ebuild b/games-misc/lolcat/lolcat-90.8.8-r1.ebuild
index 595d34230b67..696d769be5f7 100644
--- a/games-misc/lolcat/lolcat-90.8.8-r1.ebuild
+++ b/games-misc/lolcat/lolcat-90.8.8-r1.ebuild
@@ -1,7 +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="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index a20e594712e8..e7dcffed4382 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2020-08-08)
+# dev-lua/busted is not keyworded yet
+dev-lua/mpack test
+
 # Felix Janda <felix.janda@posteo.de> (2020-08-01)
 # Requires unkeyworded dev-lang/spidermonkey:17
 >=www-client/elinks-0.13.3 javascript