commit: 2e7be44a1f4a20f5b9495127c89ca78a438e6cbc
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 11:33:41 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 11:33:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7be44a
Revert "bitcoincore: Bump to 0.11.1"
This reverts commit f0eac2dfbd1498bff1f03350c97d2d12e63e2711.
dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild | 21 -----
eclass/bitcoincore.eclass | 19 ++--
.../libbitcoinconsensus-0.11.1.ebuild | 27 ------
net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild | 33 -------
net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild | 104 ---------------------
net-p2p/bitcoind/bitcoind-0.11.1.ebuild | 77 ---------------
6 files changed, 6 insertions(+), 275 deletions(-)
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
b/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
deleted file mode 100644
index 5885033..0000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE=""
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bitcoincore
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --enable-util-tx
-}
diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 0cebdb5..69ed9d6 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -91,11 +91,8 @@ case "${PV}" in
0.11*)
BITCOINCORE_SERIES="0.11.x"
LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423"
- # 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
+
BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
+ BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
;;
9999*)
BITCOINCORE_SERIES="9999"
@@ -125,7 +122,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 && [ -n "${BITCOINCORE_RBF_DIFF}" ]; then
+ if in_bcc_policy rbf; 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}"
@@ -207,8 +204,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 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."
+ "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."
$bitcoincore_policymsg_flag && einfo "For more information on any of
the above, see ${LJR_PATCH_DESC}"
}
@@ -242,11 +239,7 @@ bitcoincore_prepare() {
use bitcoin_policy_${mypolicy} || continue
case "${mypolicy}" in
rbf)
- if [ -n "${BITCOINCORE_RBF_PATCHFILE}" ]; then
- epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
- else
- epatch "$(LJR_PATCH ${mypolicy})"
- fi
+ epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
;;
*)
epatch "$(LJR_PATCH ${mypolicy})"
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
deleted file mode 100644
index e7e0b22..0000000
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="ljr test"
-BITCOINCORE_POLICY_PATCHES="cltv dcmp"
-inherit bitcoincore eutils
-
-DESCRIPTION="Bitcoin Core consensus library"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
- bitcoincore_conf \
- --with-libs
-}
-
-src_install() {
- bitcoincore_src_install
- dodoc doc/bips.md
- prune_libtool_files
-}
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
deleted file mode 100644
index 17d993f..0000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="ljr"
-inherit bash-completion-r1 bitcoincore
-
-DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to
Bitcoin Core Daemon"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
- sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind
\(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion
- bitcoincore_src_prepare
-}
-
-src_configure() {
- bitcoincore_conf \
- --enable-util-cli
-}
-
-src_install() {
- bitcoincore_src_install
-
- doman contrib/debian/manpages/bitcoin-cli.1
-
- newbashcomp contrib/bitcoind.bash-completion ${PN}
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
deleted file mode 100644
index d2618cf..0000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="dbus kde ljr +qrcode qt4 qt5 test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
-LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en
eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN
hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR
pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK
zh_CN zh_TW"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2
-
-DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-libs/protobuf
- qrcode? (
- media-gfx/qrencode
- )
- qt4? ( dev-qt/qtgui:4 )
- qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
- dbus? (
- qt4? ( dev-qt/qtdbus:4 )
- qt5? ( dev-qt/qtdbus:5 )
- )
-"
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
-"
-REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
-
-src_prepare() {
- bitcoincore_prepare
-
- local filt= yeslang= nolang=
-
- for lan in $LANGS; do
- if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
- die "Language '$lan' no longer supported. Ebuild needs
update."
- fi
- done
-
- for ts in $(ls src/qt/locale/*.ts)
- do
- x="${ts/*bitcoin_/}"
- x="${x/.ts/}"
- if ! use "linguas_$x"; then
- nolang="$nolang $x"
- rm "$ts"
- filt="$filt\\|$x"
- else
- yeslang="$yeslang $x"
- fi
- done
- filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
- sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
- sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
- einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-
- bitcoincore_autoreconf
-}
-
-src_configure() {
- bitcoincore_conf \
- $(use_with dbus qtdbus) \
- $(use_with qrcode qrencode) \
- --with-gui=$(usex qt5 qt5 qt4)
-}
-
-src_install() {
- bitcoincore_src_install
-
- insinto /usr/share/pixmaps
- newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
- make_desktop_entry "${PN} %u" "Bitcoin-Qt"
"/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;"
"MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
-
- dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
- doman contrib/debian/manpages/bitcoin-qt.1
-
- if use kde; then
- insinto /usr/share/kde4/services
- doins contrib/debian/bitcoin-qt.protocol
- fi
-}
-
-update_caches() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
- buildsycoca
-}
-
-pkg_postinst() {
- update_caches
-}
-
-pkg_postrm() {
- update_caches
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
b/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
deleted file mode 100644
index ef75d87..0000000
--- a/net-p2p/bitcoind/bitcoind-0.11.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE="addrindex examples ljr logrotate test upnp +wallet zeromq"
-BITCOINCORE_ADDRINDEX_DIFF="8a915e56f4be5d090d79f01cbd4a23ce1b7e9168...4a6331c5068d8f2c95731518445a57267d506bb5"
-BITCOINCORE_ADDRINDEX_PATCHFILE="bitcoin-addrindex-v0.11.0.patch"
-BITCOINCORE_POLICY_PATCHES="cltv cpfp dcmp rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- logrotate? (
- app-admin/logrotate
- )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- local UG='bitcoin'
- enewgroup "${UG}"
- enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
- sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\)
bitcoin-cli$/\1/' contrib/${PN}.bash-completion
- bitcoincore_src_prepare
-}
-
-src_configure() {
- bitcoincore_conf \
- --with-daemon
-}
-
-src_install() {
- bitcoincore_src_install
-
- insinto /etc/bitcoin
- newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
- fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
- fperms 600 /etc/bitcoin/bitcoin.conf
-
- newconfd "contrib/init/bitcoind.openrcconf" ${PN}
- newinitd "contrib/init/bitcoind.openrc" ${PN}
- systemd_dounit "${FILESDIR}/bitcoind.service"
-
- keepdir /var/lib/bitcoin/.bitcoin
- fperms 700 /var/lib/bitcoin
- fowners bitcoin:bitcoin /var/lib/bitcoin/
- fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
- dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
- dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
- doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
- newbashcomp contrib/${PN}.bash-completion ${PN}
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{bitrpc,qos,spendfrom,tidy_datadir.sh}
- fi
-
- if use logrotate; then
- insinto /etc/logrotate.d
- newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
- fi
-}
