Merge updates from master

34 files changed, 231 insertions, 35 deletions

diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index 77325ce33eb6..e9d1efa6db65 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-feedparser-0.9.4.tar.gz 2705393 BLAKE2B 22d95f817d7cd80c33da804e391dce877eb3947dc249eff82884e0ba747aae9d6949418311a7596f6639470e32ce81e1bcc180737e25ab1bbc910bbfeaabdcca SHA512 0fbecb83837996c1a9483d70275cf869a62dcb53bb42d3fc8d1c7992e37c7d2c8b3194a9d0372566c4907f8ffd893c1f6ee1b2e55fa2417c5f34b71496bfad9d
 DIST ruby-feedparser-0.9.6.tar.gz 2705372 BLAKE2B 4a169fb980a6fc23f2e1aeaaae6a74607d3aebfa0a779ee52d7621196e39363886a88e5fd77ce84abaf52d956881e02f8b4f776b0abcab234cd1a4d26b012b90 SHA512 a35748bd23e87138583aaf04ecb482712a3774e1f97c471f86d97e506edf33f63651d5fd64c680d5250c42277ff3f33248fa65d2fa53d0e468a51b0d745a7a33
+DIST ruby-feedparser-0.9.7.tar.gz 2705854 BLAKE2B d64d35696dd66890013643339817cf470e714fef4ecb5ad8c12a221fd949af53b6fa3668ec2ec16ac0a5fa76eb8dedf037530881ce2545356a4bf20dc7153b01 SHA512 6283e21448cebbfc0d07c01d24be48acadb852110c9e940983a22ce3c95592aea12a99dc4763aa267ba7386c935e2f58e52427b57171aa8fcaa332c6bb440fed
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
new file mode 100644
index 000000000000..bcaa2442bb43
--- /dev/null
+++ b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="feed2imap"
+
+DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
+HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/magic"
+
+ruby_add_bdepend "dev-ruby/magic
+	test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Extract gemspec source from Rakefile
+	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
+		-e 's/PKG_VERSION/"'${PV}'"/' \
+		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
+}
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 4c6c78188a9a..4aa86e4c4eb4 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,2 +1,3 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
 DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b47022d269131daac4e12e759bf1129fc46293f3f4408cefeacad87214d1e34da1b3e3421638e5609659afb7586 SHA512 df47968288592aba4093b8c4d19ea86d6171c1f2cb10ab7b9a03fccc8ed65a9aec35908d831a281970e75becc7feff7242f9fc3ca5b64a54ffb56a717bccbdf3
+DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
new file mode 100644
index 000000000000..902854a7d964
--- /dev/null
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
+HOMEPAGE="https://github.com/ruby/xmlrpc"
+SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 8ab448765946..f3b3ee02085c 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-fakegem.eclass
@@ -113,6 +113,20 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
 # get installed. Some gems provide extra files such as version information,
 # Rails generators, or data that needs to be installed as well.
 
+# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTENSIONS
+# @DEFAULT_UNSET
+# @DESCRIPTION
+# List of extensions supported by this gem. Each extension is listed as
+# the configuration script that needs to be run to generate the
+# extension.
+
+# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTENSION_LIBDIR
+# @DESCRIPTION:
+# The lib directory where extensions are copied directly after they have
+# been compiled. This is needed to run tests on the code and was the
+# legacy way to install extensions for a long time.
+RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
+
 case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI} (too old) for ruby-fakegem.eclass" ;;
@@ -387,6 +401,22 @@ EOF
 	) || die "Unable to create fakegem wrapper"
 }
 
+# @FUNCTION: each_fakegem_configure
+# @DESCRIPTION:
+# Configure extensions defined in RUBY_FAKEGEM_EXTENSIONS, if any.
+each_fakegem_configure() {
+	for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
+		${RUBY} -C ${extension%/*} ${extension##*/} || die
+	done
+}
+
+# @FUNCTION: each_ruby_configure
+# @DESCRIPTION:
+# Run each_fakegem_configure for each ruby target
+each_ruby_configure() {
+	each_fakegem_configure
+}
+
 # @FUNCTION: all_fakegem_compile
 # @DESCRIPTION:
 # Build documentation for the package if indicated by the doc USE flag
@@ -408,6 +438,23 @@ all_fakegem_compile() {
 	fi
 }
 
+# @FUNCTION: each_fakegem_compile
+# @DESCRIPTION:
+# Compile extensions defined in RUBY_FAKEGEM_EXTENSIONS, if any.
+each_fakegem_compile() {
+	for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
+		emake V=1 -C ${extension%/*}
+		cp "${extension%/*}"/*$(get_modname) "${RUBY_FAKEGEM_EXTENSION_LIBDIR}" || die "Copy of extension into ${RUBY_FAKEGEM_EXTENSION_LIBDIR} failed"
+	done
+}
+
+# @FUNCTION: each_ruby_compile
+# @DESCRIPTION:
+# Run each_fakegem_compile for each ruby target
+each_ruby_compile() {
+	each_fakegem_compile
+}
+
 # @FUNCTION: all_ruby_unpack
 # @DESCRIPTION:
 # Unpack the source archive, including support for unpacking gems.
@@ -506,6 +553,18 @@ each_fakegem_install() {
 
 	[[ -n ${_gemlibdirs} ]] && \
 		ruby_fakegem_doins -r ${_gemlibdirs}
+
+	if [[ -n ${RUBY_FAKEGEM_EXTENSIONS} ]] && [ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -ge 0 ]; then
+		einfo "installing extensions"
+		local _extensionsdir="$(ruby_fakegem_gemsdir)/extensions/$(ruby_rbconfig_value 'arch')/$(ruby_rbconfig_value 'ruby_version')/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
+
+		for extension in ${RUBY_FAKEGEM_EXTENSIONS[@]} ; do
+			emake V=1 sitearchdir="${D}/${_extensionsdir}" -C ${extension%/*} install
+		done
+
+		# Add the marker to indicate that the extensions are installed
+		touch "${D}${_extensionsdir}/gem.build_complete" || die
+	fi
 }
 
 # @FUNCTION: each_ruby_install
diff --git a/sys-libs/libcxx/libcxx-10.0.1.ebuild b/sys-libs/libcxx/libcxx-10.0.1.ebuild
index 42d16c17aa15..4f386c128379 100644
--- a/sys-libs/libcxx/libcxx-10.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-11.0.0.ebuild b/sys-libs/libcxx/libcxx-11.0.0.ebuild
index 83f5fdb6ce16..f63adc4cf51c 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-11.0.1.ebuild b/sys-libs/libcxx/libcxx-11.0.1.ebuild
index acb3f6367ef0..9414c15c0f46 100644
--- a/sys-libs/libcxx/libcxx-11.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-11.1.0_rc1.ebuild b/sys-libs/libcxx/libcxx-11.1.0_rc1.ebuild
index 76372b775b84..8ed99383fe0b 100644
--- a/sys-libs/libcxx/libcxx-11.1.0_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-11.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-11.1.0_rc2.ebuild b/sys-libs/libcxx/libcxx-11.1.0_rc2.ebuild
index 76372b775b84..8ed99383fe0b 100644
--- a/sys-libs/libcxx/libcxx-11.1.0_rc2.ebuild
+++ b/sys-libs/libcxx/libcxx-11.1.0_rc2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
index 76372b775b84..8ed99383fe0b 100644
--- a/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild
index 76372b775b84..8ed99383fe0b 100644
--- a/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-12.0.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
index 76372b775b84..8ed99383fe0b 100644
--- a/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-13.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( libcxxabi )"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-libs/libcxx/libcxx-9.0.1.ebuild b/sys-libs/libcxx/libcxx-9.0.1.ebuild
index 3249adf01345..9e4aac296d82 100644
--- a/sys-libs/libcxx/libcxx-9.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind static-libs test"
 REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
 	?? ( libcxxabi libcxxrt )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
index a8d5a05997f5..7aa13e0d8e6e 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
index fe26ee75eaa7..e0342a38384b 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.ebuild
@@ -17,7 +17,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild
index df3f045f7202..7ceb778be532 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc1.ebuild
index 32af10f1e6cf..59511b92f9ed 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-11.1.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc2.ebuild
index 32af10f1e6cf..59511b92f9ed 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.1.0_rc2.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.1.0_rc2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
index fdb1d198e853..8c24d9691115 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc1.ebuild
index fdb1d198e853..8c24d9691115 100644
--- a/sys-libs/libcxxabi/libcxxabi-12.0.0_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-12.0.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
index fdb1d198e853..8c24d9691115 100644
--- a/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-13.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
index 26bb7e5ca0fe..94d469615757 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libunwind +static-libs test elibc_musl"
+IUSE="+libunwind static-libs test elibc_musl"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
index 13cab062c868..7be495a57783 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
index 5f0e806022c0..8d86e39b63fb 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild
index 7427b7f7c975..0856ae1999ec 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc1.ebuild
index 7c1fd0a6d8ef..350dc8c77379 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc2.ebuild
index 7c1fd0a6d8ef..350dc8c77379 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc2.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.1.0_rc2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
index 0e6da8298540..bf538b66689b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
index 0e6da8298540..bf538b66689b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-12.0.0_rc1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
index 0e6da8298540..bf538b66689b 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.9999.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
index b5f6727bbe8b..6f8fa70ec4e7 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ llvm.org_set_globals
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug +static-libs test"
+IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="!sys-libs/libunwind"
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index e83ce165bd75..f577bf3f32cf 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -4,3 +4,4 @@ DIST puma-4.3.7.tar.gz 242780 BLAKE2B 22a81839bde50c61147712b85fceb90af8f46ada0b
 DIST puma-5.0.4.tar.gz 275942 BLAKE2B 1e607d7ff44ae9b677f6fb41355fe3b660bd880a642e5d3859e177c9327b68c0db729621ef0b3d7a5bb08917249fb7eac688027ceb62f072dabe7ba30086bf79 SHA512 6804ef3bfd4fa3a6695c213e3550244adace91121cb2c45f06fa4c68fb502787c5fdebba41b4754216eab880ca8738ab6f83d0ec9456a86fc6db99a4d4405bd8
 DIST puma-5.1.1.tar.gz 284807 BLAKE2B 59ba17129e55e79aa2f8092d60a5643840bd996b7832d421cb72538fc48b0fb302353bedef56cc9b115bdfb15b33b0f453bfbf759b2e9552a9490a8b0cef3090 SHA512 8653c622c21dca2116219702e801d7aa3272f0771fd5c2d5149927edbd504a9838fb0d442bfc5dc523035a94dad25946738a5dda954fdaa74a9a00c85ed9f86e
 DIST puma-5.2.0.tar.gz 292173 BLAKE2B e09e524ef651a674373e0c5281832fef2e016f58e9623968e11c47135f7bcddb72c6458e74e85f4264c40f49222161d9749c3c29295d5470e47e7b0382e96bab SHA512 3e97f17be3926ff23b03def55dd1c9f015750a5aec74f0fa1551d20c9f386e0ec1a9e676dc0df49ae12129be6768a7d2f7df7a944dd2ec3d44f8243098dc7950
+DIST puma-5.2.1.tar.gz 292945 BLAKE2B 1590dd256953578330ffcb4b2e8745c20ea893f62f251813da5b2473694312a9daeccd7cd5f453dbad441619594210fbdac431a6459deea24e1656c4da0ba01c SHA512 8ec1a351badd68ce6559eb99592e3f4d836ca49406749a6c2cd9162c443eadf3b4cf24ceb6c92e0e27057217f6487ff9923888ff4a1590f8cf9061d06ec16e52
diff --git a/www-servers/puma/puma-5.2.1.ebuild b/www-servers/puma/puma-5.2.1.ebuild
new file mode 100644
index 000000000000..0d7b9f48b0c6
--- /dev/null
+++ b/www-servers/puma/puma-5.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-e '/stub_const/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb test/test_worker_gem_independence.rb || die
+
+	# Skip integration tests since they make a lot of assumptions about
+	# the environment
+	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
+
+	# Avoid test that uses unpackaged stub_const
+	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
+
+	sed -e 's/git ls-files --/find/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+}