| 1 |
commit: e76247bb5348dfe4a837ab7c8c491f81f5b7f297 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 22 21:35:57 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 01:17:26 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76247bb |
| 7 |
|
| 8 |
bitcoincore.eclass: Drop special handling for old ebuilds |
| 9 |
|
| 10 |
eclass/bitcoincore.eclass | 41 +++-------------------------------------- |
| 11 |
1 file changed, 3 insertions(+), 38 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass |
| 14 |
index a8ab23e..d656c14 100644 |
| 15 |
--- a/eclass/bitcoincore.eclass |
| 16 |
+++ b/eclass/bitcoincore.eclass |
| 17 |
@@ -1,4 +1,4 @@ |
| 18 |
-# Copyright 1999-2015 Gentoo Foundation |
| 19 |
+# Copyright 1999-2017 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
# |
| 23 |
@@ -76,31 +76,7 @@ BITCOINCORE_LJR_NAME=ljr |
| 24 |
[ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}" |
| 25 |
|
| 26 |
case "${PV}" in |
| 27 |
-0.10*) |
| 28 |
- BITCOINCORE_MINOR=10 |
| 29 |
- LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20141212" |
| 30 |
- case "${PVR}" in |
| 31 |
- 0.10.2) |
| 32 |
- BITCOINCORE_RBF_DIFF="16f45600c8c372a738ffef544292864256382601...a23678edc70204599299459a206709a00e039db7" |
| 33 |
- BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.10.2.patch" |
| 34 |
- ;; |
| 35 |
- *) |
| 36 |
- BITCOINCORE_RBF_DIFF="16f45600c8c372a738ffef544292864256382601...4890416cde655559eba09d3fd6f79db7d0d6314a" |
| 37 |
- BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.10.2-r1.patch" |
| 38 |
- ;; |
| 39 |
- esac |
| 40 |
- BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f" |
| 41 |
- ;; |
| 42 |
-0.11*) |
| 43 |
- BITCOINCORE_MINOR=11 |
| 44 |
- LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423" |
| 45 |
- # RBF is bundled with ljr patchset since 0.11.1 |
| 46 |
- if [ "${PVR}" = "0.11.0" ]; then |
| 47 |
- BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e" |
| 48 |
- BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" |
| 49 |
- fi |
| 50 |
- ;; |
| 51 |
-0.12* | 0.13*) |
| 52 |
+0.13*) |
| 53 |
BITCOINCORE_MINOR=$(get_version_component_range 2) |
| 54 |
IUSE="${IUSE} libressl" |
| 55 |
OPENSSL_DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" |
| 56 |
@@ -227,9 +203,7 @@ if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then |
| 57 |
RDEPEND="${RDEPEND} virtual/bitcoin-leveldb" |
| 58 |
fi |
| 59 |
if in_bcc_iuse ljr; then |
| 60 |
- if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then |
| 61 |
- DEPEND="${DEPEND} ljr? ( dev-vcs/git )" |
| 62 |
- elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then |
| 63 |
+ if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then |
| 64 |
DEPEND="${DEPEND} ljr? ( dev-lang/perl )" |
| 65 |
fi |
| 66 |
fi |
| 67 |
@@ -272,12 +246,6 @@ bitcoincore_pkg_pretend() { |
| 68 |
$bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}" |
| 69 |
} |
| 70 |
|
| 71 |
-bitcoincore_git_apply() { |
| 72 |
- local patchfile="$1" |
| 73 |
- einfo "Applying ${patchfile##*/} ..." |
| 74 |
- git apply --whitespace=nowarn "${patchfile}" || die |
| 75 |
-} |
| 76 |
- |
| 77 |
bitcoincore_predelete_patch() { |
| 78 |
local patchfile="$1" |
| 79 |
mkdir -p "${WORKDIR}/pdp" |
| 80 |
@@ -317,9 +285,6 @@ bitcoincore_prepare() { |
| 81 |
bitcoincore_predelete_patch "$(LJR_PATCH f)" |
| 82 |
bitcoincore_predelete_patch "$(LJR_PATCH branding)" |
| 83 |
epatch "$(LJR_PATCH ts)" |
| 84 |
- elif [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then |
| 85 |
- # Regular epatch won't work with binary files |
| 86 |
- bitcoincore_git_apply "$(LJR_PATCH ljrF)" |
| 87 |
else |
| 88 |
epatch "$(LJR_PATCH ljrF)" |
| 89 |
fi |
Archives