gentoo resync : 06.08.2019

5 files changed, 10 insertions, 17 deletions

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3e107484b19c..d57a71b5f736 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -9,8 +9,8 @@ DIST nova.conf.sample-18.2.2 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a3396
 DIST nova.conf.sample-19.0.2 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
 DIST nova.conf.sample-2019.1.9999 387769 BLAKE2B 2b4668e78765469c5ee518a8c340a09407a8f7e9bf3f87a6919b820db0ce2f38499827dbea58994490c8db3a648eef2c95521f7c62b3ae37606bb249492b4b12 SHA512 4facb96c111945f472654788e1ac3d52808b0c45e36c87b873cd1355d36b71922fa94b11d66ec5a8b250739072ecdec394dd4f852a8eb57dbd900c61c71ba770
-EBUILD nova-18.2.2.ebuild 9500 BLAKE2B c4fa7159a2fddcf8a3c5eaa598d6ce30074701f6f56c12f7e7f96717cb96748676f4e2f6b562d04abf89b4662a8b1c4fc6d6c93da3a61849ab1e39e4b3951d0e SHA512 bbb0b6b791c39681ad14dbfd63534d74ce40872b2cbb14181e151d93bbfd60f89daa4e702eacb7e7fdce25adb08aef70c525f3b41a2618cba9bb9f21128bb5d7
-EBUILD nova-19.0.2.ebuild 9589 BLAKE2B e8af169540a4a7d9980416cc2c60cf4a4b3eefebafbac928f50bfd7cab407e5b0778105349b3c19edab023fb27cda9e4181c911f718ac98cc1721de32a6838be SHA512 32c3f2888abaced0c49a0b43809cd5789fd4d4ebd4c602bd9ccd3a37c3762120fedb0de10772009a3c329cf62194c795b4df45afe9c345619fc91b2f9b398ee6
-EBUILD nova-2018.2.9999.ebuild 9503 BLAKE2B 93d037866011c61dc8d61283d8d6a3897f8df51d35e9f5688ad8831d07033a5420ea280e2c51ebf5fb700520463f89e0fd1a596b20f0948bc63a44287da5ad61 SHA512 08acb5d955ef369c3b352009be92885c90e9632a5cacdca9ccc52ea11ca6c32d726a18b290df79ff60c00601b4b8715fa14721e4ebf67788c504fda743d098c7
-EBUILD nova-2019.1.9999.ebuild 9592 BLAKE2B b9d936d1b245e40280053f76dbcfd25730c2b9aa1d64b4c5e815c8256e4827023dce5ee39d1b9cbb977a8e9765114193f91e049e9022e4520e2371ee6602bc5b SHA512 f78cd0043406c2d62ca01f86f4c36efd3e21623cb625ad5a459e2e17496b040afedd32411033218ebcc4627d6c14f6ff203d0f4dc207bfe1da05e3ebd79daf27
+EBUILD nova-18.2.2.ebuild 9493 BLAKE2B 1b9ec29a2a6ff3eb43933d2871d5c7c2caec586cbd2e15df1b79e98a39e852de164b43647c1c00ff2a3557d39c6b697686bee3a3c53a9201a8b0726e88406356 SHA512 fbb3e4561c7b5ff86da1216ad3ab9e891da0564ce77b290d1abeec910a13738da14b46caf902ddf388513f835e15dd0774811ec885ba6b919894db349c9a7b57
+EBUILD nova-19.0.2.ebuild 9582 BLAKE2B 285306242428951b117928d492e8babe5786e03e4065e8556395c7cf67afaea3c10d04acc6cb74907a23aa44535b4c8661635dafe0727ade47fdae1359395a38 SHA512 9d61543f6809972a18843d122a3c098f956f27f1954e179fb0bbe235c974bc01c255c400563b4c21d4ffcb991174792548991c402aebedb76851d05cb9c15486
+EBUILD nova-2018.2.9999.ebuild 9496 BLAKE2B c962c25fe0107327d30eb0fde3163e4722763db4e2b3b0ff0250f9dbee071807db7a5dd9404e4425d758cb6408efafa571f79fa50cd0756355ca6754513668e6 SHA512 62756e826de4bed6fa6d185e92defe459e9e32ca53b7b860c882896e0dd306d04918cd932c25311d0700ccefc3effb16e5fadcc4e17d7e2074088d90e3f49734
+EBUILD nova-2019.1.9999.ebuild 9354 BLAKE2B 92302f07eb36bcf62aaefaa51cec5795692823fa886978c70bbbcae000fa46f6b4baeb355831fa58bc8a9bd8fd57fe4dde23c7d50a250d6492c080929979c375 SHA512 cca0284a3e11f5b4509bc755e1390aa383809d8acb7baaa40345d41d09da9222ac7aa968fe14fa95528268410a1bc5f474c3acc7145256709109a4c26278ebd4
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-18.2.2.ebuild b/sys-cluster/nova/nova-18.2.2.ebuild
index 123609323504..f57c926d0e3e 100644
--- a/sys-cluster/nova/nova-18.2.2.ebuild
+++ b/sys-cluster/nova/nova-18.2.2.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-19.0.2.ebuild b/sys-cluster/nova/nova-19.0.2.ebuild
index ffc81bcc8570..d25e3939bb40 100644
--- a/sys-cluster/nova/nova-19.0.2.ebuild
+++ b/sys-cluster/nova/nova-19.0.2.ebuild
@@ -244,8 +244,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2018.2.9999.ebuild b/sys-cluster/nova/nova-2018.2.9999.ebuild
index f0694e7ed9a0..dd30ccf5b550 100644
--- a/sys-cluster/nova/nova-2018.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2018.2.9999.ebuild
@@ -242,8 +242,8 @@ python_install_all() {
 python_install() {
 	distutils-r1_python_install
 	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	python_moduleinto db/sqlalchemy/migrate_repo
+	python_domodule nova/db/sqlalchemy/migrate_repo/migrate.cfg
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/nova/nova-2019.1.9999.ebuild b/sys-cluster/nova/nova-2019.1.9999.ebuild
index a28cdc16dcc1..4eaf50a66197 100644
--- a/sys-cluster/nova/nova-2019.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2019.1.9999.ebuild
@@ -241,13 +241,6 @@ python_install_all() {
 	rm -r "${ED}/usr/etc"
 }
 
-python_install() {
-	distutils-r1_python_install
-	# copy migration conf file (not coppied on install via setup.py script)
-	insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-}
-
 pkg_postinst() {
 	if use iscsi ; then
 		elog "iscsid needs to be running if you want cinder to connect"