Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 604520 | Differences between
and this patch

Collapse All | Expand All

(-)a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild (-1 / +1 lines)
Lines 6-12 EAPI=5 Link Here
6
6
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
8
BITCOINCORE_LJR_DATE="20170102"
8
BITCOINCORE_LJR_DATE="20170102"
9
BITCOINCORE_IUSE="ljr"
9
BITCOINCORE_IUSE="+knots"
10
BITCOINCORE_NEED_LIBSECP256K1=1
10
BITCOINCORE_NEED_LIBSECP256K1=1
11
BITCOINCORE_NO_DEPEND="libevent"
11
BITCOINCORE_NO_DEPEND="libevent"
12
inherit bitcoincore
12
inherit bitcoincore
(-)a/dev-util/bitcoin-tx/metadata.xml (+1 lines)
Lines 10-15 Link Here
10
		<name>Luke Dashjr</name>
10
		<name>Luke Dashjr</name>
11
	</maintainer>
11
	</maintainer>
12
	<use>
12
	<use>
13
		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
13
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
14
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
14
	</use>
15
	</use>
15
	<upstream>
16
	<upstream>
(-)a/eclass/bitcoincore.eclass (-8 / +14 lines)
Lines 38-44 fi Link Here
38
38
39
EXPORT_FUNCTIONS src_prepare src_test src_install
39
EXPORT_FUNCTIONS src_prepare src_test src_install
40
40
41
if in_bcc_iuse ljr || in_bcc_iuse 1stclassmsg || in_bcc_iuse zeromq || [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
41
if in_bcc_iuse ljr || in_bcc_iuse knots || in_bcc_iuse 1stclassmsg || in_bcc_iuse zeromq || [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
42
	EXPORT_FUNCTIONS pkg_pretend
42
	EXPORT_FUNCTIONS pkg_pretend
43
fi
43
fi
44
44
Lines 54-60 if [[ ! ${_BITCOINCORE_ECLASS} ]]; then Link Here
54
54
55
# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
55
# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
56
# @DESCRIPTION:
56
# @DESCRIPTION:
57
# Set this variable before the inherit line, to the datestamp of the ljr
57
# Set this variable before the inherit line, to the datestamp of the Knots
58
# patchset.
58
# patchset.
59
59
60
# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES
60
# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES
Lines 73-78 WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" Link Here
73
LIBEVENT_DEPEND=""
73
LIBEVENT_DEPEND=""
74
UNIVALUE_DEPEND=""
74
UNIVALUE_DEPEND=""
75
BITCOINCORE_LJR_NAME=ljr
75
BITCOINCORE_LJR_NAME=ljr
76
BITCOINCORE_KNOTS_USE=knots
76
[ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}"
77
[ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}"
77
78
78
case "${PV}" in
79
case "${PV}" in
Lines 90-95 case "${PV}" in Link Here
90
		;;
91
		;;
91
	esac
92
	esac
92
	BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f"
93
	BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f"
94
	BITCOINCORE_KNOTS_USE=ljr
93
	;;
95
	;;
94
0.11*)
96
0.11*)
95
	BITCOINCORE_MINOR=11
97
	BITCOINCORE_MINOR=11
Lines 99-104 case "${PV}" in Link Here
99
		BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
101
		BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
100
		BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
102
		BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
101
	fi
103
	fi
104
	BITCOINCORE_KNOTS_USE=ljr
102
	;;
105
	;;
103
0.12* | 0.13*)
106
0.12* | 0.13*)
104
	BITCOINCORE_MINOR=$(get_version_component_range 2)
107
	BITCOINCORE_MINOR=$(get_version_component_range 2)
Lines 112-119 case "${PV}" in Link Here
112
	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"
115
	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"
113
	UNIVALUE_DEPEND="dev-libs/univalue"
116
	UNIVALUE_DEPEND="dev-libs/univalue"
114
	BITCOINCORE_LJR_NAME=knots
117
	BITCOINCORE_LJR_NAME=knots
118
	if in_bcc_iuse ljr; then
119
		BITCOINCORE_KNOTS_USE=ljr
120
	fi
115
	if in_bcc_policy spamfilter; then
121
	if in_bcc_policy spamfilter; then
116
		REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ljr )"
122
		REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ${BITCOINCORE_KNOTS_USE} )"
117
	fi
123
	fi
118
	;;
124
	;;
119
9999*)
125
9999*)
Lines 226-236 DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND} Link Here
226
if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
232
if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
227
	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
233
	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
228
fi
234
fi
229
if in_bcc_iuse ljr; then
235
if in_bcc_iuse ${BITCOINCORE_KNOTS_USE}; then
230
	if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then
236
	if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then
231
		DEPEND="${DEPEND} ljr? ( dev-vcs/git )"
237
		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-vcs/git )"
232
	elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
238
	elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
233
		DEPEND="${DEPEND} ljr? ( dev-lang/perl )"
239
		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-lang/perl )"
234
	fi
240
	fi
235
fi
241
fi
236
242
Lines 247-253 bitcoincore_policymsg() { Link Here
247
253
248
bitcoincore_pkg_pretend() {
254
bitcoincore_pkg_pretend() {
249
	bitcoincore_policymsg_flag=false
255
	bitcoincore_policymsg_flag=false
250
	if use_if_iuse ljr || use_if_iuse 1stclassmsg || use_if_iuse addrindex || use_if_iuse xt || { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; }; then
256
	if use_if_iuse ${BITCOINCORE_KNOTS_USE} || use_if_iuse 1stclassmsg || use_if_iuse addrindex || use_if_iuse xt || { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; }; then
251
		einfo "Extra functionality improvements to Bitcoin Core are enabled."
257
		einfo "Extra functionality improvements to Bitcoin Core are enabled."
252
		bitcoincore_policymsg_flag=true
258
		bitcoincore_policymsg_flag=true
253
		if use_if_iuse addrindex addrindex; then
259
		if use_if_iuse addrindex addrindex; then
Lines 312-318 bitcoincore_prepare() { Link Here
312
	else
318
	else
313
		epatch "$(LJR_PATCH syslibs)"
319
		epatch "$(LJR_PATCH syslibs)"
314
	fi
320
	fi
315
	if use_if_iuse ljr; then
321
	if use_if_iuse ${BITCOINCORE_KNOTS_USE}; then
316
		if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
322
		if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
317
			bitcoincore_predelete_patch "$(LJR_PATCH f)"
323
			bitcoincore_predelete_patch "$(LJR_PATCH f)"
318
			bitcoincore_predelete_patch "$(LJR_PATCH branding)"
324
			bitcoincore_predelete_patch "$(LJR_PATCH branding)"
(-)a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild (-1 / +1 lines)
Lines 6-12 EAPI=5 Link Here
6
6
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
8
BITCOINCORE_LJR_DATE="20170102"
8
BITCOINCORE_LJR_DATE="20170102"
9
BITCOINCORE_IUSE="+ljr"
9
BITCOINCORE_IUSE="+knots"
10
inherit bash-completion-r1 bitcoincore
10
inherit bash-completion-r1 bitcoincore
11
11
12
DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
12
DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
(-)a/net-p2p/bitcoin-cli/metadata.xml (+1 lines)
Lines 10-15 Link Here
10
		<name>Luke Dashjr</name>
10
		<name>Luke Dashjr</name>
11
	</maintainer>
11
	</maintainer>
12
	<use>
12
	<use>
13
		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
13
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
14
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
14
	</use>
15
	</use>
15
	<upstream>
16
	<upstream>
(-)a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild (-6 / +6 lines)
Lines 6-12 EAPI=5 Link Here
6
6
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
8
BITCOINCORE_LJR_DATE="20170102"
8
BITCOINCORE_LJR_DATE="20170102"
9
BITCOINCORE_IUSE="dbus kde +libevent ljr +qrcode qt5 +http test +tor upnp +wallet zeromq"
9
BITCOINCORE_IUSE="dbus kde +libevent +knots +qrcode qt5 +http test +tor upnp +wallet zeromq"
10
BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
10
BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
11
LANGS="af af_ZA ar be_BY bg bg_BG ca ca@valencia ca_ES cs cs_CZ cy da de el el_GR en en_GB eo es es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et et_EE eu_ES fa fa_IR fi fr fr_CA fr_FR gl he hi_IN hr hu id_ID it it_IT ja ka kk_KZ ko_KR ku_IQ ky la lt lv_LV mk_MK mn ms_MY nb ne nl nl_NL pam pl pt_BR pt_PT ro ro_RO ru ru_RU sk sl_SI sq sr sr@latin sv ta th_TH tr tr_TR uk ur_PK uz@Cyrl vi vi_VN zh zh_CN zh_HK zh_TW"
11
LANGS="af af_ZA ar be_BY bg bg_BG ca ca@valencia ca_ES cs cs_CZ cy da de el el_GR en en_GB eo es es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et et_EE eu_ES fa fa_IR fi fr fr_CA fr_FR gl he hi_IN hr hu id_ID it it_IT ja ka kk_KZ ko_KR ku_IQ ky la lt lv_LV mk_MK mn ms_MY nb ne nl nl_NL pam pl pt_BR pt_PT ro ro_RO ru ru_RU sk sl_SI sq sr sr@latin sv ta th_TH tr tr_TR uk ur_PK uz@Cyrl vi vi_VN zh zh_CN zh_HK zh_TW"
12
KNOTS_LANGS="et_EE nl_NL"
12
KNOTS_LANGS="et_EE nl_NL"
Lines 33-50 RDEPEND=" Link Here
33
"
33
"
34
DEPEND="${RDEPEND}
34
DEPEND="${RDEPEND}
35
	qt5? ( dev-qt/linguist-tools:5 )
35
	qt5? ( dev-qt/linguist-tools:5 )
36
	ljr? (
36
	knots? (
37
		gnome-base/librsvg
37
		gnome-base/librsvg
38
		media-gfx/imagemagick[png]
38
		media-gfx/imagemagick[png]
39
	)
39
	)
40
"
40
"
41
REQUIRED_USE="
41
REQUIRED_USE="
42
	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
42
	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
43
	!libevent? ( ljr )
43
	!libevent? ( knots )
44
"
44
"
45
45
46
for lang in ${KNOTS_LANGS}; do
46
for lang in ${KNOTS_LANGS}; do
47
	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( ljr )"
47
	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( knots )"
48
done
48
done
49
49
50
src_prepare() {
50
src_prepare() {
Lines 54-60 src_prepare() { Link Here
54
54
55
	for lan in $LANGS; do
55
	for lan in $LANGS; do
56
		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
56
		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
57
			if has $lan $KNOTS_LANGS && ! use ljr; then
57
			if has $lan $KNOTS_LANGS && ! use knots; then
58
				# Expected
58
				# Expected
59
				continue
59
				continue
60
			fi
60
			fi
Lines 93-99 src_install() { Link Here
93
	bitcoincore_src_install
93
	bitcoincore_src_install
94
94
95
	insinto /usr/share/pixmaps
95
	insinto /usr/share/pixmaps
96
	if use ljr; then
96
	if use knots; then
97
		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
97
		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
98
	else
98
	else
99
		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
99
		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
(-)a/net-p2p/bitcoin-qt/metadata.xml (+1 lines)
Lines 17-22 Link Here
17
		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
17
		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
18
		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
18
		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
19
		<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
19
		<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
20
		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
20
		<flag name="libevent">Use dev-libs/libevent</flag>
21
		<flag name="libevent">Use dev-libs/libevent</flag>
21
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
22
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
22
		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
23
		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
(-)a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild (-1 / +1 lines)
Lines 6-12 EAPI=5 Link Here
6
6
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7
BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
8
BITCOINCORE_LJR_DATE="20170102"
8
BITCOINCORE_LJR_DATE="20170102"
9
BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
9
BITCOINCORE_IUSE="examples +knots test upnp +wallet zeromq"
10
BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
10
BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
11
BITCOINCORE_NEED_LEVELDB=1
11
BITCOINCORE_NEED_LEVELDB=1
12
BITCOINCORE_NEED_LIBSECP256K1=1
12
BITCOINCORE_NEED_LIBSECP256K1=1
(-)a/net-p2p/bitcoind/metadata.xml (+1 lines)
Lines 16-21 Link Here
16
		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
16
		<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
17
		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
17
		<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
18
		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
18
		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
19
		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
19
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
20
		<flag name="ljr">Enable Luke Dashjr's patches</flag>
20
		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
21
		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
21
		<flag name="upnp">Enable Universal Plug and Play</flag>
22
		<flag name="upnp">Enable Universal Plug and Play</flag>

Return to bug 604520