public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/
Date: Tue, 12 Jul 2016 00:13:11 +0000 (UTC)	[thread overview]
Message-ID: <1468282386.3f3cc0194f8d0f598ef2e6152da5d1c12550bc94.robbat2@gentoo> (raw)

commit:     3f3cc0194f8d0f598ef2e6152da5d1c12550bc94
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 00:12:45 2016 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 00:13:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3cc019

app-emulation/ganeti: match dependencies used in Ubuntu.

Package-Manager: portage-2.2.28

 app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index 74f768e..e1c3ee4 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -78,7 +78,7 @@ DEPEND="
 	>=dev-haskell/old-time-1.1.0.0:0=
 	>=dev-haskell/random-1.0.1.1:0=
 	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-	>=dev-haskell/transformers-0.3.0.0:0=
+	>=dev-haskell/transformers-0.4.3.0:0=
 
 	>=dev-haskell/attoparsec-0.10.1.1:0=
 	<dev-haskell/attoparsec-0.14:0
@@ -121,9 +121,6 @@ DEPEND="
 	>=dev-haskell/case-insensitive-0.4.0.1
 
 	dev-haskell/vector:0=
-	<dev-haskell/semigroupoids-4.1:0=
-	<dev-haskell/contravariant-0.6
-	<dev-haskell/transformers-compat-0.4[three]
 	xen? ( >=app-emulation/xen-3.0 )
 	kvm? (
 		dev-python/psutil
@@ -144,7 +141,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
@@ -160,7 +157,7 @@ DEPEND+="
 		>=dev-haskell/hunit-1.2.4.2:0=
 		<dev-haskell/hunit-1.3:0=
 		>=dev-haskell/quickcheck-2.4.2:2=
-		<dev-haskell/quickcheck-2.8:2=
+		<dev-haskell/quickcheck-2.8.3:2=
 		sys-apps/fakeroot
 		net-misc/socat
 		dev-util/shelltestrunner
@@ -209,6 +206,16 @@ pkg_setup () {
 src_prepare() {
 	local testfile
 	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
 
 	# not sure why these tests are failing
 	# should remove this on next version bump if possible


             reply	other threads:[~2016-07-12  0:13 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-12  0:13 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-07-23 18:51 [gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/ Ionen Wolkens
2022-07-23 17:11 Robin H. Johnson
2022-07-23 17:11 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2022-07-23 16:39 Robin H. Johnson
2020-07-27 10:02 Michał Górny
2020-07-27 10:02 Michał Górny
2020-05-06  1:02 Patrick McLean
2019-04-14 11:12 Agostino Sarubbo
2019-04-08 17:11 Robin H. Johnson
2018-08-25 20:20 Michał Górny
2018-01-31  1:04 Patrick McLean
2018-01-17  2:52 Patrick McLean
2017-12-10  9:27 Ulrich Müller
2016-12-02  0:56 Patrick McLean
2016-12-01 11:51 Agostino Sarubbo
2016-12-01 11:50 Agostino Sarubbo
2016-07-13 21:37 Robin H. Johnson
2016-07-13 17:22 Robin H. Johnson
2016-07-12 22:54 Robin H. Johnson
2016-07-12 17:13 Robin H. Johnson
2016-07-12  0:53 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-07-11 22:50 Robin H. Johnson
2016-07-05 21:55 Robin H. Johnson
2016-05-12 23:25 Patrick McLean
2016-04-05 23:18 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-05 18:42 Patrick McLean
2016-04-04 23:43 Patrick McLean
2016-04-01 23:57 Patrick McLean
2016-02-15 18:30 Sergey Popov
2016-02-15  9:48 Sergey Popov
2015-11-23 23:41 Patrick McLean

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1468282386.3f3cc0194f8d0f598ef2e6152da5d1c12550bc94.robbat2@gentoo \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox