better install of conf files

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

4 files changed, 78 insertions, 56 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index b130d71e42d7..65bc5e07bef7 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,13 @@
 # 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.40 2014/08/21 20:44:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.41 2014/09/23 00:54:59 prometheanfire Exp $
+
+*neutron-2014.1.2-r1 (23 Sep 2014)
+
+  23 Sep 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2014.1.2-r1.ebuild, -neutron-2014.1.2.ebuild,
+  neutron-2014.1.9999.ebuild:
+  better install of conf files
 
 *neutron-2014.1.2 (21 Aug 2014)
 
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 6be78598d4d5..0dc43012a15c 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -18,25 +18,25 @@ AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321
 AUX nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
 AUX sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
 DIST neutron-2014.1.2.tar.gz 6418129 SHA256 6ecf65fa3679d2b49180740bca66cd88effdd38ecf4cd3fdd0ad8ef0979c263e SHA512 8baba8225f1c6e06a0d41e26e40307910f0944370290e6dbf6be78eb01175aba8349d4d02bb1bca5f2dc8545f141bb176df26453c777affc1c68907c17098476 WHIRLPOOL 96de6de614b8b34538fb46de06b95fe1f2686184db471d9c8ab9566762e057408dac00a5ea22607e982b7b59463c9f7e0d18d05ecbe98c675e56d12c142f7352
-EBUILD neutron-2014.1.2.ebuild 6739 SHA256 7a175617142e5c3d93ca5218bb0c697917f9bb917c53f44c5297dd97143d96f7 SHA512 473ab3e34afb5be60885e8ec48860168a42ff99a4a819e5281325883d339511dfd9540bb920887b4663abb70c758c49c0ad83c51068a72bc794f77aada2e1428 WHIRLPOOL 0d3401b6b2e7abc6e09ddea4b7572ef677301a45b5958704f570179b466f0396a30ba1e2f46bb6a28c145e31f7dfed9f697f5048bee888f88354bafc6d361b8c
-EBUILD neutron-2014.1.9999.ebuild 5744 SHA256 c62738a65b9b9a1fe1997dd550b07216e33ea4a66359d086e0da82182add17b9 SHA512 bc689fcda6fa58cb13c45c24c2f808a3c59b820e72429aa26e4bae7d02b7dd064cdea09857113a20ec3a35fd18722883c8a43db8f49c2936c57aa401430c942b WHIRLPOOL ed2353628282dcd4d05f65577189d86edb88783d9a2bd0152154619380aa23ecb9bbc2c4b6561edfdd02581c66db29ab61fdca2db15e1f5f5a306f96fb9b0118
+EBUILD neutron-2014.1.2-r1.ebuild 6543 SHA256 d00cf47d0e009d11ce8e198e6037a7798ef8f66e9b63cc17b2faabc19dd7fe49 SHA512 aeb55ee2e62c42c86f5ba155b7619748753f896f4e1a2a4765fd3e9336655ff409c082fbcad0aecc83fba44d4011f0cf29e4b85e2d5fd324f4b033fb76cc6e9d WHIRLPOOL 455f5ed1a2c17456393d44a1f289380ffa35d22f5d949fd9b6fa4943812e88b5cb0ce8a8885c119c0049e0d0cbaec4be4ad2c4aaef83591f67c6092fcd2bf94e
+EBUILD neutron-2014.1.9999.ebuild 6562 SHA256 3f7e4b2d837f79364ed1b61ab939505cd02be4371821a3f7c6a9b31d68e78f66 SHA512 c3261fd679a61cd60b09cbd6e3daffc285791b1d48e519ac29c01046c966838f8bed0b3c1ae0189fd0dcfcc013be62b1a65fa9b8ee2ca4dfcc82d92675d82544 WHIRLPOOL 69f669bbf75ac5edde0c4e92378fab5873756b699629dc8e8eefdb3fd21b1d9bc338e93c40b55273f1aa8ef89205f309d7c8a3481ace56f32de2e03e1eeece47
 EBUILD neutron-9999.ebuild 5708 SHA256 f50bbbca6ff649310d31b665b984bac6a96b4827b3fd6baf9499303c18f887f7 SHA512 0820ec933265d84921e84f9ed1cd3c4ab27af0292138e57d8f90a3e8c954bbc0d39d0fa822c210fb8957951bf71e4fe0ee9d69c600de48eedc6bd7c2950584e1 WHIRLPOOL 5699273d695853342c7cf90160996add4e1b525c8042efe2e0e16b9afbd684a6e30c988b94c3190b577f1f9edd3c63bf2f39f926aa5e60e7dc9ad3b5802a69e8
-MISC ChangeLog 12790 SHA256 bac98d96b1a5eb0ade435257708fe0d1a340fffcbe9578b1ea6631002d18292f SHA512 9ff7a412fef84430a6b992d0adc02c5bc0795b0c476474adc5b91ab64cd9847a95c4a7712129a74557a04f1c8a951676ef17f01763ca03b04a45c5198649cb33 WHIRLPOOL 3d57d2fb1574d98ffd993aa5f83346fe1671f07ae22495387a27e90ad2550c9e7666847d653d4544a8667122b73f4c0befe1fac8d37cd032fee7bab76f446029
+MISC ChangeLog 13002 SHA256 4416f8debb90e4c3eef70966e3989ccac004d1466b19158d4898eeec2706fa1c SHA512 e5a15901640628c18363a7eb43e45b053360e3b421eb31fc69aea3b37d95e2fdfb23a9f8e0db81821fb1623ea7a6c24d5f143976eb0786af353e05461e17798f WHIRLPOOL 8a508a27ce49f49405a9cebdc01cdb9374bbf76dc20b66fb5947092e7a6b7a3ce2677e5639ef28cada6c9ee720dd090a4de80d6c4211e02a7ce999e8477d1fd9
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9lovAAoJECRx6z5ArFrDmcsP/juv/I2VfXkHJXP1wTniotlG
-YWzph2ZkewfbOLk8iR5NSMEg/m9MOo1w++L1hnxZ6hgdiogF69lPJ2YZgL0VOLm+
-1IG9VbR/I5oBgonr3a5EyRkEYUOjT49Dssy2AupeOcr7QdZvKhmDBalo063feCfm
-y+S8WrYOenMaH4QLhGT/dgVbE71uFD/FYqNJH1yU6fKCybBdJe28XUS1WLt2U3ZT
-4eXntFmeJG8jq2kCdC2c3lJzzJGEafbS2kIdFUnTwZJpaRajuPd3Go5LkDSEKmk+
-moUVd04FWRUD0Ou0qIukjIB4L3TdZZlbTKhyEt7CEWdtMJMg/50H4uX7PZcTh3/U
-7/RxN34gTtkOId6wp5QFZD76VsLiMPp708/Drt01LhrMuMTz9ahaK7OgYohd8xM5
-SAk5QY8ZUtBcpIxZ5AbIRj78xNZVv6/6Z4ZAb8zpm2MWdu3ZQCN/Y6eBehkkmdwW
-ecbpRFnQJRSWdS5ZuvPYLa0UqwTdSLdCQKv0iZVSF6GSlMCwRWka+R80roW8jGB8
-EhZjnNS9AzyW0grD5bqayIBZY/HzH4hy36vZ2eDWJ6nhIaS3MwnJF1EAjwt1mEg0
-Ubq2V+21Cs7J9H4rF95DpgoamHNNxwG8dtp4HNbFh+E12ATe8/exWuLBr63gUYD5
-datB5bdWvekPkyYarGEb
-=o/0+
+iQIcBAEBCAAGBQJUIMUEAAoJECRx6z5ArFrDZB0P/3jaR72uAEzigZ+3vd2Kl9id
+VzifnP5vP6jkO8EsZDS08wxeSSHnLLC5Lkhy2sqm14yKa0odHcB/sPEb+nl/2mM1
+KIILK4dvXyz7IvDGcyz/cxzHWpKNjURm/c2RG13UF+dHlzcqndKG5/SNjjbtzGu6
+YVdAcDhQoXJK6dmhjnWhboRAy4a7q+KoABRrP+TdL1qG0H7AkP/MrLRceX4ykdxU
+8RW7oD1WgMX4QhkfeNMx+NpEHFJR22hsocp1xG4f3ukm3ZjDe5tVhXGoGnCEt161
+eEAK2cdR6/jxhocxfOT9+RXR4vItof1Tnjwo5GTZ9hJl2+UlJbVsQC2cDbiZti2b
+TVDpJSAAFu7kXIzchnnk0kTV0AUTh6Gb2yazXmCY/3OJo9BpsrWucjxrOwBy1JmG
+bioKtUv9HBu5U4Pilsla/peFQmenBm9w8goPsd8wLUhPNzuQZenciaBAQIEDkyX7
+0iHbqaBZ4YR8FmFFq4BXYhnyZ4NzvJWm5E9To9t4VsjPvfiHsZD7hFEPdhHNs/kb
+01gEYlaLTVvczazOEahe0PIY67z2PMaC6Ke6otWVK2kemAQjBvhWjgKmq87iMTob
+aPqTojUnfKrtmIgDPDvrMtFCd+OCB/QfyhFcZbNhxIw7HPiY+26U7dZhXF/23qJv
+ojY9jCV9fFBIlq7Gxpc/
+=K/d7
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-2014.1.2.ebuild b/sys-cluster/neutron/neutron-2014.1.2-r1.ebuild
index bf80d358d097..7cd94776a13e 100644
--- a/sys-cluster/neutron/neutron-2014.1.2.ebuild
+++ b/sys-cluster/neutron/neutron-2014.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.2.ebuild,v 1.1 2014/08/21 20:44:22 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.2-r1.ebuild,v 1.1 2014/09/23 00:54:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -156,18 +156,12 @@ python_install() {
 	keepdir /etc/neutron
 	insinto /etc/neutron
 	insopts -m 0640 -o neutron -g neutron
-	doins "etc/neutron.conf"
-	doins "etc/api-paste.ini"
-	doins "etc/dhcp_agent.ini"
-	doins "etc/fwaas_driver.ini"
-	doins "etc/l3_agent.ini"
-	doins "etc/lbaas_agent.ini"
-	doins "etc/metadata_agent.ini"
-	doins "etc/metering_agent.ini"
-	doins "etc/policy.json"
-	doins "etc/vpn_agent.ini"
-	doins -r "etc/neutron/plugins"
 
+	doins etc/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
 	insopts -m 0640 -o root -g root
 	doins "etc/rootwrap.conf"
 	doins -r "etc/neutron/rootwrap.d"
diff --git a/sys-cluster/neutron/neutron-2014.1.9999.ebuild b/sys-cluster/neutron/neutron-2014.1.9999.ebuild
index 9c682280a2d3..fa950699ee82 100644
--- a/sys-cluster/neutron/neutron-2014.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2014.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.6 2014/08/10 20:20:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.9999.ebuild,v 1.7 2014/09/23 00:54:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,8 +14,8 @@ EGIT_BRANCH="stable/icehouse"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="+dhcp doc +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+KEYWORDS="~amd64 ~x86"
+IUSE="dhcp doc l3 metadata openvswitch linuxbridge 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
@@ -84,7 +84,9 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
 		openvswitch? ( net-misc/openvswitch )
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
-PATCHES=( "${FILESDIR}/sphinx_mapping.patch" )
+PATCHES=(
+	"${FILESDIR}/sphinx_mapping.patch"
+)
 
 pkg_setup() {
 	enewgroup neutron
@@ -123,39 +125,58 @@ python_test() {
 
 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
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
 	keepdir /etc/neutron
 	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g 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/*
+	# stupid renames
+	rm "${D}etc/neutron/quantum"
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
 	doins "etc/rootwrap.conf"
-	insinto /etc
-	doins -r "etc/neutron/"
-
-	#remove the etc stuff from usr...
-	rm -R "${D}/usr/etc/"
+	doins -r "etc/neutron/rootwrap.d"
 
 	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"
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	#remove superfluous stuff 
+	rm -R "${D}/usr/etc/"
 }
 
 python_install_all() {