fix #457694 thx to Balint SZENTE

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

8 files changed, 67 insertions, 132 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 04ff1ff99b17..1bd97427a8a6 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.57 2013/03/05 14:08:39 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.58 2013/03/11 10:12:04 ultrabug Exp $
+
+*mongodb-2.2.3-r1 (11 Mar 2013)
+*mongodb-2.2.2-r2 (11 Mar 2013)
+
+  11 Mar 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0-r1.ebuild,
+  mongodb-2.2.0-r2.ebuild, -mongodb-2.2.1.ebuild, -mongodb-2.2.2-r1.ebuild,
+  +mongodb-2.2.2-r2.ebuild, -mongodb-2.2.3.ebuild, +mongodb-2.2.3-r1.ebuild,
+  +files/mongodb-2.2-fix-sharedclient.patch,
+  files/mongodb-2.2-fix-x86client.patch:
+  install the mongoclient shared library wrt #460764 for 2.2.x versions thx to
+  Balint SZENTE, drop useless version
 
   05 Mar 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.0.7-r1.ebuild,
   mongodb-2.0.7-r2.ebuild, mongodb-2.0.8-r1.ebuild, mongodb-2.0.8-r2.ebuild:
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
new file mode 100644
index 000000000000..21e3f66c7cb6
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
@@ -0,0 +1,34 @@
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2012-08-28 08:28:11.000000000 +0300
++++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:32:46.776436389 +0200
+@@ -3,7 +3,7 @@
+ # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple
+ # programs.
+ 
+-Import('env clientEnv')
++Import('env clientEnv has_option')
+ 
+ clientSource = [
+     'mongo/bson/oid.cpp',
+@@ -96,9 +96,11 @@
+     clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
+ 
+ mongoclient_lib = env.Library('mongoclient', clientSource),
++if has_option( "sharedclient" ):
++    mongoclient_slib = env.SharedLibrary('mongoclient', clientSource)
+ mongoclient_install = env.Install('#/', [
+         mongoclient_lib,
+-        #env.SharedLibrary('mongoclient', clientSource),
++        mongoclient_slib,
+         ])
+ env.Alias('mongoclient', mongoclient_install)
+ 
+@@ -135,6 +137,8 @@
+ prefix = GetOption("prefix")
+ 
+ env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
++if has_option( "sharedclient" ):
++    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
index f289d18da24b..197372c4b14e 100644
--- a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
@@ -1,13 +1,15 @@
-diff --git a/src/SConscript.client b/src/SConscript.client
-index 7a6bdc9..3fb55e5 100644
---- a/src/SConscript.client
-+++ b/src/SConscript.client
-@@ -134,7 +134,7 @@ env.Install(
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2013-03-08 10:32:46.000000000 +0200
++++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:34:04.208437762 +0200
+@@ -136,9 +136,9 @@
  # install
  prefix = GetOption("prefix")
  
 -env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
 +env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ if has_option( "sharedclient" ):
+-    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
++    env.InstallAs(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
  
  for x in clientHeaderDirectories:
      env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
index 039d469efb09..dacba831162b 100644
--- a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -53,6 +53,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
index 3499d22e1069..ec0db37d4e01 100644
--- a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.1.ebuild b/dev-db/mongodb/mongodb-2.2.1.ebuild
deleted file mode 100644
index fdf9c00cbd5b..000000000000
--- a/dev-db/mongodb/mongodb-2.2.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.1.ebuild,v 1.2 2012/11/09 16:08:37 flameeyes Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user versionator
-
-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? ( http://dev.gentoo.org/~ultrabug/20120830-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.2.2-r1.ebuild b/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
index 7509f10d9359..1a686f8c248d 100644
--- a/dev-db/mongodb/mongodb-2.2.2-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r1.ebuild,v 1.1 2013/01/18 11:19:27 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r2.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
diff --git a/dev-db/mongodb/mongodb-2.2.3.ebuild b/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
index 373991c9acdd..f0170cbbebb7 100644
--- a/dev-db/mongodb/mongodb-2.2.3.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3.ebuild,v 1.1 2013/02/02 19:04:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3-r1.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"
 
 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].