Attachment #465986 for bug #604520

Lines 5-11 EAPI=5 Link Here

(-)a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild (-1 / +1 lines)
5		5
6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"	6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7	BITCOINCORE_LJR_DATE="20170102"	7	BITCOINCORE_LJR_DATE="20170102"
8	BITCOINCORE_IUSE="ljr"	8	BITCOINCORE_IUSE="+knots"
9	BITCOINCORE_NEED_LIBSECP256K1=1	9	BITCOINCORE_NEED_LIBSECP256K1=1
10	BITCOINCORE_NO_DEPEND="libevent"	10	BITCOINCORE_NO_DEPEND="libevent"
11	inherit bitcoincore	11	inherit bitcoincore

Lines 10-15 Link Here

(-)a/dev-util/bitcoin-tx/metadata.xml (+1 lines)
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>





EXPORT_FUNCTIONS src_prepare src_test src_install

if in_bcc_iuse ljr || in_bcc_iuse knots || in_bcc_iuse 1stclassmsg || in_bcc_iuse zeromq || [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
	EXPORT_FUNCTIONS pkg_pretend
fi



# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
# @DESCRIPTION:
# Set this variable before the inherit line, to the datestamp of the Knots
# patchset.

# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES

LIBEVENT_DEPEND=""
UNIVALUE_DEPEND=""
BITCOINCORE_LJR_NAME=ljr
BITCOINCORE_KNOTS_USE=knots
[ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}"

case "${PV}" in

	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"
	UNIVALUE_DEPEND="dev-libs/univalue"
	BITCOINCORE_LJR_NAME=knots
	if in_bcc_iuse ljr; then
		BITCOINCORE_KNOTS_USE=ljr
	fi
	if in_bcc_policy spamfilter; then
		REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ${BITCOINCORE_KNOTS_USE} )"
	fi
	;;
9999*)

if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
fi
if in_bcc_iuse ${BITCOINCORE_KNOTS_USE}; then
	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-lang/perl )"
	fi
fi



bitcoincore_pkg_pretend() {
	bitcoincore_policymsg_flag=false
	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
		einfo "Extra functionality improvements to Bitcoin Core are enabled."
		bitcoincore_policymsg_flag=true
		if use_if_iuse addrindex addrindex; then

	else
		epatch "$(LJR_PATCH syslibs)"
	fi
	if use_if_iuse ${BITCOINCORE_KNOTS_USE}; then
		if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
			bitcoincore_predelete_patch "$(LJR_PATCH f)"
			bitcoincore_predelete_patch "$(LJR_PATCH branding)"

Lines 5-11 EAPI=5 Link Here

(-)a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild (-1 / +1 lines)
5		5
6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"	6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7	BITCOINCORE_LJR_DATE="20170102"	7	BITCOINCORE_LJR_DATE="20170102"
8	BITCOINCORE_IUSE="+ljr"	8	BITCOINCORE_IUSE="+knots"
9	inherit bash-completion-r1 bitcoincore	9	inherit bash-completion-r1 bitcoincore
10		10
11	DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"	11	DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"

Lines 10-15 Link Here

(-)a/net-p2p/bitcoin-cli/metadata.xml (+1 lines)
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>





BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
BITCOINCORE_LJR_DATE="20170102"
BITCOINCORE_IUSE="dbus kde +libevent +knots +qrcode qt5 +http test +tor upnp +wallet zeromq"
BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
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"
KNOTS_LANGS="et_EE nl_NL"

"
DEPEND="${RDEPEND}
	qt5? ( dev-qt/linguist-tools:5 )
	knots? (
		gnome-base/librsvg
		media-gfx/imagemagick[png]
	)
"
REQUIRED_USE="
	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
	!libevent? ( knots )
"

for lang in ${KNOTS_LANGS}; do
	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( knots )"
done

src_prepare() {


	for lan in $LANGS; do
		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
			if has $lan $KNOTS_LANGS && ! use knots; then
				# Expected
				continue
			fi

	bitcoincore_src_install

	insinto /usr/share/pixmaps
	if use knots; then
		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
	else
		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"

Lines 13-18 Link Here

(-)a/net-p2p/bitcoin-qt/metadata.xml (+1 lines)
13	<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>	13	<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>
14	<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>	14	<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
15	<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>	15	<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
		16	<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
16	<flag name="libevent">Use dev-libs/libevent</flag>	17	<flag name="libevent">Use dev-libs/libevent</flag>
17	<flag name="ljr">Enable Luke Dashjr's patches</flag>	18	<flag name="ljr">Enable Luke Dashjr's patches</flag>
18	<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>	19	<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>

Lines 5-11 EAPI=5 Link Here

(-)a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild (-1 / +1 lines)
5		5
6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"	6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7	BITCOINCORE_LJR_DATE="20170102"	7	BITCOINCORE_LJR_DATE="20170102"
8	BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"	8	BITCOINCORE_IUSE="examples +knots test upnp +wallet zeromq"
9	BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"	9	BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
10	BITCOINCORE_NEED_LEVELDB=1	10	BITCOINCORE_NEED_LEVELDB=1
11	BITCOINCORE_NEED_LIBSECP256K1=1	11	BITCOINCORE_NEED_LIBSECP256K1=1

Lines 12-17 Link Here

(-)a/net-p2p/bitcoind/metadata.xml (+1 lines)
12	<use>	12	<use>
13	<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>	13	<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>
14	<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>	14	<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
		15	<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
15	<flag name="ljr">Enable Luke Dashjr's patches</flag>	16	<flag name="ljr">Enable Luke Dashjr's patches</flag>
16	<flag name="upnp">Enable Universal Plug and Play</flag>	17	<flag name="upnp">Enable Universal Plug and Play</flag>
17	<flag name="wallet">Enable wallet support</flag>	18	<flag name="wallet">Enable wallet support</flag>

Return to bug 604520

Lines 37-43 fi Link Here

(-)a/eclass/bitcoincore.eclass (-7 / +11 lines)
37		37
38	EXPORT_FUNCTIONS src_prepare src_test src_install	38	EXPORT_FUNCTIONS src_prepare src_test src_install
39		39
40	if in_bcc_iuse ljr \|\| in_bcc_iuse 1stclassmsg \|\| in_bcc_iuse zeromq \|\| [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then	40	if in_bcc_iuse ljr \|\| in_bcc_iuse knots \|\| in_bcc_iuse 1stclassmsg \|\| in_bcc_iuse zeromq \|\| [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
41	EXPORT_FUNCTIONS pkg_pretend	41	EXPORT_FUNCTIONS pkg_pretend
42	fi	42	fi
43		43
Lines 53-59 if [[ ! ${_BITCOINCORE_ECLASS} ]]; then Link Here
53		53
54	# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE	54	# @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
55	# @DESCRIPTION:	55	# @DESCRIPTION:
56	# Set this variable before the inherit line, to the datestamp of the ljr	56	# Set this variable before the inherit line, to the datestamp of the Knots
57	# patchset.	57	# patchset.
58		58
59	# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES	59	# @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES
Lines 72-77 WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" Link Here
72	LIBEVENT_DEPEND=""	72	LIBEVENT_DEPEND=""
73	UNIVALUE_DEPEND=""	73	UNIVALUE_DEPEND=""
74	BITCOINCORE_LJR_NAME=ljr	74	BITCOINCORE_LJR_NAME=ljr
		75	BITCOINCORE_KNOTS_USE=knots
75	[ -n "${BITCOINCORE_LJR_PV}" ] \|\| BITCOINCORE_LJR_PV="${PV}"	76	[ -n "${BITCOINCORE_LJR_PV}" ] \|\| BITCOINCORE_LJR_PV="${PV}"
76		77
77	case "${PV}" in	78	case "${PV}" in
Lines 87-94 case "${PV}" in Link Here
87	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"	88	LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]"
88	UNIVALUE_DEPEND="dev-libs/univalue"	89	UNIVALUE_DEPEND="dev-libs/univalue"
89	BITCOINCORE_LJR_NAME=knots	90	BITCOINCORE_LJR_NAME=knots
		91	if in_bcc_iuse ljr; then
		92	BITCOINCORE_KNOTS_USE=ljr
		93	fi
90	if in_bcc_policy spamfilter; then	94	if in_bcc_policy spamfilter; then
91	REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ljr )"	95	REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ${BITCOINCORE_KNOTS_USE} )"
92	fi	96	fi
93	;;	97	;;
94	9999*)	98	9999*)
Lines 201-209 DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND} Link Here
201	if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then	205	if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
202	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"	206	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
203	fi	207	fi
204	if in_bcc_iuse ljr; then	208	if in_bcc_iuse ${BITCOINCORE_KNOTS_USE}; then
205	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then	209	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
206	DEPEND="${DEPEND} ljr? ( dev-lang/perl )"	210	DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-lang/perl )"
207	fi	211	fi
208	fi	212	fi
209		213
Lines 220-226 bitcoincore_policymsg() { Link Here
220		224
221	bitcoincore_pkg_pretend() {	225	bitcoincore_pkg_pretend() {
222	bitcoincore_policymsg_flag=false	226	bitcoincore_policymsg_flag=false
223	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	227	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
224	einfo "Extra functionality improvements to Bitcoin Core are enabled."	228	einfo "Extra functionality improvements to Bitcoin Core are enabled."
225	bitcoincore_policymsg_flag=true	229	bitcoincore_policymsg_flag=true
226	if use_if_iuse addrindex addrindex; then	230	if use_if_iuse addrindex addrindex; then
Lines 279-285 bitcoincore_prepare() { Link Here
279	else	283	else
280	epatch "$(LJR_PATCH syslibs)"	284	epatch "$(LJR_PATCH syslibs)"
281	fi	285	fi
282	if use_if_iuse ljr; then	286	if use_if_iuse ${BITCOINCORE_KNOTS_USE}; then
283	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then	287	if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
284	bitcoincore_predelete_patch "$(LJR_PATCH f)"	288	bitcoincore_predelete_patch "$(LJR_PATCH f)"
285	bitcoincore_predelete_patch "$(LJR_PATCH branding)"	289	bitcoincore_predelete_patch "$(LJR_PATCH branding)"

Lines 5-11 EAPI=5 Link Here

(-)a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild (-6 / +6 lines)
5		5
6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"	6	BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
7	BITCOINCORE_LJR_DATE="20170102"	7	BITCOINCORE_LJR_DATE="20170102"
8	BITCOINCORE_IUSE="dbus kde +libevent ljr +qrcode qt5 +http test +tor upnp +wallet zeromq"	8	BITCOINCORE_IUSE="dbus kde +libevent +knots +qrcode qt5 +http test +tor upnp +wallet zeromq"
9	BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"	9	BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
10	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"	10	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	KNOTS_LANGS="et_EE nl_NL"	11	KNOTS_LANGS="et_EE nl_NL"
Lines 32-49 RDEPEND=" Link Here
32	"	32	"
33	DEPEND="${RDEPEND}	33	DEPEND="${RDEPEND}
34	qt5? ( dev-qt/linguist-tools:5 )	34	qt5? ( dev-qt/linguist-tools:5 )
35	ljr? (	35	knots? (
36	gnome-base/librsvg	36	gnome-base/librsvg
37	media-gfx/imagemagick[png]	37	media-gfx/imagemagick[png]
38	)	38	)
39	"	39	"
40	REQUIRED_USE="	40	REQUIRED_USE="
41	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )	41	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
42	!libevent? ( ljr )	42	!libevent? ( knots )
43	"	43	"
44		44
45	for lang in ${KNOTS_LANGS}; do	45	for lang in ${KNOTS_LANGS}; do
46	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( ljr )"	46	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( knots )"
47	done	47	done
48		48
49	src_prepare() {	49	src_prepare() {
Lines 53-59 src_prepare() { Link Here
53		53
54	for lan in $LANGS; do	54	for lan in $LANGS; do
55	if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then	55	if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
56	if has $lan $KNOTS_LANGS && ! use ljr; then	56	if has $lan $KNOTS_LANGS && ! use knots; then
57	# Expected	57	# Expected
58	continue	58	continue
59	fi	59	fi
Lines 94-100 src_install() { Link Here
94	bitcoincore_src_install	94	bitcoincore_src_install
95		95
96	insinto /usr/share/pixmaps	96	insinto /usr/share/pixmaps
97	if use ljr; then	97	if use knots; then
98	newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"	98	newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
99	else	99	else
100	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"	100	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"