diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2014-07-23 15:42:58 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2014-07-23 15:42:58 +0000 |
commit | a1aaed3fec905e7a446d5e20c4e30381de7f5fae (patch) | |
tree | e0ff2fd3d81db0579dc41bdd72337f4bf5cceeb4 /dev-db | |
parent | Keyword ~arm and ~mips, bug #517838 (diff) | |
download | historical-a1aaed3fec905e7a446d5e20c4e30381de7f5fae.tar.gz historical-a1aaed3fec905e7a446d5e20c4e30381de7f5fae.tar.bz2 historical-a1aaed3fec905e7a446d5e20c4e30381de7f5fae.zip |
drop old and vulnerable version wrt #497540
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mongodb/ChangeLog | 9 | ||||
-rw-r--r-- | dev-db/mongodb/Manifest | 16 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch | 34 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch | 15 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch | 46 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch | 215 | ||||
-rw-r--r-- | dev-db/mongodb/mongodb-2.2.7.ebuild | 110 |
7 files changed, 13 insertions, 432 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index d156734acde9..7314aceedd9f 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.95 2014/06/20 16:44:09 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.96 2014/07/23 15:42:49 ultrabug Exp $ + + 23 Jul 2014; Ultrabug <ultrabug@gentoo.org> -mongodb-2.2.7.ebuild, + -files/mongodb-2.2-fix-sharedclient.patch, + -files/mongodb-2.2-fix-x86client.patch, + -files/mongodb-2.2-r1-fix-scons.patch, + -files/mongodb-2.2-r2-boost-1.50.patch: + drop old and vulnerable version wrt #497540 *mongodb-2.6.3 (20 Jun 2014) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 4dba70770203..da11eae81c43 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -7,11 +7,7 @@ AUX mms-agent.initd-r1 798 SHA256 8de9906e3095c37e492d1684748f86b5ac992de1b394bf AUX mms-agent.initd-r2 665 SHA256 2d5ccc09812af5b25bfdf5f773e4298c7709444efb99a2d9ed2a027e2640485f SHA512 6f89215002799c60a8eb36b7726bdc6181ab5c8f2d1b0496c07a93fbd40406725998f0743c8011d4c5df1ee6f23059a0eda1b48663d3886cbc3e26f08f75ed42 WHIRLPOOL c165eab0a3e77da000b1cd9cc2bd1bef1cf485fbb78948e1bbf2141211b0840b023e1d0496207b13414df8720d48fbec45a11c89ed9e290f3be8898883ae439a AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594 SHA512 42510c21c2cd9c3de066b565e556998bbe61469a53cc1871a6a498cc32702f47818ccaf08a2183ff7719ceb4566c4144de610952ca093646bfe74c70c58247ad WHIRLPOOL a27f5dc7210294300cb24a871c68b335efbe708555a61ed00c651f1f0f5d26ee474aa90c8cd87d1a610d1628bcb8fd9917e1c0ee2060be7588443c07de628d45 AUX mongodb-2.0-r1-boost-1.50.patch 12282 SHA256 f224ee1e29e3cf7f93f91c5665398ed53f2b0dfc74bdf2eaac37efb303c4c432 SHA512 c4d18e78f482cf5423846082b112dc0c59aab3e70e601e9190aa60ec514773a4ecc93ec893a005002f57b4bad906faae3799e1b53ba1afe89f0d68e24cf8b5aa WHIRLPOOL 885a280fff1e00c1e7cc0f85b72a0c0ae2d889418c4245b81f37b8cd1943cc816c228b4efc166b416ace86d3f94bec57830f0c7982c79ecff1877d2009683ce5 -AUX mongodb-2.2-fix-sharedclient.patch 1281 SHA256 d30f74e091b08f475699913fabd43c32b085241680440177bb281e2317c1de1e SHA512 aa1cc55a595f40467c023626979934e4e15bc0a5432aab4450833021499fe0989a725f0d2659f693e849ede5d990de95a225c9ec39404b2d51f34f5a6c91ed6d WHIRLPOOL 9e29eafa482ba575ba1ba6add5bde3a0479c9cbddc993986fd18ea3f40b7e0b0a41e6da496b3a6ac5998bfb96b66b6ef248b5d71aa29b1559c44e403ceccf305 -AUX mongodb-2.2-fix-x86client.patch 743 SHA256 1cab0f44dad67a01f160d7a7322e5d3301b9d54c9fc4ea393844c2c4d8e4dc1e SHA512 aca84b3480e26727b8b13d731722bb3b7a85be8c45e3ac07c11526e965b131c9358b189f2ae6e6ceff180923346d012976364fffc00ee382415fb1fc183b6c67 WHIRLPOOL 36160796454431d9ed089dae6a1d543c2c4ef9bbd554c920f939ea83a6ab77e0d4fe16bdecdde5cdcef068e44969eb20cfa53a90af510b4c72c425bb4244f4e6 AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449ab8e434ca677acc7814e7485231e841 SHA512 902c11e15e26be6c64053b4f3c0d0fda1670373fa3a5805063b49957843173b3663f6271ae541bb07aedf884a9861099bb1f452761f7baeaa819f14eb0755336 WHIRLPOOL b5df66a5e90202db903989c66b7423103ca1a666a477175c1746c94d5cf250ac4ceb2d237737ee2bfc158a8f9c611916e91d5133ba94e544abbaaec8b0d0361a -AUX mongodb-2.2-r1-fix-scons.patch 1950 SHA256 cd136dea1ee03cfe8009cfe1e787478115f1f73209f3a770794c36813d1374df SHA512 741c4438b1f2060023ddb053317021f680a33d535299350f8775f602fd0221e7f96be0ca2694861611dfe449cb09fea4f3075018a6fc9f3c32ee978c075f3e97 WHIRLPOOL a8d592c4a6483445cb95ae7045b3b7025379b83446673af3d23f68c135ffe9fe5060d4d7a508a9ae7a5774191aa9a2df383fb77b0dbdd02b31b1cb089000395b -AUX mongodb-2.2-r2-boost-1.50.patch 9980 SHA256 e289811f7abb9525e7ba1c2904ab8c26b687c7c45601e8b7b7f83a8a2523526b SHA512 83b181301037c35810970e1163b4d01593bc60edce77514d99f74552ea981f0455552306a1f843cb4fae72489abd2ce8a91705a878ef540811f28c53dda2a5c0 WHIRLPOOL 03e4c56f1b364fb6917be67cff641799e85790714b240030c1fdbcc066d7b127db6533e53165bd8eaf2bca6e284f3be3899fafa1f78ce0734d9da4e14f18e8e8 AUX mongodb-2.4-fix-v8-pythonpath.patch 439 SHA256 27728aaefca317287147d10c1b9e4331d4d4ab5c813356c32067699f22f4db72 SHA512 8d8a73eaf605cac50fe429c7141500bbc0e4f308c35b36b4ec48b4123f3241b6f5dc2670725bc7caba5769949b254874e9c36871142635c552a4c2d05a339d2c WHIRLPOOL ae1e88085c8db0f6244f3e286c8af5e8fb5b3966a204c0c104a094d27b5832b339b6ffe60f9a06ebdd1c8ec4eee94b3d89cf3b732fed88eb84668475c1e544aa AUX mongodb-2.4.5-fix-scons.patch 1276 SHA256 b55cddc0590065f4888645c8f5738bafc8de21834dcb3b174616b58c93e9ec06 SHA512 b38f2815ca3d3b82357782044e9358f1f1b6c237ea80abdcc516135dbe84e34c89f54ad54b60cc612f229fb76919dbb8acf3249589ddd6322ec62ea373417f99 WHIRLPOOL 155e88498b34fd0f4cfe7b1eaf710cbb10f3987da985c1ebaaad754b57a5799bfb00a8654135abb0bc3507584e6b46ca76dff3abdb86f3a1d8cbde0e2a39abe5 AUX mongodb-2.6.1-fix-scons.patch 1386 SHA256 18c454168e6c4feac4b67a3ff18e811d486284cb014ba0ededc039433c1caf28 SHA512 a67a1b2f75783ac3520f3ea5765e7a57669c23969a8242f481594e3a28e400a3656068e65ebaac0765b66433eb56c30280762fe3f6fe49b9b255c3b80dd24a29 WHIRLPOOL 7828f0314e6fa8e44cdfdbe90255e94158aa3136e71a3afff001c2308b4ef31bc8f0001083d68f00a767baff69c8bb0034f65a50e970deda45acd540fe5de772 @@ -31,20 +27,18 @@ AUX mongos.initd-r1 1370 SHA256 d4c9f32f0f001ae7cfe2b35034fd8e5a24a83fd1bc899415 AUX mongos.initd-r2 766 SHA256 673c0662c0638a77cb5f630605a828a6191abd0c4e9bd295b43d7b4aefeb2e1a SHA512 620062890f13bee96a1ff3b1c6900b8e08358481aae7476187eddee8f56f89e4a3d4351df88c9264fdf5e773f57e1c28337b6086a33fa97246005bfd027e0b6d WHIRLPOOL 74094c383596a1c24ced57aea1943ec86e6c98dad3a615fbf9bfc59969aaee2571c7f99a44de879864466fba9efd780f7187a5a95da04faf094f0ce3cd8031f7 DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0597e78a9011b57cd1030a05cdd16e7c SHA512 9467d229829076733a023d81e377479e1e4c71c4d2c1d163928abf7215bc87809a304768f83b531b6f585d19b18585f9d0d35fd74762cf180586be11536eb1a8 WHIRLPOOL d632c1761d1f47f2139a046d58af09641a0c8d9f3168d7ebc99dac5c6a3b5b0846cba8eac581b67d35c5e7580c6910759503b85e7ca74e5930c0e0dac3d77c97 DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1 -DIST mongodb-src-r2.2.7.tar.gz 10191656 SHA256 4ff250458940c3f408f8992b41b41c114cc6cc166bb7e88bc7d7b62b1621aeb6 SHA512 b4297ea86499e611aca1455ba48f984b9df7ec7dd03cfe586ab14fd0c68c6a917272d0a26b7de89bb9e3a4d7fa9f07c0fb6a6627544762b66f29fa25ccbf0ee4 WHIRLPOOL b043fe4e284d0ef19cc282cb413a1b7305e62021da3ca087bd8275c0b05d24d8cb97b56b374fdb3cf181e75602389b4562ebb1952a091746265840629cd1c7b8 DIST mongodb-src-r2.4.10.tar.gz 14166404 SHA256 8ac8d0537e5316e842e3713870b76ea3cc18ec1234307e850046449f48a87402 SHA512 970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6 WHIRLPOOL d2503300499c213c76ad1185fceec5a495c79ec6774af11ebfc372f1c56515b5727a0538c7d26f310b100582c675ff3b70334030d784a87af3ff372bff16507c DIST mongodb-src-r2.4.6.tar.gz 14141660 SHA256 b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb SHA512 73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae WHIRLPOOL 4c5c9b8b7530a58f5fab62c414054939014a38cb49429ff619059b7305b29eb41c8ec3977a3b4490391afe963384d4560097a7ef536679c42c9d0ecc1677c958 DIST mongodb-src-r2.6.3.tar.gz 14472012 SHA256 77bd9ec1b3aba25494633b40c21e9e8623d7b7d2b3be5ab0b2315b627a238301 SHA512 c73ff95c949380c9b8a8e2c851d53731b08dcd6b93088c0d67fce1580a898d6742bebab3a142d5316353f00fbe12ea32c4651f04b66b85b205589414b7f6811a WHIRLPOOL f96fa94069fcde8bb2f1c4eb70397330f75ab78cf7b7e4f8e5238ea25cb6634a1ec0d7a0283df034f12f3e9ae69edb78ee24922223a9bd22c3cf9435391e4c5a -EBUILD mongodb-2.2.7.ebuild 3133 SHA256 292e974b583ac64e0c4535b8c1c89ad41058d19317623e7348dec8a720e4ea19 SHA512 bf8172cac0f6894aa9c955c88d10c39b4129c9a06bbdc94708cef7eab5e7e68f55775d2974c2ccccea4f8bbe3f2435d5c32976b8f1a057419ca1e9bc1d2e85f4 WHIRLPOOL 1e7c824d394c80dbe6fd288ee3e520ae2f05e47a1a87e1f80d16782c9ba6d8817ff4b32693b720c106032de3920940041fbb1fc1a5cedcc7fe28782f4bbdbf47 EBUILD mongodb-2.4.10-r1.ebuild 3851 SHA256 914e787dff401132c20dd3f9e229e529f9f0fffabf3fcae5dc767557e054bbc6 SHA512 e787b7dab731397b52e7683679ed2c7efbf2ee92f4b94c4bc7be03d2051116b126c80180552b069a2dcbb45e73538342eda8205173b3418e104c4f043fa90b18 WHIRLPOOL c80fb21e4911efe7e62c0004a1c50fb0388d20cf8755c39efbb4e6caebede8dbf889001648bd0be005212fccd97c00af21c16f46d0d5bc24991a42f47f995d19 EBUILD mongodb-2.4.6-r2.ebuild 3733 SHA256 b7cdc682f6ae451dc252827a05a8b0a69ae1c78b48520512d698a61faf034c59 SHA512 07c32f6dfef084956ba6592555b13e53188718eecf55ba929e0ec5d4fd36e5d844e6cea30e1467b58d5318f668d86128a2e06019032e4f767b4cab7d535fe98c WHIRLPOOL 1a15f756fbb9a4d76e3d88e5f3a54876f93d8a963fcea4413adc25f1ff795e8c27892ee68865bdb9b747f91354a926cc609088630ab0a71c6ef67b600f0b4f14 EBUILD mongodb-2.6.3.ebuild 4426 SHA256 eb2da6f5d7dbf0d1bcb3d6136d32908652a8d96132081a75eb2affb6b91b41c5 SHA512 f22caab8883dcdb81e24ca68edd044cb81c2995b502d1e7b663e29bb0e7887df097fdfff7445c5bca28f2d25b75e56c12b1f9d5d4457861596c228483daf3dab WHIRLPOOL 6be80615cafc62945b115682bcd0d23c2db3bbd64bbfa9f878302c6885cf488c6c9a1048debc9c3941aa1b3c6ee9e28d2794a6f01af0e8f1d70fbbf4166a51d2 -MISC ChangeLog 20812 SHA256 3853d1dabda1787753d763bc8f43a19a39c7bef96464e2676ad605485c6d3ff0 SHA512 42929982b1c4309a55af00c225e2965507895c10727e1ffe7a303e627948b6ea5d6f5559a1f0e1dc2602b68ccaed0eb68248f5764209b03fb3df693d560e0ba8 WHIRLPOOL 0a937e96e5830bb2314a0c4b6049334cd3cfa4eada20249955e5903a8c59d22a31b8330fccc98b79f2784427f19f35d983fc490819510893eb0e253e40fafa2f +MISC ChangeLog 21098 SHA256 2aea317bab816b0bfd9a17aa2174026834ceb98a8b5ac7250ec2532a5b620498 SHA512 87483a3c9d74f4f9f289dde59683db29bc012890b2de6480052f55639f2ae53e6aaf2bbe6c98e4bf30a7b2b2c91cb8fe357917741477bef5020548eeb6074f14 WHIRLPOOL 13e2451033a4e625bcf3e51a769d2611fff203bf56ee439ab194e99c1d6a74eaff9ab0dfe3cdb9dc34e1195a29652c87d4b5095a9e96344fa69bbbf61b404a65 MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlOkZN4ACgkQKiQSS7ZY+hNAaQD+Mx89wf+C7Y+FWfcPLy6CXsFV -unon0t7LxilnaNIOq10A/jHz+ETlcxHfKq7HaiCyhRhQGU03YutrU8w4Tr0rfePX -=mIZh +iF4EAREIAAYFAlPP2AAACgkQKiQSS7ZY+hPr+AEAmJ3Hfx2sWS3UlwbYFiosZClj +CxUKdnmG9LLw+2G/bTkBALC0SkstUGrZQSzw9RwHF7GSxP17SgMyprfDmBtMglOT +=qP8q -----END PGP SIGNATURE----- diff --git a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch deleted file mode 100644 index 21e3f66c7cb6..000000000000 --- a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 197372c4b14e..000000000000 --- a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch +++ /dev/null @@ -1,15 +0,0 @@ -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/files/mongodb-2.2-r1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch deleted file mode 100644 index 2d08fb454dfa..000000000000 --- a/dev-db/mongodb/files/mongodb-2.2-r1-fix-scons.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/SConstruct 2012-08-29 16:21:35.107094792 +0200 -+++ b/SConstruct 2012-08-29 19:09:16.964893217 +0200 -@@ -677,7 +677,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", -@@ -685,14 +684,15 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: -- env.Append( CCFLAGS=["-Werror", "-pipe"] ) -+ # env.Append( CPPDEFINES=["XP_UNIX=1"] ) - if not has_option('clang'): - env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's - - env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) -- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) -+ env.Append( CXXFLAGS=os.environ['CXXFLAGS']) -+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] ) - env.Append( LINKFLAGS=["-fPIC", "-pthread", "-rdynamic"] ) -- env.Append( LIBS=[] ) -+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] ) - - #make scons colorgcc friendly - for key in ('HOME', 'TERM'): -@@ -703,6 +703,7 @@ - - if linux and has_option( "sharedclient" ): - env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) -+ env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " ) - - if linux and has_option( "gcov" ): - env.Append( CXXFLAGS=" -fprofile-arcs -ftest-coverage " ) -@@ -712,7 +713,7 @@ - env.Append( CCFLAGS=["-O0", "-fstack-protector"] ) - env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind - else: -- env.Append( CCFLAGS=["-O3"] ) -+ env.Append( CXXFLAGS=["-O3"] ) - - if debugLogging: - env.Append( CPPDEFINES=["_DEBUG"] ); diff --git a/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch b/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch deleted file mode 100644 index c8b146f5d87d..000000000000 --- a/dev-db/mongodb/files/mongodb-2.2-r2-boost-1.50.patch +++ /dev/null @@ -1,215 +0,0 @@ ---- a/src/mongo/db/db.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/db/db.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -348,7 +348,7 @@ - boost::filesystem::path path( dbpath ); - for ( boost::filesystem::directory_iterator i( path ); - i != boost::filesystem::directory_iterator(); ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( boost::filesystem::is_directory( *i ) && - fileName.length() && fileName[ 0 ] == '$' ) - boost::filesystem::remove_all( *i ); -@@ -748,11 +748,11 @@ - dbExecCommand = argv[0]; - - srand(curTimeMicros()); --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -+// #if( BOOST_VERSION >= 104500 ) -+// boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); -+// #else -+// boost::filesystem::path::default_name_check( boost::filesystem::no_check ); -+// #endif - - { - unsigned x = 0x12345678; -@@ -1083,7 +1083,7 @@ - if (params.count("shutdown")){ - bool failed = false; - -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) - failed = true; - ---- a/src/mongo/db/dur.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/db/dur.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -770,7 +770,7 @@ - - bool samePartition = true; - try { -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); -+ const string dbpathDir = boost::filesystem::path(dbpath).string(); - samePartition = onSamePartition(getJournalDir().string(), dbpathDir); - } - catch(...) { ---- a/src/mongo/db/dur_journal.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/db/dur_journal.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -176,7 +176,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( anyFiles || str::startsWith(fileName, "j._") ) - return true; - } -@@ -194,7 +194,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - try { - removeOldJournalFile(*i); ---- a/src/mongo/db/dur_recover.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/db/dur_recover.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -72,7 +72,7 @@ - i != boost::filesystem::directory_iterator(); - ++i ) { - boost::filesystem::path filepath = *i; -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - unsigned u = str::toUnsigned( str::after(fileName, '_') ); - if( m.count(u) ) { -@@ -85,7 +85,7 @@ - if( i != m.begin() && m.count(i->first - 1) == 0 ) { - uasserted(13532, - str::stream() << "unexpected file in journal directory " << dir.string() -- << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file"); -+ << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); - } - files.push_back(i->second); - } ---- a/src/mongo/db/instance.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/work/mongodb-src-r2.2.0/src/mongo/db/instance.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -833,13 +833,13 @@ - i != boost::filesystem::directory_iterator(); ++i ) { - if ( directoryperdb ) { - boost::filesystem::path p = *i; -- string dbName = p.leaf(); -+ string dbName = p.leaf().string(); - p /= ( dbName + ".ns" ); - if ( exists( p ) ) - names.push_back( dbName ); - } - else { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) - names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); - } -@@ -1102,7 +1102,7 @@ - } - - void acquirePathLock(bool doingRepair) { -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - - bool oldFile = false; - ---- a/src/mongo/db/pdfile.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/db/pdfile.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -1675,7 +1675,7 @@ - virtual bool apply( const Path &p ) { - if ( !boost::filesystem::exists( p ) ) - return false; -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); - return true; - } - virtual const char * op() const { -@@ -1783,7 +1783,7 @@ - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? - "backup" : "_tmp" ); - MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); -- string reservedPathString = reservedPath.native_directory_string(); -+ string reservedPathString = reservedPath.string(); - - bool res; - { ---- a/src/mongo/dbtests/framework.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/dbtests/framework.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -199,7 +199,7 @@ - boost::filesystem::create_directory(p); - } - -- string dbpathString = p.native_directory_string(); -+ string dbpathString = p.string(); - dbpath = dbpathString.c_str(); - - cmdLine.prealloc = false; ---- a/src/mongo/pch.h 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/pch.h 2012-10-21 18:25:50.000000000 +0300 -@@ -44,7 +44,7 @@ - #include "string.h" - #include "limits.h" - --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include <boost/shared_ptr.hpp> - #include <boost/smart_ptr.hpp> - #include <boost/function.hpp> ---- a/src/mongo/shell/shell_utils_launcher.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/shell/shell_utils_launcher.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -184,7 +184,7 @@ - } - #endif - -- _argv.push_back( programPath.native_file_string() ); -+ _argv.push_back( programPath.string() ); - - _port = -1; - ---- a/src/mongo/tools/restore.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/tools/restore.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -174,7 +174,7 @@ - log(2) << "drillDown: " << root.string() << endl; - - // skip hidden files and directories -- if (root.leaf()[0] == '.' && root.leaf() != ".") -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") - return; - - if ( is_directory( root ) ) { -@@ -255,7 +255,7 @@ - - verify( ns.size() ); - -- string oldCollName = root.leaf(); // Name of the collection that was dumped from -+ string oldCollName = root.leaf().string(); // Name of the collection that was dumped from - oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) ); - if (use_coll) { - ns += "." + _coll; -@@ -287,7 +287,7 @@ - if (!boost::filesystem::exists(metadataFile.string())) { - // This is fine because dumps from before 2.1 won't have a metadata file, just print a warning. - // System collections shouldn't have metadata so don't warn if that file is missing. -- if (!startsWith(metadataFile.leaf(), "system.")) { -+ if (!startsWith(metadataFile.leaf().string(), "system.")) { - log() << metadataFile.string() << " not found. Skipping." << endl; - } - } else { ---- a/src/mongo/tools/tool.cpp 2012-08-28 08:28:11.000000000 +0300 -+++ b/src/mongo/tools/tool.cpp 2012-10-21 18:25:50.000000000 +0300 -@@ -118,11 +118,11 @@ - // we want durability to be disabled. - cmdLine.dur = false; - --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -+// #if( BOOST_VERSION >= 104500 ) -+// boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); -+// #else -+// boost::filesystem::path::default_name_check( boost::filesystem::no_check ); -+// #endif - - _name = argv[0]; diff --git a/dev-db/mongodb/mongodb-2.2.7.ebuild b/dev-db/mongodb/mongodb-2.2.7.ebuild deleted file mode 100644 index ee4b5bcdcddd..000000000000 --- a/dev-db/mongodb/mongodb-2.2.7.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.7.ebuild,v 1.1 2014/02/17 09:43:11 ultrabug Exp $ - -EAPI=4 -SCONS_MIN_VERSION="1.2.0" -CHECKREQS_DISK_BUILD="2400M" -CHECKREQS_DISK_USR="512M" - -inherit eutils flag-o-matic multilib pax-utils scons-utils user versionator check-reqs - -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/20130821-10gen-mms-agent.zip )" - -LICENSE="AGPL-3 Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mms-agent static-libs" - -PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )" -RDEPEND=" - >=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) --sharedclient --usesm" - scons_opts+=" --use-system-tcmalloc" - scons_opts+=" --use-system-pcre" - scons_opts+=" --use-system-snappy" - scons_opts+=" --use-system-boost" -} - -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]. - # [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" - - for x in /var/{lib,log}/${PN}; do - keepdir "${x}" - fowners mongodb:mongodb "${x}" - done - - doman debian/mongo*.1 - dodoc README docs/building.md - - newinitd "${FILESDIR}/${PN}.initd-r1" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${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}" -} |