26compat branch ebuild wrt #518104

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

3 files changed, 133 insertions, 1 deletions

diff --git a/dev-libs/mongo-cxx-driver/ChangeLog b/dev-libs/mongo-cxx-driver/ChangeLog
index 742b39d24859..5422811fdc4e 100644
--- a/dev-libs/mongo-cxx-driver/ChangeLog
+++ b/dev-libs/mongo-cxx-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/mongo-cxx-driver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-cxx-driver/ChangeLog,v 1.3 2015/03/17 11:17:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-cxx-driver/ChangeLog,v 1.4 2015/03/23 09:51:59 ultrabug Exp $
+
+*mongo-cxx-driver-0.0.2.6.7 (23 Mar 2015)
+
+  23 Mar 2015; Ultrabug <ultrabug@gentoo.org>
+  +mongo-cxx-driver-0.0.2.6.7.ebuild,
+  +files/mongo-cxx-driver-26compat-fix-scons.patch:
+  add 26compat branch ebuild thx to Balint SZENTE fix #518104
 
   17 Mar 2015; Ultrabug <ultrabug@gentoo.org> mongo-cxx-driver-1.0.0.ebuild:
   fix static-libs detection
diff --git a/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch
new file mode 100644
index 000000000000..be5408511bda
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/files/mongo-cxx-driver-26compat-fix-scons.patch
@@ -0,0 +1,34 @@
+--- a/SConstruct	2015-03-23 10:36:42.328921927 +0100
++++ b/SConstruct	2015-03-23 10:37:37.599310414 +0100
+@@ -828,7 +828,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",
+@@ -836,13 +835,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.
+@@ -938,7 +937,6 @@
+ if not use_system_version_of_library("snappy"):
+     env.Prepend(CPPPATH=['$BUILD_DIR/third_party/snappy'])
+ 
+-env.Prepend(CPPPATH=['$BUILD_DIR/third_party/gtest-1.7.0/include'])
+ 
+ env.Append( CPPPATH=['$EXTRACPPPATH'],
+             LIBPATH=['$EXTRALIBPATH'] )
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7.ebuild
new file mode 100644
index 000000000000..a8ff9ede8aa8
--- /dev/null
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mongo-cxx-driver/mongo-cxx-driver-0.0.2.6.7.ebuild,v 1.1 2015/03/23 09:51:59 ultrabug Exp $
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+
+inherit eutils flag-o-matic multilib scons-utils versionator
+
+MY_PV=$(get_version_component_range 3-5)
+MY_P=legacy-0.0-26compat-${MY_PV}
+
+DESCRIPTION="C++ Driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-cxx-driver"
+SRC_URI="https://github.com/mongodb/${PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos ssl static-libs"
+
+RDEPEND="
+	app-arch/snappy
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.50[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	dev-libs/snowball-stemmer
+	dev-util/google-perftools[-minimal]
+	net-libs/libpcap
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${PN}-${MY_P}
+
+pkg_setup() {
+	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-yaml"
+
+	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 static-libs; then
+		scons_opts+=" --sharedclient"
+	fi
+
+	if use ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-26compat-fix-scons.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
+}
+
+src_compile() {
+	escons ${scons_opts} mongoclient
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install-mongoclient --prefix="${ED}"/usr
+
+	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+	dodoc README.md CONTRIBUTING.md
+}
+
+pkg_preinst() {
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib64/ &>/dev/null
+	else
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}