From 6eb09f115ed0c281d77a4ae1543b0eb43b9845cb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 1 Nov 2020 13:57:52 +0000 Subject: [PATCH] dev-haskell/cabal: update to EAPI=7 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich --- dev-haskell/cabal/cabal-1.18.1.3.ebuild | 4 +++- dev-haskell/cabal/cabal-1.18.1.5.ebuild | 4 +++- dev-haskell/cabal/cabal-1.20.0.2.ebuild | 4 +++- dev-haskell/cabal/cabal-1.22.8.0.ebuild | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev-haskell/cabal/cabal-1.18.1.3.ebuild b/dev-haskell/cabal/cabal-1.18.1.3.ebuild index b4a410cf4d32b..c48c74d40c4fe 100644 --- a/dev-haskell/cabal/cabal-1.18.1.3.ebuild +++ b/dev-haskell/cabal/cabal-1.18.1.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.3.6.9999 @@ -37,6 +37,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" CABAL_CORE_LIB_GHC_PV="7.8.2014* 7.8.0.2014* 7.8.1 7.8.2 7.8.3 7.8.3.20141119" src_prepare() { + default + if [[ -n ${LIVE_EBUILD} ]]; then CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}" fi diff --git a/dev-haskell/cabal/cabal-1.18.1.5.ebuild b/dev-haskell/cabal/cabal-1.18.1.5.ebuild index 369324fa47126..220ee8187a537 100644 --- a/dev-haskell/cabal/cabal-1.18.1.5.ebuild +++ b/dev-haskell/cabal/cabal-1.18.1.5.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.3.6.9999 @@ -39,6 +39,8 @@ S="${WORKDIR}/${MY_PN}-${PV}" CABAL_CORE_LIB_GHC_PV="7.8.4" src_prepare() { + default + if [[ -n ${LIVE_EBUILD} ]]; then CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}" fi diff --git a/dev-haskell/cabal/cabal-1.20.0.2.ebuild b/dev-haskell/cabal/cabal-1.20.0.2.ebuild index abbfa9df88f62..de5558e4a3a96 100644 --- a/dev-haskell/cabal/cabal-1.20.0.2.ebuild +++ b/dev-haskell/cabal/cabal-1.20.0.2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.4.9999 @@ -36,6 +36,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { + default + if [[ -n ${LIVE_EBUILD} ]]; then CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}" fi diff --git a/dev-haskell/cabal/cabal-1.22.8.0.ebuild b/dev-haskell/cabal/cabal-1.22.8.0.ebuild index c42d09e543c70..15fd12acb3a96 100644 --- a/dev-haskell/cabal/cabal-1.22.8.0.ebuild +++ b/dev-haskell/cabal/cabal-1.22.8.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 # ebuild generated by hackport 0.4.5.9999 @@ -37,6 +37,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { + default + if [[ -n ${LIVE_EBUILD} ]]; then CABAL_FILE=${MY_PN}.cabal cabal_chdeps 'version: 1.17.0' "version: ${PV}" fi