Revision bump, the haskell dependencies are runtime deps as well as build time.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 438c38f6c631f76ff3ffa27e9246f7d535de15bf..21694a22a76ea644635cd768537b0f1bef1591aa 100644 (file)
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.97 2015/03/06 01:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.98 2015/03/06 18:27:43 chutzpah Exp $
+
+*ganeti-2.12.1-r1 (06 Mar 2015)
+
+  06 Mar 2015; Patrick McLean <chutzpah@gentoo.org> +ganeti-2.12.1-r1.ebuild,
+  -ganeti-2.12.1.ebuild:
+  Revision bump, the haskell dependencies are runtime deps as well as build
+  time.
 
 *ganeti-2.11.6-r2 (06 Mar 2015)
 *ganeti-2.10.5-r4 (06 Mar 2015)

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index ddea9c27c4a43f7597ba9c75b47c9992c7d2590e..62af574083a15345f166533466ec9687d171cd19 100644 (file)
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -39,24 +39,24 @@ DIST ganeti-2.12.1.tar.gz 4353529 SHA256 bd1b33d12485f4de25cca74dcf2e5354067cdda
 DIST ganeti-2.4.5.tar.gz 1828118 SHA256 9141379f3802238fb209309ec12f7090d872b77d7a473c91fe766d1fcec97c89 SHA512 e3abc2fd7c031fbef41c6e993f4cb129fa1dd4cb8c44961a2574da23832fd8412b8b3664b2e05ba8236cb8e58e8d70c3c9081f3f1b6dba8ffdc28d298c8a5099 WHIRLPOOL 897c2b3cdf0c7b03232a4ec99314439dbd29afd65eb2502d21a9f197cc098323a4b9ec0671c24ef7aad44b5327316ee68731e7e5304c8730d03f8ca908b93b62
 EBUILD ganeti-2.10.5-r4.ebuild 4775 SHA256 30f797b09d1510a1a0fa0a91bb400449269042c7cb4bd2beb96decd963451eb3 SHA512 52c5ebf14db43a9c57bd9c57fc0b784493448430e2a0990c72eaec773403a898cfbab67c1cdc3916259a0ff3259e9de6bf3ae0e048196277be8393658e7eebd9 WHIRLPOOL a9879141baacbc19964f9c61bb36e2d16269d8b07d9b1a3d87c2c866deceb3668c9fb8a40b6cc1bb9ab1c0027ee1105eaf2f8df1a8afc4bc7bfcd5cf56f582b1
 EBUILD ganeti-2.11.6-r2.ebuild 6236 SHA256 c72fbaa8ef1ab96b38c4615e32e307b668fc5b0bc21e6e78d3c76f14e93dc7e0 SHA512 167c73f97fbe3ed456a0c61326877ff4960f41b215a2ddcf667eb7c6ee89e59072127a6a851fba2da4d46856c6c46b0fc6ba3500deab8254df16a93026878c22 WHIRLPOOL 2010fbcfb28cea6c5d682efaa4f4121ed185fdf8de050657f61141531ed5e45c8f6f49ab6d45bd1c810a20910fb05b082da66ceb0716d30e522810b771c12872
-EBUILD ganeti-2.12.1.ebuild 7302 SHA256 be520eae132857b5c9a92ea3b359a7448e1d0295f7af49b196bee60e81e6d430 SHA512 c945e989dc6452eae63afd472468ecafe338efdc8bb928bf2c004c3fa392fc53ce5159201a1b74ec93f31c528ac9e35d6dd6896141d81c5c9162a0b3aabdc5dc WHIRLPOOL fefa5125e72942c7c31406219168373d9c084eb9e745209794c68bfe2fa111edd4ee25bb34625c42fcdbe39cc798da0e118452e858a33c696cb4c609c6a2ccf8
+EBUILD ganeti-2.12.1-r1.ebuild 7332 SHA256 dde67c3c2e21d6920f638b7f706bc9e9c1a772c1cbdf58e1ff42b85967ba8c80 SHA512 48c2130445cfb76074da88d374f01e778e313dd078c958d2a4db7c2989d04f0febe73a2a7ad62838e565db340c37cb7f6fdc6557da1895914598c45da95ce8fd WHIRLPOOL 8f117b9a8884d4b26d7e3f8ac38ae652f2e829ecdef60c1107e1d2b2b20a8a62b65b315721aeba29c604303e4c92922e8b912558cf5c124a4490d063854fd4e6
 EBUILD ganeti-2.4.5-r1.ebuild 2540 SHA256 8024d6ba63f08762ec42f6acf8d3ad7f7f51ca4d221f780e7b86229e694dbea3 SHA512 85cce9aa0ccbfbfb889962b407eda507adaa5cbbf0630ddea6b86dc923c8b23dc4e881a41d0a63cf927f0b93b9427c10f428b36f534658ed8edec272e2559677 WHIRLPOOL 7a65b8e03cdf3ca189ea0cfd2ceeba597d45843df7c8a25f4c7de8224a16421f1235e9e7689c84b566c9eaeab815ef939259915e02b884beb1996595951a35bb
-MISC ChangeLog 21862 SHA256 1fcdc1b50afe9d979732bf6853d84e0f37dd910c1363f965fca0e1d95a677874 SHA512 d8ba44f20bfc746b3b9b6e1e7b6aed0444180bedf4fd967447cf426f122912a270e67d8579fda3408ccaf501349df0c67b09cf944b7ea65551a7c22f6cb570f7 WHIRLPOOL 6a7df75263b6d3e8278f5bbbbfa70f0030389d9c5b1f085da9f2a1908e40d876adbfa2887e90552a23933f4adf676b2fbbdf3d725a1cdc1b284c50a37be1cb1c
+MISC ChangeLog 22083 SHA256 5008f5b8dbd54647417372d3480202e96cd90e6e943456b4fccae18f7859d5fe SHA512 84552810581adb17edd3c5c42c6ddf5dc1917cb988c56be3e6bd107975ce6c0610ae78e13c020d52d6f38db926a200fc5af9d512f99827111ccc726db73dc6f2 WHIRLPOOL e0fb296bf196e29f0ef34ae79ab9a4e2d7a63a983f8468d41e557d1d1b67a15cab76a8a4d4068f20bac9fdb9a294a03bdd98506f452f439d87fd2f5def1dfc32
 MISC metadata.xml 1666 SHA256 b30104372f656db1e16b213d141b9224208958df5231bb17214ad7897a759662 SHA512 85c98e126690eccd836d4d7472327edc588785c27d0da7f71ce562783e9d1685b5a2f681438bcb619831476443792a4ef272cc61d339bbb1e352b8921788ef98 WHIRLPOOL f66c5e39d6be4808d65cd21203255bc0b1a6ae3ccce3d0b84ec0ecd062e6e3dc682807f92f9b30fa3cb32bbaa67f35f1775a9a8974e2b295282c34e3cfa1293b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU+QH7AAoJEHy/RO9cNQiDvPoP/jwFYxRn+dQW3yL8iPbZYJ2W
-VL/W7DkhI72V1DghiaqGJr66mCmxWsnZ+U3ROaybMIo90SVnX+hP3S3JS7BI/ay+
-gV5E/RveVxKbmOd0M+wGQ7x9ly2pBqo+OVamiL1wAcXZi5scghcoFa2z7Tl2xW4P
-w4yCusyRebxUr+j76xyl1xZeOogcmgAA1g55HqnJeqg7Laf+UKqDynEoMA7W0g6O
-xy9/Y4CEjZBHKtpcwTBspKP2qLdRp/gP+y1kjb203jM4/pLgahALNEbsBEI+phdJ
-fMolR8FIJVHZt+JYNVu0tQ9jFd5q3dKH15gh1R2AnmlwFGg1JbWkr2EyIW/ZPt7m
-CrtzhNiBxxKy+HiPDYdkFD7IkJg3+uKnu6mU7PSEuYPYuC35ALK9TuSw+4Ii5X2R
-Y1kwPNIsr/+HgTSk4vFdmzGC2JDoEay27RBdMi+wMJ7edjiMBdWLYyrMe1sZiP/f
-crNejiCQSLjketpxyUSZ2lkd5FD/RLTnk7M5guFyKrTpIDbtslEM7RRBlx/uQluz
-QlRH8u57Wh6CvxZQWq/WiVsREoGy+i26H2gcSvvmXwSN9HHGiaLCx4UxkLdfXscP
-aFIQz2Qlqy6dWfeArHmMLsPfcSsSUsDozeK1xUu5LNQGW8uKOD7tB4Ykj7a07AKc
-XSUV5jeuSnJhWwhNQfhU
-=vyNz
+iQIcBAEBCAAGBQJU+fGpAAoJEHy/RO9cNQiDHfkQAMUmX/nnB2cH29Sd//kf3GOI
+1VnESfZ2IhgthN/5oCHCun0JazVdVCh9+o+KvNbPLAwvlnOgW1ozeLb9FVxLVc+k
+Mi9T7MRF/yeipWax7UHZXdfNg0L7rtGG80n/U95A12WgVM0oYfSlkSOxZW/xTyxa
+vEAZ/ICuQeouURv6NL/qVMIw18SleDws7/4QF64hT8mokHOaMjoMCPh4eke++CIO
+eJsI6+uq8mH+l7A+OlIvaEfiHuPMqGky4DozEuIqHdEtapNUWCwNZFA9g6ukjANe
+sGrBw+2BBfXckFwNdLcTz9Vb9nPYihawJg9hdh3nHGJaTOAxGmKk9t0vCarpxGM3
+de5dS52wfPV1JEPCKykspCkj/dGhhhfUStiLt2g+wa+cDvjHtmyo1wbfADULba46
+Esfe1mISDznT4aJPZwiuK1qsqj2j11AvyOBlZZDD1jtQlm5zqBL0iIMWKfVECVXm
+OjWBLllOV2+ZcK/VCHg1DJsjtQD614WX26I6nk5qZ5ZrRF3fYWNOES2UwUzQvaq1
+iT1p7yVE2gfwnhu4Bw1E0QcUcWTrKtw96+HtzOpeC3vP52jpD/5pHa5sPoR/0d/0
+vWj+mai8hRaxK61hSyBnxM28l0A8J1qG5vcE+bo3pLQl1Lf3dshtOQeTr3B+G+4L
+dyk5mH1VcRYSGm+Swx6J
+=QXhW
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/ganeti/ganeti-2.12.1.ebuild b/app-emulation/ganeti/ganeti-2.12.1-r1.ebuild
similarity index 94%
rename from app-emulation/ganeti/ganeti-2.12.1.ebuild
rename to app-emulation/ganeti/ganeti-2.12.1-r1.ebuild
index 1abceacbf4c84758e99e9d818bb15b7be8d8a238..693f54990d6d64faff6e9c79d6641ddb5af72453 100644 (file)
--- a/app-emulation/ganeti/ganeti-2.12.1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.12.1.ebuild,v 1.1 2015/03/06 01:25:05 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.12.1-r1.ebuild,v 1.1 2015/03/06 18:27:43 chutzpah Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python2_7)
@@ -40,9 +40,30 @@ REQUIRED_USE="|| ( kvm xen lxc )"
 USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
 GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
-# lest-than atoms at the end of this list are resolver hints
-# they aren't actual direct dependencies, these need to stay until 2.14.0
-HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
+# the haskell less-than atoms list are resolver hints, they aren't actual
+# direct dependencies, just hints to help the resolver fufill the dependency
+# on an older transformer.
+# these need to stay until 2.14.0
+DEPEND="
+       dev-libs/openssl:0
+       dev-python/paramiko[${PYTHON_USEDEP}]
+       dev-python/pyopenssl[${PYTHON_USEDEP}]
+       dev-python/pyparsing[${PYTHON_USEDEP}]
+       dev-python/pycurl[${PYTHON_USEDEP}]
+       dev-python/pyinotify[${PYTHON_USEDEP}]
+       dev-python/simplejson[${PYTHON_USEDEP}]
+       dev-python/ipaddr[${PYTHON_USEDEP}]
+       dev-python/bitarray[${PYTHON_USEDEP}]
+       net-analyzer/arping
+       net-analyzer/fping
+       net-misc/bridge-utils
+       net-misc/curl[ssl]
+       net-misc/openssh
+       net-misc/socat
+       sys-apps/iproute2
+       sys-fs/lvm2
+       >=sys-apps/baselayout-2.0
+       >=dev-lang/ghc-7.6.0:0=
        >=dev-haskell/json-0.9:0=
        <dev-haskell/monad-control-1.0.0.0:0=
        <dev-haskell/transformers-0.4.0:0=
@@ -71,42 +92,19 @@ HASKELL_DEPS=">=dev-lang/ghc-6.12:0=
        <dev-haskell/transformers-base-0.4.4
        <dev-haskell/semigroupoids-4.0
        <dev-haskell/semigroupoid-extras-4.0
-       <dev-haskell/groupoids-4.0"
-
-DEPEND="xen? ( >=app-emulation/xen-3.0 )
+       <dev-haskell/groupoids-4.0
+       xen? ( >=app-emulation/xen-3.0 )
        kvm? ( app-emulation/qemu )
        lxc? ( app-emulation/lxc )
        drbd? ( <sys-cluster/drbd-8.5 )
        rbd? ( sys-cluster/ceph )
        ipv6? ( net-misc/ndisc6 )
-       haskell-daemons? (
-               ${HASKELL_DEPS}
-               dev-haskell/text:0=
-       )
-       dev-libs/openssl:0
-       dev-python/paramiko[${PYTHON_USEDEP}]
-       dev-python/pyopenssl[${PYTHON_USEDEP}]
-       dev-python/pyparsing[${PYTHON_USEDEP}]
-       dev-python/pycurl[${PYTHON_USEDEP}]
-       dev-python/pyinotify[${PYTHON_USEDEP}]
-       dev-python/simplejson[${PYTHON_USEDEP}]
-       dev-python/ipaddr[${PYTHON_USEDEP}]
-       dev-python/bitarray[${PYTHON_USEDEP}]
-       net-analyzer/arping
-       net-analyzer/fping
-       net-misc/bridge-utils
-       net-misc/curl[ssl]
-       net-misc/openssh
-       net-misc/socat
-       sys-apps/iproute2
-       sys-fs/lvm2
-       >=sys-apps/baselayout-2.0
+       haskell-daemons? ( dev-haskell/text:0= )
        ${PYTHON_DEPS}
        ${GIT_DEPEND}"
 RDEPEND="${DEPEND}
        !app-emulation/ganeti-htools"
-DEPEND+="${HASKELL_DEPS}
-       sys-devel/m4
+DEPEND+="sys-devel/m4
        test? (
                dev-python/mock
                dev-python/pyyaml