BUMP!

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

12 files changed, 608 insertions, 60 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 70879fcb2b3a..e9f316e71c52 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.27 2014/01/08 06:02:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.28 2014/02/20 21:06:57 prometheanfire Exp $
+
+*cinder-2013.2.2 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2013.2.2.ebuild:
+  BUMP!
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> cinder-2013.1.4.ebuild,
   cinder-2013.1.9999.ebuild, cinder-2013.2.1.ebuild, cinder-2013.2.9999.ebuild,
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 6fea203abcc0..1e0eebb67791 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -7,27 +7,29 @@ AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 DIST cinder-2013.1.4.tar.gz 1702388 SHA256 b3466dbc2ea88eef67f73db2b12ec2e8b66047b2bfa0eea31392e155657bee00 SHA512 360d02852b185e21ab59a4006999a1210c23c44f143a2e32b2c9f1a1475b985d302c889a799ae3d1ace2b386c504a768c106bab27ae44715560cf14127133010 WHIRLPOOL 47e8eb85d52880eed8f3612e8784b53f9b760ca7c0a7937bb488bab3d4167d32b7d739f48751c3a582eac4473f71785e1ae459706c952866839302b8a2bf1a95
 DIST cinder-2013.2.1.tar.gz 3500112 SHA256 79ac0767343f8b11c444f775aec505fdaee4689539529d188204d4297d904013 SHA512 b1a38b7a01999d6837f81ad44983c18ac7b61591660f68cf53b2c5ce2a091acd93dfe5c8c1bcd1a0406d6e884c5a9f54a56ec417955cc0b06d68c60b30b7925f WHIRLPOOL 900b63ce0bcbf7fbb31e05c080e49ef7bc25b67ed0f787793ad0c23cc78379817f4a4b1b47c75a4531685432e6407b83e2b348ac9c93abd765cbbb6ce0992d25
+DIST cinder-2013.2.2.tar.gz 3216841 SHA256 caa2b5c1ba0ad434c6406d739d437f25c6f7db2318eb7da1b5a68e773bd9f2ce SHA512 e059bf057c85a93662f10499512e21bc5b09ff63462aac0cbc376a703089e6b59bcb0c06e79dd2879781b9cf7c7e866eba1417fd9af94797258631cc05155d53 WHIRLPOOL 19c989016ed1a6757f2cb4c6c96c39a45e6df350c3b7fc98c12d719da6202be1384d9a728eb75d296cd72d0aa6ed1ea829b5574394b59208e65ed3c74d0bd8a9
 EBUILD cinder-2013.1.4.ebuild 3653 SHA256 2cf7c132329dca4f2f7d8ffa4c8710e0eef407b1df44364709c413f38aee6e42 SHA512 cd9f8b4d2b5e23b828627725c54e755da7999f6821a95738cc474cdee4c9d79d68c32d19cebb24f6c2126f4c1b336d5f398e75b3742caf264d6d572769d53638 WHIRLPOOL 8e124102900ea2229c48febda7f5604195f94342db67192e430d20f496df99026c2cf5a83b3012c1e596e9915b3b70fcf7579331886269a766e0197075024f95
 EBUILD cinder-2013.1.9999.ebuild 3599 SHA256 92bcac75df4fd773d7d570bea9d405a79b9359e9075cde50198f505a6133f8a6 SHA512 c0ac4e1f44baf5c916492367ca2693f9fd61b7f35b5edd362cd8bc43e41c7759e43b81262b22ca95f8f6809c73c1838352c2c004e513a6af06e19badb8f4dfe1 WHIRLPOOL 03838809db8f54b71b835c19365b928c42ca78c1a52d704662cac58a4e541c5078c8241c656ec2d1e7b64f770d6dc1f1217c6a200e8ab975ad86d9a4cc887f84
 EBUILD cinder-2013.2.1.ebuild 4748 SHA256 a2aab7e3242f1c477574abd907dae44772d165963108ae660996e91076b4fad5 SHA512 b8f0d2f9281df98a5e10fa8951c5323111f9dd32222791c6d8ced59ee1e167bc520e3ddfe7427e13b082b01e2be3aecc57ea9e28f2043ea26dad83175a8ef321 WHIRLPOOL 08347a6eff3dc8cd2a323bc89aadbe4c02033a81e637ae6c4a834d5d639ebb5c009f8ddd6ace0908b31c4a5d3f9ea671da426cb9eeffb7a70214a9e3782bafc6
+EBUILD cinder-2013.2.2.ebuild 4756 SHA256 eb3583f200cf69c732bd07255e401fe25d7f3c8e69dbc4fe65d3bc09c222ae7f SHA512 1df6c38945ec6e8f150741b51e572aba60914eee73ec178a41466bfb5e99bb3bd843ea616fb303efc92e88f3018b621db96e0bdeb49df014e5c56cd0a683253f WHIRLPOOL 71ddb560122ac3974f90bbebfd082e1be62b33caf7eb2f1283b450775d32dedf5599bca3ab48a0f22a463be57cbbcc2022d7f635e65eb443d65547e92c25744f
 EBUILD cinder-2013.2.9999.ebuild 4758 SHA256 7c15922c302e1b9a8c26fbc557892fd3a85bb23f18e877fb54b5443de069af2f SHA512 7aab183590ea0f38a13a94505dff770ee001e8e422f60c4178a61f9f997983cdfbdeb101cf837d99a37911648b5781b4f0851cb8020c81249e1dd485b58afad9 WHIRLPOOL 2e310912d350140d968694819052d7c70c4f47a5f1e92bb529699c2db10ab45f54127f28e703ad226c720a7feb0c80ab8e338db5c1dfdafb3325cba84dae0950
 EBUILD cinder-9999.ebuild 3651 SHA256 ef4e69e7dd8f0a7dfe1978f31f38e5c3a668f58ef7af1c76a78eda399c7dad70 SHA512 4c1d88905c4394f2acebff85759987b94e38a79319f9227096fca94edc3eb56810de742874060b811c3f61d92fa01e35141445bf78afdfb925f07753f628bd69 WHIRLPOOL ebd9e226babd7d5820c16a5b201c04daf9ed29cd6699731513d93f27caabacca13a59797a418a50271e6fa8ddef5e699322d1f095eb3d598fdbf3c1ad3887b4c
-MISC ChangeLog 5434 SHA256 73ec60b3aa9fdeb23b0a8e3aeb97c474dc8586acfbce38fae3830b05c30e7afe SHA512 0b98f9d5ce58227abd10c828c3d5aebf5b0ef190822fd51e5843552e7ef7f777fd645aa89c40342a1014f32bc2b44cb484c1755d1f31c9fb809beec3f3c99644 WHIRLPOOL eed7041c033a47eb568985d37dd0fd85ecee75a70532b704e10acb35408aea1db4962a89ce81b5f0b5924c00ea068cd1b67e4fe585688abb1c9cd5d83d6646aa
+MISC ChangeLog 5567 SHA256 56b8503d0336d5e2d2bb986d0a62622a378205078b588179ba01a22fa41cb88c SHA512 b6f27ed44236d8ad3238b9ffc3038b47b010f188c08fd46e1a1bfeabc084ddb73e6a7d18193931d79f0a5fbdb8174340c573554059ffba7c28139728b7bd9616 WHIRLPOOL 4c556333dc23b53b445142d88a2fea1bc0bdc86be8b3e89e3842d7547906800ad3d59a2e47cfc15abcae2c2f8a5d7a380ee8d2f60796407cab96dec18e579357
 MISC metadata.xml 661 SHA256 9621b252596847dcd9bb85787c8659a9724f082a4fbbae416fee6109a32ed379 SHA512 50232b02941c021dd6400937eb2d74e4813f576abdd7923b622b84af0d04dcf0367e6de9d829f457988ef57732975d1662c35eaca9e0226cd99cb9d52ce06df9 WHIRLPOOL ac55bae82fb59b42cdd9a09a71789a2b19eed96f65a795fedcad5718e5bf26161f2eb3ce133a4316487088eddd58ea0533eaac87679ca88ed1dfca3ccace3c66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOoJAAoJEPGu1DbS6WIARlgP/ijTesTSI63/8205EKjj1UMN
-J3WQA7dcA3QfK73PQwHnDe/KduFF6QAsXWSwlf1N2Kr34TiNHn2B48KaBPWNuZMn
-T6x+eEzdcpODcKNdgObT2W9wIeWxLG3F2LcAD/2QuLDvnXh996ovzBlW3B2f/Ku2
-b0JTgLo+C+3P+m6owix8Rut+nB63lptUpzrXGomJVVC3i7Mg5kOjfpGXzKJGUIHE
-5Uhg2isUu5TOToNoD4YSt2yRKt13DzFBtShpTP+xIoFLtnOlKTXvrFJih/C3nB3J
-cckNPO1UYQUx7nnCB2M6+2peobRDT1m633L+oi1YJha/52PDCRLFNkgoh4znfFGe
-qjHi4GUlWPL2qMAuh2P112o6dpSEu3s5bZvWBabqGF+bWWiK2seATbLFnTNVQ0G4
-F2gB1g3atFoMhl8d+t6JpQe59r3betUPFe5B22WMcBH70dIf+dHH393ISaOV4tPx
-v+BQI6qyGAqW4YeOXnaKgoftDimQRqNtpvmsuGtHY4zaLvikLnAqvce/WSvjUYCI
-6m1v2+O8HSd3F+Lm59qg36Hs8NZs+oCFIstLLwjxoztoD4M+3O5Ax5Yv/qbo87Dt
-Ew5HS6X3koh93RSxKLLAb7zNYNUDC7rfL/cVMNLtvpD/wrqz2kvVFqWlhCbggJ6l
-FR5lmL5Cz5OCb/DaTatE
-=jGjq
+iQIcBAEBCAAGBQJTBm6CAAoJECRx6z5ArFrDaP0P/iHGXC8nW1PbfDy4WQH4SvrO
+vYizPSxu4pKBjR0jPaEbiM6Qftval/izguXktMTgV7UaqWuh8gLlj9MulcmvIcu5
+5VM9CbaCYUykGfyWxq9NhyPsCk1SLdPtxdU8wpZAEdStUlmTNKONvKW4p7uEQ9MR
+c5RC1RXY7ZKhMI1B9Vh+jaG+106T7k4CA2ZkyQz4IT8es7MgrqsMRvzrt6FRsnef
+v7Y4POpwm7Vl2ICoTdcgSFnlQmrVbJgwo3PAT2MtltDhmeQ6FYSCC0cFJOfWk5in
+Wlbl9JEAb5dTLbSF+2ljYYiSNXHbTkIkXqTnGyxNW1kAg+OdtXrnJfYcSSo63kXg
+S15PcWWVzYZDRZgGcXAxYkJE2b9z+0x0d7jo1JtZlGH3cntHXQ5gVpCcHFpPELz9
+KFyTg0Uy/egkYEydpsPGKDEOWjaF+CCN4OeSFFCnFFvFY27olv4r2K4aTCQ0Pld3
+FiOHqdvukTyPSmePKC1qpV2UlrAYk6F1UYXT0BvojDHNIMlWuc2yhv8P1QNM0mWh
+AOZZHwoKO+P8SaEyYaEcvGkkSBy/Un8Fd6M+DOlsXAsj51QJR/1DVGv6KEARm4WK
+WCohYpZDrmu7nJ9glAB2ugSdGTb2rN27cnGqP7Yctmp7kIiCnBRYIAPYsdEOypbb
+7SPoZhD8BWjqWm2kpS39
+=fGVU
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2013.2.2.ebuild b/sys-cluster/cinder/cinder-2013.2.2.ebuild
new file mode 100644
index 000000000000..df9e8935391d
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2013.2.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2013.2.2.ebuild,v 1.1 2014/02/20 21:06:57 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes."
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume mysql postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? ( >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+			<=dev-python/jsonschema-1.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			>=dev-python/hp3parclient-2.0[${PYTHON_USEDEP}]
+			<dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+			dev-python/subunit[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+			dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
+
+RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+			<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=sys-block/iscsitarget-1.4.20.2_p20130821
+		sys-fs/lvm2
+		sys-block/open-iscsi
+		sys-fs/sysfsutils"
+
+PATCHES=( )
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+#python_compile_all() { leave for next attempt
+#	use doc && emake -C doc html
+#}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+	newinitd "${FILESDIR}/cinder-init" "cinder"
+	newconfd "${FILESDIR}/cinder-confd" "cinder"
+	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
+	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
+	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
+
+	insinto /etc/cinder
+	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
+	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
+	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
+	newins "${S}/etc/cinder/policy.json" "policy.json"
+	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
+	insinto /etc/cinder/rootwrap.d
+	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/cinder-sudoers"
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+}
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index fd2c09fdfb35..7ec655ac73a5 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.22 2014/01/08 05:57:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.23 2014/02/20 21:10:50 prometheanfire Exp $
+
+*neutron-2013.2.2 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2013.2.2.ebuild:
+  BUMP!
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> neutron-2013.1.4-r1.ebuild,
   neutron-2013.1.9999.ebuild, neutron-2013.2.1.ebuild,
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7935fa86b886..5209e8351b41 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -10,28 +10,30 @@ AUX neutron-sudoers 88 SHA256 bb631691e67d9ddc405fd1f6a23b066120ecebfbf3a48bca75
 AUX nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
 AUX sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
 DIST neutron-2013.2.1.tar.gz 4397455 SHA256 7deb45fcad21a51986955a06fbf56565b3bc8b41a2812d9ac53213051964c208 SHA512 9763e2d43224e3cf3804723cc38ce86ea61062cf603f92965d732027301bed30b250f0ef373aa90b521758c78c4f13ee5d6986b7e4bf5cfda20d40cff71beab2 WHIRLPOOL ed29e106d45ba19ed673df05c44964493cd6a6035218dad644f9a5e1af0c067baa02217220799a65a0d8d2761d86fe1be53a30e53c5a2ea849fc321569bc6e92
+DIST neutron-2013.2.2.tar.gz 4010144 SHA256 3181d76992b77b47b02f43aed1b62b17930d1aedc75bcedf3e328268b8727243 SHA512 4359669f1c94505d7cab55dc224d0ab6fd36da57a056ced3d053cadc2d0e54a45d3f3daaa332a49dc0ebf0efd855b521387697fcce75997dd0e3905fc0b83cd5 WHIRLPOOL f5fa012dbca202308eb071fb0c6fa5351f139d3233a9ea6a5ceef8c868d47e92133c3cb23e3c6b9c6a3a69aa090eab9bf659c84c9eb39886e36294e9fb014068
 DIST quantum-2013.1.4.tar.gz 1178442 SHA256 3bd26ae7dabe6093a3cbe701ac8d7022fbdbe1d8231ab1c6866de388684e272c SHA512 48ce3aa8467eefe4ef07b03dee293c7eae1800736abadd56d0bf7b559506044bea3fefba0dac6fb20783f808baada70c52ebc388137ae80b41271dcde824243d WHIRLPOOL a5456fe6fb48192a4f4d97c85b7b235093f549965b36971802302998de7d8ed76fd7f393a659371b8057aafcc4594ac246159663dfcdb5251c786eeede6d66fd
 EBUILD neutron-2013.1.4-r1.ebuild 4655 SHA256 0bf835ddd6e7c962a6a896f92a7ecb7d320c1ad3b6758adf09426ed1670fb164 SHA512 bc16d7fb062243def0a72a4605bf13608374727333466277c882068455c7c156a620b012aae50ab4256d60e9f9d83d7b54d0ad21f4dbe2d2bc78a55c6f48f3a9 WHIRLPOOL 88fe15fe93a79eff87040ac91b9661806fc75f3c120bfb9ab8313e7cf37b71667e16d3c7aaf2bc7398490e95045e49f5bc7f002f04e5d4ca6e79b9bb362f269a
 EBUILD neutron-2013.1.9999.ebuild 4474 SHA256 325a48eb9f212eb2603ff2f5942f9dc34fffbad1a296bed6cf1b65afc32e40ba SHA512 d80dcc568b657fa7d25748213970dd5306c35ff0a1f3d32087ae78c469baafcb9844744d60db8595cc5afbcea8bced5087fa889f193f63870f9ba2287011d53b WHIRLPOOL 0874a425eb8e6b8ce1245453c1e095b6badb8a53c1912f05a9ffee5a4774f1e7e9e75b59793efb5fd2cf59b5c39488fd28bc86cce5aa910389d432f4119ffe75
 EBUILD neutron-2013.2.1.ebuild 5688 SHA256 a323424e8caa3d45cf083092f8139499957a78cf61c8d405a78a6e638722d23d SHA512 12f65112e8607f292bb9fa33eb57d4550f7fca09ef68dba9aa9edafe63a9ab684908812ada7dcd856a0ff6b73724543f96233046cba73650eb99d12a5526c3f6 WHIRLPOOL ba2e48cf514d62987d5410e84df6598bc62318e31b47f6a3605ca32edba3f6fc66415d1af828624c09fa1027a64bfe20e46bda91fda0a88fd7c828f398ce2036
+EBUILD neutron-2013.2.2.ebuild 5696 SHA256 bb96184e45e89c973c4e755981d8fe5f5c737f48edc4ef8fae683652e9206c0d SHA512 6afe633a4ffb6a7ff76dc9bb9930db9b43199d6092419e14489eeda0e66734319e51c448ceb6ad154e356dad091ff6d20500b84239806d46f6589254cc5143ec WHIRLPOOL 0c2cba7b5267f39f3014faee1adc731fdfc17503740be94e590065510f332172397afd21d62554d25ceb7d851226dd059a2760be315de05cdc472e3e49d99bdd
 EBUILD neutron-2013.2.9999.ebuild 5699 SHA256 eca1d474ea110482cc901ada794f72efb495de226834b11a87c005185af7bb1d SHA512 94bc0bf14894f20772586b7f19694f38fba9654404c6b507cfa9e483a90df166e32f6ab1db04d24f5a0147438fbc8f4def248d08101fec59d2849744bca5dde9 WHIRLPOOL fefec821fcfb38c3af2d84e961816486b86eeb2419ee33d6353991f6fd7fa710e5ee183c2469597850116028560eb67dec1a8ab17d471dd3b5aff3ba2523950c
 EBUILD neutron-9999.ebuild 4409 SHA256 7e81a4614bc6813ac6c71f330f02afdd4986de592bed8deb9ff662823f349b97 SHA512 cdca470997f7b31d5f99a682ae21f22870678437a1bd8128e3e7140589b3b6041f133108fdb3f390f8da768f4e131f327000ee3f3c7adb1bcc7332e038adde9d WHIRLPOOL 2288062acc8e99c6707917fc2ff80bf54ebf736cac1b3158b42148c6575e3f23c01257383ac030d75af9d0dcb422486bccc8f0d564c6eb805ff5c245d3cbcd4a
-MISC ChangeLog 9081 SHA256 f0d7c555e4bf72402d6d63b1a7d6cec682b6e2a881e99f798f9a66e395ec0f59 SHA512 0a4b1c9188b22c669c2a62a2126dd276a3f8966debc76f5e3ff5fb7b61ee7a936e54fb48045344b82b78bd6a6d21e41412a968958f24792537d47f2bf10ec9b1 WHIRLPOOL 28fdaf728a43addb02e6c30b8e6db9f5f229fab01a9b593a09a6632c883912c49fdd714fea4b208b014e3c663f6508174b4560c830f8cd691bf5b0bfd4bce296
+MISC ChangeLog 9216 SHA256 e1c1d3d6a4da6bc409f85f6b3ff7f8c2e0d8625c0ba65c9c28e5c7e15086985e SHA512 2b09695a3b491139793baed4d833738806fe2ec4cb408305a405013224f20ba9a68657087a22958c580d47be8a5c276c0e0c8cff480073edfc1e0e32556b876b WHIRLPOOL 0b4040daebd8c6f31f1fae283739a52f62ab6516bdf7a609b40d9787d4c21bf5219ea9cf4e970589d0cf5315894a1eb2b4cf0cc6eafced2375810f470c1a8143
 MISC metadata.xml 1175 SHA256 95ceaccefb744f80032d97a4cc13c43c13d7e4116d6810d5779df5be3ebe11ce SHA512 74a46511f82bef78397bfaef2901606c6f468f532bbd7112fc8196b69362a4666fafbda8023a281514ada958cd2b4ba567f11dfa071d0b76bc94e456d96ed287 WHIRLPOOL 783aa30c05484b68b2a8f1ebcfd39294a21731cfa9587c0e1cd07ff291416d10912066e23c0572ac63a125f9836374c73b91775858c863abb0779eb13356ca11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOjSAAoJEPGu1DbS6WIAldMP/1tjFJxsNbD5h+ahDuMQyAaA
-u1B8B1fdmKuxGZLIBxzaTiLSnG+KTQ2uQYRKusZj32dAr6qcexh8N2DWq8sq2jgO
-f5jmLPmcjcStihfMXQNUTltQ76yORXSvSuO/L+Fbv7DdM6wDCyrIAr/Yyycq7L7O
-695fik4B4LEXqDfEAIMgS1K0QYPi13B+E8/m8z4QJDZ62JhQyE3u3JYlDl67qeN1
-yYPHqsYmWuA1VfXH2rRrOZDouA+MSm0tTKA89aIpHba7Ensf0Oeekw074ub12PFO
-5nyqln71v5J4YaWfiM61tb5f/+a2Vr0xKlmQqU/ztKph87e8YdXBDU01MTZd/MQo
-1bwbvxQ9e+PA5xRqd2tWD6kMazecAGncbQsf48kogyrfzCD3icgMDI+v2/21Bpl1
-7ZGYy2MRu7a24VdEHj0srDQ4jkAetcyNohfSFwSqNMbABu3nS0KkvhgG5vUVcsF8
-39JWJhBZB2/4MXR6ObL+/SWC0GshoTmNDMFOWE6tVRHln4zY73IvmrRFbLaQa+rC
-PnNWekOE1l/yCIxXrv/5SU8FNVhJPBwss44DPUggU7xJiF+//8R2X2b0gsw7IuSC
-el2vJjOVHoeKtXLIfiHluYKHiSVFXovVrmgVEfaZYiryBh1hHbP8Usf/XJqNyX/j
-Ih81ddTSm/ATewRjAPLe
-=Rhbs
+iQIcBAEBCAAGBQJTBm9rAAoJECRx6z5ArFrDPuAP/iFvPo6Hw85K9PXyYZumPtQ/
+AiOdUOYBAqA1LJojEnO79DlKOEcW8ybr4OYrV+BP7GrgzaKrGKw0C3YZgdXv8wJs
+gZgvA12mMXb87s4dqxAnh9G+Fl4zFuXkF/MbFyzoaNZgCQmdja2MXLTCSNlD6ly3
+xLgaee0oxLfhtlrfE0mYxm9ycgmC6CrdtnQ7R7JNdvwG4R0uAf7s0Pd4exKNifXN
+lt5cM7RTGY44fyFrtkbsPZtGL9AEPIGuXCcg5fQ2FatPP4BILd+xMIsUiNN5evdM
+BBIaa1DWae4VWPJzNObnBdLOZ1bvRbUWtLhY2K/+dyzF6ZWqO/PLc6eMIngR54Tu
+1LMj2chi1zMGrwPcNiVLRStd0wJYbv28P4IhqbzzPaV3CzN95+ESY4G1XhODKse9
+c+Av9p97aRPilJvJa/FHjPKWu+b8Jzj1mhagRzgiEE406VbCNFZI4T6enMEdg0ii
+Frn/mo8mKiQdn1mhO2hJv6FF69iDyQAf5jGqpnm3iqT6YiWa6OA9YuAeC9JiHlQ/
+PHl+U/SA0vDDrDxaymA3OHjYifG4E1R58+ajQJu13DqGuoR0vraXhH6ytC0qmxAI
+jiJkdbbYXijmVClQDq9SB70uu9rkgNYoRY/wcC8xWYO5wgUlwgX12ExVxKOEfTeq
+iThdTHsx59MPitO3tGSp
+=ToJZ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-2013.2.2.ebuild b/sys-cluster/neutron/neutron-2013.2.2.ebuild
new file mode 100644
index 000000000000..dca0a0a47d19
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2013.2.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.2.ebuild,v 1.1 2014/02/20 21:10:50 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="A virtual network service for Openstack."
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dhcp doc +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? ( >=dev-python/cliff-1.4.3[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+				dev-python/subunit[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+				>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+				dev-python/configobj[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				dev-python/mimeparse[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+		>=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
+		dev-python/jsonrpclib[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		sys-apps/iproute2
+		openvswitch? ( net-misc/openvswitch )
+		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=( "${FILESDIR}/sphinx_mapping.patch"
+		"${FILESDIR}/nicira.patch" )
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	#it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "neutron"
+	newinitd "${FILESDIR}/neutron-initd" "neutron"
+
+	use server && dosym /etc/init.d/neutron /etc/init.d/neutron-server
+	use dhcp && dosym /etc/init.d/neutron /etc/init.d/neutron-dhcp-agent
+	use l3 && dosym /etc/init.d/neutron /etc/init.d/neutron-l3-agent
+	use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
+	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
+
+	diropts -m 750
+	dodir /var/log/neutron /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+
+	doins "etc/api-paste.ini"
+	doins "etc/dhcp_agent.ini"
+	doins "etc/l3_agent.ini"
+	doins "etc/policy.json"
+	doins "etc/neutron.conf"
+	doins "etc/rootwrap.conf"
+	insinto /etc
+	doins -r "etc/neutron/"
+
+	#remove the etc stuff from usr...
+	rm -R "${D}/usr/etc/"
+
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 44ec415afa41..dbb23decacc5 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.49 2014/01/27 08:44:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.50 2014/02/20 21:15:02 prometheanfire Exp $
+
+*nova-2013.2.2 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org> +nova-2013.2.2.ebuild:
+  BUMP!
 
 *nova-2013.2.1-r3 (27 Jan 2014)
 *nova-2013.1.4-r5 (27 Jan 2014)
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index b591936f2fa8..3ad76f0a5aa9 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -16,27 +16,29 @@ AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087a
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 DIST nova-2013.1.4.tar.gz 5801779 SHA256 0491ec81552b9c407021941ea1c477d5bcd93ec1dcc66d5fc0c1cef594dac760 SHA512 de1addcbc4577c4a376d8762e44d6f7c455bd63ba0be9d8a6a7176ef7a24e85f2bf9014e31d1180e42e48308ee6a17dcf039da2739388501a5fedbad8e5a7f0c WHIRLPOOL 08898e55b7380bd1852c00dcd8e03d4eb06c8c888688d66ba717842929973235eb9d6d34dda4be2700f208a7ff9e088de2690a74acd97f5cb6b81bcce743ece3
 DIST nova-2013.2.1.tar.gz 8937179 SHA256 b1a4ccb24d9a55b7ef0edc1a2b4ba374d52360a1f41148c92823787e8747401e SHA512 34b8e05128e000770731c63c4240071b8a764913b42bc9284a79af3d76fb10d6c825ca78e490762237a8ee416ce04a9a3f0c7ddcad54cb6830fd6376851d050f WHIRLPOOL 9a54affc20c10d88f0f559528b5d24ce71a073b90d710b7d84be53d150a2cfe47e766a4eda3638620ba8d7075b7f354af1ada2489eb04f8d18cdeb9cee5d5016
+DIST nova-2013.2.2.tar.gz 6884905 SHA256 203bb5f7b773006bfbc4a946ae00e899896c27a21e73d1e4103bacc55bb83744 SHA512 6a1380204a22535a42c38f21efae8cf306d5d1c34da7997a1c9b3aebaa815c5e16d9cf6626e72575bbba3bba9dc93512ddc43a3f2d5bceac9dd518f409e9f14f WHIRLPOOL c620184e2d67e4ce726011ddcecc17ffdfec0e02934209feff891c3782c389cd9607ec393a9f3edd95905ea1da1ced18b9867e13cbdfed3a59a49d8336ee1e5a
 EBUILD nova-2013.1.4-r5.ebuild 5512 SHA256 21e05c0b067c81e408d4edee1060328f23bcd807a850fd7eed504562db070949 SHA512 80b1e59d946ad29fbe5ff4fb8269a143deaba8949b7c39e9167eb0288f9d587a5161cf7b369b491fc735353d787bb2cd572dcb8fe374e8df79a2ba1f587ec9b4 WHIRLPOOL cb1cc492ea255b0c61f904497d8d2b058221de6263926a2484c73ef41be48724410cb6268f49a85287275c6bd20a5a5523fee5240ae75faac755242e21805585
 EBUILD nova-2013.1.9999.ebuild 5070 SHA256 1dd4815b62e7290b24f0a6ebed20b388546d1cc143fc9ee3ecf1fc9a572188c6 SHA512 d75b2d6e7c100b86627f06de5d14b9094b3074f8bf758b5f9195f5fd589bf3bd0fe6a5d0ac9d1b74e604754b905f9e2020c953631da7549156de6b50bb273b09 WHIRLPOOL 83349cd2a1d59d7faef7112d786e223dcc0403664ce763cfb8b793b1ad7fb2d68b33dc1134eafc9cddccfd366815013e578e992080d280d29239e33cfdd12e46
 EBUILD nova-2013.2.1-r3.ebuild 5223 SHA256 dbb4782a5bb5ea79331a80add9f15b8d15fb5d1a58eff60e2d33fe8d57eea7b1 SHA512 00e9fc3f31aa224b023c272b63affbe6a83143aa0f51acc4c95eefdc6c51fe0b6e6821476e956a1071bae693a1587f21b093bfc8cba01401ec45b1472146f5ed WHIRLPOOL f4f94abc52b465ced44d189154a23c739dde9b52cc2da49477d0bd627f62574c9929db5f73cb8a4f4ce2a23b77beec8f78e958f3040a23eeb6847a741435676a
+EBUILD nova-2013.2.2.ebuild 5085 SHA256 fff602912b2f955ebe07edce0331bd463da44e95fbca3c2dccf8d0d18542d7c1 SHA512 748aeeb6a1a0045e5dd5353e005ed41a3bb79ab42981a5e96a922d76bd4f71366e0c76edafa60c81894b802bf2a4e9eceb6b5f606f004c6e992ec885d33685a3 WHIRLPOOL 9a5ffc57f6f6324a96fa7e4b14254ed42badf6ecf9b8bffc1b989eefa38d5ec85613e2bd08a7cf3fdfbc7d8425282d5b3d799692e8b065df6100277d2d461ec9
 EBUILD nova-2013.2.9999.ebuild 5086 SHA256 9a7a79415aa6c5597a7eaac6967c9a69e917c183dc6424f5eaaed42753c996ab SHA512 b964c5fe5caf221fd00c94444470b3c638b504352fdaf48985784a157cbb1b71379af34e10bb9977da99dede7e6eb67e3ceb8d40bcd5b570639d609cb710a724 WHIRLPOOL 2088fe0677075c2efdaebdd9a5295146daba5a2f1bf0d3bd85c24ca891564176523a324445325e7b7f2019c7dfcdbc2cede820b89fa417746fadb2a0796a0f89
 EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 12030 SHA256 7a0fe236a97b54eb8d34d33918c76115840b59484e3ed93b5ea00f430070e4de SHA512 1effda4e7cd0f8d5c6c05621391e23035810e034343a60624679bf702070ec861fb8f647350c229d6edad2497596c75ad9c5367783cdac554132f8513733cd67 WHIRLPOOL 2162254d2086c651e31f8fda1f005eabab7737b7230c4ceb5250793547751ac0ecaa48ad0f8e62e2f0d9dfc4fe286ce5f1b11f68ea79d7b2567977ea53202082
+MISC ChangeLog 12149 SHA256 b0afc4f374c9291c9a78bef6f4035dbd98c53a08baf1cb91d3eb193f1dffc945 SHA512 07645653cad41c0b1c45bc3764c06c14a1e5d8d3f657016b3f890b2dec3f7cedb80f9825cfd030d12deef35d430aae55eca6a3eaa95f091f1a4cd1b019f7491a WHIRLPOOL 845ec8412574b86f9e3ae8f71fb1a13a214a5cd18f3f15d9cc61b3e263f19ec46baa91c0422993fa611ea8fe57a2d7cc67b974b50de1bfaa3e0ea1aa9e0db1e6
 MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5hy2AAoJECRx6z5ArFrD2pwQAK8q76E2QvcCpmweCSEJZHno
-scmIlSPyThBPReVHjiproB7gq4XzxBx9o5ITlTGNZmZ7OGS9F2/HWtec1P1ANu9R
-4dhtAt5ih/A1B3T49aetChJu4mLX861h2//lkxyKaGB7FNnUqPpw+OA7NNBKeE+h
-O0xuwgfL68aGwTmLf/Moz8h8/HvQM5Sb2Znid9AfW7fjwE2jyPBIEI91P7LC5MTQ
-7dMYALgptR02ngr8f23fHikNSqRh4eG2v4+Dk5BEhJGGAiqJfUktcmmXeHi+bKZJ
-GymOU2xPBsq0kULi1szyPSc04JlRwBVsIWzESQQly1DSh2fomLOtmhvGrngXtUMs
-XbUkb92mWiNt4g+X4Y1s2KXWmceejaZVQ0DVgMinitjNIt7FuuOrVx9pi+tdrZNd
-7l2QaXF4tQVZP7Bt9l33IBsZsjfJ+4NfeOsm5rzFqbXB2seNMav3lE4G1gcxayv9
-SNaaA+y5kDtwq46DEwmW5oQO7lQ3VsrmXoC9EOm7PwHe+ZJQNDCWaWlRTwrq1FKz
-UReMSPxeHuqpQqEbms1s4xP43L/okWP5WNuq+xD5ajrwwugAq8Bg4jCLd3D9xoCZ
-spDTEQX6URpPxKUMji18DjXLPlHcrEv+PRFcU4eMzXNFjEGN9e+L4rqKPvJA5SIc
-TcQ5cbBBOtNZ7w3PB9ab
-=zOVi
+iQIcBAEBCAAGBQJTBnB2AAoJECRx6z5ArFrDmZ0QAIGYjrW0HEyMa6Fo6rzyLnUN
+gVzhcNZubFizuR6fFlaaA1FtMAo7v/FqYmq+tysX1lyj+gmRvf7RXxZnpr3+8LSJ
+YrMKMAIgCa13y3m5cAxVsgFf9loNhJ1qiDBos5bRYg31YzN08sFtxYtI+Y03GxtL
+PlNYBYBEwg7kd0E/wSVPwHHwF6S5LmuKUzNyC3rwAQY232SflpJsOHlopwvyGBLI
+FesjpycGIM3tItoVGYTOjKM0nG0ZMPqQShMbQbS/3WbQlgt6vJSiTGHX6L24bflV
+UO3+ycuvDgl8gRIHxAFvrqzZhVGym8f6c1J5CRzaOp3RVb6iJWeQ5dVGFhCrATPB
+833Q8t9vPggMhzzt1SuBm+nukeghNiOoYf1sb2tWIMsX9dHNyIJkJASDx+Ji5MLj
+KvrF1ol/W6Op9uyYqOaXK/UiIeLfBjPlalkmjYy/xdhF02/hYtdiWhTw3PwTsvyM
+1D6rPtRBeVp8Qa9LDC57z9J1XM8ajtxGNHTmo0VGeNbxKZ48isvMu8ndAzFFOyo6
+mRPRff+rvQQ5qpclcyCddgprfe0J+71Ssh7taiGnYyWMC49v4CqGEFO8kFE2u8mP
+GUiH8ZZahUsWqM56BKQHx3Y8NCNMiBnc2v/VAQHE4whDEFfb7oXSW1pHH1GLF0B2
+UCG0AjIpIv5XB8NfdvM5
+=nLG4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2013.2.2.ebuild b/sys-cluster/nova/nova-2013.2.2.ebuild
new file mode 100644
index 000000000000..25d94ea03322
--- /dev/null
+++ b/sys-cluster/nova/nova-2013.2.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.2.ebuild,v 1.1 2014/02/20 21:15:02 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib user
+
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python."
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
+REQUIRED_USE="|| ( mysql postgres sqlite )
+			  || ( kvm xen )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo"
+
+RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
+		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
+		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		novncproxy? ( www-apps/novnc )
+		sys-apps/iproute2
+		net-misc/openvswitch
+		sys-fs/sysfsutils
+		sys-fs/multipath-tools
+		kvm? ( app-emulation/qemu )
+		xen? ( app-emulation/xen
+			   app-emulation/xen-tools )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/nova-confd" "nova"
+	newinitd "${FILESDIR}/nova-initd" "nova"
+	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
+	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
+	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
+	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
+	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
+	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
+	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
+	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
+	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
+	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
+
+	diropts -m 0750
+	dodir /var/run/nova /var/log/nova /var/lock/nova
+	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
+
+	diropts -m 0755
+	dodir /var/lib/nova/instances
+	fowners nova:nova /var/lib/nova/instances
+
+	keepdir /etc/nova
+	insinto /etc/nova
+	newins "etc/nova/nova.conf.sample" "nova.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	#copy migration conf file (not coppied on install via setup.py script)
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/nova-sudoers"
+}
diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 7dbd395f73f6..83ce2f3ba33f 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.24 2014/01/20 05:41:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.25 2014/02/20 21:04:11 prometheanfire Exp $
+
+*swift-1.12.0 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org> +swift-1.12.0.ebuild:
+  BUMP!
 
 *swift-1.10.0-r1 (20 Jan 2014)
 *swift-1.11.0-r1 (20 Jan 2014)
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index fc4b12d73b50..ee461ad4f239 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -10,27 +10,29 @@ AUX swift-object.initd 989 SHA256 19a252739dca026435b0a861eea10ff76c22a41ec71d94
 AUX swift-proxy.initd 1505 SHA256 8e1ee2051116e869f5e51de426d640c7f57278f1fc2681bd80ec9393fa834c92 SHA512 a030a5b8ceedb69f89fca93abdd08d9f527d2789ed9983f7cca616b4a318176f84913e1d01ed09d5a1a9e55bd0d697d501f5698ea5b3f8ccce7f76b95984dff1 WHIRLPOOL e8653ceb1e19fead4b0941d158661fe6e81d66c71f032aa1be7aa56dd839d43a82adb090a7e509142bfa9a341c49fdf82c8f86e3a9159be63b538b588cca6e66
 DIST swift-1.10.0.tar.gz 660633 SHA256 9a841225c3a00a93a15a160102d3f7116f2f1ba98ebffedfe641747844e14889 SHA512 7531f0c6c06be9a4cc2242a75140845474e176994667b60adb356945c78dfae4993f65dea55789735ac6e5a940353fd5188dab855a0fb91a844c5d26352efa68 WHIRLPOOL 63e7876a61010b3d14ad3b0703a8e1e8601b9824deca1745ac45e840fa9ca212269f5b7f24f2285bd65e2069f09be410d11d71eeac6df4d0204612f8c0f3d6e3
 DIST swift-1.11.0.tar.gz 712263 SHA256 d22767a417bdf9837df194672fc8f1e7eb8499e885f144bd83c865b2f95160c9 SHA512 265ecb5bdf5dedad68a7dd4860333fa81e14f4a16881b8d249ee848c543df5494628ccf917db0fdc37209af7333ecd15fd0faf99d978e097917486b8cb1be7be WHIRLPOOL de118849e0ef1e652368d23c51ebc903c8cd557fc05ab1d35a627576d28563184189c2fe89ed337e88e5d04680fcc323ca0dac1b3f98d762e54f97f2540829e7
+DIST swift-1.12.0.tar.gz 751007 SHA256 8ca450e747339668ade6b62b78c4617b2f7c5ff4c4b9f7b3cbc48779b8dfaa3e SHA512 1b16ae1c93af129266acf49f87adaebc78d28fefae5d99e55335c74339da4abf933368287b4bf48a5d868838e16bdc565b2f807d0bbe3952d390abcdb98dc5ed WHIRLPOOL 1c09cc33c7b421c829be957543d9e4bddbc49f191be316f8b9e6cdb1ce96c900c306632ead49ae244bd52daacb5a1a305459cad480fad174abff064114f96514
 EBUILD swift-1.10.0-r1.ebuild 4136 SHA256 59d3ca28d26370608950106a1a288f39fc58b24986f177a11e80ae087fcc65a1 SHA512 1803834c9756bb5987547d553802a155803274eb5856f10683005f9b52760271dec2e690d8c4e6e122e1c3a4072c060c12f107b39c72d8e24364cfd3599de68f WHIRLPOOL b9606a1be2f6553f7f094697cf3d2774d691a6466a4470395a81445187b2f59cf72d4a2be0f7d6f0e5411c4c16b80ac95ad60292635e87c495d60c61005564d9
 EBUILD swift-1.11.0-r1.ebuild 4139 SHA256 001684f2add182a100f69b12275598ae6ac0388036a34fdbc711f9ea458de071 SHA512 9dcaa0d93b69c10841465878955e4876537b819fb6d477969192ee40e06e18820b34a1c018d68fcc23615a0389482433f1808a463b493ada840ef3ea4cad02db WHIRLPOOL 29240ce9b05f35686527e84294d0187d6b600dfc4e0ff5cec50f467d73f9d705cb8c59985cf497f23aec8eb30e8a4de59f10756ef3a9818646f59f00d5c79b80
+EBUILD swift-1.12.0.ebuild 4182 SHA256 66978608aee2828b94bd60947e92867a4cb1bbe9894f293af1066d783bbbd540 SHA512 b02b982a1739e37b7f6d257a11a5847ccf88702a9460152a4c53fad8bdff10f7f86f93a3d1800257700576f961bf905de30cae4cd084de1d0ad3585bf3b7b0fd WHIRLPOOL 719434cfbfec1b8dc0a4cb03cbf0e82accd5335d7a6144c37a80490f6ae441804f4b5dce19b7f306c28aad2029fa09fbf3af941485abbe2a6604c903e399aa92
 EBUILD swift-2013.1.9999.ebuild 3979 SHA256 023aed4521192fad79dc572c50f446d9cf05595bbafc89e61ab1e26d25d5d74b SHA512 778270f3350582aee501c60d6195d0b7ba5d2f89e2819e55433f435fb74d42037bc543533092602aeb22c8f3339e5839771b235e02c599f29d438ac6994cd3fc WHIRLPOOL c99af499ccd12b1f9bee44748c16233fa1d197ac7e9c81987dc5367f48b8272b95902f4b35adab2d6b5815108de38abf527e094a2dc9bbec4a21968a92e249f4
 EBUILD swift-2013.2.9999.ebuild 4014 SHA256 3de1990c02c1f41f69c87444e0bf0fcb236a3ed35294ebd6b341c8a652aed127 SHA512 fbc8f06d994609217c6944e02f58a49a0f2c483ed3fa59690eb14a6410c7781d99d0ecdcab0cd4e0de2ecbd80b0836931b4b7112e786a15f5b6e89a6e2448c7d WHIRLPOOL d7ea0b53bdb30ac1b0fafc45a419f129a3e1245ff65804673ddf64f101e310b0769344a2fdfd6240cc094654935bb2425780ef1374c3bce181d285d764346ba6
 EBUILD swift-9999.ebuild 4115 SHA256 e7065fa4019f26a41180adb3074aa02dbb8a7fa88f1d4e3a09eedeb363e083c1 SHA512 88ca4c3bef9ba4a26cf103c89fc72d69618a8e5148d8055b0209585312f9be6edc16c9b6d3988cef482db4df6c9847de1ce2d21f87ad3ec88ddfb24b419e19f2 WHIRLPOOL aa7525858153ad4107115841b035d2c6cc321eadbfe2f500c0e1e180e5c609267628f9ac309e0cc8a62aeaee9fda477e20d8376b878ca2dcff76e17bb3b376a0
-MISC ChangeLog 4852 SHA256 18e2079037c2c69b0152ea414e4b9e5843dff4943cca2765760dd86f0af6576e SHA512 4df1c387ac7153e74b9aa04ae00c75707a46e0450e04c597e58f300f77d35e8990de5d96e8327f4bf352bacfe79b4b65505e3a77847ebebf425ca878bb4e202a WHIRLPOOL 52b0ab65db280acc11ff849b35e721e3083f72cdc91807ccc5a560c4a1d0711fcef0fda4c94526bad22c93fd4ecfecb259051e00cf0bbd788bc942bfe1fff926
+MISC ChangeLog 4969 SHA256 2eeff7370b83b629b6ba7d4862faa9e05679b5b661c162730b87df1c535a8d2a SHA512 1bf7a3561b08eeac01f7090f2ffe079fe8c6adc24403619872883d0c2611c6a5da613150265a745641ae7195b4efaff4410125d89f6df4768a7231ac99eeddb1 WHIRLPOOL 04c634b8de63643bd10cde553ba437811bc5a453d70b60e84f38862c8a130f4424b65e54c042a8b029b18f50afb9dc63a0964f6fcf3994e751e56d01107d77bd
 MISC metadata.xml 719 SHA256 319a1a58e687f433d3fbbc742d13c046dae70211fcf1b81a60d2acb69580c0ec SHA512 029f6557fa226e698e7070a9ee1d445adde992f9b44a219b5be80035d14dbab1daa61d9ad53ae52917a93d7689a0bfd1b0ca8f99e787d6beed9e601d459ea257 WHIRLPOOL da64649598a4601918d5f3932600105de0f8f5c3aa80acca697a7155115a18b562cad8dc068272931907ab4300b55219daec8bbe897a34363c0e9d1700967159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3Lc2AAoJECRx6z5ArFrDHksQAJsHVQen3Xc3lmi2/oW8KYIZ
-rk1q+IALwqfQRvE4qNxlbdGZT8wB+B2M0sYDCjt4XrbHoDoIapWXTDX2yGdpIi9E
-12J16S81WeaXjMbyAozgxHRC6F/QYHWGedN0SHpHWNPjB5xOqOfM30J5Lj3KI3T2
-pCEQffVjUFyBXr2vyXqq0yFM3tSlD74hD7O90If5mVpelrKH51kz2Jwl0AHrh/Gw
-RamBmpQ41bdXBInuqLISDNShGIPYgGPNvcyKWw7rrVtXAlI04lDTjpcN5hXfn+En
-Iez/OV3uE0621+EXbUj3LjklNzTji7sTb5xVnN2Gfn8AGBNrJ2L0FezrEHgj6BwM
-n2mOoBrymquJXlofi1cJQOup5rwJenB3X7wUpO9ZBn7LiutHShqpD2F6SKm7K1o8
-h/yk9B6f+//ulO6FEDIaOk4+Md3aL1yTK5zovnhG5pRIW5f91M/P66MqCEGiscMq
-UzRrhrfXqiDj8vm4DQVNpw0eDTPo6yvWVxrPwoA0CODOIq1d3A0Idgpl9FLnqEqr
-Ju7psNsWcGpBOiXyXMTCVmRca+XCfoUeKdrvCSPKHe4izLz0pBxXvk7viMcRmEL9
-mazCVwMF4fMxsn9AC2e6VDMYCAWfFnbWnCAk0CHadC49vvY2TNt7Y9BpUmHK2AAV
-XrW9cQcmX8t9UOlZB//3
-=6S0A
+iQIcBAEBCAAGBQJTBm3kAAoJECRx6z5ArFrDIXAP/RBoOZZryKBEBJmP7kQvuYnV
+ewoy7T8sFPS4lHlWKUNfstjGmYBUi9d5JQ+6Rrks6tLV42GDiQkS6cZlmLmJkiCr
+us315bFEpOrHkBRZY8w3pfSHb3Q/gnxzXmJ6Xa+nz2a3PBwfRYt2JP+8b40CtGoZ
+gQw9370nAU8CE2WVi3JJu8mAxRGFf/ZqrvgighDiliTYymlpvwugDdwq+RjohH0l
+qqVBtiFyNWJOuCR4YgkITgEpwbBGKaTT6575OFYOrMOk+iaous8LzvmCU+8E+dLI
+aNSvwjAf0fA19cAEEoZTUz5B2yQt6Mp+5R1o9wqaoNwRrNBmtmr+K42xP1a2en5L
+yLP8ElscsJcu1VVEaG8pWmm6+xzisjZNMudejWjqB2VgzrNHxyma0R1wPxDtrxg8
+lFL4MfBx8vJnznIQY+IqRbVrFGZYW/6zTF6jbo2m6+/pqexJegBSULpQZyHrIeB8
+JGkqJKEGOAwfLlJ1QVAautLPYVzlxyrMRIK6URIiALuGrUxY+O7UwB8TJJv0qdwY
+GEr9ubJQWD5C5/FIY12Kl8vAn/7zzHzpd0LqiRJ5yI4pmURAybI0gS2zYmHoTnjF
+z0sZn4ucUpNvrQhmpTz2bET2rtuzU5Ql7DKBLD+0aSWY7yedK/89/Z3ZGYmHtAMI
+UTzzpnM+FytL2QUXb60H
+=qMjX
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.12.0.ebuild b/sys-cluster/swift/swift-1.12.0.ebuild
new file mode 100644
index 000000000000..7b9def11a5b7
--- /dev/null
+++ b/sys-cluster/swift/swift-1.12.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.12.0.ebuild,v 1.1 2014/02/20 21:04:11 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="proxy account container object test +memcache"
+REQUIRED_USE="|| ( proxy account container object )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
+				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.6[${PYTHON_USEDEP}]
+				dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
+				dev-python/nosexcover[${PYTHON_USEDEP}]
+				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
+				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+				~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				<dev-python/sphinx-1.2[${PYTHON_USEDEP}] )"
+
+RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+		dev-python/pyxattr[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
+		memcache? ( net-misc/memcached )
+		net-misc/rsync[xattr]"
+
+CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+~ZFS"
+
+#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
+	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 sh .unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+#	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcache; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners swift:swift "/etc/swift" || die "fowners failed"
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}