12 files changed, 421 insertions, 15 deletions
diff --git a/dev-libs/leveldb/ChangeLog b/dev-libs/leveldb/ChangeLog
index 0e945d57b919..3698a4989f00 100644
--- a/dev-libs/leveldb/ChangeLog
+++ b/dev-libs/leveldb/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-libs/leveldb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.18 2013/12/16 05:04:15 patrick Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/ChangeLog,v 1.19 2014/06/30 01:08:11 blueness Exp $
+
+*leveldb-1.11.0-r1 (30 Jun 2014)
+*leveldb-1.12.0-r1 (30 Jun 2014)
+*leveldb-1.10.0-r1 (30 Jun 2014)
+*leveldb-1.9.0-r6 (30 Jun 2014)
+*leveldb-1.13.0-r1 (30 Jun 2014)
+
+  30 Jun 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/leveldb-1.9.0-forwardcompat.patch, +leveldb-1.10.0-r1.ebuild,
+  +leveldb-1.11.0-r1.ebuild, +leveldb-1.12.0-r1.ebuild,
+  +leveldb-1.13.0-r1.ebuild, +leveldb-1.9.0-r6.ebuild, leveldb-1.10.0.ebuild,
+  leveldb-1.11.0.ebuild, leveldb-1.12.0.ebuild, leveldb-1.13.0.ebuild:
+  Add forward compat patch, bug #506184
 
 *leveldb-1.15.0 (16 Dec 2013)
 
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 6dcbc009f6d8..83339a676d65 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX leveldb-1.9.0-configure.patch 990 SHA256 7e509d4a77fc8ae77082f9b54e505dd6b42eca9af36e2b9e03bfe4a25472b529 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5 WHIRLPOOL eafac457577fc66a0d096b50c408c5e5298278cc071c5ea867ea61c4bdff1c95759ea73cf60be4ee6f5dfa20babce075d2efe928345f39538789c8c3995403de
+AUX leveldb-1.9.0-forwardcompat.patch 3464 SHA256 1ca68f5dc7d3da0083e497d2e6ceb27675890a18db29f99f9cdf2c3cf5f7628b SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824 WHIRLPOOL 54b19b1990b7c962e285878297e4a09479eb9d3cdb08ee36b4ab6cbf8e22ac486c062b3097b0970e6ed346d3765f76048518a41b1541647049f051d20571f5e4
 DIST leveldb-1.10.0.tar.gz 204270 SHA256 84a4ab34671e1271d895f093932f8c8cfecb45b2e085da738671599825d12f62 SHA512 ba9829a203c25d00184b77382ee8db6b383058c527771a795443e0d3ae02b93dd29c3362f12fd89b08ac24f784b7ed2f3e3325b30abe2763df1cc9e4b8a12948 WHIRLPOOL d9b46a0f6586203091f2b89e4d141f8c7ba65ea994a2352d7f063796f50ba0e7a8c2d3a93ac2591a554b293ac8cb8a6eb26bfb2879f8859cb985db2cfd5985ae
 DIST leveldb-1.11.0.tar.gz 205413 SHA256 f2eaffcb60d6368088a7ef0c2b889132ea42483fed541a7601fa22e54a8839ac SHA512 2b01227d3339d5ab09a6488e43f4b92f1c8f23d9d9b3a1636710aadfebb2a291622b83d636c96314a651f7a774ec39b404490dcf7cd4ac6ec2997d5d651582aa WHIRLPOOL 410e0433a3eaabc838af22e6667c07e639c64da0143cc4af4ca88bb44dc74dabd749e90d2bb5766a448d8c0e952f7a099a593a558eb89cf43cab4f0404cd6ad1
 DIST leveldb-1.12.0.tar.gz 205436 SHA256 a50b44bcae9680c2872081df98395a34a1ac3162ea41f646676e53fb5f691108 SHA512 b0798ecc598a7dcee38887867521face02b11ec93bc55e28fb3e1e16fb9c4d2068564f7779849a0dc0d758ee9665c2297c004947bedd149e392c129fc39a921f WHIRLPOOL 834777dfa5f7e6ecfd1360185ac31389d8e2c92679f496f6925b902caccb42fa05523016bbb6908ffe2ad8c543d2c14f7913a79384f5e8aa05a75efd5be58cc4
@@ -6,12 +10,34 @@ DIST leveldb-1.13.0.tar.gz 207718 SHA256 083497a48ff54a3470ab5085730306a536013c0
 DIST leveldb-1.14.0.tar.gz 208282 SHA256 9122d2c248ba40d6ce46d0c3e4738fcfa941d0d93fdba20a101471a98e8b00a3 SHA512 c8dc837b77b7aa0be4fca03f31061685534d4280c59b929e5c3e7ef9ceb29e7ea75f8836a55c9df49cd3bc67143d91a2512fc5d9a181f440ec4961a256c77108 WHIRLPOOL 445589cb1f6f540a5a0cc395907f04bb785ea98441d6c9ea19eee6888ebbcc659cf9b9a44a87693336b9cf14a0645de43c0761ad9aafadbd33f157ef05687a6e
 DIST leveldb-1.15.0.tar.gz 205691 SHA256 d7c4ec571ef2ee9719f31db06344a1eba495e6abeeac1bc349d0d38a911c6680 SHA512 af5b18a7750ac553659075c1c34aa2fddf6322b6837f096589cf5908c7050fd19053cd98d19fd7097e0840392b318f0166360d3a0595adcaaabcfdf393246775 WHIRLPOOL 10136e1b8686ef2993e4b45b371bf749972fe84e0cd615bf18fc85de676e589951689adefc3a14625e66cf6cc4f70ffd99bf0c832209a97ceccee834853a7503
 DIST leveldb-1.9.0.tar.gz 203872 SHA256 b2699b04e5aba8e98382c4955b94725d1f76bd0b5decd60c5628205b717a1d4f SHA512 47b0a3272eef2d677ddeb8d0c973e59a1be4bff580528c3bc3f83a654f41485ecc86892d9124ce21ef747c220f98cdad687436849dc978adfd42f8c8c05b9160 WHIRLPOOL 301ba45968095420ff72da36f128bd916d4e039385270eecd8e077aac3781ed12931c9a7d426842e197fd62a99ad6477e5eabbca7524fcba2a185a702f4ef22a
-EBUILD leveldb-1.10.0.ebuild 1332 SHA256 be6fe511efc53728ee88ae77570cf6648f778cef924136c6ca3cc671a053cecf SHA512 38e0d86dadb4b78f736d22cead7a172d099d2fee95dd7d6a0af035eafc59d798813aa57da06f4647efa4fb80dfab45d55012d0f61499c5ba1256dbc95a484063 WHIRLPOOL 337090add18767c7842d6c55d5a0054370992c852f2827f9f6966b938be87ef36006c6dfe487aee4656af915231db4f6619b876bc6ad88b86eefefe3d00752ac
-EBUILD leveldb-1.11.0.ebuild 1331 SHA256 e3de0ec925932c6b3ad5258a1f0f55481ceb2518493630989b537d4806ca793d SHA512 b4563b0e19600c154ae9aac1fc9151bc596532f610ff7d584ca4ff84688c184d139a12deec1b4f640f15d2b0ca11dfc49c62ebb21fc8a34befe55f77b13066e4 WHIRLPOOL a706adf4fca65b3971476fd1de07043305a54666be03f46c644d706adc635fdd57f03a944250441c9b9d17eba60a3410b045787b1a6243081e4f1202a8002a72
-EBUILD leveldb-1.12.0.ebuild 1331 SHA256 e99523900a5681ba7709425cd280d4954fe97ecf74e5e320491122330164c1e9 SHA512 e7510a14bcba9f01346afc6228b1e692ff0aa8649096cf001246d153cdf9e3a9525e03c96f1cb9707d4450ece2c235da854822306f2fa65f750d89cafb6e808d WHIRLPOOL 812597ae8d43df2bded603fe8ceeb73235854e6e234aaf9ef61b2bbce508264e106c4a70123c9d1c097b647b72b2e99f02126231f77394d46a6ea26d4fe1e66f
-EBUILD leveldb-1.13.0.ebuild 1331 SHA256 736c3f6f533fe874b14050eb8b76fa1302a349380c19dfa4d8c8ea1ed61002fe SHA512 f12b89e496fc531a815c196cd516cbbcb2fa2f8038aeb2bff7135468dbdc5815e4b80b39d27c2b032f997bf9ad778e461202157b2bd6c1bf56f1dc05b349aa9e WHIRLPOOL 4255ed95d54d3230f64ed42902214d2673527a1740edd7d1dee220f1ef5bd8504b9eb58bd4a6a97b3affbce13172a7e188328563b8157df164bdde22e24389b4
+EBUILD leveldb-1.10.0-r1.ebuild 1408 SHA256 f7960a4caa19484ab022140e381920fa093ec9873a95980d3910328071425e2b SHA512 69adc5868beaec96c99bde2ed9b585714864a5cc1d39645a6c69df3641788c0e41443356d390cc5af69085a2bec301f4a01ec0e51951414bb6bc046a4859a583 WHIRLPOOL e1b702ea6ae2125ed0d7372b2ee7b0a3e4a13f9e1cd7e44b8f1d0a121268a6707339da5abb1b9fb8d8bc104ca40418915e45e20afa98a371792c604ea561b007
+EBUILD leveldb-1.10.0.ebuild 1332 SHA256 7d1096d1fe811a9ae2f61cfd2e7d6350d5b131ff2774ea6eb21974e6058772bc SHA512 52868097f52d4f136e64ecd4e8f1d244158d304baaff7bc7c03bae0bf37193def84d8b6d0593cdbee194b2355b6733a8c8453d05faba5c30eff6eea4c59fd26c WHIRLPOOL 06fc4a72d354e8fa71704aab6d66e1efbad21eef512a530f2e21285e9211de00b4197de96b164640b0461cfa0a27aa9cc42e03b625202c119914441746d07b45
+EBUILD leveldb-1.11.0-r1.ebuild 1408 SHA256 f77175e9f8ace43c37eb7fd1e1830c197fb05ed4327ad76eff266332c589bb25 SHA512 0bc8a29ba6c3a9dbfcb248279186bd7ea9754ddc2ef57be51863d90ccab4dfc2148f70ac60e30056d63ef25827a8664ef3e26d6037542efcf39f5db57cfbb76f WHIRLPOOL 5ec21c729dd5a9c242d3032e9c697fb2934a309c3e9c73db30cfd94fd9ec1077da36b7acd811658195b9497161fb3d4b130361ed7b7d325d8a8b6ffde84ed0aa
+EBUILD leveldb-1.11.0.ebuild 1332 SHA256 d854b2e96333f7383b25d91eea2f9c127b49c0eb1c3bb9df4e6bb873af2da01c SHA512 8ab386f914d129fa88167aeba68e35771d6d83a400342b1875427f0be9e4c3ba59d2a7de19d146338fee236f9fb20699296f6a836582fb59b4a87b23f0a50033 WHIRLPOOL 82571dbe54976a0b063bf47ea1105282f2bf351dbb4d1a347ecaedc78e2c2f246918dc6011477798c901c1feb7b0e8400c563a0baf0c1e1ba8495752ec19c643
+EBUILD leveldb-1.12.0-r1.ebuild 1408 SHA256 8d8dfbb3336ff8c8ad60552541a71f3bab982bffcc624015605231d44c9e2c44 SHA512 12d7529472b0d8f71c8dfbf79f90c2868d9ea537878cae5b8e8347e3c603c03d12258d3cb008a52d9cb5c17f40c27e6f04fc6286bb9cf70dd4c23a6d5de80975 WHIRLPOOL 7cbc7e6390002933202c03f9410e3f78d85ffed5af9145c754957e3b84ba3c9c5e76cc94ced1ed92ba9ddd3be095b4a8dc5cde1c01e66052d29c0e07bb43ee4f
+EBUILD leveldb-1.12.0.ebuild 1332 SHA256 9458dc73a9af4450f925d78fc82c6eeb59181775690e2ff71908e3d517ab1e5d SHA512 1044982cef833c35c3f8a73d9d31a7430da1e5430c11b665f97d62c8ccd1c369710e3eae4c7e3e3a28eb4de8f60f24a2eae264e9f510df14becf6bbdfffeafc7 WHIRLPOOL 30821993bc15ededd17f6a4882cda53854cccc458afd0001022d2bf886ec798dfb43a0d8ead94b632513719427adc2dcc9a7af5f1a4a65e6b11cbcf894e86acc
+EBUILD leveldb-1.13.0-r1.ebuild 1408 SHA256 9debf867423dc17c5b78471fb17716c4647d895c2768dc5c9fbd0743918f2ff7 SHA512 5926c01bf7f71c6b39a130bec19c0b46068fe0e5b34beeef2c96963fbf027c5dfc1e3156e0b531bca80c98f313c7e4815aaa92b79ad99840967ea0f6dbc1385b WHIRLPOOL f3c110efe8797cd0bff7e840b28c889de6d89d0a01bf6ce78948a0059c360a5683e1e072483663c4e849fbe8b6056b88de1fa27e8e97494f8f09fddd4ba42085
+EBUILD leveldb-1.13.0.ebuild 1332 SHA256 5c2e27e292bf0d16502458119cf77f353df1b9799e94bd3905da39f381b9d687 SHA512 cda65e842220ede60a6eddd2eca5609e125619b44239a1b3282ddd51ea253c9d1426770fd545d4ba5b1d3bca10fe5b188ad9e5ece4a62518f48e6bf30f184d92 WHIRLPOOL a5e52e9e351fd2cc2d8d057e906ff4edecad88d5b623ea00eb0f299eedb9c9c984c12955796f1211557ad7285d4806882d52e9e7efc7e4eb46645ae5e5d589cd
 EBUILD leveldb-1.14.0.ebuild 1331 SHA256 79c3a2913c0b72170c7248989ec05cdc77ddfed35b38b09b169e574ccc3c9ce4 SHA512 39b52f2c71ff08e6ca84e5ecb7c17790a070ab0786067ffd99e9a80a0a825da82036e1c0b46a3f16f1afa593733e294ce55efd632e74a1ec9ec8d9fa6f0486c9 WHIRLPOOL 24793edf1d7cbee02b21c8ade5ca229067f49c18cf8ae305da466a1974542ab70fc38ada1205aef7a8a4f999e3d70d9982c21777b96f9b5037aba8a1f68ebb1c
 EBUILD leveldb-1.15.0.ebuild 1331 SHA256 399bd550cd61269d6e7ee97c22275819c16a40580663408729fe2041f9e7d1d9 SHA512 5d0b924ce36f2c0dff34e6528ca5ca152ceef2844ab027994d8c549513bb6ee1fe9093c00e1fec491db8860531fdb388ef6ac8073027fbd035c9517efa336a96 WHIRLPOOL 621fd8b9654583084701e176f9bdf6b01b80cb88428c118d448de922ca925466ca6d5a1997525347ba4ccf40c717d247f65aa48530000232b9d40cab2be86ce8
 EBUILD leveldb-1.9.0-r5.ebuild 1322 SHA256 b0110c5ab60f7042c8e33f090a94b93c7900607f2e7773f6a0abd494f53f6071 SHA512 0ca565fb96b055a7fa50e9d00ff7ce9bac72f14101d5d1b273fbd8d8cd536bf935a2f9c39c8c023ae9a51b036db884dd6937d4a10b673fbfddb29d13939232a0 WHIRLPOOL 28efb36b01995f24aa04146b401a8cf8258538fd84a2ce696f251e36aabe41c910e4c93dd0d95b8f5956002b9bdcfd903832d7b580cb8595b9bc3bf6ad95dacb
-MISC ChangeLog 2551 SHA256 f19f73f207301c10500b76fb421469550a76d34fdd2fb217e5164bddd8625d0b SHA512 f18a142c8c25430d0f5063f0f830f746cb051322b6440905469c6b5c83260afe55d0c0d1da84e242ed4d094b8b32c5c099746cb988566053a186a532e3d9d9b2 WHIRLPOOL 179bf03bc7dc8ef481b60c1f7832bcee305ec168bb89fc3273dfdd400ba9ae464b9a838c2a5ac2e01e460e90eec41a50739a5a56ac3e84849ac08695f82d7ef6
+EBUILD leveldb-1.9.0-r6.ebuild 1384 SHA256 5a86c5780d76db7ad70eb80c8e2ebeb4161b86d17f7dae3b63822881152b0508 SHA512 6b1dac76ee66732b3d902c7a212beed707c98ff92ce331e265189876b8b829a6f855e8c9bc4b5dfacd4b6da34694211fb78cfd5fa63ae1faf4154e8d5120572b WHIRLPOOL e60b80877b2341dd805f0d3c8f08256d56eb59525e9a93ce5d77458576845a470586752b96021a04be16abcb7040dbdb3fc1bc61a6c4376e052f96c531ab0199
+MISC ChangeLog 3089 SHA256 2f21f4e07e483a79193086a204098ec438fcca43126c78d9d85b9a36e8b79d6b SHA512 43297222d281840265658dbbd44e22eb87f153640c1888c3b1998050c5a93a3ecdc72796e82b1b0cd1e9573aa59abecc5728e0573bd525fda9b609d2b613d921 WHIRLPOOL d9d8deb43686c09fbaab8bbf2f86053a9460ac6a83067d9c2604811c6f63d0a5ddf70a5ddf5859e0916939f1db0d8db23e704ccdb716982228105f3ea3b7e39b
 MISC metadata.xml 446 SHA256 f36024a661afe4d9be20033f664174a90b76df85e531da553abe9ca7d10dcb58 SHA512 d61a8e5645c7eff9fed94136ead2ad8d310e0313fd200ae754a8fc13ca8f5378b03ca2c95bd228cd1c7c5227edb00c25ddc512c6a004a9f5514238986b8dbade WHIRLPOOL 65044cd9194579bf1a2e577369cc4b09fa9d84d0d1e78bcdb41b0c70b68369171829ff80c89cbe24c974af0c829f415c207a0b537c8b5e9170fe71eafebb3ef7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJTsLi4AAoJEJOE+m71LUu6Zt0QAI47uc8OSgeTjRcw5ff9ySeq
+zVhO5WayUONBK/DmtSCpG9fjtO28876nROGqVYPhRbKaYyL962NOw2GfsvnZjTpv
+8w0V0Yw5TiC/cZFzSLEGH+bj6/zuHjQaMdZ625kirOK5WvpCobGacxaWSwEHkHZf
+mqkBtrsW5xI1BHFoDaG7BIvKTz3kRYOishzNBD1SoFdfjvtdrG6bLGCXLpQJGdGk
+TSMOMMssnNGHcFNx5Za2f6UjShf2B3A36bkNm7RLKdJwnCp/z6DN/VGrPFJbbI3M
+mwjbAiZbvXep+vZ614OofOmx4i35Uvwqf9kW8eqGQELYzU9lgbtIHVI0QrNHg+na
+8TlRl7U5CV2xnyx7dr+jGoQk5P1HNzB5F0QKJfpptvhuyHPPbldgGxRBZTntebAC
+dTDgsEc+1jHmz1HpohVUIJwrXEH8UwgCbhV1Pqw8juq642W7P6VzZoRyRSrS2HL3
+ZU3kbuoDbdew7QIBov/bkTA8QkIvGdb5414ox9eHF71CYtQskM1vwK21HaesppRn
+cEbxihxbpYleHkg0FOKESXj3LM4694+kMD3gpHrfRLI/42jPFFDv4VZZNOWITtS6
+16vtVZvBWdtyZKSUxLjURttoHZpsZ3bkF2b/Fr+DDS3PGqxmhGFNUSdItH3YfGUs
+hRZWFXATfv2NAFoOZ+Qy
+=6NUY
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
new file mode 100644
index 000000000000..1c21dbe09ff5
--- /dev/null
+++ b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
@@ -0,0 +1,81 @@
+diff -ur leveldb-1.9.0.orig/db/db_test.cc leveldb-1.9.0/db/db_test.cc
+--- leveldb-1.9.0.orig/db/db_test.cc	2013-01-07 21:07:29.000000000 +0000
++++ leveldb-1.9.0/db/db_test.cc	2014-03-28 22:58:59.000000000 +0000
+@@ -139,7 +139,7 @@
+ 
+     Status s = target()->NewWritableFile(f, r);
+     if (s.ok()) {
+-      if (strstr(f.c_str(), ".sst") != NULL) {
++      if (strstr(f.c_str(), ".sst") != NULL || strstr(f.c_str(), ".ldb") != NULL) {
+         *r = new SSTableFile(this, *r);
+       } else if (strstr(f.c_str(), "MANIFEST") != NULL) {
+         *r = new ManifestFile(this, *r);
+diff -ur leveldb-1.9.0.orig/db/filename.cc leveldb-1.9.0/db/filename.cc
+--- leveldb-1.9.0.orig/db/filename.cc	2013-01-07 21:07:29.000000000 +0000
++++ leveldb-1.9.0/db/filename.cc	2014-03-28 23:07:48.000000000 +0000
+@@ -34,6 +34,11 @@
+   return MakeFileName(name, number, "sst");
+ }
+ 
++std::string LDBTableFileName(const std::string& name, uint64_t number) {
++  assert(number > 0);
++  return MakeFileName(name, number, "ldb");
++}
++
+ std::string DescriptorFileName(const std::string& dbname, uint64_t number) {
+   assert(number > 0);
+   char buf[100];
+@@ -106,7 +111,7 @@
+     Slice suffix = rest;
+     if (suffix == Slice(".log")) {
+       *type = kLogFile;
+-    } else if (suffix == Slice(".sst")) {
++    } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) {
+       *type = kTableFile;
+     } else if (suffix == Slice(".dbtmp")) {
+       *type = kTempFile;
+diff -ur leveldb-1.9.0.orig/db/filename.h leveldb-1.9.0/db/filename.h
+--- leveldb-1.9.0.orig/db/filename.h	2013-01-07 21:07:29.000000000 +0000
++++ leveldb-1.9.0/db/filename.h	2014-03-28 23:07:43.000000000 +0000
+@@ -36,6 +36,7 @@
+ // in the db named by "dbname".  The result will be prefixed with
+ // "dbname".
+ extern std::string TableFileName(const std::string& dbname, uint64_t number);
++extern std::string LDBTableFileName(const std::string& dbname, uint64_t number);
+ 
+ // Return the name of the descriptor file for the db named by
+ // "dbname" and the specified incarnation number.  The result will be
+diff -ur leveldb-1.9.0.orig/db/repair.cc leveldb-1.9.0/db/repair.cc
+--- leveldb-1.9.0.orig/db/repair.cc	2013-01-07 21:07:29.000000000 +0000
++++ leveldb-1.9.0/db/repair.cc	2014-03-28 23:13:28.000000000 +0000
+@@ -263,6 +263,14 @@
+     std::string fname = TableFileName(dbname_, t->meta.number);
+     int counter = 0;
+     Status status = env_->GetFileSize(fname, &t->meta.file_size);
++    if (!status.ok()) {
++      // Try alternate file name.
++      fname = LDBTableFileName(dbname_, t->meta.number);
++      Status s2 = env_->GetFileSize(fname, &t->meta.file_size);
++      if (s2.ok()) {
++        status = Status::OK();
++      }
++    }
+     if (status.ok()) {
+       Iterator* iter = table_cache_->NewIterator(
+           ReadOptions(), t->meta.number, t->meta.file_size);
+diff -ur leveldb-1.9.0.orig/db/table_cache.cc leveldb-1.9.0/db/table_cache.cc
+--- leveldb-1.9.0.orig/db/table_cache.cc	2013-01-07 21:07:29.000000000 +0000
++++ leveldb-1.9.0/db/table_cache.cc	2014-03-28 23:12:39.000000000 +0000
+@@ -54,6 +54,12 @@
+     RandomAccessFile* file = NULL;
+     Table* table = NULL;
+     s = env_->NewRandomAccessFile(fname, &file);
++    if (!s.ok()) {
++      std::string ldb_fname = LDBTableFileName(dbname_, file_number);
++      if (env_->NewRandomAccessFile(ldb_fname, &file).ok()) {
++        s = Status::OK();
++      }
++    }
+     if (s.ok()) {
+       s = Table::Open(*options_, file, file_size, &table);
+     }
diff --git a/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..9be1ef39f0b2
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.10.0-r1.ebuild,v 1.1 2014/06/30 01:08:11 blueness Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}
diff --git a/dev-libs/leveldb/leveldb-1.10.0.ebuild b/dev-libs/leveldb/leveldb-1.10.0.ebuild
index 3ba4b9cdda3a..aef122687a73 100644
--- a/dev-libs/leveldb/leveldb-1.10.0.ebuild
+++ b/dev-libs/leveldb/leveldb-1.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.10.0.ebuild,v 1.2 2013/06/11 19:09:53 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.10.0.ebuild,v 1.3 2014/06/30 01:08:11 blueness Exp $
 
 EAPI=4
 
diff --git a/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..d9933913f917
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.11.0-r1.ebuild,v 1.1 2014/06/30 01:08:11 blueness Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}
diff --git a/dev-libs/leveldb/leveldb-1.11.0.ebuild b/dev-libs/leveldb/leveldb-1.11.0.ebuild
index 10ccd6885feb..00529a42573a 100644
--- a/dev-libs/leveldb/leveldb-1.11.0.ebuild
+++ b/dev-libs/leveldb/leveldb-1.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.11.0.ebuild,v 1.1 2013/06/19 03:28:03 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.11.0.ebuild,v 1.2 2014/06/30 01:08:11 blueness Exp $
 
 EAPI=4
 
diff --git a/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild
new file mode 100644
index 000000000000..d110428c7db0
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.12.0-r1.ebuild,v 1.1 2014/06/30 01:08:11 blueness Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}
diff --git a/dev-libs/leveldb/leveldb-1.12.0.ebuild b/dev-libs/leveldb/leveldb-1.12.0.ebuild
index 97757e95f36d..7b6707bb9247 100644
--- a/dev-libs/leveldb/leveldb-1.12.0.ebuild
+++ b/dev-libs/leveldb/leveldb-1.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.12.0.ebuild,v 1.1 2013/06/20 03:30:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.12.0.ebuild,v 1.2 2014/06/30 01:08:11 blueness Exp $
 
 EAPI=4
 
diff --git a/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..5f790d245a06
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.13.0-r1.ebuild,v 1.1 2014/06/30 01:08:11 blueness Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy static-libs +tcmalloc"
+
+DEPEND="tcmalloc? ( dev-util/google-perftools )
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}
diff --git a/dev-libs/leveldb/leveldb-1.13.0.ebuild b/dev-libs/leveldb/leveldb-1.13.0.ebuild
index 549572cf8367..a55ff719bdf4 100644
--- a/dev-libs/leveldb/leveldb-1.13.0.ebuild
+++ b/dev-libs/leveldb/leveldb-1.13.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.13.0.ebuild,v 1.1 2013/08/29 01:25:20 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.13.0.ebuild,v 1.2 2014/06/30 01:08:11 blueness Exp $
 
 EAPI=4
 
diff --git a/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild b/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild
new file mode 100644
index 000000000000..6e159bc6fb72
--- /dev/null
+++ b/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild,v 1.1 2014/06/30 01:08:11 blueness Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a fast key-value storage library written at Google"
+HOMEPAGE="http://code.google.com/p/leveldb/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+snappy static-libs"
+
+DEPEND="
+	snappy? (
+		app-arch/snappy
+		static-libs? ( app-arch/snappy[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.0-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
+}
+
+src_configure() {
+	# These vars all get picked up by build_detect_platform
+	# which the Makefile runs for us automatically.
+	tc-export AR CC CXX
+	export OPT="-DNDEBUG ${CPPFLAGS}"
+	# Probably needs more filling out
+	export TARGET_OS
+	case ${CHOST} in
+	*) TARGET_OS="Linux";;
+	esac
+	export USE_SNAPPY=$(usex snappy)
+	export USE_TCMALLOC=no
+}
+
+src_compile() {
+	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	insinto /usr/include
+	doins -r include/* helpers/memenv/memenv.h
+	dolib.so libleveldb*$(get_libname)*
+	use static-libs && dolib.a libleveldb.a
+	dolib.a libmemenv.a
+}