From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 334B4139085 for ; Tue, 24 Jan 2017 01:17:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 812382340EA; Tue, 24 Jan 2017 01:17:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 469442340E9 for ; Tue, 24 Jan 2017 01:17:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 476ED341655 for ; Tue, 24 Jan 2017 01:17:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D1942756 for ; Tue, 24 Jan 2017 01:17:47 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1485220646.e76247bb5348dfe4a837ab7c8c491f81f5b7f297.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/bitcoincore.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e76247bb5348dfe4a837ab7c8c491f81f5b7f297 X-VCS-Branch: master Date: Tue, 24 Jan 2017 01:17:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e03327a2-defa-4167-afa0-8b09a9942484 X-Archives-Hash: 90b9dddf247a43d914685ff6e82acef2 commit: e76247bb5348dfe4a837ab7c8c491f81f5b7f297 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 22 21:35:57 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 24 01:17:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76247bb bitcoincore.eclass: Drop special handling for old ebuilds eclass/bitcoincore.eclass | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass index a8ab23e..d656c14 100644 --- a/eclass/bitcoincore.eclass +++ b/eclass/bitcoincore.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # @@ -76,31 +76,7 @@ BITCOINCORE_LJR_NAME=ljr [ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}" case "${PV}" in -0.10*) - BITCOINCORE_MINOR=10 - LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20141212" - case "${PVR}" in - 0.10.2) - BITCOINCORE_RBF_DIFF="16f45600c8c372a738ffef544292864256382601...a23678edc70204599299459a206709a00e039db7" - BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.10.2.patch" - ;; - *) - BITCOINCORE_RBF_DIFF="16f45600c8c372a738ffef544292864256382601...4890416cde655559eba09d3fd6f79db7d0d6314a" - BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.10.2-r1.patch" - ;; - esac - BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f" - ;; -0.11*) - BITCOINCORE_MINOR=11 - LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423" - # RBF is bundled with ljr patchset since 0.11.1 - if [ "${PVR}" = "0.11.0" ]; then - BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e" - BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" - fi - ;; -0.12* | 0.13*) +0.13*) BITCOINCORE_MINOR=$(get_version_component_range 2) IUSE="${IUSE} libressl" OPENSSL_DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" @@ -227,9 +203,7 @@ if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then RDEPEND="${RDEPEND} virtual/bitcoin-leveldb" fi if in_bcc_iuse ljr; then - if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then - DEPEND="${DEPEND} ljr? ( dev-vcs/git )" - elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then + if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then DEPEND="${DEPEND} ljr? ( dev-lang/perl )" fi fi @@ -272,12 +246,6 @@ bitcoincore_pkg_pretend() { $bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}" } -bitcoincore_git_apply() { - local patchfile="$1" - einfo "Applying ${patchfile##*/} ..." - git apply --whitespace=nowarn "${patchfile}" || die -} - bitcoincore_predelete_patch() { local patchfile="$1" mkdir -p "${WORKDIR}/pdp" @@ -317,9 +285,6 @@ bitcoincore_prepare() { bitcoincore_predelete_patch "$(LJR_PATCH f)" bitcoincore_predelete_patch "$(LJR_PATCH branding)" epatch "$(LJR_PATCH ts)" - elif [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then - # Regular epatch won't work with binary files - bitcoincore_git_apply "$(LJR_PATCH ljrF)" else epatch "$(LJR_PATCH ljrF)" fi