From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B78C1581D3 for ; Thu, 30 May 2024 06:46:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45EA0E29C0; Thu, 30 May 2024 06:46:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 207C3E29C0 for ; Thu, 30 May 2024 06:46:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4738B33DF47 for ; Thu, 30 May 2024 06:46:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB3F6E21 for ; Thu, 30 May 2024 06:46:38 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1717051577.6f7385468e9c387af5c97075d9e2ede8cf582c7a.ultrabug@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/, dev-db/mongodb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mongodb/Manifest dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch dev-db/mongodb/mongodb-4.4.20.ebuild dev-db/mongodb/mongodb-5.0.16-r1.ebuild X-VCS-Directories: dev-db/mongodb/ dev-db/mongodb/files/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: 6f7385468e9c387af5c97075d9e2ede8cf582c7a X-VCS-Branch: master Date: Thu, 30 May 2024 06:46:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e9037d3d-528b-4372-af17-f8cf7d6d2c94 X-Archives-Hash: 2130fded5b74e0b2cf154d221e879a35 commit: 6f7385468e9c387af5c97075d9e2ede8cf582c7a Author: Alexys Jacob gentoo org> AuthorDate: Thu May 30 06:46:17 2024 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Thu May 30 06:46:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f738546 dev-db/mongodb: drop 4.4.20, 5.0.16-r1 Signed-off-by: Alexys Jacob gentoo.org> dev-db/mongodb/Manifest | 2 - dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch | 25 --- dev-db/mongodb/mongodb-4.4.20.ebuild | 186 ---------------------- dev-db/mongodb/mongodb-5.0.16-r1.ebuild | 197 ------------------------ 4 files changed, 410 deletions(-) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index d432e2c66186..0d19b4137668 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,4 +1,2 @@ DIST mongodb-4.4.29.gh.tar.gz 51651007 BLAKE2B 9e9bd08ce87659fcf788964ec1bff80baef5bb9c2f5bd4968588511d289b9baf9fc68812f72ee89f90fb557dcc8d2ecbb3f607ca8e31c2212ec9633c0b99da37 SHA512 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335 DIST mongodb-5.0.26.gh.tar.gz 57252091 BLAKE2B a4663a4dbac90118b56646816b178680a6bd99be6abb582fdfdb662c8ddf14eb9db18ed97260a37b2d04bf11715e6cfaa34bb12c4f4b08426e3afa90908f0b3c SHA512 efd56649006bb61070a2f255e8d843e4ddab33562ec9454afe55848dcc3ce8ee90431f70c9362b14e52c4a49a162ea3075a869a6fd71f63efdd5f4358703fea4 -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 diff --git a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch b/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch deleted file mode 100644 index 00b82aca94fc..000000000000 --- a/dev-db/mongodb/files/mongodb-4.4.8-gcc-13.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://cgit.openembedded.org/meta-openembedded-contrib/commit/?id=856c21b061e000640829e158b9bb9e978a974386 - -From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 29 Jan 2023 17:15:30 -0800 -Subject: [PATCH] free_mon: Include missing - -gcc 13 moved some includes around and as a result is no -longer transitively included [1]. Explicitly include it -for uintXX_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Signed-off-by: Khem Raj ---- a/src/mongo/db/free_mon/free_mon_options.h -+++ b/src/mongo/db/free_mon/free_mon_options.h -@@ -29,6 +29,7 @@ - - #pragma once - -+#include - #include - #include - - diff --git a/dev-db/mongodb/mongodb-4.4.20.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild deleted file mode 100644 index 12cef7fbaaa0..000000000000 --- a/dev-db/mongodb/mongodb-4.4.20.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) - -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 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-debug/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) - >=dev-build/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}-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" - "${FILESDIR}/${PN}-4.4.8-gcc-13.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-build/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=( - AR="$(tc-getAR)" - 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 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 - 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_newunit "${FILESDIR}/${PN}.service-r1" "${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-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild deleted file mode 100644 index 239cdc96c99c..000000000000 --- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..11} ) - -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" -CPU_FLAGS="cpu_flags_x86_avx" -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 -RESTRICT="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-debug/valgrind )" -BDEPEND=" - $(python_gen_any_dep ' - >=dev-build/scons-3.1.1[${PYTHON_USEDEP}] - dev-python/cheetah3[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') -" -PDEPEND=" - mongosh? ( app-admin/mongosh-bin ) - tools? ( >=app-admin/mongo-tools-100 ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.4.1-boost.patch" - "${FILESDIR}/${PN}-4.4.1-gcc11.patch" - "${FILESDIR}/${PN}-5.0.2-fix-scons.patch" - "${FILESDIR}/${PN}-5.0.2-no-compass.patch" - "${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch" - "${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch" - "${FILESDIR}/${PN}-5.0.2-boost-1.79.patch" - "${FILESDIR}/${PN}-5.0.5-no-force-lld.patch" - "${FILESDIR}/${PN}-4.4.10-boost-1.81.patch" - "${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch" - "${FILESDIR}/${PN}-4.4.8-gcc-13.patch" - "${FILESDIR}/${PN}-5.0.16-arm64-assert.patch" -) - -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - python_has_version ">=dev-build/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() { - # Bug 809692 + 890294 - if use amd64 && ! use cpu_flags_x86_avx; then - ewarn "MongoDB 5.0 requires use of the AVX instruction set." - ewarn "This ebuild will use --experimental-optimization=-sandybridge which" - ewarn "will result in an experimental build of MongoDB as per upstream." - ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/" - fi - - if [[ -n ${REPLACING_VERSIONS} ]]; then - if ver_test "$REPLACING_VERSIONS" -lt 4.4; then - ewarn "To upgrade from a version earlier than the 4.4-series, you must" - ewarn "successively upgrade major releases until you have upgraded" - ewarn "to 4.4-series. Then upgrade to 5.0 series." - else - ewarn "Be sure to set featureCompatibilityVersion to 4.4 before upgrading." - fi - fi -} - -src_prepare() { - default - - # remove bundled libs - rm -r src/third_party/{boost,pcre-*,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=( - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - - --disable-warnings-as-errors - --force-jobs - --jobs="$(makeopts_jobs)" - --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 amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294 - - scons_opts+=( --ssl=$(usex ssl on off) ) - - # 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 - filter-flags '-m*' - filter-flags '-O?' - fi - - default -} - -src_compile() { - PREFIX="${EPREFIX}/usr" ./buildscripts/scons.py "${scons_opts[@]}" install-core || die -} - -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_newunit "${FILESDIR}/${PN}.service-r1" "${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" -}