Fix linux-3 kernel compilation wrt #375353

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

4 files changed, 145 insertions, 5 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 469749c94210..e589a634fe24 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.19 2011/06/22 17:26:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.20 2011/07/29 15:35:14 ultrabug Exp $
+
+*mongodb-1.8.2-r1 (29 Jul 2011)
+
+  29 Jul 2011; Ultrabug <ultrabug@gentoo.org> +files/mongodb-linux3.patch,
+  +mongodb-1.8.2-r1.ebuild:
+  Fix linux-3 kernel compilation. Fix #375353. Thanks to Priit Laes, Johan
+  Bergström and SchAmane.
 
 *mongodb-1.8.2 (22 Jun 2011)
 
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index e67d481c14b5..70c589d8d4f6 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX mongodb-1.6-fix-scons.patch 1632 RMD160 fa6a3ededbc0f78a113d66735c003860e0bcd75c SHA1 5ac604f9ef2c19c002f722d33c6e066552d28b5a SHA256 bbd2c111a3f4b44a287b3e00ced6618fb7a9d80fcf8d9fcf0ec07cca19f5c860
 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
+AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b
 AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
 AUX mongodb.initd 1019 RMD160 9b5b825228208a7656ccc03e248eb9e8fdcf7757 SHA1 51936bea587cc8186d57877ce8293933aec30252 SHA256 922e274456872cdf961299b35ddbfd27901694bcb6acd0df0a2e62f151c31d23
 AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
@@ -11,14 +12,15 @@ DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b6a339c46
 DIST mongodb-src-r1.8.2-rc3.tar.gz 1722716 RMD160 32c70893e1f33b07d582b91520ca3b446caf65d7 SHA1 8b63d3ce9e04df33480e0434154bfdf8c8e8c776 SHA256 72954d3ab217b2fe8a7d586f3e45e93ec3303390ea68242b0ec07057694a9dd6
 DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
 EBUILD mongodb-1.6.5-r1.ebuild 1937 RMD160 759eada221931d555bc967f5208bc55dabe0c94e SHA1 cfcdada929b522505a61cec51932c7247414becb SHA256 700fff85edfddfc4816e467e30339dc674985dbe42ef77abfa0af34a8d52a91e
+EBUILD mongodb-1.8.2-r1.ebuild 2019 RMD160 fa68c30f1454fdfc7cc94ba44cdc867ea07270e3 SHA1 ae4c355c996a62e40a7cf2c5830c8ebd6ddaff04 SHA256 1c0f714d21a270877d71e1682750cdc4da532d0d788de5bccd2ee48cae950c7b
 EBUILD mongodb-1.8.2.ebuild 1975 RMD160 fb8493c4b7dfb73c389dc8f1a5cbf11cf3e1e0be SHA1 7c0085fe1b1cbe5efd6804e8a146acf7a04a18db SHA256 74fe228662928a86f5eac0ba82aade647f2d9cb92d59aa1cdf7c81f28c074e67
 EBUILD mongodb-1.8.2_rc3.ebuild 1979 RMD160 12c3169acf26b6290f465fe62245edf42d07be17 SHA1 1eb91fb66d6d1efab1aa8a0a2bed3d3b617627af SHA256 5445e9ee5cd7ab2c624fcc8f100a1a1aa3fb2997fe549ac9b6eff8b4ef879ca8
-MISC ChangeLog 5168 RMD160 0383d9789d671ae747aa40ab31a8e32a196d3906 SHA1 e995100960f203feb3c2854ab7793e1be424383a SHA256 2895cde1cd735566d00f3d26af0b6c288a864416d691dc720cc8a0f013e675fa
+MISC ChangeLog 5407 RMD160 b13316949e1d2ce2d8d9818a126356709ab491ad SHA1 1e1953f1c078635d2f698aeb9a1a5560b994cf56 SHA256 1e63eb28e89ab534edd14b093316bbf3eb77ea6491bc5a44ae85d80851f73e12
 MISC metadata.xml 884 RMD160 f0cb7b3592708ec85696616af69b9bfc0e81e9c2 SHA1 de8f61e005e2c499c24084a0e0ab493c65a50c0c SHA256 e15990a373759e839063bd6bf698f0cc835bb4ef46352dbe50020d14335b91c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4CJboACgkQKiQSS7ZY+hNi1wEAvgVGJLTVMzsCbKBL47ftrTC4
-zZCw6D/lAEGJv8bd56UBALCGCaH63Egec9+M2C4voMtbxH1TFGcQ+YcKXb9O3w5m
-=VC8n
+iF4EAREIAAYFAk4y00AACgkQKiQSS7ZY+hP4mgD/bLIbbWT9dzbt0ujr06nbmRTy
+qW81PP/dqs3G6glQLi4A/0ysAjidgOHWraHrP4/gzP3DCSfjIHvpsFMyEn9T4h+Q
+=RQms
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-linux3.patch b/dev-db/mongodb/files/mongodb-linux3.patch
new file mode 100644
index 000000000000..5c7d11c28c09
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-linux3.patch
@@ -0,0 +1,48 @@
+From b1ec2058673f8ca582a490c2dd4a8405698221ae Mon Sep 17 00:00:00 2001
+From: Eliot Horowitz <eliot@10gen.com>
+Date: Thu, 28 Jul 2011 19:54:51 -0400
+Subject: [PATCH] compile on linux3 SERVER-3457
+
+---
+ SConstruct                |    4 +++-
+ distsrc/client/SConstruct |    2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 55d34d5..c47d3f6 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -343,6 +343,8 @@ processInfoFiles = [ "util/processinfo.cpp" ]
+ 
+ if os.path.exists( "util/processinfo_" + os.sys.platform + ".cpp" ):
+     processInfoFiles += [ "util/processinfo_" + os.sys.platform + ".cpp" ]
++elif os.sys.platform == "linux3":
++    processInfoFiles += [ "util/processinfo_linux2.cpp" ]
+ else:
+     processInfoFiles += [ "util/processinfo_none.cpp" ]
+ 
+@@ -474,7 +476,7 @@ if "darwin" == os.sys.platform:
+         env.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
+         env.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
+ 
+-elif "linux2" == os.sys.platform:
++elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
+     linux = True
+     platform = "linux"
+ 
+diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct
+index c2d309a..54fc943 100755
+--- a/distsrc/client/SConstruct
++++ b/distsrc/client/SConstruct
+@@ -41,7 +41,7 @@ linux = False
+ if "darwin" == os.sys.platform:
+     addExtraLibs( "/opt/local/" )
+     nix = True
+-elif "linux2" == os.sys.platform:
++elif "linux2" == os.sys.platform or "linux3" == os.sys.platform:
+     nix = True
+     linux = True
+ 
+-- 
+1.7.5.4
+
diff --git a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..36cfe0e18817
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.1 2011/07/29 15:35:14 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils multilib scons-utils 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"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs v8"
+
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+	v8? ( dev-lang/v8 )
+	dev-libs/boost
+	dev-libs/libpcre[cxx]
+	net-libs/libpcap"
+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=" --cxx=$(tc-getCXX) --sharedclient"
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-linux3.patch"
+}
+
+src_compile() {
+	escons ${scons_opts} all
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
+
+	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
+
+	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}
+}
+
+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}.conf"
+}