From 3222ba8c78fd841601a2c7fe4d8520db3e36097a Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Tue, 12 Jul 2016 15:54:22 -0700 Subject: [PATCH] app-emulation/ganeti: only use GHC 7.10 patch when present, causes failures on older GHC. Package-Manager: portage-2.2.28 --- app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild index 600f1bdfa166..2e696ebab0d5 100644 --- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild +++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild @@ -29,7 +29,6 @@ else "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 "${WORKDIR}"/debian/patches/relax-deps - "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch "${WORKDIR}"/debian/patches/zlib-0.6-compatibility "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 @@ -205,6 +204,12 @@ pkg_setup () { src_prepare() { local testfile + if has_version '>=dev-lang/ghc-7.10'; then + # Breaks the build on 7.8 + PATCHES+=( + "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch + ) + fi eapply "${PATCHES[@]}" # Upstream commits: # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb -- 2.26.2