sys-cluster/heat: remove ocata

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 17fadaecbe6b42c79b48f2b6e93b754d76b0feab..ebe3a36063d46b449a5c78e0eb155999bbfd7745 100644 (file)
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,6 +1,3 @@
-DIST heat-8.0.6.tar.gz 2312653 BLAKE2B fe48fc6df05be1f41b2b8e1a3f42291573627a812e2deda02cd8ad3ed9fd49c566a44dbb6565843a3371878e79a6052d887d4b6cb29fa423397dec15ef4d62c8 SHA512 221c29aed02feb02d2d28e9fc754e859962e385e20a6796e90659e3c6e661f08c3f243031b7257635329b0119ca8fc890ab827fed9adfd9bbdf1557649dd108f
 DIST heat-9.0.2.tar.gz 2364044 BLAKE2B ca2c6e1f504e7b443906e1c33d2105293313223d9af851a5c46719b5c74d95687d11ea2460f7fc3e818719c9132bb8e0041b4ae123d5a0eb12b5bff22606f474 SHA512 c27dbcd74abed231b5e375461c03e32d5a55c08d04619bf7f315baad14fb20e2041aa92656b7e597bc7c804533c6496f569ce450e81a52cab5735d6d84af2734
-DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-DIST heat.conf.sample-8.0.6 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932

diff --git a/sys-cluster/heat/files/heat.initd b/sys-cluster/heat/files/heat.initd
index 41ec14cf82a35a9e299c06e0ab4f10957771cb0d..295879ebea7953673549f77077fc06b40de58918 100644 (file)
--- a/sys-cluster/heat/files/heat.initd
+++ b/sys-cluster/heat/files/heat.initd
@@ -1,52 +1,16 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+description="Starts ${SVCNAME} service for OpenStack"
+
+command=/usr/bin/${SVCNAME}
+command_user="${HEAT_USER:-heat}"
+command_background=yes
+command_args="--config-file /etc/heat/heat.conf --log-file ${HEAT_LOGDIR:-/var/log/heat}/${SVCNAME}.log"
+pidfile=/run/${SVCNAME}.pid
+required_files=/etc/heat/heat.conf
 
 depend() {
     need net 
 }
-
-checkconfig() {
-    if [ ! -r /etc/conf.d/$BASENAME ]; then
-        eerror "No heat conf.d file found: /etc/conf.d/$BASENAME)"
-    else
-        . /etc/conf.d/$BASENAME
-    fi
-}
-
-start() {
-    checkconfig || return $?
-    
-    ebegin "Starting ${SVCNAME}"
-        if [ ! -d ${PID_PATH} ]; then
-                mkdir ${PID_PATH}
-        chown heat:root ${PID_PATH}
-        fi
-
-    start-stop-daemon --start \
-              --quiet \
-              --user heat \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --make-pidfile \
-              --background \
-              --exec /usr/bin/heat-${SERVERNAME} --  --config-file /etc/heat/heat.conf --log-file /var/log/heat/heat-${SERVERNAME}
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-    checkconfig || return $?
-    
-    ebegin "Stopping ${SVCNAME}"
-    
-    start-stop-daemon --stop \
-              --quiet \
-              --user heat \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --exec /usr/bin/heat-${SERVERNAME} --  --config-file /etc/heat/heat.conf
-
-    eend $? "Failed to stop ${SVCNAME}"
-}

diff --git a/sys-cluster/heat/files/heat.initd-2 b/sys-cluster/heat/files/heat.initd-2
deleted file mode 100644 (file)
index 2161aa9..0000000
--- a/sys-cluster/heat/files/heat.initd-2
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${SVCNAME}
-command_user="${HEAT_USER:-heat}"
-command_background=yes
-command_args="--config-file /etc/heat/heat.conf --log-file ${HEAT_LOGDIR:-/var/log/heat}/${SVCNAME}.log"
-pidfile=/run/${SVCNAME}.pid
-required_files=/etc/heat/heat.conf
-
-depend() {
-    need net 
-}

diff --git a/sys-cluster/heat/heat-2017.1.9999.ebuild b/sys-cluster/heat/heat-2017.1.9999.ebuild
deleted file mode 100644 (file)
index 848baeb..0000000
--- a/sys-cluster/heat/heat-2017.1.9999.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
-EGIT_REPO_URI="https://github.com/openstack/heat.git"
-EGIT_BRANCH="stable/ocata"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-       !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-       >=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-       !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-       >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-       >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-       >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-       >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       !~dev-python/routes-2.3[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-       )
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-
-       >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-       >=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-       enewgroup heat
-       enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       diropts -m0750 -o heat -g heat
-       keepdir /etc/heat
-       dodir /etc/heat/environment.d
-       dodir /etc/heat/templates
-
-       for svc in api api-cfn engine; do
-               newinitd "${FILESDIR}/heat.initd" heat-${svc}
-       done
-
-       insinto /etc/heat
-       insopts -m0640 -o heat -g heat
-       newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-       doins "etc/heat/api-paste.ini"
-       doins "etc/heat/policy.json"
-       insinto /etc/heat/templates
-       doins "etc/heat/templates/"*
-       insinto /etc/heat/environment.d
-       doins "etc/heat/environment.d/default.yaml"
-
-       dodir /var/log/heat
-       fowners heat:heat /var/log/heat
-}

diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild
index 64992465d1a3457980710d9c2e69bd6b8e63ba75..08a656c38a7ab62a41160dc798965f30f44b3ee1 100644 (file)
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.2.9999.ebuild
@@ -145,7 +145,7 @@ python_install_all() {
        dodir /etc/heat/templates
 
        for svc in api api-cfn engine; do
-               newinitd "${FILESDIR}/heat.initd-2" heat-${svc}
+               newinitd "${FILESDIR}/heat.initd" heat-${svc}
        done
 
        insinto /etc/heat

diff --git a/sys-cluster/heat/heat-8.0.6.ebuild b/sys-cluster/heat/heat-8.0.6.ebuild
deleted file mode 100644 (file)
index 395c670..0000000
--- a/sys-cluster/heat/heat-8.0.6.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
-HOMEPAGE="https://launchpad.net/heat"
-SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
-       https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+mysql +memcached postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       app-admin/sudo"
-
-RDEPEND="
-       ${CDEPEND}
-       >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-       >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-       !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-       >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-       >=dev-python/aodhclient-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
-       !~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
-       >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-manilaclient-1.12.0[${PYTHON_USEDEP}]
-       >=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/python-saharaclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-senlinclient-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-       >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-       >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       !~dev-python/routes-2.3[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       sqlite? (
-               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-               !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               >=dev-python/psycopg-2.5.0
-               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-       )
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-
-       >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-       >=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-       enewgroup heat
-       enewuser heat -1 -1 /var/lib/heat heat
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-       distutils-r1_python_install_all
-       diropts -m0750 -o heat -g heat
-       keepdir /etc/heat
-       dodir /etc/heat/environment.d
-       dodir /etc/heat/templates
-
-       for svc in api api-cfn engine; do
-               newinitd "${FILESDIR}/heat.initd" heat-${svc}
-       done
-
-       insinto /etc/heat
-       insopts -m0640 -o heat -g heat
-       newins "${DISTDIR}/heat.conf.sample-${PV}" "heat.conf.sample"
-       doins "etc/heat/api-paste.ini"
-       doins "etc/heat/policy.json"
-       insinto /etc/heat/templates
-       doins "etc/heat/templates/"*
-       insinto /etc/heat/environment.d
-       doins "etc/heat/environment.d/default.yaml"
-
-       dodir /var/log/heat
-       fowners heat:heat /var/log/heat
-}

diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild
index 05e13dfb05dc7db18bfa6f82043325070e316e43..9de5bb7102cf8fc0f430ba9875b43ef79edb411e 100644 (file)
--- a/sys-cluster/heat/heat-9.0.2.ebuild
+++ b/sys-cluster/heat/heat-9.0.2.ebuild
@@ -143,7 +143,7 @@ python_install_all() {
        dodir /etc/heat/templates
 
        for svc in api api-cfn engine; do
-               newinitd "${FILESDIR}/heat.initd-2" heat-${svc}
+               newinitd "${FILESDIR}/heat.initd" heat-${svc}
        done
 
        insinto /etc/heat