[patch] Patch to Bitcoin ebuilds to change default upstream to Knots

knots.patch (text/plain), 9.70 KB, created by Luke-Jr on 2017-01-03 16:06:31 UTC

diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
index 226280c..2ef5784 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.13.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
 BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="ljr"
+BITCOINCORE_IUSE="+knots"
 BITCOINCORE_NEED_LIBSECP256K1=1
 BITCOINCORE_NO_DEPEND="libevent"
 inherit bitcoincore
diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index a686a21..16e544a 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 	</use>
 	<upstream>
diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index a8ab23e..0a63d3e 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -38,7 +38,7 @@ fi
 
 EXPORT_FUNCTIONS src_prepare src_test src_install
 
-if in_bcc_iuse ljr || in_bcc_iuse 1stclassmsg || in_bcc_iuse zeromq || [ -n "$BITCOINCORE_POLICY_PATCHES" ]; then
+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
 
@@ -54,7 +54,7 @@ if [[ ! ${_BITCOINCORE_ECLASS} ]]; then
 
 # @ECLASS-VARIABLE: BITCOINCORE_LJR_DATE
 # @DESCRIPTION:
-# Set this variable before the inherit line, to the datestamp of the ljr
+# Set this variable before the inherit line, to the datestamp of the Knots
 # patchset.
 
 # @ECLASS-VARIABLE: BITCOINCORE_POLICY_PATCHES
@@ -73,6 +73,7 @@ WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]"
 LIBEVENT_DEPEND=""
 UNIVALUE_DEPEND=""
 BITCOINCORE_LJR_NAME=ljr
+BITCOINCORE_KNOTS_USE=knots
 [ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}"
 
 case "${PV}" in
@@ -90,6 +91,7 @@ case "${PV}" in
 		;;
 	esac
 	BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f"
+	BITCOINCORE_KNOTS_USE=ljr
 	;;
 0.11*)
 	BITCOINCORE_MINOR=11
@@ -99,6 +101,7 @@ case "${PV}" in
 		BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
 		BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
 	fi
+	BITCOINCORE_KNOTS_USE=ljr
 	;;
 0.12* | 0.13*)
 	BITCOINCORE_MINOR=$(get_version_component_range 2)
@@ -112,8 +115,11 @@ 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? ( ljr )"
+		REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ${BITCOINCORE_KNOTS_USE} )"
 	fi
 	;;
 9999*)
@@ -226,11 +232,11 @@ DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND}
 if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then
 	RDEPEND="${RDEPEND} virtual/bitcoin-leveldb"
 fi
-if in_bcc_iuse ljr; then
+if in_bcc_iuse ${BITCOINCORE_KNOTS_USE}; then
 	if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then
-		DEPEND="${DEPEND} ljr? ( dev-vcs/git )"
+		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-vcs/git )"
 	elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then
-		DEPEND="${DEPEND} ljr? ( dev-lang/perl )"
+		DEPEND="${DEPEND} ${BITCOINCORE_KNOTS_USE}? ( dev-lang/perl )"
 	fi
 fi
 
@@ -247,7 +253,7 @@ bitcoincore_policymsg() {
 
 bitcoincore_pkg_pretend() {
 	bitcoincore_policymsg_flag=false
-	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
+	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
@@ -312,7 +318,7 @@ bitcoincore_prepare() {
 	else
 		epatch "$(LJR_PATCH syslibs)"
 	fi
-	if use_if_iuse ljr; then
+	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)"
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild
index 9692fe1..2ce433c 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
 BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="+ljr"
+BITCOINCORE_IUSE="+knots"
 inherit bash-completion-r1 bitcoincore
 
 DESCRIPTION="Command-line JSON-RPC client specifically designed for talking to Bitcoin Core Daemon"
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index a686a21..16e544a 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 	</use>
 	<upstream>
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
index 30cc24a..8a3452a 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
 BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="dbus kde +libevent ljr +qrcode qt5 +http test +tor upnp +wallet zeromq"
+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"
@@ -33,18 +33,18 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
-	ljr? (
+	knots? (
 		gnome-base/librsvg
 		media-gfx/imagemagick[png]
 	)
 "
 REQUIRED_USE="
 	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
-	!libevent? ( ljr )
+	!libevent? ( knots )
 "
 
 for lang in ${KNOTS_LANGS}; do
-	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( ljr )"
+	REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( knots )"
 done
 
 src_prepare() {
@@ -54,7 +54,7 @@ src_prepare() {
 
 	for lan in $LANGS; do
 		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
-			if has $lan $KNOTS_LANGS && ! use ljr; then
+			if has $lan $KNOTS_LANGS && ! use knots; then
 				# Expected
 				continue
 			fi
@@ -93,7 +93,7 @@ src_install() {
 	bitcoincore_src_install
 
 	insinto /usr/share/pixmaps
-	if use ljr; then
+	if use knots; then
 		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
 	else
 		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index 7e5bba9..322fb1e 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -17,6 +17,7 @@
 		<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>
 		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="libevent">Use dev-libs/libevent</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
diff --git a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild b/net-p2p/bitcoind/bitcoind-0.13.2.ebuild
index b1a28ad..43093ff 100644
--- a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.13.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
 BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
+BITCOINCORE_IUSE="examples +knots test upnp +wallet zeromq"
 BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
 BITCOINCORE_NEED_LEVELDB=1
 BITCOINCORE_NEED_LIBSECP256K1=1
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 4823df2..9c35920 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -16,6 +16,7 @@
 		<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>
 		<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>
 		<flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
+		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="ljr">Enable Luke Dashjr's patches</flag>
 		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>