Do not apply client patch on amd64 machines, fix #434664.

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

5 files changed, 35 insertions, 20 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 903208587d3c..221a6b67498b 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.44 2012/09/10 12:13:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.45 2012/09/11 17:47:10 ultrabug Exp $
+
+  11 Sep 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild,
+  files/mongodb-2.2-fix-sconscript.patch,
+  +files/mongodb-2.2-fix-x86client.patch:
+  Do not apply client patch on amd64 machines, fix #434664.
 
   10 Sep 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.2.0.ebuild,
   files/mongodb-2.2-fix-sconscript.patch:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 51d62e889321..6642549b3463 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -7,7 +7,8 @@ AUX mongodb-1.8-fix-scons.patch 1859 SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9e
 AUX mongodb-1.8.5-fix-smokepy.patch 1262 SHA256 68f44868b107aebb0c2cdea8aa33cc785ef9f700f9cb66b10a9db60947bab22e SHA512 f88e79d511c02cd8a512233cb390943827b6a12e863f65bef53e78e501186616b470a0e3e5646d860e6055add462b5dbf8b4a207b5fdc5f4857ab1e838f668e9 WHIRLPOOL 6702cd53e1e116783bb2acd0f795b4e49c88ddada67f86e2bc96673713be37f40e8b22fe94eda66716520a0a96509ad0603add58f8dd2be26cd66302b0b69388
 AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594 SHA512 42510c21c2cd9c3de066b565e556998bbe61469a53cc1871a6a498cc32702f47818ccaf08a2183ff7719ceb4566c4144de610952ca093646bfe74c70c58247ad WHIRLPOOL a27f5dc7210294300cb24a871c68b335efbe708555a61ed00c651f1f0f5d26ee474aa90c8cd87d1a610d1628bcb8fd9917e1c0ee2060be7588443c07de628d45
 AUX mongodb-2.2-fix-scons.patch 1954 SHA256 b45b6128eb49d47841feba656a95dfe3c1d580e63e5e61315a8aa13abb1a9d0d SHA512 4aa5a80abc0ef537e9620cffe9d69f92a1e1b881c59e6d0ea208bf62b184097cc274424b9d5ed9d7c62a5310fb73b1dd2371a1596225e1f54abd1d746c91ffa7 WHIRLPOOL 1893f1cca511432107a8c9f0e358d7a55ece58d1cd30d925e1e14ed1015acc1b9411d7503f5da8eea93464c5e108e3d99166d57859792cf3e843786c91f9dfd1
-AUX mongodb-2.2-fix-sconscript.patch 961 SHA256 a8609ce53409e510d136cecb9fb89dd078695c28d5ee31eb84b9826c8e03882b SHA512 12d3856622a297b255fdd523a0de2929e79aced6da9625907a87ec431fed290250e981d7493cc49c31fd4b9fba354c3b317b47e15317e2a63a159d482e774ad9 WHIRLPOOL 84290555d2dccc35251455e099528a01ef148a43d5c83a0ed970320e06abd57ef44f1fb2d46f181b9e37a31a56dac43669ad49deea51c62d04504efe47afdae6
+AUX mongodb-2.2-fix-sconscript.patch 602 SHA256 00a4e718c38991f008d20fb3caefeb5eb260cb81ee433bb1bf558149b6af63f4 SHA512 85019d63312d60cbba2fe13f35c06cf3afb5829003e6b415686d6cbdb59da63c6244c01c8f91aac727bdd4fc96861e7228fba148353f72ceeead52bf21b4b755 WHIRLPOOL f949888e8c7f2a793812f5699013de83fc786fe904723c0bc3e642a28d9564b58d94db22255b8348669c17e508f5709d455e82f2ad61ffe3f86c588e35e7ef91
+AUX mongodb-2.2-fix-x86client.patch 447 SHA256 ca00fedc9f87bc3e013a2d4345fc125b22d614e111cc11c233f544940574c058 SHA512 2f7d0e9e35a043d9006fd429f36cd6b45ed4edd98ce653b35b237e0313d2d7ef39ae85dcd31713bae7ab68e40a38534bba5f7746653e9380f2106865a8b3b9a5 WHIRLPOOL 7ae858dc87968cde6512d4ce746081110ebd99de5ae0127aafa6276e0e9d5bc547add2cf4e1769900bc79b5331b72049bb2e2f51e57960bece13692976fef583
 AUX mongodb-linux3.patch 1588 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b SHA512 de37834e2b71b392eac70b7152e6b0676c5527e70ee28afa7b8e918d45b4d5fb8482c68925d778ee1b6a3eef5272bfa8babe1a7a2bc810d1b6dc075d370a681a WHIRLPOOL a98c65827098c729b86782db9ec92a8a006d79487b4ab202b4bdb370403c7f867ec011f281e2a3ed27b013aa0584a219877ebc022836700aecde424f956c7a06
 AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
 AUX mongodb.initd 1254 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642 SHA512 f81e56ce893a95b1d980dcdf17c1d395e9062dde28a12a48d8bf31d5ef888bff63c7894a7a97fbb31ceff70371488ab2d4bdec474b8ad7b163c397dd46056196 WHIRLPOOL 6dae08004ff053df104a7645d61cd8dd691758db20e5a153e0d4f5404c18542d7d82d67f973206d178da77fed42dbc54abfa6d3f7507a824569e4ddd858fe012
@@ -22,13 +23,13 @@ DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4b
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
 EBUILD mongodb-1.8.5.ebuild 2533 SHA256 98c542e4b5c4234d23d8419f3baf32b228cd83d58ef924d359a876ea83576770 SHA512 3afceeb057a613cb90c05f10c5639c109698ea45ba81ea16e783eef98654d62818ec34d9ed4e3d94d95e53a460541cf9941bbb0977c512c89c2363fe90635714 WHIRLPOOL aaba10b2c4d96b8e120ae7d895b9dac3eb16ff0d321df38b3c58f0eaa5053dfa0a843c39a93560674996403385251fe4a98dc356fabd468aef419d82cc4b80b9
 EBUILD mongodb-2.0.7.ebuild 2790 SHA256 5f10bf9022a6a971bc995684fa5e7d967f9f1d2670cb010e8f3eb67312df5abf SHA512 f1bb5dee03a9ce98d9317fa28988020bd06829b555a1ee1f461dfdc24a14d5a279c5bfbc14e283086e3561521b7d192994d0eb3a7c8343a7a2664d0939044028 WHIRLPOOL 7faf7fd087349a41e1273c7afedcd7b8e7aec4ab7e9252bb6aa51443b59072dd1a44b04ffd0c9d34dd2308a1ca573cad4e1065d45d0ae7e11df810f230062df8
-EBUILD mongodb-2.2.0.ebuild 2856 SHA256 ac0dfdddb065c3ece6215dd1566e1f4e173d7dbb14a57e444a8d099c3cf8eb3e SHA512 b4bf3b147c1a195b55f32e6d72b3dc747d2e99fa81e1f03d4f87df5a8c64bb2709fe6d7756f74eff1d15cea35a2d84d986a0d71aba630335d71343ca69e0cc29 WHIRLPOOL d2e7f36501468afd9e057210b65b6550edc482b9ba6ef5842d8b2ef9d6ab5efa37f2cbe5a9d36b5ced8bb59c35a6478d87f130273ebc581002a714e9fdf8148e
-MISC ChangeLog 10015 SHA256 5ae58e2c6d15fbd20c8dd67a3b9846155ce648e9aab229e8bb50e4a335281cec SHA512 321377f161416d8bb6d74020c6c418cf8056316b8d7dcfd02c0f4e3c1d7d9a949d1b9afe40cb1630406e95e1c47de55e20c0f7cd614836e10e94eaa6a09c383e WHIRLPOOL b9bf8fb34dd80478a49511074dc045693f80689cf03ecf7b2546af1139c46a31294b6d15d407e9e858a96543db6f683aeebdd9d6100b6053e5b31f364da78063
+EBUILD mongodb-2.2.0.ebuild 3161 SHA256 574ceb45b7769f0f7523c1c28deae70c7e0f25bfeaf658d6d97a5653245509c9 SHA512 a90f5c3f989bf53eda1f818a2bb4c5bf91fd8465a1bb39730f909e73db56f5682bdc5670ef53e6f07466a4012466f97d47cf86bdf8c08601365306d87b425222 WHIRLPOOL 9a04e73f6e62acd10c3d88b29da3dbaae661ea00725d16f45f0ec756e5f77f7f6b3cc5e601b991abac357b90698f532d1b2ccd866256e13d3f497be4df6f0065
+MISC ChangeLog 10228 SHA256 4c930d0ab6e97bbccad46eeaf82475809283d54765d1f34b6fc9933d546e1d3b SHA512 5c51f4884a8efb526ce0838f7b475816d62a6ea965c1223664bde9cffbae6d6d61ccb538098b719b27b98721758b6800644ec585d23d08c7d749269105922d87 WHIRLPOOL 01954389fe579424835f962e0ffd960a7c6c84768c35236721e56a8d26b5c9a49d181a041d66fca50d76e4d3388d3390ac0fe2ec2ee54a099e919683b89f7113
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBN2YIACgkQKiQSS7ZY+hM2bgEA2V7IDsrZfZDzJo/b/Qt0m53Z
-eZU98kL/cjsHol8ueUsBAN7wPrqvB13JkHNsostEBWJQsKh3RmzvFa2NLlkBj3bT
-=9AMS
+iF4EAREIAAYFAlBPeSgACgkQKiQSS7ZY+hNwqAD+KeziYlFEwHNC5KijKiI07FMr
+KLMOsdLgc+rO7DYKXZsBAOPG1BIwwUHH3alzb3+AdeeFVX6GCpYMtS+qc/D1U+nv
+=ZG10
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
index f92aaa72508a..43b9db6530dc 100644
--- a/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-sconscript.patch
@@ -9,15 +9,3 @@
  elif usev8:
      env.StaticLibrary('scripting', scripting_common_files + ['scripting/engine_v8.cpp',
                                                               'scripting/v8_db.cpp',
-
---- a/src/SConscript.client
-+++ b/src/SConscript.client
-@@ -134,7 +134,7 @@ env.Install(
- # install
- prefix = GetOption("prefix")
- 
--env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
-+env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
- 
- 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
new file mode 100644
index 000000000000..f289d18da24b
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
@@ -0,0 +1,13 @@
+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(
+ # install
+ prefix = GetOption("prefix")
+ 
+-env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
++env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
diff --git a/dev-db/mongodb/mongodb-2.2.0.ebuild b/dev-db/mongodb/mongodb-2.2.0.ebuild
index 9a40ca6926a0..fe626062265f 100644
--- a/dev-db/mongodb/mongodb-2.2.0.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.3 2012/09/10 12:13:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0.ebuild,v 1.4 2012/09/11 17:47:10 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -49,6 +49,14 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-fix-sconscript.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 [ "$(get_libdir)" == "lib" ]; then
+		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
+	fi
+
 	sed -e 's@third_party/js-1.7/@/usr/include/js/@g' \
 		-i src/mongo/scripting/engine_spidermonkey.h  \
 		-i src/mongo/scripting/engine_spidermonkey.cpp || die