summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2015-05-29 11:21:31 +0000
committerAnthony G. Basile <blueness@gentoo.org>2015-05-29 11:21:31 +0000
commitb8a40b85349ba0575222337c0a3056bfa9419237 (patch)
tree56fa49b9842fabe1537036cae45bee736dffc998 /net-p2p/bitcoin-qt
parentNew package, ebuild written by me (diff)
downloadgentoo-2-b8a40b85349ba0575222337c0a3056bfa9419237.tar.gz
gentoo-2-b8a40b85349ba0575222337c0a3056bfa9419237.tar.bz2
gentoo-2-b8a40b85349ba0575222337c0a3056bfa9419237.zip
Restore vapier's fix for memenv.h.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-p2p/bitcoin-qt')
-rw-r--r--net-p2p/bitcoin-qt/ChangeLog6
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild9
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild9
3 files changed, 21 insertions, 3 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/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
}