Restore vapier's fix for memenv.h.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 37 insertions, 19 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index bbf952ceff07..cacfd1a462e4 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.105 2015/05/29 11:10:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.106 2015/05/29 11:21:31 blueness Exp $
+
+  29 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  bitcoin-qt-0.10.0-r1.ebuild, bitcoin-qt-0.10.2.ebuild:
+  Restore vapier's fix for memenv.h.
 
   29 May 2015; Anthony G. Basile <blueness@gentoo.org>
   bitcoin-qt-0.10.0-r1.ebuild, bitcoin-qt-0.10.2.ebuild:
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 622a6cf4b472..c943213df893 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -19,28 +19,28 @@ DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438
 DIST bitcoin-v0.9.4.tgz 4885466 SHA256 e7d17bd33a51a755b2d23f3bd9f384a272d87a234d02789056b2e4b8a8a92ca1 SHA512 6f13b3adf8791458e8eb7c1e62cbb2277f2caeb36c21cf0d783db15473cb0f29047bc3939c529ce893437aaf3eac0e7af2b161bd82381434a16474611136de06 WHIRLPOOL a65841ef1bf44066ed7548f81c5efaf59bb1adb99a698bd2e9910e09c395518218d8443180fcd0f63c7c938e9852c36a27b5f021b128e8c4973ec427fe0995ed
 DIST bitcoinxt-v0.10.0.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
 DIST bitcoinxt-v0.10.2.patch 72007 SHA256 f2694f976803dfd8cba11cddd6ee2bdd441737d9b82c9d7550f0f362603223b5 SHA512 6b993859b07d28ed8eac79711c0580d29267c1158838772970fe22e88d68f42f46758494e4430b9470ad529e05b24a936052bbb6747c04b54aa8a95694442747 WHIRLPOOL bbf0904cb06f547976edca2f36f49b1352d4c3e99798b19d45f5c34a74167c8db86017c9fdbaca90f3b7de38ece5f3c527e67e97ccbffdd99abd840f6cd335e4
-EBUILD bitcoin-qt-0.10.0-r1.ebuild 2924 SHA256 f60fc8722682721c90bbdc7c5c525c213b745951213b60f61ab2795e6cd29e20 SHA512 8922b7a779ce83606f8b54eb92bc42d4062e27379ed038e19689745b45ce2cc04876f4c760e72e22d06ecd44a19cf01eaa289f0139bcbcd9bb521cb20e822f4f WHIRLPOOL bda9025b9b2d74bff686ab0a94c5ee49c4f2ab45126a15edbd039ef7306f711177ab6fce7048e06639d58b255bf51c163752d2ba95847130b27b25e988da1d6c
-EBUILD bitcoin-qt-0.10.2.ebuild 2949 SHA256 541f8d9d441fccf418986cc96d8b18087cf97ddffe786de06eceb735767588d7 SHA512 ea736dbd17e2b29c5ef090454fbdaf339265849d2e41e9ecb45521b996ea5d6ad13fc7f81fd686fca67e7a644b2fff37b288e124b63ace2ba2d6a1bce2a9e385 WHIRLPOOL ddd5bda336ef697fc7152a33bb19905fc4cde66419d2a149b6f979e00d17baa10028585503ad33dc8a881436aa8b975b9b0f72fe3edc62fff8ab6137ad9dbdd6
+EBUILD bitcoin-qt-0.10.0-r1.ebuild 3128 SHA256 bee52d9a10f1475e319e1c1a74e4644f705377d7841891b175372e1062931a8a SHA512 beaf8e0d650108965d8c42dc2a51d956e7c6934d014f650c74761d4d2ce190e741b83ddb1042712914f64586700b4dddf29782dc57f6cf81fa1779b806ba4c3a WHIRLPOOL 20b562e9fa192ef5afb5233c72a1824ba70eb8971e990c5bb083948b5561d532472941358bd0473e57ff60667a2b371489b51ecfd0931c5d546e68359f91c2d2
+EBUILD bitcoin-qt-0.10.2.ebuild 3153 SHA256 d5f1da8b5234299b4529b8ed35acf22f7e9c4d5393af9f6c67721689ffb298d5 SHA512 bcf59fb5abd05c5769258c1f88c3941802d84b2a0b4faa3b750b93466f958e13c270771fbce9a16511cd16c305c9c3f4b9f9cac4fa5aa8e303ec945b44bf6804 WHIRLPOOL 3f670681c41880c3c297876b015085c89dc109c4a7e2b7c5ea6a2ec6482a7a92b99778fda5988ea12a3143b8daefba16246facd30f993753fcd2ce6c245106d9
 EBUILD bitcoin-qt-0.8.6-r1.ebuild 3493 SHA256 4643ae29b4964fa112b59d26248a0d654b96dbce2fbac35e67209f5caf8968af SHA512 8d7eb8ce1dde933c7d33a96d3176a361dff659ac94bc933f8e37348442fa20aa96002700a595777db0e438a887e226c2d2316211368022ad27f0d037f780e021 WHIRLPOOL d6e18fc3b8e06f7454a8d9e299153e998b6b88c16281fdf057ce513dbf23c49f57c4d5d44abc543e110ddc2caf3d9915ca3b9c4b7f8bfddec0a9591215473410
 EBUILD bitcoin-qt-0.9.3-r1.ebuild 3614 SHA256 224b1c75c7b8c83c446a97b3ffef001bceefc7d60d6ff62ae71ef4e90004c000 SHA512 68dc467711679f30dfea2e95fa4a504f59b1877fe28bdbb929fbd281fa83814deb62541a3a83197b05c2089ca90ac1b5026c4c7f7fdff8bc37bb8345c4f76506 WHIRLPOOL efde5bc68dbc7906d4ed94b61fb0558cfa715e4b95f4e00ea668116fcdeab3e9a83e9298a0866470a447e3069cf022a6f1d8d78c84371460509ebc5040909fc3
 EBUILD bitcoin-qt-0.9.4.ebuild 3562 SHA256 4b9cb092345324a385ac26e35c8b9d7aec326915fa46ada52ba21eeef02fe488 SHA512 74c7e8cf17a6a542448e9fb67ef61dbe217d2d865025d8bb41d6206815645f44ab29241bf8a9b43735ddf9e2a5ed94e22554b6311deb9b1c31c3a9fbf3dd8bf4 WHIRLPOOL aaa104ee943a6c7b38e1eb769d232f79a01a9fada62ac9c99f9b048bb41bee5d108ce7fed204b51d1df9db5f17c3b663e286b657e272ca310358ddea9cfbf0c5
 EBUILD bitcoin-qt-9999.ebuild 2497 SHA256 a76b38f8a5daddd562da259b24a3752561aff940fe5a3c9ff2ccd22189b20b81 SHA512 0936a89e0a876fb2b515f5a7385390f27e1129d81eff13ee2a3e7d9dbfcc4f92d2069d8c1aca150ebc6b0ae34073d12eb8cf25a3111eabd428ba045d8ccfaf41 WHIRLPOOL 3422dd98aa1b123b5f423db26694b6c744069f9018a71a1b9ee68d2e83c21946689256c799d8180380fc5a9c7b29930c6bdd89e1151f0f8b7e0dfde1828b3610
-MISC ChangeLog 21105 SHA256 730ba75fde586e761129a78a73d51968fcd9a58aa22ce49ae9d73291c4cd9a65 SHA512 5da66b306c62aa996111c7108ad0dab9b4b64f01eb558ef9bc5a4d345c7d3e28613a749d3782c7f8e03b83969927371eff6031411628b2aaff07a76d55516ae8 WHIRLPOOL 8d66b9a2ab088007447d3dc20177dfa6eb93a0c23674d7a5921a6d4d251135adbc83f458693f0ef57cbc6152de849ec3a78b4941dc620b34d18eca7379e5416e
+MISC ChangeLog 21255 SHA256 1c8ece824c7e0fbfc0759480b2a4f9869b21910da39828559560b582f01b54ab SHA512 acd75b35212412f235149df34131a57e199504f1200b0beeab6eabb0ab9a75faf72db9af12e4946a44cfac94ee238e179d0f10f714f9b8c5cb38df7187143a06 WHIRLPOOL 91e0d5cf940d2445e1abb26be7df05f66801598dc9f5250afac9754a597897e0865df441d67674ed920909c558134535a763af9a88ab03df954997750dcfa724
 MISC metadata.xml 1556 SHA256 f5b8c1e0e2cfbefc6b70785434a95d5509a1335935cb5e675537eab0f54be6da SHA512 c6ae1e639e1c4f82cafa6193615c8b641d5926dc9cad712e3fc98dc20eba68e8700b6d4a587c00275a422cf31516f74e5c1bfbbdef41960b7784e2b46a22edf7 WHIRLPOOL a30463812581ebb11fc17d531c5de5d29f5e8a9997606e06a6965227ea0d4be1e38c3a7ad6bb3adfa83cf49f87605639307e6c2cac60b001d034d953cc7aa98e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVaEl6AAoJEJOE+m71LUu6ssMP/3BVO57YJEYIf1SiatwFiBwp
-4ik81uFyV4uLTviwa92MssgjwJFYEgzVG/lPxOzWzUNINirJpAo6ju9U5lDnu0M5
-3sbRGMX77llh+n1x5Wfj6rQeTxvs871cfF04XjGdFmi/F8++28vsRBmwo6DPeRh0
-GmcPBEDSCCZhHoGPUhhs1ez4P36curfWMIBC5ydJWsNe3fKJ2BOmsOk/jJh5SfqN
-jr0Mq7FIupBubgYhLqwJGtUbfSxrHyXqOen5YUO0TlGnF4LfMLn/OZ9qTh4cA16/
-qWaYVYK1ttGgma7SNsBHt6F/3OSPJNGlJJ1upAKzGod30Bc2AocGRmiP6+RSbSJY
-BpZT0brBtjwX9cnTslmpho4oJoGkFbetxr9j2gaBbU2nv+AFd4YMwXicePzpgYFr
-HgWZDDZRRkm7vXUZzfeI+jpSY6NXtZ11YZLqEgGFG0Eq4r3Lr3D/tqipuyNRYOg7
-KVF1M1kpCVRvjhMC5n7/Ujpo8ZMcmDcody11RULrDGk2uejgrWK1l8c1fyysF8oI
-I/iAhLTr1AQPTk7/SO4Da5BOzHEHxMPi2rgMqjIUUE/u7d10bF2Nqsh6aqZy5C7K
-janHpmTM10KRNCdR3S2c0hVZHQAfTMnjWEoNVfjU8A/c5QEt1J16av+cmWs3WvJB
-klanVWlzdTiBxo2+cnCH
-=Lrkx
+iQIcBAEBCAAGBQJVaEv9AAoJEJOE+m71LUu6MKkP/jzNNE46gE/0XOVe9m4G0Rww
+5c36n+aaPqFCTCkOtuqggFFZYXqJHBMudtpAxKGKiBjXuIKttqhEsFEjWtpTV+q6
+jR/WzodZOaB4BgUB5hDVKej9GSPI5DKx1D1Cbu+s3yKMtRR9Btq3QpXCLswuvVXl
+hVHG7aabCkKmOD7Az/ufLrOb6Y/6/MTIw62pZLpnuFj+quj805JK9h92gOPFOCVr
+sB7uZGTfawlBhfNg8foBbPjjTkjp7RpsQ5d9PFiiIsqk5w3HF5QzzF/a7Yk/EBmd
+gg1OaJq5XLUhoQe5703pvWfRvLHmOK45PxvFXc6AVny/QmPEbqyJdMDjfiZTjX5f
+Afxpgz9eDDXTdVexTW+1GyMrjn52CDKLTYbcpm4VGz134XeWZRKFpCPNyiSrI2rM
+7AzaPKS318afWzDPU0c/j/p4l/EJ9UPvcy7wv0jtqafoWhzhPObOzdy331W0A4SP
+U8Lh4HamVkX6Z0WMuVTdtRwVbKCLtz6h6/svJh+wOlhitGIzAG03NU/3vJ+9CS1N
+F61WcUbQmSZE84EwsWEbKDlg1b0eWVjKPChhqlj6RLdwqIqAANbzERn/9tTSOz3i
+rH4vCt6ZIhvpK42IRQVJ1j0Fotrun+wmQBhg+vMBOysZDS4FnLfYvTzyd4I6mgW0
+vcWFAjoFC3zh7vbyoLtG
+=jPnq
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild
index d6db8e2df8e0..160eb0a1ef3b 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild,v 1.4 2015/05/29 11:10:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild,v 1.5 2015/05/29 11:21:31 blueness Exp $
 
 EAPI=5
 
@@ -61,6 +61,13 @@ src_prepare() {
 	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
+	if has_version '>=dev-libs/leveldb-1.18-r1'; then
+		# Newer leveldb has changed header location.
+		sed -i \
+			-e '/#include/s:memenv.h:leveldb/helpers/memenv.h:' \
+			src/leveldbwrapper.cpp || die
+	fi
+
 	bitcoincore_autoreconf
 }
 
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
index 5699ef7607ad..1764bc61a59c 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild,v 1.2 2015/05/29 11:10:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild,v 1.3 2015/05/29 11:21:31 blueness Exp $
 
 EAPI=5
 
@@ -62,6 +62,13 @@ src_prepare() {
 	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
+	if has_version '>=dev-libs/leveldb-1.18-r1'; then
+		# Newer leveldb has changed header location.
+		sed -i \
+			-e '/#include/s:memenv.h:leveldb/helpers/memenv.h:' \
+			src/leveldbwrapper.cpp || die
+	fi
+
 	bitcoincore_autoreconf
 }