bitcoincore.eclass: Drop special handling for old ebuilds

johu · Jan 24, 2017 · e76247b · e76247b
1 parent 7e4f64e
commit e76247b
Showing 1 changed file with 3 additions and 38 deletions.
diff --git 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