Merge updates from master

15 files changed, 167 insertions, 13 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 21b96cd40b9f..286498805740 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,3 +1,4 @@
 DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
+DIST xmlsec1-1.2.38.tar.gz 2036578 BLAKE2B 03f7e1b5e659793bf1984c5a59582d9459089ce913620d5cc1e5a5d0eb65557580cd23fa190db277298fd7cc55bd41563b93cf61a37c8b7521a4690cd2ca3489 SHA512 724089777caae95db27e67f24381c066eaae23a9d64819a18bb04837c1ab1b380d19be2c7ee25659ca481d9eab96fcbe8027a430a0ac1630ad3b073cddd20fac
 DIST xmlsec1-1.3.0.tar.gz 2425729 BLAKE2B a83d0117aaf1824a8a8f597f73ab1b76bcd1a9f0bb5d160df6c775f70cd2485f8e09c250f4ddbb4d42ba35549f9617d06f5470a91306757b4d5d54fdc0684f3c SHA512 ac1b1b88336959f54ef7fcfd6b9ff0feb2ba00a966a8e5b4efb97e802a1f9bb7adf5f4524c7f169344a1b7258377b5a7e879a0ab5ce25cfae3b05eac9b54729d
 DIST xmlsec1-1.3.1.tar.gz 2432943 BLAKE2B 1dafdffd959579add5c579e3fa9c9f9ddc73ce4aadc6fc2139506e6e64ffcd1bbe7298786e414900eb9f33f93b0a47da64e686c499e48d4c80d81b256db6692e SHA512 7f30c15c3edcafe70fa5febaa0ba39f73f8d30525ee102b5961a658dd2842fbc58e63f7595f15b150d71bf735bfa7688c3694a191b0d475776ca26902d90d25f
diff --git a/dev-libs/xmlsec/xmlsec-1.2.38.ebuild b/dev-libs/xmlsec/xmlsec-1.2.38.ebuild
new file mode 100644
index 000000000000..7db6d5418226
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.38.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc gcrypt gnutls nss +openssl static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )
+"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.7.4[ftp(+)]
+	>=dev-libs/libxslt-1.0.20
+	dev-libs/libltdl
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
+	nss? (
+		>=dev-libs/nspr-4.4.1
+		>=dev-libs/nss-3.9
+	)
+	openssl? (
+		dev-libs/openssl:=
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.37-libressl.patch # bug #903001
+)
+
+src_configure() {
+	# Bash because of bug #721128
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
+}
+
+src_test() {
+	# See https://github.com/lsh123/xmlsec/issues/280 for TZ=UTC
+	TZ=UTC SHELL="${BROOT}"/bin/bash emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 43b92192e606..1c1e9fc0fb74 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1 +1,2 @@
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
+DIST M2Crypto-0.39.0.tar.gz 1248372 BLAKE2B f89793b847fae3c51a0ea79c3ba861d26b53fa12b2c8d68c3b3476bb2c944b586e875bea0c4693c213e024024096a06de0734631e546c4284d65fc5494784476 SHA512 5d8210c6204fd71f06d238c5b1fe08dd38d6b8e92db7b1e433a9e4e2fe9af46d6d55df7550716a7d05328fb3c9eed427f015b7d5a1fe33a073f0af15a82ab050
diff --git a/dev-python/m2crypto/m2crypto-0.39.0.ebuild b/dev-python/m2crypto/m2crypto-0.39.0.ebuild
new file mode 100644
index 000000000000..65fe30ad10d2
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.39.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..11} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="M2Crypto"
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test abi_mips_n32 abi_mips_n64 abi_mips_o32"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+"
+RDEPEND="
+	dev-libs/openssl:=
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests setup.py
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+src_prepare() {
+	# relies on very exact clock behavior which apparently fails
+	# with inconvenient CONFIG_HZ*
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	# Avoid similar errors to bug #688668 for MIPS
+	if use abi_mips_n32; then
+	    swig_define _MIPS_SIM = _ABIN32
+	elif use abi_mips_n64; then
+	    swig_define _MIPS_SIM = _ABI64
+	elif use abi_mips_o32; then
+	    swig_define _MIPS_SIM = _ABIO32
+	fi
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
diff --git a/dev-ruby/bundler/bundler-2.2.33-r1.ebuild b/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
index 2648ee18bb9e..d7150828d87d 100644
--- a/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.33-r1.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.3.26.ebuild b/dev-ruby/bundler/bundler-2.3.26.ebuild
index 91d40972c38e..0d7d28f64890 100644
--- a/dev-ruby/bundler/bundler-2.3.26.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.26.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.3.8-r1.ebuild b/dev-ruby/bundler/bundler-2.3.8-r1.ebuild
index 296afea67cba..c37b4c7e2c02 100644
--- a/dev-ruby/bundler/bundler-2.3.8-r1.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.3.8.ebuild b/dev-ruby/bundler/bundler-2.3.8.ebuild
index 321c1ab7c03b..be4b051c799f 100644
--- a/dev-ruby/bundler/bundler-2.3.8.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.4.1.ebuild b/dev-ruby/bundler/bundler-2.4.1.ebuild
index 8e20f267e9b8..d7b69802994a 100644
--- a/dev-ruby/bundler/bundler-2.4.1.ebuild
+++ b/dev-ruby/bundler/bundler-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.4.15.ebuild b/dev-ruby/bundler/bundler-2.4.15.ebuild
index 4ebc48a4f154..3d9edeb1c010 100644
--- a/dev-ruby/bundler/bundler-2.4.15.ebuild
+++ b/dev-ruby/bundler/bundler-2.4.15.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.4.3.ebuild b/dev-ruby/bundler/bundler-2.4.3.ebuild
index 2047ba0a75cd..d7b69802994a 100644
--- a/dev-ruby/bundler/bundler-2.4.3.ebuild
+++ b/dev-ruby/bundler/bundler-2.4.3.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/bundler-2.4.6.ebuild b/dev-ruby/bundler/bundler-2.4.6.ebuild
index 390a130f77b9..9c3683f8c7fb 100644
--- a/dev-ruby/bundler/bundler-2.4.6.ebuild
+++ b/dev-ruby/bundler/bundler-2.4.6.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
+HOMEPAGE="https://github.com/rubygems/rubygems"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
diff --git a/dev-ruby/bundler/metadata.xml b/dev-ruby/bundler/metadata.xml
index ee48a2af0c3d..a1bfd976bb6d 100644
--- a/dev-ruby/bundler/metadata.xml
+++ b/dev-ruby/bundler/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">carlhuda/bundler</remote-id>
+    <remote-id type="github">rubygems/rubygems</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 76cde1987983..e720a5fe2c71 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,9 +33,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2023-07-05)
+# Doesn't install all needed files by e.g. kernelshark.
+# Need to either split into libtracecmd for the libraries or revert to Makefiles.
+# See bug #909439.
+=dev-util/trace-cmd-3.2
+
 # Hans de Graaff <graaff@gentoo.org> (2023-07-04)
 # Discontinued by upstream. No reverse dependencies. Upstream recommends
-# using dry-inflector. Please file a but if you would like us to package
+# using dry-inflector. Please file a bug if you would like us to package
 # this. Masked for removal on 2023-08-04.
 dev-ruby/inflecto
 
diff --git a/www-apache/mod_perl/metadata.xml b/www-apache/mod_perl/metadata.xml
index 743975e53191..78a62be94e65 100644
--- a/www-apache/mod_perl/metadata.xml
+++ b/www-apache/mod_perl/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="ithreads">Build for use with thread-capable perl, needs same setting as in <pkg>dev-lang/perl</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">apache/mod_perl</remote-id>
+	</upstream>
 </pkgmetadata>