| 1 |
commit: 3f3cc0194f8d0f598ef2e6152da5d1c12550bc94 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 12 00:12:45 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 12 00:13:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3cc019 |
| 7 |
|
| 8 |
app-emulation/ganeti: match dependencies used in Ubuntu. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/ganeti/ganeti-2.15.2-r5.ebuild | 19 +++++++++++++------ |
| 13 |
1 file changed, 13 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 16 |
index 74f768e..e1c3ee4 100644 |
| 17 |
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 18 |
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild |
| 19 |
@@ -78,7 +78,7 @@ DEPEND=" |
| 20 |
>=dev-haskell/old-time-1.1.0.0:0= |
| 21 |
>=dev-haskell/random-1.0.1.1:0= |
| 22 |
haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) |
| 23 |
- >=dev-haskell/transformers-0.3.0.0:0= |
| 24 |
+ >=dev-haskell/transformers-0.4.3.0:0= |
| 25 |
|
| 26 |
>=dev-haskell/attoparsec-0.10.1.1:0= |
| 27 |
<dev-haskell/attoparsec-0.14:0 |
| 28 |
@@ -121,9 +121,6 @@ DEPEND=" |
| 29 |
>=dev-haskell/case-insensitive-0.4.0.1 |
| 30 |
|
| 31 |
dev-haskell/vector:0= |
| 32 |
- <dev-haskell/semigroupoids-4.1:0= |
| 33 |
- <dev-haskell/contravariant-0.6 |
| 34 |
- <dev-haskell/transformers-compat-0.4[three] |
| 35 |
xen? ( >=app-emulation/xen-3.0 ) |
| 36 |
kvm? ( |
| 37 |
dev-python/psutil |
| 38 |
@@ -144,7 +141,7 @@ RDEPEND="${DEPEND} |
| 39 |
DEPEND+=" |
| 40 |
sys-devel/m4 |
| 41 |
app-text/pandoc |
| 42 |
- <dev-python/sphinx-1.3[${PYTHON_USEDEP}] |
| 43 |
+ <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}] |
| 44 |
media-fonts/urw-fonts |
| 45 |
media-gfx/graphviz |
| 46 |
>=dev-haskell/test-framework-0.6:0= |
| 47 |
@@ -160,7 +157,7 @@ DEPEND+=" |
| 48 |
>=dev-haskell/hunit-1.2.4.2:0= |
| 49 |
<dev-haskell/hunit-1.3:0= |
| 50 |
>=dev-haskell/quickcheck-2.4.2:2= |
| 51 |
- <dev-haskell/quickcheck-2.8:2= |
| 52 |
+ <dev-haskell/quickcheck-2.8.3:2= |
| 53 |
sys-apps/fakeroot |
| 54 |
net-misc/socat |
| 55 |
dev-util/shelltestrunner |
| 56 |
@@ -209,6 +206,16 @@ pkg_setup () { |
| 57 |
src_prepare() { |
| 58 |
local testfile |
| 59 |
eapply "${PATCHES[@]}" |
| 60 |
+ # Upstream commits: |
| 61 |
+ # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb |
| 62 |
+ # 24618882737fd7c189adf99f4acc767d48f572c3 |
| 63 |
+ sed -i \ |
| 64 |
+ -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ |
| 65 |
+ cabal/ganeti.template.cabal |
| 66 |
+ # Neuter -Werror |
| 67 |
+ sed -i \ |
| 68 |
+ -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ |
| 69 |
+ Makefile.am |
| 70 |
|
| 71 |
# not sure why these tests are failing |
| 72 |
# should remove this on next version bump if possible |
Archives