diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index b21bed1..5abe19d 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -1,2 +1,4 @@ -DIST mongodb-src-r4.4.28.tar.gz 51471609 BLAKE2B 1b0d54c39b02f4e0684023e1474a9f846be7a714d19c8836b58689257427e7d879c53fe2528d6185fa5279b09179fe3616797c0e8128b8a11fafc97c9e76041d SHA512 f2af1c64ed18dcbda63d2562993259e4dd0dea682831f9c2504f09c10c66106f564051bc2f8c6c0e908df3802f8452f1e45ba66065415a842ce4071f97c070f8 -DIST mongodb-src-r5.0.24.tar.gz 56957730 BLAKE2B cc4762b62aacc1efa870c3d082d7ba3f38fad31b4b4c0d50712bb991a6862d57d0b029bdd1cd4acc0392141f7c7bc47c9793d3fefa56fa704b792298ec218534 SHA512 d322c890affccc8c9b86ca627b3aa83cd29f40d8d860eb69ee22eab99111af66afc286bff8d8fc3c95b034a5662371b8b530e718f228394844f0514e61d71a8f +DIST mongodb-src-r4.4.29.tar.gz 51483592 BLAKE2B 9d3469b78fba473aa8cf70a4649927a8b34e567a88fe4b29a3080bb4047022a457bb37ad6f8686c64929381d57e48f31dc08b8c64a33719d7deafa139df13b72 SHA512 10e75a14a7abfddc12c34d301968c85bca4a6b489e0e5f8a4fcf7cfb02ca616e63f3a98104c5fbcccca5d1d2bac1a836030f6e05768bb955bfbbdadc233d25dd +DIST mongodb-src-r4.4.29.tar.gz.sig 833 BLAKE2B 39532d91686fe7697f629d486fc7d4f1ac2d6ee6c40d4e5aa39235e3aa16cd9a9059c097ed70411f76fe056a7a45f1425d77c56f45c8b53716873539956f43fb SHA512 5d97e616836360a878d99664be9d4b46f248feee6abb9a90c645f37f9f1cd647c8313fb573067e48af0d103c6078851dec0b156f51c365fa0a7a78e64c5cfc84 +DIST mongodb-src-r5.0.25.tar.gz 57070487 BLAKE2B 813e7e480dc9e7b3ed0d99ed6e410bbcd19e1040d07414cb605a6d6e862ce29f6a88385bd67ac2d1aff59a0972884eeaeade36c5c984a2785081c3643fc15542 SHA512 f1f44011abe31321f4753f45e5acd2d5e54aa0349246d67f07ad3f256fd07fa9125eba05cc98c157145bf43314b04a9df14a5010a4e5a64b7d545e10a530a55d +DIST mongodb-src-r5.0.25.tar.gz.sig 833 BLAKE2B 354e5007b855c654630de3b17def55b6c3b65c7fe4907c34798ce47f73fa20286b0fc568535eb195b84af0bc41aef495764fdcf3d2a8b1d9377f66624dd26cdd SHA512 6707a74685c2beaa204a082cffdb69ff4bf1679140999c292bc1aec6d6afb041c719054839ad8de714eccbadff414ee1d7573a686cff0fd16dcef5de04f27c1a diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml index 4209dc6..f8c3c65 100644 --- a/dev-db/mongodb/metadata.xml +++ b/dev-db/mongodb/metadata.xml @@ -14,7 +14,6 @@ and powerful queries). - Adds support for link time optimization Install the MongoDB shell from app-admin/mongosh-bin Install the MongoDB tools (mongoimport, mongodump...) from app-admin/mongo-tools diff --git a/dev-db/mongodb/mongodb-4.4.28.ebuild b/dev-db/mongodb/mongodb-4.4.29.ebuild similarity index 88% rename from dev-db/mongodb/mongodb-4.4.28.ebuild rename to dev-db/mongodb/mongodb-4.4.29.ebuild index a068e6a..c00ae32 100644 --- a/dev-db/mongodb/mongodb-4.4.28.ebuild +++ b/dev-db/mongodb/mongodb-4.4.29.ebuild @@ -10,14 +10,15 @@ 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 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mongodb-$(ver_cut 1-2).asc +inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs verify-sig 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" - +SRC_URI+=" verify-sig? ( https://fastdl.mongodb.org/src/${MY_P}.tar.gz.sig )" LICENSE="Apache-2.0 SSPL-1" SLOT="0" KEYWORDS="~amd64 ~arm64 -riscv" @@ -46,11 +47,11 @@ DEPEND="${RDEPEND} 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}] ') + verify-sig? ( =sec-keys/openpgp-keys-mongodb-$(ver_cut 1-2) ) " PDEPEND="tools? ( >=app-admin/mongo-tools-100 )" @@ -72,10 +73,9 @@ python_check_deps() { 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}]" + python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { @@ -98,6 +98,9 @@ src_prepare() { # remove compass rm -r src/mongo/installer/compass || die + + # remove features tied to enterprise license + rm -r src/mongo/db/modules/enterprise || die } src_configure() { @@ -108,6 +111,10 @@ src_configure() { AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + CCFLAGS="${CXXFLAGS}" + + VERBOSE=1 + VARIANT_DIR=gentoo --disable-warnings-as-errors --use-system-boost diff --git a/dev-db/mongodb/mongodb-5.0.24.ebuild b/dev-db/mongodb/mongodb-5.0.25.ebuild similarity index 87% rename from dev-db/mongodb/mongodb-5.0.24.ebuild rename to dev-db/mongodb/mongodb-5.0.25.ebuild index dc377f1..feb1804 100644 --- a/dev-db/mongodb/mongodb-5.0.24.ebuild +++ b/dev-db/mongodb/mongodb-5.0.25.ebuild @@ -10,13 +10,15 @@ 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 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/mongodb-$(ver_cut 1-2).asc +inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs verify-sig 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" +SRC_URI+=" verify-sig? ( https://fastdl.mongodb.org/src/${MY_P}.tar.gz.sig )" LICENSE="Apache-2.0 SSPL-1" SLOT="0" @@ -48,11 +50,11 @@ DEPEND="${RDEPEND} 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}] ') + verify-sig? ( =sec-keys/openpgp-keys-mongodb-$(ver_cut 1-2) ) " PDEPEND=" mongosh? ( app-admin/mongosh-bin ) @@ -75,10 +77,9 @@ PATCHES=( 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}]" + python_has_version -b "dev-python/cheetah3[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/psutil[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" } pkg_pretend() { @@ -109,6 +110,9 @@ src_prepare() { # remove compass rm -r src/mongo/installer/compass || die + + # remove features tied to enterprise license + rm -r src/mongo/db/modules/enterprise || die } src_configure() { @@ -119,6 +123,10 @@ src_configure() { AR="$(tc-getAR)" CC="$(tc-getCC)" CXX="$(tc-getCXX)" + CCFLAGS="${CXXFLAGS}" + + VERBOSE=1 + VARIANT_DIR=gentoo --disable-warnings-as-errors --jobs="$(makeopts_jobs)" @@ -132,7 +140,7 @@ src_configure() { ) use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300 - use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294 + use amd64 && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294 use debug && scons_opts+=( --dbg=on ) use kerberos && scons_opts+=( --use-sasl-client ) @@ -195,3 +203,4 @@ pkg_postinst() { 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" } +