diff options
| author |   Luke Dashjr <luke-jr+git@utopios.org> | 2015-10-15 04:23:19 +0000 |
|---|---|---|
| committer |   Anthony G. Basile <blueness@gentoo.org> | 2015-10-23 07:26:32 -0400 |
| commit | f0eac2dfbd1498bff1f03350c97d2d12e63e2711 (patch) | |
| tree | fbf194bb779288a3e367a5d12ff85556cf156d83 /eclass | |
| parent | x11-terms/pangoterm: Add new snapshot (diff) | |
| download | gentoo-f0eac2dfbd1498bff1f03350c97d2d12e63e2711.tar.gz gentoo-f0eac2dfbd1498bff1f03350c97d2d12e63e2711.tar.bz2 gentoo-f0eac2dfbd1498bff1f03350c97d2d12e63e2711.zip | |
bitcoincore: Bump to 0.11.1
Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/bitcoincore.eclass | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass index 69ed9d69d6c1..0cebdb5a92b6 100644 --- a/eclass/bitcoincore.eclass +++ b/eclass/bitcoincore.eclass @@ -91,8 +91,11 @@ case "${PV}" in 0.11*) BITCOINCORE_SERIES="0.11.x" LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423" - BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e" - BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" + # RBF is bundled with ljr patchset since 0.11.1 + if [ "${PVR}" = "0.11.0" ]; then + BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e" + BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" + fi ;; 9999*) BITCOINCORE_SERIES="9999" @@ -122,7 +125,7 @@ else BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch" SRC_URI="${SRC_URI} xt? ( https://github.com/bitcoinxt/bitcoinxt/compare/${BITCOINCORE_XT_DIFF}.diff -> ${BITCOINXT_PATCHFILE} )" fi - if in_bcc_policy rbf; then + if in_bcc_policy rbf && [ -n "${BITCOINCORE_RBF_DIFF}" ]; then SRC_URI="${SRC_URI} bitcoin_policy_rbf? ( https://github.com/petertodd/bitcoin/compare/${BITCOINCORE_RBF_DIFF}.diff -> ${BITCOINCORE_RBF_PATCHFILE} )" fi S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}" @@ -204,8 +207,8 @@ bitcoincore_pkg_pretend() { "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order." \ "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones." bitcoincore_policymsg spamfilter \ - "Enhanced spam filter is enabled: A blacklist (seen as controversial by some) will be used by your node. This may impact your ability to use some services (see link for a list)." \ - "Enhanced spam filter is disabled: Your node will not be checking for notorious spammers, and may assist them." + "Enhanced spam filter policy is enabled: Your node will identify notorious spam scripts and avoid assisting them. This may impact your ability to use some services (see link for a list)." \ + "Enhanced spam filter policy is disabled: Your node will not be checking for notorious spam scripts, and may assist them." $bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}" } @@ -239,7 +242,11 @@ bitcoincore_prepare() { use bitcoin_policy_${mypolicy} || continue case "${mypolicy}" in rbf) - epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}" + if [ -n "${BITCOINCORE_RBF_PATCHFILE}" ]; then + epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}" + else + epatch "$(LJR_PATCH ${mypolicy})" + fi ;; *) epatch "$(LJR_PATCH ${mypolicy})" |