[gentoo-commits] repo/gentoo:master commit in: dev-db/mongodb/files/, dev-db/mongodb/

["Alexys Jacob" <ultrabug@gentoo.org>]

commit:     c17e73664b1be99b76b1f7e4c76068c43bca2846
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 13:05:50 2018 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 13:07:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17e7366

dev-db/mongodb: drop obsolete 2.6 series

 dev-db/mongodb/Manifest                            |   2 -
 .../files/mongodb-2.4-fix-v8-pythonpath.patch      |  11 --
 .../files/mongodb-2.6.10-fix-boost-1.57.patch      |  13 --
 dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch |  35 ----
 dev-db/mongodb/mongodb-2.6.12.ebuild               | 183 ---------------------
 5 files changed, 244 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 9de795e1fd7..9d09d246826 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,3 @@
-DIST 20140409-mms-monitoring-agent.zip 40122 BLAKE2B 265121024a973ca02634bf17fc680b2369db0681e365f79690f77fd0aec976d60a374062554c3a72af75911684ce7aa8537f72a3f4d321a65815fb1f7c1c89af SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd
-DIST mongodb-src-r2.6.12.tar.gz 16462842 BLAKE2B 881b71958abab312e21b2b3d07fc84a2d9b141999df9a01ca80c7b726f5d87ed95dd964d8a9daf9f37d5c9e81067d1ac2453152654d207e7c4d31ef08bf0a712 SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657
 DIST mongodb-src-r3.0.14.tar.gz 28093922 BLAKE2B c36f1868aaf8d149550d9e8fcfa3598b917426f896cdb9e1d12fb047345011b06975719d24db3ffadadf6e1f6007a3e32768eaaa9da9ec8f340c7a49c9239b45 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152
 DIST mongodb-src-r3.0.15.tar.gz 28096395 BLAKE2B 123194723e7f1057bc5497ce9bf51f8dd2d65495f6e2c84adde22e3b41cace9c0bce8134a7b85fa1c8e89ce953a3df780eae013d61bba44bbf9339c1e2e478af SHA512 21cec235a691dad7d1d2c625ef04a851b59223b8f2c0bdc979f2a0b8249ed46b4e62753fd595afa7b74bce13851d1f6547e54d8ffad8ba1f56e36db664f5b27e
 DIST mongodb-src-r3.2.12.tar.gz 29178424 BLAKE2B 212a2aaac62460812874bb4d924f9cedcb591699367a72ace620e9635a6511048efa3f1202a51e4b58ca8e5f8879fbe4638284c5d3899290bff6b1ca9be565a3 SHA512 0c4ddaaddf15d97957faff46dc4a3f79c545cacc8a56dbe1d063778117ba9b645323b0cb7fd054fae805d092b8372c411a82e3370244b7939bda20a65fdb951c

diff --git a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch b/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
deleted file mode 100644
index 19efad67683..00000000000
--- a/dev-db/mongodb/files/mongodb-2.4-fix-v8-pythonpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/third_party/v8/SConscript	2014-05-26 11:00:37.725508098 +0200
-+++ b/src/third_party/v8/SConscript	2014-05-26 11:01:13.265029083 +0200
-@@ -29,7 +29,7 @@
- import sys
- from os.path import join, dirname, abspath
- root_dir = dirname(File('SConscript').rfile().abspath)
--sys.path.append(join(root_dir, 'tools'))
-+sys.path.insert(0, join(root_dir, 'tools'))
- import js2c
- 
- Import("env windows linux darwin solaris freebsd debugBuild")

diff --git a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch b/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
deleted file mode 100644
index 5f289c07883..00000000000
--- a/dev-db/mongodb/files/mongodb-2.6.10-fix-boost-1.57.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h\~ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h
---- mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h~	2015-01-13 18:12:06.000000000 +0100
-+++ mongodb-src-r2.6.7/src/mongo/shell/linenoise_utf8.h	2015-01-28 22:22:50.538934558 +0100
-@@ -17,6 +17,7 @@
- 
- #include <boost/smart_ptr/scoped_array.hpp>
- #include <string.h>
-+#include <algorithm>
- 
- namespace linenoise_utf8 {
- 
-
-Diff finished.  Wed Jan 28 22:24:47 2015

diff --git a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
deleted file mode 100644
index 76feba7bfe7..00000000000
--- a/dev-db/mongodb/files/mongodb-2.6.2-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct	2014-06-16 19:32:46.274507258 +0200
-+++ b/SConstruct	2014-06-16 19:34:04.763586829 +0200
-@@ -813,7 +813,6 @@
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
-     env.Append( CCFLAGS=["-fPIC",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -821,13 +820,13 @@
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux or darwin:
--        env.Append( CCFLAGS=["-pipe"] )
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
--    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- 
-     # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
-     # startup.
-@@ -844,7 +843,7 @@
-     if not darwin:
-         env.Append( LINKFLAGS=["-rdynamic"] )
- 
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
- 
-     #make scons colorgcc friendly
-     for key in ('HOME', 'TERM'):

diff --git a/dev-db/mongodb/mongodb-2.6.12.ebuild b/dev-db/mongodb/mongodb-2.6.12.ebuild
deleted file mode 100644
index e17d7986b3c..00000000000
--- a/dev-db/mongodb/mongodb-2.6.12.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd 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="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos mms-agent ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.50[threads(+)]
-	>=dev-libs/libpcre-8.37[cxx]
-	dev-libs/snowball-stemmer
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1.0.1g )"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	sys-libs/readline
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors"
-	scons_opts+=" --use-system-boost"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-stemmer"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-yaml"
-	scons_opts+=" --usev8"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --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}-2.6.2-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch"
-
-	# fix yaml-cpp detection
-	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_configure() {
-	# filter some problematic flags
-	filter-flags "-march=*"
-	filter-flags -O?
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	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-r2" ${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}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-
-		insinto /etc
-		newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
-		rm "${WORKDIR}/${MY_PN}/settings.py"
-
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		dosym /etc/mms-agent.conf ${MY_D}/settings.py
-
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.6 ${v}; 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/2.6-upgrade/"
-			ewarn " "
-			if use mms-agent; then
-				ewarn "MMS Agent configuration file has been moved to :"
-				ewarn "  /etc/mms-agent.conf"
-			fi
-			break
-		else
-			if use mms-agent; then
-				elog "Edit your MMS Agent configuration file :"
-				elog "  /etc/mms-agent.conf"
-			fi
-		fi
-	done
-}