commit:     3004e2571a7b08d15e41e149e15fd50f818b78df
Author:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  9 07:15:47 2019 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Aug  9 07:28:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3004e257

dev-db/mongodb: drop soon to EOL 3.4

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

 dev-db/mongodb/Manifest                            |   1 -
 dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch |  35 -----
 .../files/mongodb-3.4.6-sysmacros-include.patch    |  38 -----
 dev-db/mongodb/mongodb-3.4.16.ebuild               | 160 ---------------------
 4 files changed, 234 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c161dde8b45..4d77bdc425a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,4 +1,3 @@
-DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 
7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367
 SHA512 
e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
 DIST mongodb-src-r3.6.11.tar.gz 40581959 BLAKE2B 
86244472ce8cff5180d8833a3415dd8a43fb5c76545034822989d5be90f45ed0ef1d43cb726be1e53241255491a7a516e6f90b1c1218ad10cf4ead4557311088
 SHA512 
e74af9f2f40ab0e2c20b135db3f0ce17825cfe5da912ff8edb2902226abb662a6cf87038ea57df73b06b4961ba71aa78fffd542153eb30c4ea2729d642b1091d
 DIST mongodb-src-r3.6.12.tar.gz 40847074 BLAKE2B 
45cc0ec4858fa4c17fb86449e6feaf11df32fd55f8a642031ce9be967127d608842cdc64e0a335af67ab3942a233d905b0778782e54dfe4c5d2ad58b828745ca
 SHA512 
173112a05234e06ef4b6c26a092b285b4d12618b3f131fc2b73bd152c11ec42db11cb003566efefce0c98df87a520d0515a3bb1982ffdb27827cd032b1bb3f68
 DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B 
de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82
 SHA512 
eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd

diff --git a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch 
b/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
deleted file mode 100644
index 2dd751fad81..00000000000
--- a/dev-db/mongodb/files/mongodb-3.4.0-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct       2016-12-27 11:10:06.801949538 +0100
-+++ b/SConstruct       2016-12-27 11:12:40.426407713 +0100
-@@ -1557,7 +1557,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=["-fno-omit-frame-pointer",
-                          "-fno-strict-aliasing",
--                         "-ggdb",
-                          "-pthread",
-                          "-Wall",
-                          "-Wsign-compare",
-@@ -1568,8 +1567,9 @@
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
--    env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
-     env.Append( LINKFLAGS=["-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.
-@@ -1579,10 +1579,10 @@
-         env.Append( LINKFLAGS=["-Wl,-z,now"] )
-         env.Append( LINKFLAGS=["-rdynamic"] )
- 
--    env.Append( LIBS=[] )
-+    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
- 
--    #make scons colorgcc friendly
--    for key in ('HOME', 'TERM'):
-+    #make scons colorgcc, distcc, ccache friendly
-+    for key in ('HOME', 'PATH', 'TERM'):
-         try:
-             env['ENV'][key] = os.environ[key]
-         except KeyError:

diff --git a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch 
b/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
deleted file mode 100644
index 868ba73e442..00000000000
--- a/dev-db/mongodb/files/mongodb-3.4.6-sysmacros-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e245cac2b3c18015dee8caddd449532785d15c2b Mon Sep 17 00:00:00 2001
-From: Jason Carey <[email protected]>
-Date: Mon, 26 Jun 2017 11:09:10 -0400
-Subject: [PATCH] SERVER-29855 Pull major/minor from sys/sysmacros.h
-
-Per newer versions of glibc:
-
-----
-error: In the GNU C Library, "major" is defined
- by <sys/sysmacros.h>. For historical compatibility, it is
- currently defined by <sys/types.h> as well, but we plan to
- remove this soon. To use "major", include <sys/sysmacros.h>
- directly. If you did not intend to use a system-defined macro
- "major", you should undefine it after including <sys/types.h>. [-Werror]
-         string path = str::stream() << "/sys/dev/block/" << major(dev) << ':' 
<< minor(dev)
-----
-
-Including <sys/sysmacros.h> appears to be the correct solution to quiet
-the warning
----
- src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp 
b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-index 5a784b25dc7..c43e148d3f4 100644
---- a/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-+++ b/src/mongo/db/storage/mmap_v1/mmap_v1_engine.cpp
-@@ -36,6 +36,10 @@
- #include <boost/filesystem/path.hpp>
- #include <fstream>
- 
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include "mongo/db/mongod_options.h"
- #include "mongo/db/storage/mmap_v1/data_file_sync.h"
- #include "mongo/db/storage/mmap_v1/dur.h"

diff --git a/dev-db/mongodb/mongodb-3.4.16.ebuild 
b/dev-db/mongodb/mongodb-3.4.16.ebuild
deleted file mode 100644
index fb7263b16bf..00000000000
--- a/dev-db/mongodb/mongodb-3.4.16.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.3.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-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}
-
-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="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl mms-agent ssl test +tools"
-
-RDEPEND=">=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]
-       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= )
-               libressl? ( dev-libs/libressl:0= )
-       )"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       dev-util/scons
-       sys-libs/ncurses:0=
-       sys-libs/readline:0=
-       debug? ( dev-util/valgrind )
-       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"
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_pretend() {
-       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
-}
-
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       # remove bundled libs
-       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)"
-
-               --disable-warnings-as-errors
-               --use-system-boost
-               --use-system-pcre
-               --use-system-snappy
-               --use-system-stemmer
-               --use-system-yaml
-               --use-system-zlib
-       )
-
-       use debug && scons_opts+=( --dbg=on )
-       use kerberos && scons_opts+=( --use-sasl-client )
-       use ssl && scons_opts+=( --ssl )
-
-       # 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() {
-       escons "${scons_opts[@]}" core tools
-}
-
-# 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
-
-       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" ${PN/db/s}
-       newconfd "${FILESDIR}/mongos.confd-r3" ${PN/db/s}
-
-       insinto /etc
-       newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-       newins "${FILESDIR}/mongos.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}
-
-       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"
-}

Reply via email to