blueness 15/05/29 11:21:31 Modified: bitcoin-qt-0.10.2.ebuild bitcoin-qt-0.10.0-r1.ebuild ChangeLog Log: Restore vapier's fix for memenv.h. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.3 net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild?r1=1.2&r2=1.3 Index: bitcoin-qt-0.10.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bitcoin-qt-0.10.2.ebuild 29 May 2015 11:10:46 -0000 1.2 +++ bitcoin-qt-0.10.2.ebuild 29 May 2015 11:21:31 -0000 1.3 @@ -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 @@ 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 } 1.5 net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild?r1=1.4&r2=1.5 Index: bitcoin-qt-0.10.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bitcoin-qt-0.10.0-r1.ebuild 29 May 2015 11:10:46 -0000 1.4 +++ bitcoin-qt-0.10.0-r1.ebuild 29 May 2015 11:21:31 -0000 1.5 @@ -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 @@ 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 } 1.106 net-p2p/bitcoin-qt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog?rev=1.106&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog?rev=1.106&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog?r1=1.105&r2=1.106 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- ChangeLog 29 May 2015 11:10:46 -0000 1.105 +++ ChangeLog 29 May 2015 11:21:31 -0000 1.106 @@ -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 <bluen...@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 <bluen...@gentoo.org> bitcoin-qt-0.10.0-r1.ebuild, bitcoin-qt-0.10.2.ebuild: