26compat branch ebuild wrt #518104

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 140 insertions, 5 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/Manifest b/dev-libs/mongo-cxx-driver/Manifest
index a1691114a24c..c61f730db2bf 100644
--- a/dev-libs/mongo-cxx-driver/Manifest
+++ b/dev-libs/mongo-cxx-driver/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX mongo-cxx-driver-1.0.0-fix-scons.patch 1345 SHA256 11c5657660ef1359339589b06401378145afb4a47de770604cc6576788ee9914 SHA512 24031ed20354c98633887b57f513b0bd891370923fd5e6b9e668610e68875afcb64c01fb4d84dd01ab1629dcbce332f60822aa0ac7a8774cd06277cf02cb95b1 WHIRLPOOL 2dcc873753a9304e68960208bd4e7f95fe91c9bd6db8cddd84f964df7087b1feaf0bb269ef9d8c6c6ecf469d738208117171ff7b8579f0f3f262efc3e726034e
+AUX mongo-cxx-driver-26compat-fix-scons.patch 1478 SHA256 9b7e8629b1d35a9089b460bf816415abc06adfcfd6ffe8f483e6be70011a229a SHA512 3ba454dc193dfe0ab1a3727521a67f46c765a5e6f0a1fc04647d9ad52905899afd4d95ade632a9339fc3a5e5cb14473a812ea4772eecf4456874a49ff25bedd7 WHIRLPOOL cd6411d64db46be4ae9f01070687152f56f063ceb7af7cb664500dd714157ec31129f5069d83ea31da6337b31ac27876828ed0272f9755c53fe7c6e8e847fe14
+DIST legacy-0.0-26compat-2.6.7.tar.gz 1512331 SHA256 a77165e7ad0c1ff8e246adc5e60b9ebb18eec7f0cc18682a33498c12d7cab0ba SHA512 edf13d5b7802c3b2e9772f08949fd0c412f2cd25ec6d05ff4e8c1f25c3e3506da6ebbd7b017ceec5478585c84e9fa44c66a5094ad3e7a7373187d3fb3c1c1222 WHIRLPOOL f64cfded6a02e241b4b59b3394bcec1cf7df4bc175aba261893d8b24106760eb3899b85b520c5f9af9d929d93ad29ed6d2ef1e11d662b7a331f143f2b88d637c
 DIST legacy-1.0.0.tar.gz 1569156 SHA256 1350dfdcdb3969e472bf83eec08378f771196c47e70b474e7349c816acb0cca4 SHA512 e161972715fe45b777ee3d9c7e788ee3a808af789e2c1248af1dde3d3f3936e29f619e039f53210cdd3fc6a6bd8a02c101facf49c61759c6f108d25c5c03b59b WHIRLPOOL 7d5c8fc6d011f219652bc6cc5a8dd59fac899a95ca3bde22fc76a2505cb7393a1762681f77cfc9295028a427e875c0155ee7046fa9d1c2e4e52d340a19e2c925
+EBUILD mongo-cxx-driver-0.0.2.6.7.ebuild 2275 SHA256 11c6ab199bfbdc048b0ab668ab2b9a571faddaa6b70567cd70d28b5b622cf4f9 SHA512 82e6a5323e108962cd1adbf86040bc1ca96426b068252344883d5f230339c0998d2b0a66b866e93e7dde9cc62dc99e2fcfa33bb78405325d43ba155995fe026e WHIRLPOOL a9450ad63f747cf4c69d791720772cce43079b6044d2756d8d539921934b1d56e41d64edb4a7038e6c5a34a9258d9bd1a7ab9e546baffe26886e2bc6f6e45fbb
 EBUILD mongo-cxx-driver-1.0.0.ebuild 1636 SHA256 a626b3afb51cd9c24be1dd705e5a3fb4c6bab50c34befbe4e8c1b232147ae9d2 SHA512 6f8c2a0d036c2b037266c2887835f650355a57f5b5883ebc5ca2c461d733cd4b2515b0c4c84953a2ff640408348a19e9f6b3ea1304baaf8e5ff5777ef524dbab WHIRLPOOL 7c17d5fe60a1e74eb1bad828490fe7b761a971dc6294b3a55f2622c77412a13b689821ecc473a833079cb532ba9f410df1a3a66d88015e5fd36dc739e61d0e80
-MISC ChangeLog 663 SHA256 cf973ea856830655a9f87e0e446cebafc5b37471faf565492a71b604d8a88026 SHA512 3b3ef72ba15c5ebe0eab084e37f70a20be472d1867bcaa66319fc6492e6d0f98a98366fd4b07d055e61bf710a47aebc48187c26e6d99c16d45aa5c263a851e3d WHIRLPOOL 0c28fffb8dba809afabe4a8d82c08ad2c959975a807ea949c57f879e74d371d544d65a9015a7f2c13c7b9d62071c8b5c32d67f44bcd0d072bb4c3d2c5f12d487
+MISC ChangeLog 905 SHA256 52c7a3a3ea5335508279b705e78989befa5e8f50a7334f3321834c4f3f2a34cc SHA512 48f0eb25f93969e9d114b17c20ed75371b034853c86bb00d6800abd8732ea2806d261a166f2b93353db2f24ee6c341904efd5418efe2362d0c8ab8410edc5e65 WHIRLPOOL 66829ddbd6628ccc2909908100ec2011501866e7b8a0275bca31d6208496e57cd1f1cc85f4479013a236708121049e59f432aeda31a58a5113f13c19b1b55db8
 MISC metadata.xml 412 SHA256 dfb6e343d26a3fad209c0e2e0d2d66dce241ebfbc33e208c113dbfde989445ed SHA512 e4e29acd6759fcd9e188a45199f60bf81150dfc89f6ea2ee32d9e8b69208c91fd00675b290615265c30d5acce8dd4a7bffc70720055abf3198cb7f92c3c5857a WHIRLPOOL d889b77c6dc51c7210885a1c8a08788f3c96c2fd0baaadc239c0707305f09db201c9d86601cddc92cb5caebc9e4465c44a202f5e9f66d7f4dcec314607c381e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUIDUAACgkQKiQSS7ZY+hO32AEA2M8zjWiVta/rbZCHKxwFIMwQ
-PwWwVHs1bAXpz81AhvkBANtGIgctBpl4JnbCI+MlLuJsFPJxzot9xTEy45Yrhu+w
-=lx3o
+iF4EAREIAAYFAlUP4kMACgkQKiQSS7ZY+hPj/wEApfhqxHdhfX64w0/kTM7iAXUs
+4wpCo28Yu70kXbNUzGsBAOmDQ0TSai1cPyRmIx08Ta2RGVm3d3Z+gWcOO/9LsNjK
+=mplf
 -----END PGP SIGNATURE-----
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
+}