update to 2013.2.1

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

9 files changed, 75 insertions, 558 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 703ca9521e1b..3417270803cd 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.20 2013/12/13 21:07:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.21 2013/12/19 05:57:35 prometheanfire Exp $
+
+*neutron-2013.2.1 (19 Dec 2013)
+
+  19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> +files/nicira.patch,
+  +files/sphinx_mapping.patch, +neutron-2013.2.1.ebuild,
+  -files/CVE-2013-6419_2013.2.patch, -files/neutron-2013.2-json-tests.patch,
+  -files/neutron-2013.2-nicira.patch,
+  -files/neutron-2013.2-sphinx_mapping.patch, -neutron-2013.2-r2.ebuild,
+  -neutron-2013.2.ebuild, neutron-2013.2.9999.ebuild:
+  update to 2013.2.1
 
   13 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2013.1.4-r1.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7d12a7a6a31c..024a38b8382a 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -2,39 +2,36 @@
 Hash: SHA256
 
 AUX CVE-2013-6419_2013.1.4.patch 9432 SHA256 23d2d1f739a51b1d1826a5e74238d5d6876ef727687d534f7ec4e2a0ddacda2f SHA512 6e096037eac9c3b73ebeda7683db00a96336cff68db771409a9f8ffff6b772a35ccf16b078ac231662fdd3cc3c2b9ee35b17788a26272d23701fbcea3dbe57b5 WHIRLPOOL ae0868f4e068e030eb5922532c7508363ff83bde7e92693659e701fe285f4335a46386cdc2d9a4b38a33b6553b307e228d346c5bf678209a137e201954a30882
-AUX CVE-2013-6419_2013.2.patch 11822 SHA256 574680ad3e25cf9933325fee93fcd8ba8923445bb6b88d36f9ed7834dcc4cc09 SHA512 fc073aafc05d2a1f533610748409ea3fb7524c344e10b98f1c413416a34a0e4a52b81f133b214072009e1bebb09cdd4993b0a4366f1596c98c3a92ca185f74c8 WHIRLPOOL 78425a3230110ac353639a127f57f92650a0d56005a84aca0e8c8c707eed5bbc574a71c7146ebc073dbc7488193c461846eca68fc77f6b84b58e6ecbfa0e0b10
-AUX neutron-2013.2-json-tests.patch 4178 SHA256 d4ffa978eccc09f8061432aacc9e64b72feb9b74ef19f1b5421b54ef2c1d03d8 SHA512 919d4deb82803e9426fbcc0f51933f93c6bdaa486fb9427986567360b6a86bc59f340fe3b797ba88bd916a89cdfc11e07da5ec48cd4ff9ab59dcd418fc179243 WHIRLPOOL 35cff6e57678e5162b1e3d8603d560569bc17b1298d8e204ceac8402bbc68d0539f0d38eba7656918450fe5fd013a337a1d287f50698f995c3f26a01c9efd494
-AUX neutron-2013.2-nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
-AUX neutron-2013.2-sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
 AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
 AUX neutron-confd-2 75 SHA256 0fce0e6f6cec493b9b0bcb96fa3211ba47a6420b9ea675ef65979fd9505121c7 SHA512 e64116f6cab81a2ee56d797f8144dbc8b214fb627bc8d6c3045488b1fec694cee8e8f3f3fbd327fb28f704cdfae40ea468d8a212c819abd45e809a1fa56b9670 WHIRLPOOL fb027c386c99448c29b265adc234abbc4d23a8be015690fd024b1f39ccc18dd64a1ab57c6cc26a054d576a0bbbed797058b19db90abf0318ae79dddc4efd2056
 AUX neutron-initd 1610 SHA256 58f26e65b4f81ec3d4b0a670f06d9e5dddb35d2ad0dc5376587e654064059d81 SHA512 abd4170e7d7b720cd2aa7b4a65bd2fb4fdba0c11f976eb516a086e9e0e40a92428f4bcf5b3095ee8c31a0839a9d28a703fc42c0baf21bcf280867a805e86f19f WHIRLPOOL 7702f2df1e6fbebc8cc7fffb2590d9a2d3d7d496f0f5b62e72ab2c35fa226dad96492626c9ed5f5c59a33c1e9f06501f7625f037efe1926e22de0ad023d20669
 AUX neutron-initd-2 1610 SHA256 f81c0269b6f602c3557d034ca94445da640bc7b2a59050dbefeaabb4879aa24f SHA512 06ad3c20c8f8a20df76459a5d5d8586403750a940aabe837e77a8a0b25e82a1dac50fbab4862289f6e209418d3aa60407672e9c147f5e298586b34b22b34dd05 WHIRLPOOL eb5b6564eaa14b543269bba9719d6bcbeb3ba950cbaaa2f670e265d783d1afe8f8b68533cc598a8b8ae9cfc0b629e09e09841b87f7f21d462c20b6aa600500da
 AUX neutron-sudoers 88 SHA256 bb631691e67d9ddc405fd1f6a23b066120ecebfbf3a48bca752e82aa8224922b SHA512 c6a87ad7047604caf1c5d66ff1f44e9f1a289cbaaf2031ffc6bf8c705fd439db2afaa8d5858746f8539beac84945886bbbc347be0ba85e7446ea7451bb81f027 WHIRLPOOL cbcb5da9b6c7629741a076767aadad9d849462005526dde7fad76fe93285724361839b64d28aa3f0ed7dafaa35b110765b759b3f6b525a52cad5abfe6679ef1c
-DIST neutron-2013.2.tar.gz 4385581 SHA256 3ebfa6e8a6790e8b55604712a5e467ded7d76b2b713bf9d830f958b399d78ecc SHA512 bb4122ecdce3703e2b19e813241cfa285fc86a7cd4cf1f65d9d797c1c4b04f1e153a4116ba43aa86909e98cfec82aab1f6b36be03fb29089e4815a5189a2b27a WHIRLPOOL fac6fed0e5313c80e548afa82bc64c9e6a989a0e9708ed32aef5172a10ad0545e4941dd8452279976ba674271fa67a32d66db9fdb89ee25acdcd40ed821036a9
+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 quantum-2013.1.4.tar.gz 1178442 SHA256 3bd26ae7dabe6093a3cbe701ac8d7022fbdbe1d8231ab1c6866de388684e272c SHA512 48ce3aa8467eefe4ef07b03dee293c7eae1800736abadd56d0bf7b559506044bea3fefba0dac6fb20783f808baada70c52ebc388137ae80b41271dcde824243d WHIRLPOOL a5456fe6fb48192a4f4d97c85b7b235093f549965b36971802302998de7d8ed76fd7f393a659371b8057aafcc4594ac246159663dfcdb5251c786eeede6d66fd
 EBUILD neutron-2013.1.4-r1.ebuild 4658 SHA256 e8383179bb749154b6428883d101aa0369420e84ae15b5b4f3631cb4179d1371 SHA512 ebc7d686548f866fcadf6bde5419e53ce3194f3d54d7bfe00bb2848367a066775d1a568ea7a37f69339bbfaa7fac9379fad4843e3aba76d6b7a286aa9b0c2071 WHIRLPOOL 8cbfaf364affc095e3fe3060126020fac2aae2d89d782e6cbe3435545abe347f42fe4e6dc58eff25ada43e6e96b7f1f7e88376d581ce5c57dfd16cb42e7a0f07
 EBUILD neutron-2013.1.9999.ebuild 4477 SHA256 d6f042d111485e21b95d48663a70f3a92cf66560eeca98c46c03a50623276b00 SHA512 a2f757629575ae392cd622de5dc1cda7ba9cf5484ed89ce54819a0bdf863946f5c83a6cf9a1434465fa170f443b6b31ad881c06cfd07c9e201e6ce3ee7959915 WHIRLPOOL 308614fc319fa89c00ba902a3620a986f72be8fe13a4e17c36436ac792fac13430bc49e648a27cc8d0c2b0049bbc11507535a691d38ac3594a2ed0b895e86100
-EBUILD neutron-2013.2-r2.ebuild 5708 SHA256 5cf06f68b32c25144dcae96cc857a4d9a21025e02427d197595c0e6ac66db0a6 SHA512 23183bfa1d7b45469d7fd0344eb1e85327e90c3e74d5c777e18c5b5ffde583fdcacaa642fdf99350c34aab8ba2d1b82d193ec28f8718b76e16d67134d513021c WHIRLPOOL 8d6574a717ecc474ff2d08729c94285b8646378e0842215355a37b4a61a63feaa7b2f4f929ebfbf10fb26f439f6115773f898ef2d52096f1aab4288c97947699
-EBUILD neutron-2013.2.9999.ebuild 5359 SHA256 040a8b27c49a5cb2dfaedd2f6f195bf0ab48b18c6c9fdc1c102166e52f484f83 SHA512 e589b30521a48e6a576eee3f24143cf8e9650e7797734cfa53c68e9beb5c84d27fb525c5219228f6805cc84c5abd27e1ccd34ddad9f53dc0159d107eaa411a5e WHIRLPOOL 935ee2cbd09b60df7bcd3e89ef79f4f64c1ab182c29f3a1800a74961b08f1c4708e75cc59ecf8d7981e86441eceabba02945bd7b9a6ee8aeabaa60e6d2c59918
-EBUILD neutron-2013.2.ebuild 4731 SHA256 01b3061bc4c7e010689bc6afe4eec2667ada9779366998079ff8ecf733c920e5 SHA512 0d722b0fd4a262bc616ab8cac10a555fbe6d57035055fb645e1d40d99b6b52cb51f16e0cb71e769cbd98d4a74b720fe63f6e6d9366ced5f4f61e34ba27cc87cd WHIRLPOOL 1f997cf307c90f54d02685f2601c63d5cd908b1d96b9bbc5710ed89bfabf883caea9b3686db71d55f375e90cf92cdc8e244730ea5251894e4ec30be046df2f7f
+EBUILD neutron-2013.2.1.ebuild 5691 SHA256 92c47b991bd6eb0b733467cc5a5f2c5c337f51708c74e7e6a39ff0e137c09f81 SHA512 73e85ec02e95ea1e46d7d318bcf1994450362f1d572a4fec3afdc9fcf7c9db745771cfa3fa201b44d96888bff2c49e17e7e435c6666f4cd1c88e496424d1fb36 WHIRLPOOL bbd57576fd9f380f6d2958e7a8e2554640c025bb0ef7b7c2bcc31f81a00cc05b1dbddfc6019bc0a89a868376d16d1fbd17c9f65982b42cd93d5c930dc206a26d
+EBUILD neutron-2013.2.9999.ebuild 5702 SHA256 8f42e807dcf0e367c4b7f95779d7a3a59ec6ea6e84bf0f8be588f59a45b4bd81 SHA512 584cd20a99bc03738e22cc20cc69bea9472aa2bd32e2fb2ad731e06766ca04ad502b3e2c53c7f6f21872a4d8fb2bd4a00b1d86b0a93acdb973c712629a519d36 WHIRLPOOL 6af50b2d56a24f987485ff282538db80d1b2e5240cd8d436fe57e2ab5a179f4bbbca1f294d295e41f8a42e4454e625c5a6d9578fde6625912d758af00b1e54a6
 EBUILD neutron-9999.ebuild 4405 SHA256 572e72f812240221e000c890bb4fb1c7d7f8d75b894f8fe92459cebc2bf535c5 SHA512 e4eb4b1b01de3faf6a503988888e653fc1410254de48a2ef8cf466488d555cc4b9f1af214cd9ac3dfd9e12bc15cf2a3d88025f950c7426e6cb4fcda88ad40152 WHIRLPOOL 92603532008dc57cfc4bdda69bb9b21f15cbd19c9c96232553f83eae3b12c56b6476f494ed1565e8e41d7c51c80e21a09cd07cdb5a5f11db8ef8c59cf75d1c56
-MISC ChangeLog 8426 SHA256 0a784ccaac2964193ed5dacb8436d1732d332f45a895c60b8db23594d5f7bfb8 SHA512 43cde9fdc4cb0cf378c24772e8315ee6899cedce8d2b4bd4692ec5e24e03dcc7fd5f447a84b8e692ffd2fb85b84368b602352cece13bd67d3a4f0fbd64217ee0 WHIRLPOOL caf117ce2afd44a4c4b600e6e7318b4cceda7411c8a3967458ca63c3d02a0e4b22d2633c111bf557ee113f41f4f8e389708357f8ce6500d96e0388fbfc2b3488
+MISC ChangeLog 8858 SHA256 b41bd42f7facd962a4c3d09f953463d4563416c8ce4d47fc10768bc6e37e7f5f SHA512 6a59c9af89fb0fc40aefc571713de5b4d8df97e4f27919894ef29ef0f7ea84de15fbde23116d5f39f1db100f5b25227434f85d418642aa65d544860b0223b022 WHIRLPOOL af5f5a9f9d84d9db807973e038632a23c48f4c172d17cec01c22d3e5dc9bf46b2fb25185acc984eff40e7f4f90adf7a5941fdefaf8736a4b13f09793233200c9
 MISC metadata.xml 1175 SHA256 95ceaccefb744f80032d97a4cc13c43c13d7e4116d6810d5779df5be3ebe11ce SHA512 74a46511f82bef78397bfaef2901606c6f468f532bbd7112fc8196b69362a4666fafbda8023a281514ada958cd2b4ba567f11dfa071d0b76bc94e456d96ed287 WHIRLPOOL 783aa30c05484b68b2a8f1ebcfd39294a21731cfa9587c0e1cd07ff291416d10912066e23c0572ac63a125f9836374c73b91775858c863abb0779eb13356ca11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSq3csAAoJECRx6z5ArFrDqhkQAI1PIr6adrNUYjkEev6KsStP
-r52iv6ht+hk4IaDLR0sxOex/5hnU75XrEzdUFRXCgyB8fopNyKzfgvilYjkhsftd
-WMH6X08sZLZCQZ+5b16F/5IUWqP0HUEFzdkMa6hyGqGinLjd3/5Sopo5bUfEtXaI
-lD6D1lu7gzV2GRYcpealjyX4GWwdyduh+ufP9iSWCDKfkj/I+k0crwN2AdZ5iEBn
-pF+AVpwibVzSW4nj6ovhlPsHY/3rwCPaJTpNx3QcyGYJbR7rmjtLYpfWp4t7gwWx
-teB1ZahkokYV2enDNRJL0CoJkJJ/LE9VvBahyI4zN+fV4zxDDlnAkl2m996DYTtI
-qqqozzIlIfyBHvnp0Z/5KmXPls8UhWiAKbshHbnnzONy5eAoC4FmDU0GGz25T/kS
-yrQM9b1NaDvmup8Db0meMqTFBrJADPTG0BRfZZLgudH9zLBxEXsXqZTDH7qBHRc4
-TrzOMMz33sw1cudVXmKdSdqY90yZZUBmwzOxzfZtvH3JvsSwhheOcMD0u8pSMEnl
-FMRUKluj8KRgmJiz9/tNBlPk9lN7UT5SPssh1PGS01BhjuIZWmS4xD2fg9W5zKZr
-KBhD1U2yz2D1Fo3pxm1E7hWEgit8Ty7Py4rsaP5vaRRPDjHz2Kb6MnE0DH9oNjSo
-DKsdQjRQ9Ek7PN7yYaFt
-=LbH7
+iQIcBAEBCAAGBQJSsoreAAoJECRx6z5ArFrDa/QQAIIV9qV9SpFxhfV/O29hcAOk
+6CLc+msDZjs9u+oDqtHv4Anlb5N9LUMiDW5/T5gc35s1TUbo8ORMshrUJrnyD3LF
+6EgDdf/KQX0P0xoiqg7Kk4X8x7MyqgJE8ebJ0JZ1BqkwDkEvSeHstwKAvgSZQvxR
+En+Dw6E8BrWaK8OFPEHOO6fCDytvDbf+D3nHbe1pdbLXqXbpDwIVDVOnzotcjNnf
+SwTI76w+ZKXSgHOhYOkNq6P/4fIJT/VluuGlCeQ+guZZ+xOqHpb8qe0uvSiqMGgT
+bRt2yyfbTG4eFpLDTLlEigLCCOIeHVww/oYoP4jmamuSsJqxLqvBmOxVs/78lsNF
+oedI5AQDhcsr59LHjetsFkNp8gVE8oyKX7tVZVpZVY/gKRYzfZI7qbYeZQQxip4+
+s5PiKj4W74o0zoWjqvVLF8p59FbCoBh4kgZIErqcSKiGbcfHQqbm3dG+Yzumm79y
+MXcQaHa6TRTS7bYKwRuaIf+5B26BzWGc/7Y46LoCgH0sv5z/1KTwlIPpbJNSaYN1
+08oeA16+x8U71QZf1p5Ky/66FoPtu8IEcEC01lrzmKXB/MJ7rtcOZ3pMJ+xltgD+
+reeJ22QDaOtSS5U8LuY22n5GZHZrRGrBZ94m/ebATBBe4Crrrb4HVejvYiG0Czzr
+Ihyr05QgijlQf5av9ebc
+=TUsU
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/CVE-2013-6419_2013.2.patch b/sys-cluster/neutron/files/CVE-2013-6419_2013.2.patch
deleted file mode 100644
index 6530915b470b..000000000000
--- a/sys-cluster/neutron/files/CVE-2013-6419_2013.2.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-commit 78f47f96437deefa0388f2dd63651fea0165eaf1
-Author: Aaron Rosen <arosen@nicira.com>
-Date:   Mon Oct 7 15:34:38 2013 -0700
-
-    Add X-Tenant-ID to metadata request
-    
-    Previously, one could update a port's device_id to be that of another tenant's
-    instance_id and then be able to retrieve that instance's metadata. In order
-    to prevent this X-Tenant-ID is now passed in the metadata request to nova and
-    nova then checks that X-Tenant-ID also matches the tenant_id for the instance
-    against it's database to ensure it's not being spoofed.
-    
-    DocImpact - When upgrading OpenStack nova and neturon, neutron should be
-                updated first (and neutron-metadata-agent restarted before nova is
-                upgraded) in order to minimize downtime. This is because there is
-                also a patch to nova which has checks X-Tenant-ID against it's
-                database therefore neutron-metadata-agent needs to pass that
-                before nova is upgraded for metadata to work.
-    
-    Fixes bug: 1235450
-
-diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
-index dcb0e00..e0042f4 100644
---- a/neutron/agent/metadata/agent.py
-+++ b/neutron/agent/metadata/agent.py
-@@ -84,61 +84,62 @@ class MetadataProxyHandler(object):
-             endpoint_url=self.auth_info.get('endpoint_url'),
-             endpoint_type=self.conf.endpoint_type
-         )
-         return qclient
- 
-     @webob.dec.wsgify(RequestClass=webob.Request)
-     def __call__(self, req):
-         try:
-             LOG.debug(_("Request: %s"), req)
- 
--            instance_id = self._get_instance_id(req)
-+            instance_id, tenant_id = self._get_instance_and_tenant_id(req)
-             if instance_id:
--                return self._proxy_request(instance_id, req)
-+                return self._proxy_request(instance_id, tenant_id, req)
-             else:
-                 return webob.exc.HTTPNotFound()
- 
-         except Exception:
-             LOG.exception(_("Unexpected error."))
-             msg = _('An unknown error has occurred. '
-                     'Please try your request again.')
-             return webob.exc.HTTPInternalServerError(explanation=unicode(msg))
- 
--    def _get_instance_id(self, req):
-+    def _get_instance_and_tenant_id(self, req):
-         qclient = self._get_neutron_client()
- 
-         remote_address = req.headers.get('X-Forwarded-For')
-         network_id = req.headers.get('X-Neutron-Network-ID')
-         router_id = req.headers.get('X-Neutron-Router-ID')
- 
-         if network_id:
-             networks = [network_id]
-         else:
-             internal_ports = qclient.list_ports(
-                 device_id=router_id,
-                 device_owner=DEVICE_OWNER_ROUTER_INTF)['ports']
- 
-             networks = [p['network_id'] for p in internal_ports]
- 
-         ports = qclient.list_ports(
-             network_id=networks,
-             fixed_ips=['ip_address=%s' % remote_address])['ports']
- 
-         self.auth_info = qclient.get_auth_info()
--
-         if len(ports) == 1:
--            return ports[0]['device_id']
-+            return ports[0]['device_id'], ports[0]['tenant_id']
-+        return None, None
- 
--    def _proxy_request(self, instance_id, req):
-+    def _proxy_request(self, instance_id, tenant_id, req):
-         headers = {
-             'X-Forwarded-For': req.headers.get('X-Forwarded-For'),
-             'X-Instance-ID': instance_id,
-+            'X-Tenant-ID': tenant_id,
-             'X-Instance-ID-Signature': self._sign_instance_id(instance_id)
-         }
- 
-         url = urlparse.urlunsplit((
-             'http',
-             '%s:%s' % (self.conf.nova_metadata_ip,
-                        self.conf.nova_metadata_port),
-             req.path_info,
-             req.query_string,
-             ''))
-diff --git a/neutron/tests/unit/test_metadata_agent.py b/neutron/tests/unit/test_metadata_agent.py
-index 36b6f84..aa1cc84 100644
---- a/neutron/tests/unit/test_metadata_agent.py
-+++ b/neutron/tests/unit/test_metadata_agent.py
-@@ -48,54 +48,56 @@ class TestMetadataProxyHandler(base.BaseTestCase):
-         self.addCleanup(self.qclient_p.stop)
- 
-         self.log_p = mock.patch.object(agent, 'LOG')
-         self.log = self.log_p.start()
-         self.addCleanup(self.log_p.stop)
- 
-         self.handler = agent.MetadataProxyHandler(FakeConf)
- 
-     def test_call(self):
-         req = mock.Mock()
--        with mock.patch.object(self.handler, '_get_instance_id') as get_id:
--            get_id.return_value = 'id'
-+        with mock.patch.object(self.handler,
-+                               '_get_instance_and_tenant_id') as get_ids:
-+            get_ids.return_value = ('instance_id', 'tenant_id')
-             with mock.patch.object(self.handler, '_proxy_request') as proxy:
-                 proxy.return_value = 'value'
- 
-                 retval = self.handler(req)
-                 self.assertEqual(retval, 'value')
- 
-     def test_call_no_instance_match(self):
-         req = mock.Mock()
--        with mock.patch.object(self.handler, '_get_instance_id') as get_id:
--            get_id.return_value = None
-+        with mock.patch.object(self.handler,
-+                               '_get_instance_and_tenant_id') as get_ids:
-+            get_ids.return_value = None, None
-             retval = self.handler(req)
-             self.assertIsInstance(retval, webob.exc.HTTPNotFound)
- 
-     def test_call_internal_server_error(self):
-         req = mock.Mock()
--        with mock.patch.object(self.handler, '_get_instance_id') as get_id:
--            get_id.side_effect = Exception
-+        with mock.patch.object(self.handler,
-+                               '_get_instance_and_tenant_id') as get_ids:
-+            get_ids.side_effect = Exception
-             retval = self.handler(req)
-             self.assertIsInstance(retval, webob.exc.HTTPInternalServerError)
-             self.assertEqual(len(self.log.mock_calls), 2)
- 
--    def _get_instance_id_helper(self, headers, list_ports_retval,
--                                networks=None, router_id=None):
-+    def _get_instance_and_tenant_id_helper(self, headers, list_ports_retval,
-+                                           networks=None, router_id=None):
-         headers['X-Forwarded-For'] = '192.168.1.1'
-         req = mock.Mock(headers=headers)
- 
-         def mock_list_ports(*args, **kwargs):
-             return {'ports': list_ports_retval.pop(0)}
- 
-         self.qclient.return_value.list_ports.side_effect = mock_list_ports
--        retval = self.handler._get_instance_id(req)
--
-+        instance_id, tenant_id = self.handler._get_instance_and_tenant_id(req)
-         expected = [
-             mock.call(
-                 username=FakeConf.admin_user,
-                 tenant_name=FakeConf.admin_tenant_name,
-                 region_name=FakeConf.auth_region,
-                 auth_url=FakeConf.auth_url,
-                 password=FakeConf.admin_password,
-                 auth_strategy=FakeConf.auth_strategy,
-                 auth_token=None,
-                 endpoint_url=None,
-@@ -111,105 +113,113 @@ class TestMetadataProxyHandler(base.BaseTestCase):
-             )
- 
-         expected.append(
-             mock.call().list_ports(
-                 network_id=networks or [],
-                 fixed_ips=['ip_address=192.168.1.1'])
-         )
- 
-         self.qclient.assert_has_calls(expected)
- 
--        return retval
-+        return (instance_id, tenant_id)
- 
-     def test_get_instance_id_router_id(self):
-         router_id = 'the_id'
-         headers = {
-             'X-Neutron-Router-ID': router_id
-         }
- 
-         networks = ['net1', 'net2']
-         ports = [
-             [{'network_id': 'net1'}, {'network_id': 'net2'}],
--            [{'device_id': 'device_id'}]
-+            [{'device_id': 'device_id', 'tenant_id': 'tenant_id'}]
-         ]
- 
-         self.assertEqual(
--            self._get_instance_id_helper(headers, ports, networks=networks,
--                                         router_id=router_id),
--            'device_id'
-+            self._get_instance_and_tenant_id_helper(headers, ports,
-+                                                    networks=networks,
-+                                                    router_id=router_id),
-+            ('device_id', 'tenant_id')
-         )
- 
-     def test_get_instance_id_router_id_no_match(self):
-         router_id = 'the_id'
-         headers = {
-             'X-Neutron-Router-ID': router_id
-         }
- 
-         networks = ['net1', 'net2']
-         ports = [
-             [{'network_id': 'net1'}, {'network_id': 'net2'}],
-             []
-         ]
--
--        self.assertIsNone(
--            self._get_instance_id_helper(headers, ports, networks=networks,
--                                         router_id=router_id),
-+        self.assertEqual(
-+            self._get_instance_and_tenant_id_helper(headers, ports,
-+                                                    networks=networks,
-+                                                    router_id=router_id),
-+            (None, None)
-         )
- 
-     def test_get_instance_id_network_id(self):
-         network_id = 'the_id'
-         headers = {
-             'X-Neutron-Network-ID': network_id
-         }
- 
-         ports = [
--            [{'device_id': 'device_id'}]
-+            [{'device_id': 'device_id',
-+              'tenant_id': 'tenant_id'}]
-         ]
- 
-         self.assertEqual(
--            self._get_instance_id_helper(headers, ports, networks=['the_id']),
--            'device_id'
-+            self._get_instance_and_tenant_id_helper(headers, ports,
-+                                                    networks=['the_id']),
-+            ('device_id', 'tenant_id')
-         )
- 
-     def test_get_instance_id_network_id_no_match(self):
-         network_id = 'the_id'
-         headers = {
-             'X-Neutron-Network-ID': network_id
-         }
- 
-         ports = [[]]
- 
--        self.assertIsNone(
--            self._get_instance_id_helper(headers, ports, networks=['the_id'])
-+        self.assertEqual(
-+            self._get_instance_and_tenant_id_helper(headers, ports,
-+                                                    networks=['the_id']),
-+            (None, None)
-         )
- 
-     def _proxy_request_test_helper(self, response_code=200, method='GET'):
-         hdrs = {'X-Forwarded-For': '8.8.8.8'}
-         body = 'body'
- 
-         req = mock.Mock(path_info='/the_path', query_string='', headers=hdrs,
-                         method=method, body=body)
-         resp = mock.Mock(status=response_code)
-         with mock.patch.object(self.handler, '_sign_instance_id') as sign:
-             sign.return_value = 'signed'
-             with mock.patch('httplib2.Http') as mock_http:
-                 mock_http.return_value.request.return_value = (resp, 'content')
- 
--                retval = self.handler._proxy_request('the_id', req)
-+                retval = self.handler._proxy_request('the_id', 'tenant_id',
-+                                                     req)
-                 mock_http.assert_has_calls([
-                     mock.call().request(
-                         'http://9.9.9.9:8775/the_path',
-                         method=method,
-                         headers={
-                             'X-Forwarded-For': '8.8.8.8',
-                             'X-Instance-ID-Signature': 'signed',
--                            'X-Instance-ID': 'the_id'
-+                            'X-Instance-ID': 'the_id',
-+                            'X-Tenant-ID': 'tenant_id'
-                         },
-                         body=body
-                     )]
-                 )
- 
-                 return retval
- 
-     def test_proxy_request_post(self):
-         self.assertEqual('content',
-                          self._proxy_request_test_helper(method='POST'))
diff --git a/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch b/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch
deleted file mode 100644
index ebf33da1d407..000000000000
--- a/sys-cluster/neutron/files/neutron-2013.2-json-tests.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://github.com/openstack/neutron/commit/d26dfed7d47926425bb55893da45f650d6549b9a
-diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-index ba76786..fa2c2c0 100644
---- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-+++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
-@@ -97,11 +97,6 @@ def setUp(self):
-         super(TestLinuxBridgeAgent, self).setUp()
-         cfg.CONF.set_override('rpc_backend',
-                               'neutron.openstack.common.rpc.impl_fake')
--        self.lbmgr_patcher = mock.patch('neutron.plugins.linuxbridge.agent.'
--                                        'linuxbridge_neutron_agent.'
--                                        'LinuxBridgeManager')
--        self.lbmgr_mock = self.lbmgr_patcher.start()
--        self.addCleanup(self.lbmgr_patcher.stop)
-         self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
-         self.execute = self.execute_p.start()
-         self.addCleanup(self.execute_p.stop)
-@@ -113,8 +108,6 @@ def setUp(self):
-         self.get_mac.return_value = '00:00:00:00:00:01'
- 
-     def test_update_devices_failed(self):
--        lbmgr_instance = self.lbmgr_mock.return_value
--        lbmgr_instance.update_devices.side_effect = RuntimeError
-         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
-                                                                      0,
-                                                                      None)
-@@ -125,17 +118,18 @@ def info_mock(msg):
-                 raise_exception[0] += 1
-             else:
-                 raise RuntimeError()
--
--        with mock.patch.object(linuxbridge_neutron_agent.LOG, 'info') as log:
--            log.side_effect = info_mock
--            with testtools.ExpectedException(RuntimeError):
--                agent.daemon_loop()
--            self.assertEqual(3, log.call_count)
-+        with mock.patch.object(agent.br_mgr,
-+                               "update_devices") as update_devices:
-+            update_devices.side_effect = RuntimeError
-+            with mock.patch.object(linuxbridge_neutron_agent.LOG,
-+                                   'info') as log:
-+                log.side_effect = info_mock
-+                with testtools.ExpectedException(RuntimeError):
-+                    agent.daemon_loop()
-+                self.assertEqual(3, log.call_count)
- 
-     def test_process_network_devices_failed(self):
-         device_info = {'current': [1, 2, 3]}
--        lbmgr_instance = self.lbmgr_mock.return_value
--        lbmgr_instance.update_devices.return_value = device_info
-         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
-                                                                      0,
-                                                                      None)
-@@ -147,15 +141,18 @@ def info_mock(msg):
-             else:
-                 raise RuntimeError()
- 
--        with contextlib.nested(
--            mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'),
--            mock.patch.object(agent, 'process_network_devices')
--        ) as (log, process_network_devices):
--            log.side_effect = info_mock
--            process_network_devices.side_effect = RuntimeError
--            with testtools.ExpectedException(RuntimeError):
--                agent.daemon_loop()
--            self.assertEqual(3, log.call_count)
-+        with mock.patch.object(agent.br_mgr,
-+                               "update_devices") as update_devices:
-+            update_devices.side_effect = device_info
-+            with contextlib.nested(
-+                mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'),
-+                mock.patch.object(agent, 'process_network_devices')
-+            ) as (log, process_network_devices):
-+                log.side_effect = info_mock
-+                process_network_devices.side_effect = RuntimeError
-+                with testtools.ExpectedException(RuntimeError):
-+                    agent.daemon_loop()
-+                self.assertEqual(3, log.call_count)
- 
- 
- class TestLinuxBridgeManager(base.BaseTestCase):
-
diff --git a/sys-cluster/neutron/files/neutron-2013.2-nicira.patch b/sys-cluster/neutron/files/nicira.patch
index 58461f91df87..58461f91df87 100644
--- a/sys-cluster/neutron/files/neutron-2013.2-nicira.patch
+++ b/sys-cluster/neutron/files/nicira.patch
diff --git a/sys-cluster/neutron/files/neutron-2013.2-sphinx_mapping.patch b/sys-cluster/neutron/files/sphinx_mapping.patch
index d7367d6a6e52..d7367d6a6e52 100644
--- a/sys-cluster/neutron/files/neutron-2013.2-sphinx_mapping.patch
+++ b/sys-cluster/neutron/files/sphinx_mapping.patch
diff --git a/sys-cluster/neutron/neutron-2013.2-r2.ebuild b/sys-cluster/neutron/neutron-2013.2.1.ebuild
index d0e3df5073ac..7cbc44437d37 100644
--- a/sys-cluster/neutron/neutron-2013.2-r2.ebuild
+++ b/sys-cluster/neutron/neutron-2013.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2-r2.ebuild,v 1.1 2013/12/13 20:47:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.1.ebuild,v 1.1 2013/12/19 05:57:35 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -23,20 +23,20 @@ DEPEND="dev-python/setuptools[${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/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}]
-		)"
+				>=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}]
@@ -44,12 +44,12 @@ RDEPEND="dev-python/paste[${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-0.9.6[${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.4[${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}]
@@ -66,19 +66,17 @@ RDEPEND="dev-python/paste[${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[${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}]
-		net-misc/bridge-utils
-		net-misc/openvswitch
+		sys-apps/iproute2
+		openvswitch? ( net-misc/openvswitch )
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
-PATCHES=( "${FILESDIR}/${P}-sphinx_mapping.patch"
-		"${FILESDIR}/${P}-json-tests.patch"
-		"${FILESDIR}/${P}-nicira.patch"
-		"${FILESDIR}/CVE-2013-6419_2013.2.patch" )
+PATCHES=( "${FILESDIR}/sphinx_mapping.patch"
+		"${FILESDIR}/nicira.patch" )
 
 pkg_setup() {
 	enewgroup neutron
diff --git a/sys-cluster/neutron/neutron-2013.2.9999.ebuild b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
index a71872895c5c..f1a0add0caba 100644
--- a/sys-cluster/neutron/neutron-2013.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.5 2013/11/22 04:38:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.6 2013/12/19 05:57:35 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ EGIT_BRANCH="stable/havana"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+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
@@ -30,6 +30,7 @@ DEPEND="dev-python/setuptools[${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}]
@@ -44,12 +45,12 @@ RDEPEND="dev-python/paste[${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-0.9.6[${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.4[${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}]
@@ -66,7 +67,7 @@ RDEPEND="dev-python/paste[${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[${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}]
@@ -75,14 +76,27 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
 		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() {
@@ -91,7 +105,7 @@ python_test() {
 	# 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
+	# 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:_&:' \
@@ -137,7 +151,7 @@ python_install() {
 	doins "${FILESDIR}/neutron-sudoers"
 }
 
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
 }
diff --git a/sys-cluster/neutron/neutron-2013.2.ebuild b/sys-cluster/neutron/neutron-2013.2.ebuild
deleted file mode 100644
index 0c9b967ad7b5..000000000000
--- a/sys-cluster/neutron/neutron-2013.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.ebuild,v 1.4 2013/11/22 04:38:40 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8   
-RESTRICT="test"
-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 +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/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}] )"
-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-0.9.6[${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.4[${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[${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] )"
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-src_prepare() {
-	#it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
-}
-
-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"
-}
-
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
-}