commit:     f88ac0a5321e9ac4e46e2fbb3a06a00303c41485
Author:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 12:36:02 2019 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 12:36:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88ac0a5

dev-db/mongodb: version bump, drop old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 dev-db/mongodb/Manifest                            |  6 +++---
 ...{mongodb-3.6.8.ebuild => mongodb-3.6.16.ebuild} | 25 ++++++++++------------
 ...mongodb-4.0.10.ebuild => mongodb-4.0.14.ebuild} | 16 ++++++--------
 ...ongodb-4.2.0-r2.ebuild => mongodb-4.2.2.ebuild} | 15 +++++--------
 4 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 726b99ae32f..fab53f85351 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,8 +1,8 @@
 DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B 
de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82
 SHA512 
eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
 DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 
3cfe2aedd11a67a01ddee9eba36d99bad5fe8c7891e953cbdae9200427638e1acc1555c8d39df0217a48a95428838d573c90381698361f954d9aab860449cfcd
 SHA512 
2bdc0ee86625724f64b7af2962b19b13cefb21d58d45c7b22fe2e01bd021f2427236c279c89785ede7c6986742127160b032294fbb652c55ce42f8d941a18cfe
-DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B 
cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2
 SHA512 
c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
-DIST mongodb-src-r4.0.10.tar.gz 49870574 BLAKE2B 
1babbfa1a6d8fae390ec37042feff896c402772e832cc5b0b82fc4d531a6487ac2bd8d407c37ca75a76d78bc91cc665bfc3b7b223e6ceaaea2d921b337ef4d19
 SHA512 
891bfdc0d415515d7aa36aeb0618055ac6815c7d704537b88293226cecc1b677134db621fd90dee3913f4ff8174a888bcf68adee0a243d0f55ef6c0033a4f4b9
+DIST mongodb-src-r3.6.16.tar.gz 40927975 BLAKE2B 
bcd129d43eea24da3afe69c887bcd22116e0eb7e1f3f274fb8f51260625d17607b0d1eb31fb23a4f97c88e2c86b3d7a880cb05b0e77385d115cf9486d66f1249
 SHA512 
eb00f3a612942ad5f947583e92fca5b877b40d75132fa5a97989d81dd55925f5a112400eec8a43b2043bb0236b3228a670a888c41a374b0a60e8a3c26076b1e8
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 
81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055
 SHA512 
802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
 DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B 
bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6
 SHA512 
2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
-DIST mongodb-src-r4.2.0.tar.gz 60781115 BLAKE2B 
75531f69647c84f71127d4cdccf13bc21e50586240c767b4c1aa1efbf56cf008bf4f32b3a2011120ad9099da0f97be934375b8dd3d012670034327175c454f0e
 SHA512 
be2f4e00364ac49b1a0490fa859640680a4d10d861252d200bd3db535c770a3b97cee9de6d2b0b6b3622502d055ba92b6c1d88cb1134d251aa2cf50a8951b64c
+DIST mongodb-src-r4.0.14.tar.gz 50088053 BLAKE2B 
af7dc930dd7a469c06cf26201e3329967a664585b9964732c57ed283f323d4dc7fde3ea62ad4f1e8ca763360aeb614c2f77f98867031083d83808acd19e97539
 SHA512 
3d5d73a816a00887a8851e2e79919b2646f6cc34fd9b8acb255a52e2e71407a4728a80a81112bdbe0a92ba9f71e856ac7a2229741273e8485806cda2cb018d8d
 DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B 
b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12
 SHA512 
6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
+DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B 
afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1
 SHA512 
30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80

diff --git a/dev-db/mongodb/mongodb-3.6.8.ebuild 
b/dev-db/mongodb/mongodb-3.6.16.ebuild
similarity index 90%
rename from dev-db/mongodb/mongodb-3.6.8.ebuild
rename to dev-db/mongodb/mongodb-3.6.16.ebuild
index e2c2033998d..346c4039a33 100644
--- a/dev-db/mongodb/mongodb-3.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs eapi7-ver flag-o-matic multiprocessing pax-utils 
python-any-r1 scons-utils systemd toolchain-funcs user
+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}
 
@@ -18,13 +18,15 @@ DESCRIPTION="A high-performance, open source, schema-free 
document-oriented data
 HOMEPAGE="https://www.mongodb.com";
 SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz";
 
-LICENSE="AGPL-3 Apache-2.0"
+LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-arch/snappy-1.1.3
+RDEPEND="acct-group/mongodb
+       acct-user/mongodb
+       >=app-arch/snappy-1.1.3
        >=dev-cpp/yaml-cpp-0.5.3:=
        >=dev-libs/boost-1.60:=[threads(+)]
        >=dev-libs/libpcre-8.41[cxx]
@@ -55,9 +57,10 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 PATCHES=(
        "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
        "${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+       "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
 )
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
        if [[ -n ${REPLACING_VERSIONS} ]]; then
@@ -71,13 +74,6 @@ pkg_pretend() {
        fi
 }
 
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       python-any-r1_pkg_setup
-}
-
 src_prepare() {
        default
 
@@ -107,6 +103,7 @@ src_configure() {
 
        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

diff --git a/dev-db/mongodb/mongodb-4.0.10.ebuild 
b/dev-db/mongodb/mongodb-4.0.14.ebuild
similarity index 95%
rename from dev-db/mongodb/mongodb-4.0.10.ebuild
rename to dev-db/mongodb/mongodb-4.0.14.ebuild
index 5a035ec2344..ef4bca699aa 100644
--- a/dev-db/mongodb/mongodb-4.0.10.ebuild
+++ b/dev-db/mongodb/mongodb-4.0.14.ebuild
@@ -10,7 +10,7 @@ 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 user
+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}
 
@@ -20,11 +20,13 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz";
 
 LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-arch/snappy-1.1.3
+RDEPEND="acct-group/mongodb
+       acct-user/mongodb
+       >=app-arch/snappy-1.1.3
        >=dev-cpp/yaml-cpp-0.5.3:=
        >=dev-libs/boost-1.60:=[threads(+)]
        >=dev-libs/libpcre-8.41[cxx]
@@ -55,6 +57,7 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 PATCHES=(
        "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
        "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+       "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -71,13 +74,6 @@ pkg_pretend() {
        fi
 }
 
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       python-any-r1_pkg_setup
-}
-
 src_prepare() {
        default
 

diff --git a/dev-db/mongodb/mongodb-4.2.0-r2.ebuild 
b/dev-db/mongodb/mongodb-4.2.2.ebuild
similarity index 94%
rename from dev-db/mongodb/mongodb-4.2.0-r2.ebuild
rename to dev-db/mongodb/mongodb-4.2.2.ebuild
index bbb765a7566..42fec306370 100644
--- a/dev-db/mongodb/mongodb-4.2.0-r2.ebuild
+++ b/dev-db/mongodb/mongodb-4.2.2.ebuild
@@ -10,7 +10,7 @@ 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 user
+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}
 
@@ -24,7 +24,9 @@ KEYWORDS="~amd64"
 IUSE="debug kerberos libressl lto ssl test +tools"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=app-arch/snappy-1.1.3
+RDEPEND="acct-group/mongodb
+       acct-user/mongodb
+       >=app-arch/snappy-1.1.3
        >=dev-cpp/yaml-cpp-0.6.2:=
        >=dev-libs/boost-1.70:=[threads(+)]
        >=dev-libs/libpcre-8.42[cxx]
@@ -55,7 +57,6 @@ PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
        "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
-       "${FILESDIR}/${PN}-4.2.0-fix-scons-third-party.patch"
        "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
 )
 
@@ -73,13 +74,6 @@ pkg_pretend() {
        fi
 }
 
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       python-any-r1_pkg_setup
-}
-
 src_prepare() {
        default
 
@@ -108,6 +102,7 @@ src_configure() {
                --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 )

Reply via email to