From 067b4328567d8e37cb4834e674a5991d6f040c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 19 Jul 2025 17:20:57 +0200 Subject: [PATCH] [dev-db/mongodb] bump 6 series --- dev-db/mongodb/Manifest | 3 +- ...db-6.0.21.ebuild => mongodb-6.0.25.ebuild} | 61 ++++++++----------- 2 files changed, 29 insertions(+), 35 deletions(-) rename dev-db/mongodb/{mongodb-6.0.21.ebuild => mongodb-6.0.25.ebuild} (75%) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 6d467d8..f15422b 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,2 +1,3 @@ -DIST mongodb-6.0.21.gh.tar.gz 87688509 BLAKE2B 38bd6a62298567e2e190ccd3c3878812dde487b139e0bce2b2e5eaff83d34f474f1e62e9fed782cb0d9a50af2be9d5c5014b3a0f052b4bc5eb40a82089f0e93d SHA512 eb0fa9fe4eb27e6bb9c03ba9fc88f12c58633629e7a281442b517c4b563bc48edf19eb65d47e31748548a30510ac75b2ed0de2080f737190099fe1f9a2253de7 +DIST mongodb-6.0.22-patches.tar.xz 8820 BLAKE2B 973e58d0a09d8fb160beefd46b425b0f5dd7ad531f9ccec433fd201517035613c171cddaf5d3cf2883f57d4728438572062cc5c8b9166e15d8e5701efcd8b84c SHA512 fa8f18d259e829df07ec26ab570de9b3968b9b02ed195b47d7a2bfc832f2b7e74a5aaf58e54cfe6d01ea7e3d76efdad2e1efca0da4af0b0d3f50944dfd1fd4e0 +DIST mongodb-6.0.25.gh.tar.gz 87527607 BLAKE2B 0ddec1d8b6a9ba78a44fa8f14a3777dfec6ef35d873d0ea488f917762fde6c94f433f048c2da93fd95cfdf449302d23060673e255e94b3d98b69b0e4f4ef6a13 SHA512 3e86e313e84b3a2b57e9688e0a114043492d68ca9c5bbddb588fef87362e1d5e712ea6f478ba2142e86bfc68227e99832c2274cdee320a1bc964782eb1065ff0 DIST mongodb-7.0.18.gh.tar.gz 87225100 BLAKE2B 7ede32f4c6b6968ee8d797ce71457133020a3e4a039cd0db914e344e5042a0b871deb5741f86098b2e82b9ff619a511a754a06a29dcbb9527a3b7a7edf52b3ac SHA512 599767db66e95d8dd0bd0e6d51fd70129ea6df1e18a0cdaa52bc6cbe301c982684ff5aab446c50cb825573051e372d8f791aeab7df58e2a4d855e6073f2b46d5 diff --git a/dev-db/mongodb/mongodb-6.0.21.ebuild b/dev-db/mongodb/mongodb-6.0.25.ebuild similarity index 75% rename from dev-db/mongodb/mongodb-6.0.21.ebuild rename to dev-db/mongodb/mongodb-6.0.25.ebuild index b03334e..919591d 100644 --- a/dev-db/mongodb/mongodb-6.0.21.ebuild +++ b/dev-db/mongodb/mongodb-6.0.25.ebuild @@ -3,15 +3,14 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) SCONS_MIN_VERSION="3.3.1" CHECKREQS_DISK_BUILD="2400M" CHECKREQS_DISK_USR="512M" CHECKREQS_MEMORY="1024M" -inherit check-reqs eapi9-ver flag-o-matic multiprocessing optfeature pax-utils python-any-r1 \ - scons-utils systemd tmpfiles toolchain-funcs +inherit check-reqs eapi9-ver flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs MY_PV=r${PV/_rc/-rc} MY_P=mongo-${MY_PV} @@ -19,13 +18,14 @@ MY_P=mongo-${MY_PV} DESCRIPTION="A high-performance, open source, schema-free document-oriented database" HOMEPAGE="https://www.mongodb.com" SRC_URI="https://github.com/mongodb/mongo/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.0.22-patches.tar.xz" S="${WORKDIR}/${MY_P}" LICENSE="Apache-2.0 SSPL-1" SLOT="0" KEYWORDS="~amd64 ~arm64 -riscv" CPU_FLAGS="cpu_flags_x86_avx" -IUSE="debug kerberos ssl ${CPU_FLAGS}" +IUSE="debug kerberos mongosh ssl +tools ${CPU_FLAGS}" # https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server # resmoke needs python packages not yet present in Gentoo @@ -57,29 +57,25 @@ BDEPEND=" dev-python/psutil[${PYTHON_USEDEP}] dev-python/pymongo[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] ') " +PDEPEND=" + mongosh? ( app-admin/mongosh-bin ) + tools? ( >=app-admin/mongo-tools-100 ) +" PATCHES=( - "${FILESDIR}/${PN}-6.0.21-gcc-11.patch" - "${FILESDIR}/${PN}-5.0.2-no-compass.patch" - "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" - "${FILESDIR}/${PN}-6.0.21-boost-1.79.patch" - "${FILESDIR}/${PN}-6.0.21-sconstruct-changes.patch" - "${FILESDIR}/${PN}-6.0.21-gcc-12.patch" - "${FILESDIR}/${PN}-6.0.21-gcc-13.patch" - "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" - "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch" - "${FILESDIR}/${PN}-4.4.29-no-enterprise.patch" - "${FILESDIR}/${PN}-5.0.26-boost-1.85.patch" - "${FILESDIR}/${PN}-6.0.21-boost-1.85.patch" - "${FILESDIR}/${PN}-5.0.30-gcc-15.patch" - "${FILESDIR}/${PN}-5.0.26-scons.patch" - "${FILESDIR}/${PN}-6.0.21-mozjs-remove-unused-constructor.patch" - "${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85.patch" - "${FILESDIR}/${PN}-6.0.21-boost-filesystem-1.85-2.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-4.4.29-no-enterprise.patch" + "${WORKDIR}/mongodb-6.0.22-patches/${PN}-5.0.2-no-compass.patch" + "${WORKDIR}/mongodb-6.0.22-patches/${PN}-5.0.2-skip-reqs-check.patch" + "${WORKDIR}/mongodb-6.0.22-patches/${PN}-4.4.10-boost-1.81.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.0-boost-1.79.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.0-gcc12.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.7-gcc-13.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.21-boost-1.85.patch" + "${WORKDIR}/mongodb-6.0.22-patches/mongodb-6.0.2-sconstruct-changes.patch" + "${FILESDIR}/mongodb-6.0.21-mozjs-remove-unused-constructor.patch" + "${FILESDIR}/mongodb-5.0.30-gcc-15.patch" ) python_check_deps() { @@ -87,9 +83,7 @@ python_check_deps() { python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]" && python_has_version -b "dev-python/pymongo[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/regex[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/typing-extensions[${PYTHON_USEDEP}]" + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { @@ -124,6 +118,8 @@ src_prepare() { } src_configure() { + # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source + # --use-system-icu fails tests # --use-system-tcmalloc is strongly NOT recommended: # for MONGO_GIT_HASH use GitOrigin-RevId from the commit of the tag scons_opts=( @@ -193,26 +189,23 @@ src_install() { newconfd "${FILESDIR}/mongos.confd-r3" mongos insinto /etc - newins "${FILESDIR}/${PN}.conf-r4" ${PN}.conf - newins "${FILESDIR}/mongos.conf-r3" mongos.conf + newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf + newins "${FILESDIR}/mongos.conf-r2" mongos.conf systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service" - newtmpfiles "${FILESDIR}"/mongodb.tmpfiles mongodb.conf - insinto /etc/logrotate.d/ newins "${FILESDIR}/${PN}.logrotate" ${PN} # see bug #526114 pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} + + diropts -m0750 -o mongodb -g mongodb + keepdir /var/log/${PN} } pkg_postinst() { - tmpfiles_process mongodb.conf - 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" - optfeature "MongoDB Shell" app-admin/mongosh-bin - optfeature "MongoDB tools (mongoimport, mongodump...)" app-admin/mongo-tools }