Make the libcloud dep optional (bug #503396).

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

4 files changed, 25 insertions, 20 deletions

diff --git a/app-admin/salt/ChangeLog b/app-admin/salt/ChangeLog
index 5ac7445d8362..d2fde6d5291b 100644
--- a/app-admin/salt/ChangeLog
+++ b/app-admin/salt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/salt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.32 2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/ChangeLog,v 1.33 2014/03/04 19:22:43 chutzpah Exp $
+
+  04 Mar 2014; Patrick McLean <chutzpah@gentoo.org> salt-2014.1.0.ebuild,
+  metadata.xml:
+  Make the libcloud dep optional (bug #503396).
 
 *salt-2014.1.0 (26 Feb 2014)
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index f61bbcfa5f80..a73a061a1733 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -17,24 +17,24 @@ AUX syndic-initd-3 411 SHA256 2de9f69462bc3b575a69a150b6bba21a6e341477010d284cb7
 DIST salt-0.17.4.tar.gz 1871032 SHA256 5a7b3f4d5c22aa4b8e7c03d60dc429b0428c575fb8f0c285616239c0fe5a0ddd SHA512 3ea8d42c321d111bc3d277167c85a3ac6eb99c97eb5d53030e462372d227e0a0c2a93b4b13eae38eed2e73ec591e1e78b535493bf77d66c3d19102baf13cb445 WHIRLPOOL 27acf1f7adb0fbe9ad393711d6bd5998feb090f5bb38ec05d11dbd85a434ffbb19d921ec90e462a212ff080729a553701ca1d750fe8b31346e903e8944285180
 DIST salt-2014.1.0.tar.gz 2787665 SHA256 168dd154a9243b1c853700e61f56e7d6ab5cbc9862fb215ab991e05f46b2a406 SHA512 99db0a79b32adb205c7de73f3810383816e1b6051ff200c1032f17167e962bae742d0ebc916bd314361c09aff24312eb8b05a295ebdde1d6c169da22b3b523a3 WHIRLPOOL 753e2844939ccf9d781d4952f2b97a9ce41cd415c2adaae27b1a085297e4b8f06025bd9b8841b02b40744974a253df824db69ad9c4cf398908bbe9cdf9d95128
 EBUILD salt-0.17.4-r2.ebuild 2214 SHA256 99ac240c300950df1617983b0094e4f47361659d25a5d55a7afc01620c4de489 SHA512 e8c473134a71308b41293849f06d0378b72f7bb1f1479927b9bbd8bdcb4c4868d55ccda5e53f7bbdcb6068b14b089de8a80061b851d86307dd819240711c0edc WHIRLPOOL 5ca3224a701065b9bacd6dcfb4fd807e4d1fd8009a090724e60c7117d9e12025074616aca8b966742d60fb424402aed9ed40a93f78f00b9975bb1e538a36f6de
-EBUILD salt-2014.1.0.ebuild 2480 SHA256 83cbda178ec6cadbd3e43deaae630dee49a3df7420891a6107e6f6a0cbfc8147 SHA512 7f3344b4212814f8ed544ca56580304ccc1b6119ff57ede67060803db2e01baac375654781b097173b898115869f88548c103097e45855599c13380270f72c4b WHIRLPOOL edfc7ed42861bfb2059f82562ab13295a42f57970dab08e2b5d2617d1b7a94b0ac8a73a5812a7152076a1d5d3633638a41ed38e408c69e61d5342adbc97362df
+EBUILD salt-2014.1.0.ebuild 2503 SHA256 e893224cdae97f33d30eea043abafc0c6da8e702284ce3cf7c06b6991b0d40c9 SHA512 85058c56776f754b4189221cefb13535b8f8d0b4590c30fdd2efbd29fbce8fedededd5493dab4bc597f0c8a768a4f4c0e5c769c99c139eccf9a40fbf89a65781 WHIRLPOOL 51cfd66f4964b6e416f5243e021cb6f8c1d0197d464484d0de3409f8be5ec8d0ffb96d20114e9760aed2548413868ed3c19a064ccdbbd329b59a5a9b500dee93
 EBUILD salt-9999.ebuild 2361 SHA256 f4cb233adde0ae7b6ddbb0313fb6cb506a9e745ad6867793ca524c97309fed5b SHA512 12ae0148b97c8e9fdaec4f0507ceb16fd378760e5b03bdfdbabbfe866873b561b26f33e79c99bc19873fe095dfb21acfc1866fc4f22876e195dec7b562d19672 WHIRLPOOL 4111067ceddd0aa68b86e77043869838a948a17d9ccfef7bded2cc227d30864bf47bf61039941f2b599d370a8cf649b2ee6870f19e7f92e7baf452358ba58416
-MISC ChangeLog 5860 SHA256 c8c6f2e348c54a31784703cb239c0b7828af980d1dc4c766c7d3cd55b4c2a801 SHA512 498b54d79ff2fa19c4f04e3eba563879bbe0fb0bfd5c91e5f642dbb32d51007e387fde08160b6b00056f66821ab9ef1343390b42161e58293c78a2d4b313aa37 WHIRLPOOL bdee7a3867cd891eac9175e7b237852c3ee8681a46b1b9e1e72448bb66b75f32c1a5daefdf86e1f7eddc2f20994e3e44aa1866eff8bcbb9e8d0c488fbf8597c3
-MISC metadata.xml 1435 SHA256 2f0b4bacc452d8e7d10938e4fa61c282a1478748853b41f0239177082442f972 SHA512 6f987b4bb98a9fd27e0611719feef79db195fc3acc86be2b7c256e6467bcea0a09457fb802c3640c9b9edbcc83ac732c1820e0a44a3346aebab35c79224be868 WHIRLPOOL b7a3ee428471c1b690503abbec98a1f8536628576a697b25b460eaec7beb2b79e64b753938f49f41480d8a19e6167e059a67ff1fe3b6feb8ecdfa2885b00ea0f
+MISC ChangeLog 5999 SHA256 ad063a23ba5c8a825808ffb1ee57364068b18fdd6a4ee705d7fc61e5bb6b3a75 SHA512 72a457c90341dbcdb9bc3d6d336a0c7380c3d25cadfb1463b68ba5060e4737b63c125d0faf67310cfa517cf0263734e7bd1a5675785c5e10a68e08d76b766c02 WHIRLPOOL 2cd4df42da1f62d06c30fd2c48fe719c71eb022028d119578f24cf2f7e495443147887fa321518c4aa0f962f38d746b2232bdc2fdcaead309bfcd133e2f677f0
+MISC metadata.xml 1506 SHA256 ae73efc765e4fcb1806a7f8da5e27e00fd3c42b90494ba9870304b9abd49df93 SHA512 00d2c68cd6edb7ae2b26c5b16dc182d136dd2969844a5dbedc1864b5af8783885fc597f20df427dbfa57cc1a59c1e43299c6aa7ecf7d1a5a9e512b2f61a1c8f4 WHIRLPOOL 29859710a53a6cba45848b8ea0cb283c268124c592d5b95e31b7956b3e95449f607a7675087f851933b661252a7599eda869b04116279ca00261fa2008cde929
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTDoCaAAoJEHy/RO9cNQiDgjsP/Rn4DUmv2OaSL1xWweIRRU9h
-M8kk9ZzosgIc/wLNZ/1g4Nhg7KlIZH7YGYgPxOpKXLVh0wo0sDV5kYLuH/cYyrS5
-iMc8Raz0FrDtGY2Cdg0yhRFr/vISyD8+xaH8p008mRskFs/j+OTmLO/XPC+iiLO6
-3NnHa4Sa2NZij3kR19+qn3sn0J7mf7nCqiXoZ7UbeZiA1Cn7hJYo+6ackNg4XCwd
-CeSIhxGI836545zET3UBvcLCMTuJGP11fW6R4gndXhsFDo/MoxaTzfuQl+1R+HZl
-hsBS+ijyKTj1oTB0IxJ+jOs3Lt0bEkjS3BjQwU5qxeqWFD18AwpetcCxfJzDaoVY
-6h4TohSoHcU9c+fcKtJ8lmBpehBgd9ggscUgJUZTZbX/AHnhtKCGc1/LxmvEVTQw
-CWzEs5Cb3DbS4C6j5u032it+/AbwN9GcF10J8Dp1FRl9H/OsPF/SVwjE4I1ovO1Z
-9BiaSXXy+CoYpo6I0Y5r9RTjmooTV1+0TOJ52wxB5kWOvXYL450VjCC7zomAR7tc
-q6K6zG7uOXllIVJ8QdGDYPnQzy6ssaM8rddOFl9O5vqOD9BRc1pK3ew8Nd5kVdme
-VnQdp0b0VheKZgGVmNWH5KpiyFERDRmHEpGN+k4M24KqX3DtGffKeRiTtvBbnU4a
-5sbqxCVh28BdZDLKf1QT
-=O/hp
+iQIcBAEBCAAGBQJTFigEAAoJEHy/RO9cNQiDR6EQAIdv7CcZ2lhDWKiUbXKN4iMg
+a6cnfcIFx+fFy0+/Vf0c45TP+r/nZT+SoY8Ujq/Iks/yxHpRXWt1+2KkrjoJ9GqX
+uZ0isCd1DxUQUGmJvO476UzgBoA874NcgJs8mjgDtvfxoWH/jtGgS7PlBAU/Gz4/
+46MNOjLF0EXvRjmdZArLr7owo8I0fPtXIfskrKdjB2lfvMglT05dQfWIZbPKw7jW
+lO9+Ek6tNwpm/qUN66EYkYbVbAThm7L/qdKl+KslAgEMiBEo0lj5T2EL5tVYCh1d
+gp/U275fazAKi4E+7AkbSpoZ/mCV8f2m9uO2+01geCH2czY9oW0ce3FTL4ovfzdf
+ax/s0YbeCERCcyeMANoTWuCoU40X3Jfq2LHKTxC0qhxx4RAcRoNgJ6oHo7tqG5cu
+7taqHD93QI1F00m5VRg1gMQXfsi8mx3MZTmowVgivQgKROtEokOE/MJyuSyZlFt7
+rbOqW7Cgr1OBYSGC/AD5b9Q07sKcJLaCpi3mIIOW8/MNPFt4rswU305RX4LnHFSJ
+/iK1Q/uwy8XOWWYJvRO97cs3GApsM5rQFHNvmvJ9WzOTaFLM+/SvbKrDe2MruS3W
+FEhNU4Luh+CcxH6BGd135YI6xCCy4n9JxtLCep2qE5ZxkU+MTDPSTM2yc6/0yHY2
+cEFwlUkd7S8T/HzJhAcE
+=pDjO
 -----END PGP SIGNATURE-----
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 160dea7e8aaa..5ecf0208add5 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -22,6 +22,7 @@ backbone of cloud and data center management.
 </longdescription>
 	<use>
 		<flag name="openssl">Add support for using TLS via OpenSSL.</flag>
+		<flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
 		<flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
 		<flag name="mongodb">Support returning data to a mongodb server.</flag>
 		<flag name="redis">Support returning data to a redis database.</flag>
diff --git a/app-admin/salt/salt-2014.1.0.ebuild b/app-admin/salt/salt-2014.1.0.ebuild
index 2c73b7a738bb..82182d0aab4c 100644
--- a/app-admin/salt/salt-2014.1.0.ebuild
+++ b/app-admin/salt/salt-2014.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.0.ebuild,v 1.1 2014/02/27 00:02:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/salt/salt-2014.1.0.ebuild,v 1.2 2014/03/04 19:22:43 chutzpah Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="ldap libvirt mako mongodb mysql openssl redis timelib test"
+IUSE="ldap libcloud libvirt mako mongodb mysql openssl redis timelib test"
 
 RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/msgpack[${PYTHON_USEDEP}]
@@ -34,7 +34,7 @@ RDEPEND=">=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 		dev-python/pycryptopp[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 		sys-apps/pciutils
 		mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 		ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )