gentoo auto-resync : 20:04:2023 - 18:00:30

4 files changed, 14 insertions, 188 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index f5736a462069..ffac5802fc99 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -24,12 +24,11 @@ AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
-DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
+DIST mongodb-src-r4.4.20.tar.gz 50883098 BLAKE2B 3ef2fddc4d926e372033449a14b0a71c606b6f8a9bb6767ff32c8da5a9287bf2972fae9dd83eab3ad934b1341c3edeed7708afd46f9a096819e9eca48aca40f5 SHA512 70b264b6a6f3ec16c8b0750d47026928f6250cb7a1a64d980c400ffbcc3af1b9c6301fe098d209fb8461cba4534b7c2edffdcdeb0548e627da107cc23d9a6b9c
 DIST mongodb-src-r5.0.16.tar.gz 56217257 BLAKE2B d78704c0cff4f8c1da20fdc5e083634c6dbe539136de58410ae6b86c9c5cd8044926425545ae07a7011a5febec5abb6f67773b8e539a4ac16daa1ad0ffc6a070 SHA512 d5fccd6cd3ee3f70457bd96a8eff66ca9872df37e196f1baf26993b6c080297d77504020e5554eaf3a2e92bb2730a467226b4bef47ab7fdc4de247d91c0143eb
 DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
 EBUILD mongodb-4.4.10-r1.ebuild 5207 BLAKE2B 6c90fd8a69ac3aae5054bd0fd13b996b24eb14e891ffec618be02eddcc94eec3edb534b83383c813bf62aab680d4e5f38760c279b0a101b47dc99a3cde6db924 SHA512 506996d9c9aec1cd427dd6304a387a157bb31b2c84e14dd8a9699e21a9e8ba1e2c4c6ff0bae064230661c49ee1b5ed2ece42a8239fff4a7af15b26a684b3a523
-EBUILD mongodb-4.4.8-r1.ebuild 4898 BLAKE2B db6747805ff1ceed1c78abf0fcc353a1bd37e5a4cb98cd96aa159c3ebf5079ba1f5c73ffadb300152a91ed5ddd00ff93de1e57d60a576d5d8e002a1269baf18c SHA512 74727dbc719f2d789df571fca64f5bc1ee5bdd1d62bfa65bcaddf1585f4112e63d7d5d0621d63dfb21816278b058e8bdaf0c559eb16616d676f0d19ec13768ed
-EBUILD mongodb-4.4.8-r2.ebuild 4958 BLAKE2B e1d8b1be3dd9ebb4982411d3d6b5d044fa68272cef93db862b9cd38916900e6669be594bc3afcdc95b0ae9b86874a0e53fba8c9203d8251888324a58700549b2 SHA512 82f7349459a7a7de567139fe63f3fe088129a6940cda1f0334e1d160ed0f1df0f7e7fd9a232b4903c4ed4215538b4c8678cef29674839b64aac606d37730f295
-EBUILD mongodb-5.0.16.ebuild 5558 BLAKE2B 618052c86e990c4852b64a5f73d258493d86ab242dc9f40e2f33e401f9bfed1e1911677a1383316fcb048d01fcbed99b9bc170402ccec817c180318cca64f817 SHA512 3aedacbbeeb7168a78af5b3b338e8cd59da5f578338521840ea61f811fea9c55d11978a2973d505be55be2944ca334ade96b7cb4f2bf4db5f452ec79ba72f593
+EBUILD mongodb-4.4.20.ebuild 5164 BLAKE2B 8f43abb00740a5612a902fc12c35768c4cc81042a483cb86f98f2c7eec35c7869084f8c8008ff66c410794fb02bf8f4c4dddecd165e7b3d975130995464a38c8 SHA512 f3392dcbc48043f0a1e9454a269e8d97b485bdac490aeab1d1ab3711f319c444803e1df3b39dde7c230ecdce05bc627878bfd4f29decb32708dcbcbb4e2beeae
+EBUILD mongodb-5.0.16-r1.ebuild 5558 BLAKE2B 089d0da6b99e825eaec8a884dd38d41888a8f040034fd61ae47366603924f0b5cb0b5da3fbf0dbf715b2e8efe2f57924cdb1f1b7184058ea770109b001c2222d SHA512 e56bf78fa82a9eb0dc28c27ac6faa9db29ea2bd4f5871d6a4fc63e617ad7d2602d879aaf45eb4f9106645f77c0ef335624d08d4d2848850057a75a026ed3bf1b
 EBUILD mongodb-5.0.5-r2.ebuild 5305 BLAKE2B 0a9abf9575ecf1ee0cec238a4e352560e4067cf5e9ddc39fa4ea94a7c89b3dc25abcde414d27220c220044cd7c58df0f38580ec0a494e5e5d6b1ae217dd9fe21 SHA512 d2f807ce50f107706f426d0b51a6d189084779eacc8c7b5c8122b841d922ed03b337ed23beb2af49dd92f16e7d8dcb7c5e7aa477ac531413ba2346d7409a61e4
 MISC metadata.xml 919 BLAKE2B 59d8c500d1b14701caa3feef86c2377c3a2cb870bc218f8aaf993ddcf22f0b75e3b34715446900b6aaf03404387b67c5a23df3d47a64cc7b280a6bfc93f6de45 SHA512 af222eae62fc327ac2ff9f8bf2727ab8f1199a0aabb7fa9a1bd229bd817b9260fe6357ae0ca9d7184bcbc865e2a91195c84efecb430436a0bdb207910850cdda
diff --git a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild
index 7489f6bcd105..d99084f668e5 100644
--- a/dev-db/mongodb/mongodb-4.4.8-r2.ebuild
+++ b/dev-db/mongodb/mongodb-4.4.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_{9..11} )
 
 SCONS_MIN_VERSION="3.3.1"
 CHECKREQS_DISK_BUILD="2400M"
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
+KEYWORDS="~amd64 ~arm64 -riscv"
 IUSE="debug kerberos lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
@@ -59,8 +59,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
 	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-4.4.8-gcc-13.patch"
-	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
+	"${FILESDIR}/${PN}-4.4.10-boost-1.79.patch"
+	"${FILESDIR}/${PN}-4.4.10-no-force-lld.patch"
+	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -104,6 +105,7 @@ src_configure() {
 	# --use-system-icu fails tests
 	# --use-system-tcmalloc is strongly NOT recommended:
 	scons_opts=(
+		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
 
@@ -123,6 +125,10 @@ src_configure() {
 	use lto && scons_opts+=( --lto=on )
 	use ssl && scons_opts+=( --ssl )
 
+	# Needed to avoid forcing FORTIFY_SOURCE
+	# Gentoo's toolchain applies these anyway
+	scons_opts+=( --runtime-hardening=off )
+
 	# respect mongoDB upstream's basic recommendations
 	# see bug #536688 and #526114
 	if ! use debug; then
diff --git a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild b/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
deleted file mode 100644
index 7485b54678b2..000000000000
--- a/dev-db/mongodb/mongodb-4.4.8-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-SCONS_MIN_VERSION="3.3.1"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 -riscv"
-IUSE="debug kerberos lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
-	acct-user/mongodb
-	>=app-arch/snappy-1.1.3:=
-	>=dev-cpp/yaml-cpp-0.6.2:=
-	dev-libs/boost:=[nls]
-	>=dev-libs/libpcre-8.42[cxx]
-	app-arch/zstd:=
-	dev-libs/snowball-stemmer:=
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.11:=
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	ssl? (
-		>=dev-libs/openssl-1.0.1g:0=
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	debug? ( dev-util/valgrind )"
-BDEPEND="
-	$(python_gen_any_dep '
-		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
-		>=dev-util/scons-3.1.1[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	')
-"
-PDEPEND="tools? ( >=app-admin/mongo-tools-100 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.1-fix-scons.patch"
-	"${FILESDIR}/${PN}-4.4.8-no-compass.patch"
-	"${FILESDIR}/${PN}-4.4.1-boost.patch"
-	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
-	"${FILESDIR}/${PN}-5.0.2-glibc-2.34.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
-		python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
-	fi
-
-	python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ver_test "$REPLACING_VERSIONS" -lt 4.2; then
-			ewarn "To upgrade from a version earlier than the 4.2-series, you must"
-			ewarn "successively upgrade major releases until you have upgraded"
-			ewarn "to 4.2-series. Then upgrade to 4.4 series."
-		else
-			ewarn "Be sure to set featureCompatibilityVersion to 4.2 before upgrading."
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
-	# remove compass
-	rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
-	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
-	# --use-system-icu fails tests
-	# --use-system-tcmalloc is strongly NOT recommended:
-	scons_opts=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-
-		--disable-warnings-as-errors
-		--use-system-boost
-		--use-system-pcre
-		--use-system-snappy
-		--use-system-stemmer
-		--use-system-yaml
-		--use-system-zlib
-		--use-system-zstd
-	)
-
-	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
-	use debug && scons_opts+=( --dbg=on )
-	use kerberos && scons_opts+=( --use-sasl-client )
-	use lto && scons_opts+=( --lto=on )
-	use ssl && scons_opts+=( --ssl )
-
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-
-	default
-}
-
-src_compile() {
-	PREFIX="${EPREFIX}/usr" escons "${scons_opts[@]}" --nostrip install-core
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
-	ewarn "Tests may hang with FEATURES=usersandbox"
-	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
-	dobin build/install/bin/{mongo,mongod,mongos}
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/mongos.initd-r3" mongos
-	newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		diropts -m0750 -o mongodb -g mongodb
-		keepdir "${x}"
-	done
-}
-
-pkg_postinst() {
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-5.0.16.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
index 1b3bb1bda7a1..2393d1783b1d 100644
--- a/dev-db/mongodb/mongodb-5.0.16.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 SCONS_MIN_VERSION="3.3.1"
 CHECKREQS_DISK_BUILD="2400M"