From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-891746-garchives=archives.gentoo.org@lists.gentoo.org>
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 BE7201382FE
for <garchives@archives.gentoo.org>; Tue, 12 Jul 2016 22:54:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 479EE21C1AB;
Tue, 12 Jul 2016 22:54:41 +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 C3A0421C17D
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2016 22:54:40 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 CEA5C340D4F
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2016 22:54:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 151532442
for <gentoo-commits@lists.gentoo.org>; Tue, 12 Jul 2016 22:54:36 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1468364070.3222ba8c78fd841601a2c7fe4d8520db3e36097a.robbat2@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
X-VCS-Directories: app-emulation/ganeti/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: 3222ba8c78fd841601a2c7fe4d8520db3e36097a
X-VCS-Branch: master
Date: Tue, 12 Jul 2016 22:54:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 35baceab-b869-4651-af3b-22ed00ff2cc8
X-Archives-Hash: bc71628452b67372e1c744012620e209
commit: 3222ba8c78fd841601a2c7fe4d8520db3e36097a
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 22:54:22 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 22:54:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3222ba8c
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 600f1bd..2e696eb 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