gentoo resync : 23.03.2018

6 files changed, 3 insertions, 109 deletions

diff --git a/net-p2p/bitcoin-cli/Manifest b/net-p2p/bitcoin-cli/Manifest
index 2f58662686fd..1e97efba6d0b 100644
--- a/net-p2p/bitcoin-cli/Manifest
+++ b/net-p2p/bitcoin-cli/Manifest
@@ -1,13 +1,4 @@
-DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
-DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
-DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
-DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
-DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
-EBUILD bitcoin-cli-0.13.0.ebuild 845 BLAKE2B 4b8c3ed24ff36bcedd3ac20074844e9704bd77a8d21d33f973836ef32dc2127ac8aec56321a28edb8db1857acbb239c909360b436669743ccb9a85002f685ba6 SHA512 6e506aca05ad2dc9e4218117911c82130815bdf559b8c66a906be161187e4d3f8f4a51d3eafe3ecfad91e32a18e6363ad1b16701bece15776998bda4106c40ba
-EBUILD bitcoin-cli-0.13.1.ebuild 842 BLAKE2B 423aadcd0b341bd0c54a08a08fef112d6a33a8b432e3ca444b6a9e3d06fa38637dd42d6d17a2a36149a3597f38bc2ab63bf00268f382ab9cc86842554a86ab2b SHA512 f9d27641b2c952c5de81e950e8c8ce279ae60cdfd13d0ae28bf01ddc1011b597551f353b3bbdc33f0f1e50f4db8cac11b40422833d916a559558ebcda9b9d432
-EBUILD bitcoin-cli-0.13.2.ebuild 846 BLAKE2B 688ea6c2ae9b01e2e538eaa183f3c9b88a3217acf341d9bc12b65caa99efa0d45257b75345253a3c9f646137799f7ab2f2220598257ef852da33be7f98bd759e SHA512 d4274818fef2a1ccc78813be7ecee1aa2fc490b9d13126cbfbf352b2d45520d40e2493e42f49ce28a8d4f0d0951d6d6aa671e156a811d608fd5f150a5de0219a
-EBUILD bitcoin-cli-0.15.1.ebuild 2445 BLAKE2B 48925a163485bf091f4b533566ff77bdb7244ea75cfcde9c73ff02849799913a12c1717c3e2f8b0d92f3948f9230eb6084b4d4554406bb15914268ac2a21669b SHA512 f7b0a8040af3c7ca88023fd8b8dfa8ae9e5305c8531af286e7e7e1e43cd1532962b290800afc9615c0a7858e3139f17fe7209b3ed22364ccbdfbe280cf83477f
-MISC metadata.xml 675 BLAKE2B 7b92bc182ba751e03f1c39d2c03ff0d585f9bbca06f73056cb033d449b492baa521e41f2aba0cd333f91769c859f0ce0c8060c5147f1cb7a33dffd60201ef13e SHA512 88cc1fd8dbecc4c30c96680e2d38a8f870ff9ff3ab21003fc00bf159ed105ab606d5abd5242456c3776f2d3af6c860f9f622c117afd6f0d79bdc0b80931863b4
+EBUILD bitcoin-cli-0.15.1.ebuild 2444 BLAKE2B d669c80e3dae939a4b869743c26b45167c70770b5edebf640b10292a9fa9637e794aec41319ef50c593e12e153ee48fe89bd679b193aa352de69ed1937ea5cd8 SHA512 115f6fc08d571ef46a410236ea9cf6c26ccb4c2a45f5abee117d35e30ddf32f912714603e83b89c9735ea45dab2f2e346e445e2fe0ad127292289d56a3b968a0
+MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.0.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.13.0.ebuild
deleted file mode 100644
index 5214d5c7ea4b..000000000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2010-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="a402396dce64c42ea73535b7dde4a9164d430438"
-BITCOINCORE_LJR_DATE="20160814"
-BITCOINCORE_IUSE="+ljr"
-inherit bash-completion-r1 bitcoincore
-
-DESCRIPTION="Command-line JSON-RPC client for the communication with the Bitcoin Core Daemon"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~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 || die
-	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-cli/bitcoin-cli-0.13.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.13.1.ebuild
deleted file mode 100644
index 968774889471..000000000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2010-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="03422e564b552c1d3c16ae854f8471f7cb39e25d"
-BITCOINCORE_LJR_DATE="20161027"
-BITCOINCORE_IUSE="+ljr"
-inherit bash-completion-r1 bitcoincore
-
-DESCRIPTION="Command-line JSON-RPC client for the communication with the Bitcoin Core Daemon"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc 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 || die
-	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-cli/bitcoin-cli-0.13.2.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild
deleted file mode 100644
index e6f0569a9bab..000000000000
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.13.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2010-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
-BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="knots"
-inherit bash-completion-r1 bitcoincore
-
-DESCRIPTION="Command-line JSON-RPC client for the communication with the Bitcoin Core Daemon"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~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 || die
-	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-cli/bitcoin-cli-0.15.1.ebuild b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
index 48399f247da1..f9c7b8764989 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.15.1.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="Command-line JSON-RPC client specifically for interfacing with bitc
 HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index 6f3a3a4dd7b3..62d40fbeff4c 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -11,7 +11,6 @@
 	</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>
 		<remote-id type="github">bitcoin/bitcoin</remote-id>