app-admin/glance: 19.0.1 and 18.0.1 bump with change from user eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index f4b769604c7a6ab6a008791355a488aee5628ae4..981b70194d0e11fcd3f7e1fd5ca39466c3edf23b 100644 (file)
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,3 +1,5 @@
 DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
 DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
+DIST glance-18.0.1.tar.gz 1994751 BLAKE2B d04928cefaebb5370e050f0908b5058e63d7430c8834cb4b4c2b72eb35c7d48234d620a9fa6db31603c8310888249039b569f37399829047f90b60950df09274 SHA512 c50d3ccafe96dc4839362f1b94ac7e6e9e5aeeb7254718114bbce1ae6a52d9ad0b5c8a296f2e75c20cf030bbe75f9e397103d43536d413a258f3788f90532bde
 DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
+DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4

diff --git a/app-admin/glance/glance-18.0.1.ebuild b/app-admin/glance/glance-18.0.1.ebuild
new file mode 100644 (file)
index 0000000..03ff1b3
--- /dev/null
+++ b/app-admin/glance/glance-18.0.1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/openstack/glance.git"
+       EGIT_BRANCH="stable/stein"
+else
+       SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+       !~dev-python/pbr-2.1.0"
+DEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+       ${CDEPEND}
+       >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+       sqlite? (
+               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+       )
+       postgres? (
+               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+       )
+       >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+       !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+       >=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+       >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+       >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+       >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+       >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+       >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+       >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+       >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+       >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+       >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+       <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+       >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+       >=dev-python/glance_store-0.26.1[${PYTHON_USEDEP}]
+       >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+       >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+       acct-user/glance
+       acct-group/glance
+"
+
+python_prepare_all() {
+       sed -i '/xattr/d' test-requirements.txt || die
+       sed -i '/pysendfile/d' test-requirements.txt || die
+       sed -i '/^hacking/d' test-requirements.txt || die
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+
+       newinitd "${FILESDIR}/glance.initd" glance-api
+
+       diropts -m 0750 -o glance -g glance
+       dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+       keepdir /etc/glance
+       keepdir /var/log/glance
+       keepdir /var/lib/glance/images
+       keepdir /var/lib/glance/scrubber
+
+       insinto /etc/glance
+       insopts -m 0640 -o glance -g glance
+       doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+       use doc && local HTML_DOCS=( doc/build/html/. )
+       distutils-r1_python_install_all
+       rm -r "${ED}"/usr/etc
+}

diff --git a/app-admin/glance/glance-19.0.1.ebuild b/app-admin/glance/glance-19.0.1.ebuild
new file mode 100644 (file)
index 0000000..35a2c37
--- /dev/null
+++ b/app-admin/glance/glance-19.0.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/openstack/glance.git"
+       EGIT_BRANCH="stable/train"
+else
+       SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+       !~dev-python/pbr-2.1.0"
+DEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       ${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+       ${CDEPEND}
+       >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+       sqlite? (
+               >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+       )
+       postgres? (
+               >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+               >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+               !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+       )
+       >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+       !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+       !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+       >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+       >=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+       >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+       >=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+       >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+       >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+       >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+       >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+       >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+       >=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+       >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+       >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+       >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+       >=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+       >=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+       <dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+       >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+       >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+       >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+       >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+       >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+       >=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
+       >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+       >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+       >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+       >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+       >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+       acct-user/glance
+       acct-group/glance
+"
+
+python_prepare_all() {
+       sed -i '/xattr/d' test-requirements.txt || die
+       sed -i '/pysendfile/d' test-requirements.txt || die
+       sed -i '/^hacking/d' test-requirements.txt || die
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       if [ ! -z ${EGIT_BRANCH+x} ]; then
+               use doc && "${PYTHON}" setup.py build_sphinx
+       fi
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+
+       newinitd "${FILESDIR}/glance.initd" glance-api
+
+       diropts -m 0750 -o glance -g glance
+       dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+       keepdir /etc/glance
+       keepdir /var/log/glance
+       keepdir /var/lib/glance/images
+       keepdir /var/lib/glance/scrubber
+
+       insinto /etc/glance
+       insopts -m 0640 -o glance -g glance
+       doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+       use doc && local HTML_DOCS=( doc/build/html/. )
+       distutils-r1_python_install_all
+       rm -r "${ED}"/usr/etc
+}

diff --git a/app-admin/glance/glance-2018.2.9999.ebuild b/app-admin/glance/glance-2018.2.9999.ebuild
index 4e0dd7052c698d474c34a101c475cecd1c0f0afc..f592140fa209960dad4fa69a7399636899c3e544 100644 (file)
--- a/app-admin/glance/glance-2018.2.9999.ebuild
+++ b/app-admin/glance/glance-2018.2.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 user
+inherit distutils-r1
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
@@ -101,16 +101,13 @@ RDEPEND="
        >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
        >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+       acct-user/glance
+       acct-group/glance
 "
 
 #PATCHES=(
 #)
 
-pkg_setup() {
-       enewgroup glance
-       enewuser glance -1 -1 /var/lib/glance glance
-}
-
 python_prepare_all() {
        sed -i '/xattr/d' test-requirements.txt || die
        sed -i '/pysendfile/d' test-requirements.txt || die

diff --git a/app-admin/glance/glance-2019.1.9999.ebuild b/app-admin/glance/glance-2019.1.9999.ebuild
index b987a4ef398dfd5dadaf7d43eeb97f8b16e89d5f..fa0128f1643768c3ea1ab415b4d8610e4f657989 100644 (file)
--- a/app-admin/glance/glance-2019.1.9999.ebuild
+++ b/app-admin/glance/glance-2019.1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 user
+inherit distutils-r1
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
@@ -103,16 +103,10 @@ RDEPEND="
        >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
        >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+       acct-user/glance
+       acct-group/glance
 "
 
-#PATCHES=(
-#)
-
-pkg_setup() {
-       enewgroup glance
-       enewuser glance -1 -1 /var/lib/glance glance
-}
-
 python_prepare_all() {
        sed -i '/xattr/d' test-requirements.txt || die
        sed -i '/pysendfile/d' test-requirements.txt || die
@@ -144,5 +138,5 @@ python_install_all() {
 
        use doc && local HTML_DOCS=( doc/build/html/. )
        distutils-r1_python_install_all
-       rm -r ${ED}/usr/etc
+       rm -r "${ED}"/usr/etc
 }

diff --git a/app-admin/glance/glance-2019.2.9999.ebuild b/app-admin/glance/glance-2019.2.9999.ebuild
index cfaab05265b2845c5f64f48247945f594744e859..35a2c37323585f68bd7ec8dc5a1ac934c7130f18 100644 (file)
--- a/app-admin/glance/glance-2019.2.9999.ebuild
+++ b/app-admin/glance/glance-2019.2.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 user
+inherit distutils-r1
 
 DESCRIPTION="Services for discovering, registering, and retrieving VM images"
 HOMEPAGE="https://launchpad.net/glance"
@@ -105,16 +105,10 @@ RDEPEND="
        >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+       acct-user/glance
+       acct-group/glance
 "
 
-#PATCHES=(
-#)
-
-pkg_setup() {
-       enewgroup glance
-       enewuser glance -1 -1 /var/lib/glance glance
-}
-
 python_prepare_all() {
        sed -i '/xattr/d' test-requirements.txt || die
        sed -i '/pysendfile/d' test-requirements.txt || die
@@ -146,5 +140,5 @@ python_install_all() {
 
        use doc && local HTML_DOCS=( doc/build/html/. )
        distutils-r1_python_install_all
-       rm -r ${ED}/usr/etc
+       rm -r "${ED}"/usr/etc
 }