public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/mongo-tools/, dev-db/mongodb/
@ 2016-01-20 12:47 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2016-01-20 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     5f156b055166464825a020e5724ab9352171cb5a
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 20 12:47:41 2016 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 12:47:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f156b05

dev-db/mongodb: drop old

 app-admin/mongo-tools/mongo-tools-3.2.0.ebuild |  53 --------
 dev-db/mongodb/Manifest                        |   1 -
 dev-db/mongodb/mongodb-3.2.0.ebuild            | 180 -------------------------
 3 files changed, 234 deletions(-)

diff --git a/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild
deleted file mode 100644
index 658782f..0000000
--- a/app-admin/mongo-tools/mongo-tools-3.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-r${MY_PV}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl ssl"
-
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use sasl; then
-	  myconf="${myconf} sasl"
-	fi
-
-	if use ssl; then
-	  myconf="${myconf} ssl"
-	fi
-
-	./build.sh ${myconf}
-}
-
-src_install() {
-	dobin bin/*
-}

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index f031480..3481214 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,5 +5,4 @@ DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba
 DIST mongodb-src-r3.0.6.tar.gz 26241944 SHA256 609f6bd416ed11898b49406332b8ff301de239ba72df0bdbf1603233229c822d SHA512 1990e9011ae586e30aef28be58f9fc6d8b7f45b787dbde9785c82eff6fb0a70ea45152e450c032a898e6464bbb9b1683082f2a072ba874f7532e167330658175 WHIRLPOOL 4090cfb5912f81e6329d3c3680009037f22cd406611f78dc0ddd6fc9a63ee5261c7751fe83c60add2d5917f57b2a3c2796c48abb6f633157a8811d0571793a35
 DIST mongodb-src-r3.0.7.tar.gz 26261343 SHA256 2d25bae7c3bfb3c0e168fcad526dc212da72faaeae6d1573db631cacb172a7e7 SHA512 183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b WHIRLPOOL 986d962e76122142ca810eb7fe13ef66c88c7e354f066292836fc1207fa64c8bbb7fc49d1392db503c8a594d2593e2a19d831d7367462fcfa43eea38768e6323
 DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
-DIST mongodb-src-r3.2.0.tar.gz 26440220 SHA256 c6dd1d1670b86cbf02a531ddf7a7cda8f138d8733acce33766f174bd1e5ab2ee SHA512 4b321b582f5ec2613b869b003a02494c8a9e3b772b1f13898417b1e831c204468309a0e1785acd3b85c8a663cae91e55e44f53f8b74bd3a516b1e1471f606882 WHIRLPOOL c10639597303c122376d7387a4d5c9bdf6c44d9971f476fab72c85e78206ed256270d1a5e01e53aef4979127fdd03b3e5fbefa50ebf7639fa172723d6eee9737
 DIST mongodb-src-r3.2.1.tar.gz 26397562 SHA256 50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15 SHA512 5ce0af3e70010e3602dd2f7c49c80feee1c89903a694db038543a7f399f4296f2c04bf3aee7089da0b24aa9239aa79823e6f5408bf0f3c6fade6166e94070309 WHIRLPOOL de59175ad56577ffc5a90358e2f387c901a8353bb3b98ef6861d917480d853f926de7645ee4a2d8a704824609f251c82ead6e6cd95e982be18271677cfd6e2b3

diff --git a/dev-db/mongodb/mongodb-3.2.0.ebuild b/dev-db/mongodb/mongodb-3.2.0.ebuild
deleted file mode 100644
index 64205f5..0000000
--- a/dev-db/mongodb/mongodb-3.2.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-SCONS_MIN_VERSION="2.3.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=app-arch/snappy-1.1.2
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.57[threads(+)]
-	>=dev-libs/libpcre-8.37[cxx]
-	dev-libs/snowball-stemmer
-	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8
-	mms-agent? ( app-admin/mms-agent )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
-		libressl? ( dev-libs/libressl:= )
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8.2:*
-	sys-libs/ncurses
-	sys-libs/readline
-	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
-	test? (
-		dev-python/pymongo
-		dev-python/pyyaml
-	)"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
-		ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be"
-		ewarn "running a 3.0-series release. Please update to the latest 3.0"
-		ewarn "release before continuing if wish to keep your data."
-	fi
-}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	# Maintainer notes
-	#
-	# --use-system-tcmalloc is strongly NOT recommended:
-	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
-
-	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
-	)
-
-	if use debug; then
-		scons_opts+=( --dbg=on )
-	fi
-
-	if use prefix; then
-		scons_opts+=(
-			--cpppath="${EPREFIX}/usr/include"
-			--libpath="${EPREFIX}/usr/$(get_libdir)"
-		)
-	fi
-
-	if use kerberos; then
-		scons_opts+=( --use-sasl-client )
-	fi
-
-	if use ssl; then
-		scons_opts+=( --ssl )
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.2.0-fix-scons.patch"
-}
-
-src_compile() {
-	# respect mongoDB upstream's basic recommendations
-	# see bug #536688 and #526114
-	if ! use debug; then
-		filter-flags '-m*'
-		filter-flags '-O?'
-	fi
-	escons "${scons_opts[@]}" core tools
-}
-
-src_install() {
-	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.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}
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	# this one test fails
-	rm jstests/core/repl_write_threads_start_param.js
-
-	./buildscripts/resmoke.py --dbpathPrefix=test --suites core || die "Tests failed"
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
-		ewarn "!! IMPORTANT !!"
-		ewarn " "
-		ewarn "${PN} configuration files have changed !"
-		ewarn " "
-		ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
-		ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
-		ewarn " "
-		ewarn "Make sure you also follow the upgrading process :"
-		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
-		ewarn " "
-		ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
-		ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
-		ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
-		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
-	fi
-
-	ewarn "Make sure to read the release notes and follow the upgrade process:"
-	ewarn "  https://docs.mongodb.org/manual/release-notes/3.2/"
-	ewarn "  https://docs.mongodb.org/master/release-notes/3.2-upgrade/"
-	ewarn
-	ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine."
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/mongo-tools/, dev-db/mongodb/
@ 2017-10-13  8:33 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2017-10-13  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     68ae0a5e3a71bf3796cd642cbb5e9ee8529ca817
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Sep 28 09:18:07 2017 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 08:33:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ae0a5e

app-admin/mongo-tools: use local variable
dev-db/mongodb: drop obsolete yaml-cpp dependency

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5763

 app-admin/mongo-tools/mongo-tools-3.4.9.ebuild | 2 +-
 dev-db/mongodb/mongodb-3.2.12.ebuild           | 2 +-
 dev-db/mongodb/mongodb-3.2.13.ebuild           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/mongo-tools/mongo-tools-3.4.9.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.9.ebuild
index c93fd9f4bac..ba96c8cbca3 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.9.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.9.ebuild
@@ -44,7 +44,7 @@ src_prepare() {
 }
 
 src_compile() {
-	declare -a myconf
+	local myconf=()
 
 	if use sasl; then
 	  myconf+=(sasl)

diff --git a/dev-db/mongodb/mongodb-3.2.12.ebuild b/dev-db/mongodb/mongodb-3.2.12.ebuild
index 52572e12131..e6fac48d7a7 100644
--- a/dev-db/mongodb/mongodb-3.2.12.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.12.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
-	|| ( =dev-cpp/yaml-cpp-0.5.1 >dev-cpp/yaml-cpp-0.5.2 )
+	>dev-cpp/yaml-cpp-0.5.2
 	>=dev-libs/boost-1.57[threads(+)]
 	>=dev-libs/libpcre-8.39[cxx]
 	dev-libs/snowball-stemmer

diff --git a/dev-db/mongodb/mongodb-3.2.13.ebuild b/dev-db/mongodb/mongodb-3.2.13.ebuild
index 52572e12131..e6fac48d7a7 100644
--- a/dev-db/mongodb/mongodb-3.2.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.13.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
-	|| ( =dev-cpp/yaml-cpp-0.5.1 >dev-cpp/yaml-cpp-0.5.2 )
+	>dev-cpp/yaml-cpp-0.5.2
 	>=dev-libs/boost-1.57[threads(+)]
 	>=dev-libs/libpcre-8.39[cxx]
 	dev-libs/snowball-stemmer


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/mongo-tools/, dev-db/mongodb/
@ 2018-01-11 12:55 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2018-01-11 12:55 UTC (permalink / raw
  To: gentoo-commits

commit:     0a6fcc38163ff9d4dfeb58c3504b98311e28a172
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 12:54:34 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 12:54:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6fcc38

dev-db/mongodb: version bump

 app-admin/mongo-tools/Manifest                                          | 2 +-
 .../mongo-tools/{mongo-tools-3.6.1.ebuild => mongo-tools-3.6.2.ebuild}  | 0
 dev-db/mongodb/Manifest                                                 | 2 +-
 dev-db/mongodb/{mongodb-3.6.1-r1.ebuild => mongodb-3.6.2.ebuild}        | 0
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index aef3a609055..498276f23fd 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -5,4 +5,4 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
 DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
-DIST mongo-tools-3.6.1.tar.gz 4693844 BLAKE2B 1c6a600abf41a32cbac37cbcef540957e39b6e4574413ecedacdafc761e62b7bb45c285db985bbae01936fddbde0e8d10aa16cd512bd28ae3b60d072ac18b09e SHA512 15a073e92281b515d16c778ef3f540939dfaeaeb92afb303899ea3a7bbecd2782efa0ba05b9ed271660e9000c6108c05a28e2dec826880867c625d06ac65a0be
+DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a

diff --git a/app-admin/mongo-tools/mongo-tools-3.6.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.2.ebuild
similarity index 100%
rename from app-admin/mongo-tools/mongo-tools-3.6.1.ebuild
rename to app-admin/mongo-tools/mongo-tools-3.6.2.ebuild

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 1d9f22ce951..663d7836fff 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,4 +5,4 @@ DIST mongodb-src-r3.2.13.tar.gz 29273616 BLAKE2B 9fb9851953ef1561340bcb33cac6a2c
 DIST mongodb-src-r3.2.16.tar.gz 29293555 BLAKE2B e2863ed0210bc66fcf2c80e28668674c254e78ee750a0eb84c45569c2224157f1db65aca5296a0ed0c32ef83ab6269de25bd69dbf1f0ef54b021bb0aecd2e46a SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2
 DIST mongodb-src-r3.2.17.tar.gz 29295394 BLAKE2B 3fa9d8fa0b50b72c3b2aa86980dd4d46bd053f23d044e321d6f98f5edb76c566bf00455cf745110a8c39355843664d9d1fbbdf554fc8696de73db2b270446adc SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512
 DIST mongodb-src-r3.4.10.tar.gz 39959937 BLAKE2B f14f081525f694b939bc21f8cb6364c2a37573c0e1867322dd2062dc167b112751579c3e2d76730b3ff07b0c6bbfd36666bbea99162b7c10eef62d92eb1b0850 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a
-DIST mongodb-src-r3.6.1.tar.gz 39996730 BLAKE2B 4d05b5bec959ff6d87913aae7a30af1cdec5d22eaf7785ec7f49e3deb5d4d92db35f278c7cddf91ed8bd3750797c0461bb7bc188214c82cecf9d3b2e43fbf6aa SHA512 ad02fac423186da725493bf82a417cf5f68b08afe91c67f007b46324dfde3d6b4c51ed8eb1a314da73563be498b844f79be66a4f5d1fb83095df6c5458bd6d1f
+DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a648fe52e69d8194998dc74453ad6766688929a80456f6cb4801f2806ac938a5dfc0407e5f46345b47a80ecce0ba03d7fde SHA512 7acfbcc68c1bd4e6e63eee09be1dfbb064be6f8b0144418105100a065f8162cafc9b776fe0429fd64c79b958561aa42d0bdef56588dda65acee27ccc98631f39

diff --git a/dev-db/mongodb/mongodb-3.6.1-r1.ebuild b/dev-db/mongodb/mongodb-3.6.2.ebuild
similarity index 100%
rename from dev-db/mongodb/mongodb-3.6.1-r1.ebuild
rename to dev-db/mongodb/mongodb-3.6.2.ebuild


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/mongo-tools/, dev-db/mongodb/
@ 2018-08-02  7:31 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2018-08-02  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     56192c875c9139eee2bd13e85928efe499d5c01f
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Jul 19 10:46:43 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 07:30:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56192c87

dev-db/mongodb: bump to 3.6.6

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 app-admin/mongo-tools/mongo-tools-3.4.16.ebuild    | 18 +++---
 app-admin/mongo-tools/mongo-tools-3.6.6.ebuild     | 20 +++----
 dev-db/mongodb/Manifest                            |  1 +
 dev-db/mongodb/mongodb-3.4.16.ebuild               | 51 +++++++---------
 ...{mongodb-3.4.16.ebuild => mongodb-3.6.6.ebuild} | 69 +++++++++++-----------
 5 files changed, 75 insertions(+), 84 deletions(-)

diff --git a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
index 509a9eb6a0e..5efc22cf1e8 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
@@ -27,32 +27,32 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	default
 
-	# do not substitute version because it uses git
-	sed -i '/^sed/,+3d' build.sh || die
-	sed -i '/^mv/d' build.sh || die
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^mv/d' \
+		-i build.sh || die
 
 	# build pie to avoid text relocations wrt #582854
 	# skip on ppc64 wrt #610984
 	if ! use ppc64; then
 		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
 	fi
-
-	# ensure we use bash wrt #582906
-	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
 }
 
 src_compile() {
 	local myconf=()
 
 	if use sasl; then
-	  myconf+=(sasl)
+		myconf+=(sasl)
 	fi
 
 	if use ssl; then
-	  myconf+=(ssl)
+		myconf+=(ssl)
 	fi
 
-	./build.sh ${myconf[@]} || die "build failed"
+	./build.sh "${myconf[@]}" || die "build failed"
 }
 
 src_install() {

diff --git a/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
index 3589981cbd8..47f22a423a8 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
@@ -27,33 +27,33 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	default
 
-	# do not substitute version because it uses git
-	sed -i '/^sed/,+3d' build.sh || die
-	sed -i '/^stty/d' build.sh || die
-	sed -i '/^mv/d' build.sh || die
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
 
 	# build pie to avoid text relocations wrt #582854
 	# skip on ppc64 wrt #610984
 	if ! use ppc64; then
 		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
 	fi
-
-	# ensure we use bash wrt #582906
-	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
 }
 
 src_compile() {
 	local myconf=()
 
 	if use sasl; then
-	  myconf+=(sasl)
+		myconf+=(sasl)
 	fi
 
 	if use ssl; then
-	  myconf+=(ssl)
+		myconf+=(ssl)
 	fi
 
-	./build.sh ${myconf[@]} || die "build failed"
+	./build.sh "${myconf[@]}" || die "build failed"
 }
 
 src_install() {

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 08ba14fc001..b59b7af8535 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -10,4 +10,5 @@ DIST mongodb-src-r3.6.2.tar.gz 39999539 BLAKE2B 3e38917ebaf79b63bf054279fbb91a64
 DIST mongodb-src-r3.6.3.tar.gz 40093607 BLAKE2B bb21bf0487661eec6140ade22526617b26b2499bd36e138d955d14a4b13a0685ec7308bccfc11ef17c785cd8a71c5b6cd9d154d461b8973410b03952b93953ec SHA512 94aa9955f99d5f6bbbe65dc3755583952525398308ca7cb9224b91d1fa403de5bb3abb63a651583815cbecaff58966b5cfe7334a36ef6583f73d8c213410ddbc
 DIST mongodb-src-r3.6.4.tar.gz 40159916 BLAKE2B d3878d4e6bbf331de672768b2c92a4d71f758232170432d757f7e61849e6e1ef3b190e6a089101c9ea23c4ce23087c684c86fc6ea0f32f6fe052ce322d47e438 SHA512 02c2a697af9fdcbb16d19792be17d987e18c684418a63ed4750471c7ec22eb2eabf84e93cb1d298f67898b7e23687f668bb333c50ffc4e1b8adf8859f856ad95
 DIST mongodb-src-r3.6.5.tar.gz 40310152 BLAKE2B 72110ae47b17ec8b1f60636a5ef8491b076e1cc019513fd872ea38b3bb8393efff4bddc7b795b3da711f258d21be9fa23e24d396a9429349c51ce05fff180a53 SHA512 6ecb3140ee4a7929fabe62d698f23e87cb5030cf31abefe7f82374f407fb87dc05f712089998f96bc40e23698836a86e7f3590892bde9d2d6f2c4bcc15cc3ebf
+DIST mongodb-src-r3.6.6.tar.gz 40391572 BLAKE2B 1cee1ad5431d2941cf2f0ee31290b2b5bc1c628f2cb5041d4d5a1427d342ecc3bbfb123e540581d81a1c5b018464abb9dcd1ead8df0de6a01a1462ca0c258e83 SHA512 cd91979ba29538c9e1645fe81e03ac56101b0fa8980ea2bdf89a4987ee8f7f6ddc97e2b27495500548a4424f155a1847471c7a5715beabf75ff894edf05c546b
 DIST mongodb-src-r4.0.0.tar.gz 49138467 BLAKE2B 616e267c737729103de544d82db60489e7a32c5f9847ffd2d643a9025c18aa867718216f5de9f18a93fb2a7930c3dbe9ec3850eef09dbec084570328a99f2865 SHA512 11d00cdde606cfea268471cffccedb6d003e421aeffda2303aff4d4126c386aaec50a1de733d7a1d5fb6605403cf9f2218dae50374c7b5e8625fa80317804589

diff --git a/dev-db/mongodb/mongodb-3.4.16.ebuild b/dev-db/mongodb/mongodb-3.4.16.ebuild
index 3869755fe9f..309759cbd00 100644
--- a/dev-db/mongodb/mongodb-3.4.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.16.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+inherit check-reqs eapi7-ver eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -30,6 +30,7 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	dev-libs/snowball-stemmer
 	net-libs/libpcap
 	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	mms-agent? ( app-admin/mms-agent )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -37,11 +38,10 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
+	dev-util/scons
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	test? (
 		dev-python/pymongo[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -57,10 +57,12 @@ PATCHES=(
 S=${WORKDIR}/${MY_P}
 
 pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.2-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.2-series. Then upgrade to 3.4 series."
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.2; then
+			ewarn "To upgrade from a version earlier than the 3.2-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.2-series. Then upgrade to 3.4 series."
+		fi
 	fi
 }
 
@@ -75,14 +77,13 @@ src_prepare() {
 	default
 
 	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || 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)"
@@ -125,24 +126,17 @@ src_test() {
 src_install() {
 	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
 
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
 	doman debian/mongo*.1
 	dodoc README docs/building.md
 
 	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+	newinitd "${FILESDIR}/mongos.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
 
 	insinto /etc
 	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+	newins "${FILESDIR}/mongos.conf-r2" ${PN/db/s}.conf
 
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
@@ -151,17 +145,16 @@ src_install() {
 
 	# see bug #526114
 	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
 
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
+	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/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+	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-3.4.16.ebuild b/dev-db/mongodb/mongodb-3.6.6.ebuild
similarity index 68%
copy from dev-db/mongodb/mongodb-3.4.16.ebuild
copy to dev-db/mongodb/mongodb-3.6.6.ebuild
index 3869755fe9f..8945e0387ba 100644
--- a/dev-db/mongodb/mongodb-3.4.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.6.6.ebuild
@@ -5,12 +5,12 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-SCONS_MIN_VERSION="2.3.0"
+SCONS_MIN_VERSION="2.5.0"
 CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user versionator
+inherit check-reqs eapi7-ver eutils flag-o-matic multilib multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
 
 MY_P=${PN}-src-r${PV/_rc/-rc}
 
@@ -30,6 +30,7 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	dev-libs/snowball-stemmer
 	net-libs/libpcap
 	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	mms-agent? ( app-admin/mms-agent )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -37,30 +38,35 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	<dev-util/scons-3
-	sys-libs/ncurses
-	sys-libs/readline
+	dev-python/cheetah[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+	dev-util/scons
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
 	debug? ( dev-util/valgrind )
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
 	test? (
 		dev-python/pymongo[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
-	"${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
 	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
 )
 
 S=${WORKDIR}/${MY_P}
 
 pkg_pretend() {
-	if [[ -n ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2 ]]; then
-		ewarn "To upgrade from a version earlier than the 3.2-series, you must"
-		ewarn "successively upgrade major releases until you have upgraded"
-		ewarn "to 3.2-series. Then upgrade to 3.4 series."
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+			ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.4-series. Then upgrade to 3.6 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+		fi
 	fi
 }
 
@@ -75,14 +81,16 @@ src_prepare() {
 	default
 
 	# remove bundled libs
-	rm -rv src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+	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)"
@@ -116,33 +124,23 @@ src_compile() {
 
 # FEATURES="test -usersandbox" emerge dev-db/mongodb
 src_test() {
-	# this one test fails
-	rm jstests/core/jsHeapLimit.js || die
-
 	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
 }
 
 src_install() {
 	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
 
-	local x
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-		fperms 0750 "${x}"
-	done
-
 	doman debian/mongo*.1
 	dodoc README docs/building.md
 
 	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+	newinitd "${FILESDIR}/mongos.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
 
 	insinto /etc
 	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+	newins "${FILESDIR}/mongos.conf-r2" ${PN/db/s}.conf
 
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
@@ -151,17 +149,16 @@ src_install() {
 
 	# see bug #526114
 	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-}
 
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
+	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/$(get_version_component_range 1-2)/"
-	ewarn "  https://docs.mongodb.com/manual/release-notes/$(get_version_component_range 1-2)/#upgrade-procedures"
+	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"
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-08-02  7:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-11 12:55 [gentoo-commits] repo/gentoo:master commit in: app-admin/mongo-tools/, dev-db/mongodb/ Alexys Jacob
  -- strict thread matches above, loose matches on Subject: below --
2018-08-02  7:31 Alexys Jacob
2017-10-13  8:33 Alexys Jacob
2016-01-20 12:47 Alexys Jacob

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox