From 093a6599d461dfeac30f386c73662ca00de92099 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Mon, 14 Jun 2021 20:06:51 +0200 Subject: [PATCH] add a patch for older ruamel-yaml-0.15.100 requested by core --- app-misc/home-assistant-cli/Manifest | 3 +- .../home-assistant-cli-0.9.3-r1.ebuild | 70 +++++++++++++++++++ .../home-assistant-cli-9999.ebuild | 4 +- 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 app-misc/home-assistant-cli/home-assistant-cli-0.9.3-r1.ebuild diff --git a/app-misc/home-assistant-cli/Manifest b/app-misc/home-assistant-cli/Manifest index 8f30a4e73..16d557c79 100644 --- a/app-misc/home-assistant-cli/Manifest +++ b/app-misc/home-assistant-cli/Manifest @@ -3,6 +3,7 @@ DIST home-assistant-cli-0.9.1.tar.gz 62884 BLAKE2B 4ccafb7d461da42772c9168ce2b9c DIST home-assistant-cli-0.9.3.tar.gz 61623 BLAKE2B 3833b3e63c9b44afd911d642f9a829d5ab473fd48b374fa185c4210a7f5a792ca3873ee583bc0d4aab4e447d15e11d0bdcfed4932c276311da953a06498c32e1 SHA512 9f52e96a5330135f1fcebb8dc32ebe9732555641a656768ef09e5b19f9222f99b67e31a7dea4c48411718f28ceca14ce7fe65e0bc0d47e5b6a8506fc82fde37f EBUILD home-assistant-cli-0.9.0.ebuild 2703 BLAKE2B 75fe441d4b155ad4300c8808a7f59991fb13cd1bca445802f167dcbf0293d0f224818f0e5afcb91b8b6a266caec53dcd7d0b0e2ca31ad5bcca6ffef9a01d61f2 SHA512 596c9010e399aff07ba707b81b9254d451671ca7b9d80a7d8827bbc2a82156add5e514c210f61e9eff12e86a24f998716f44a4b6fadac725441a8fa1d5f8061d EBUILD home-assistant-cli-0.9.1.ebuild 2703 BLAKE2B 75fe441d4b155ad4300c8808a7f59991fb13cd1bca445802f167dcbf0293d0f224818f0e5afcb91b8b6a266caec53dcd7d0b0e2ca31ad5bcca6ffef9a01d61f2 SHA512 596c9010e399aff07ba707b81b9254d451671ca7b9d80a7d8827bbc2a82156add5e514c210f61e9eff12e86a24f998716f44a4b6fadac725441a8fa1d5f8061d +EBUILD home-assistant-cli-0.9.3-r1.ebuild 2595 BLAKE2B d0e659f66c96d3cf4d2247e6abcdc938e6339e2dc10b1576d213b974a50a3633efc5cdaa8c7278bea0536ac3c980d5a4637cf27289c7131bc4f6532507aa8c89 SHA512 af64d09edfcf97a463b3ab5372f05b1366f9a4a8d73ad14cbe35e2ccc0411d1248db52c2566df320aa2bd6ce074f53682e71796648d47746f30df2d10918259f EBUILD home-assistant-cli-0.9.3.ebuild 2595 BLAKE2B d9a49ff6f8ea0c4114459cbdc2c43fcc6a9dd9c94783e5d3bbcd8b662efa861b00b9388175873c83b4e8c9255c5fda3e5cbeb750f10f011eea47263ad6a704e1 SHA512 fb24220b626a053e06522af91254d8b6f37a99ab65a61e5bccb9850b922e37ace659ccf5cc482561583eaf4c9e41ddc745e96d704940c9a2ecba44c9ed9c25a8 -EBUILD home-assistant-cli-9999.ebuild 2595 BLAKE2B d9a49ff6f8ea0c4114459cbdc2c43fcc6a9dd9c94783e5d3bbcd8b662efa861b00b9388175873c83b4e8c9255c5fda3e5cbeb750f10f011eea47263ad6a704e1 SHA512 fb24220b626a053e06522af91254d8b6f37a99ab65a61e5bccb9850b922e37ace659ccf5cc482561583eaf4c9e41ddc745e96d704940c9a2ecba44c9ed9c25a8 +EBUILD home-assistant-cli-9999.ebuild 2595 BLAKE2B d0e659f66c96d3cf4d2247e6abcdc938e6339e2dc10b1576d213b974a50a3633efc5cdaa8c7278bea0536ac3c980d5a4637cf27289c7131bc4f6532507aa8c89 SHA512 af64d09edfcf97a463b3ab5372f05b1366f9a4a8d73ad14cbe35e2ccc0411d1248db52c2566df320aa2bd6ce074f53682e71796648d47746f30df2d10918259f MISC metadata.xml 480 BLAKE2B 171a4a346c5b4d88abdd8f0e1b2e3480cb7e8e5e250e759cdfc7ee9dc7f763f235617ac12f171d9f96eeabe4f92a9a347371badbee7a230c59229e9fae14ec84 SHA512 ce473493061008ae30714cb39fa7f13fd0aff9451342da57da0cac5f6d6c4488dad514044548c8fe9b0e8030d00ac7c606a68c176f3834df2aed810fbf0b2902 diff --git a/app-misc/home-assistant-cli/home-assistant-cli-0.9.3-r1.ebuild b/app-misc/home-assistant-cli/home-assistant-cli-0.9.3-r1.ebuild new file mode 100644 index 000000000..9ce66592b --- /dev/null +++ b/app-misc/home-assistant-cli/home-assistant-cli-0.9.3-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/home-assistant/home-assistant-cli.git" +else + SRC_URI="https://github.com/home-assistant/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="The Home Assistant Command-line Interface (hass-cli)" +HOMEPAGE="https://github.com/home-assistant/home-assistant-cli/" +EGIT_REPO_URI="https://github.com/home-assistant/home-assistant-cli.git" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND=">=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] + >=dev-python/click-log-0.3.2[${PYTHON_USEDEP}] + >=dev-python/click-8.0[${PYTHON_USEDEP}] + >=dev-python/dateparser-0.7.1[${PYTHON_USEDEP}] + >=dev-python/jinja-2.10[${PYTHON_USEDEP}] + >=dev-python/jsonpath-ng-1.5.1[${PYTHON_USEDEP}] + >=dev-python/netdisco-2.8.3[${PYTHON_USEDEP}] + >=dev-python/regex-2021.4.4[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}] + =dev-python/requests-2.22.0[${PYTHON_USEDEP}] + >=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/coveralls-1.2.0[${PYTHON_USEDEP}] + >=dev-python/flake8-docstrings-1.3.0[${PYTHON_USEDEP}] + >=dev-python/flake8-3.9[${PYTHON_USEDEP}] + >=dev-python/mock-open-1.4[${PYTHON_USEDEP}] + >=dev-python/mypy-0.800[${PYTHON_USEDEP}] + >=dev-python/pydocstyle-6.0.0[${PYTHON_USEDEP}] + >=dev-python/pylint-2.7[${PYTHON_USEDEP}] + >=dev-python/pytest-cov-2.11[${PYTHON_USEDEP}] + >=dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}] + >=dev-python/pytest-timeout-1.4[${PYTHON_USEDEP}] + >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-mock-1.8.0[${PYTHON_USEDEP}] + >=dev-python/wheel-0.33.1[${PYTHON_USEDEP}] + >=dev-python/codecov-2.0.15[${PYTHON_USEDEP}] + >=dev-python/twine-1.13.0[${PYTHON_USEDEP}] + )" + +src_prepare() { + sed -i -e "s/'ruamel.yaml>=0.16.5,<0.17'/'ruamel.yaml>=0.15.100'/" setup.py || die "Sed version helper failed!" + # sed -i -e 's;jsonpath-rw>=1.4.0,<2;jsonpath-ng>=1.5.1;' setup.py || die "Sed on jsonpath-rw in setup-py failed." + # sed -i -e 's;jsonpath_rw;jsonpath_ng;' homeassistant_cli/helper.py || die "Sed on helper.py failed." + eapply_user +} + +python_test() { + nosetests --verbose || die + py.test -v -v || die +} diff --git a/app-misc/home-assistant-cli/home-assistant-cli-9999.ebuild b/app-misc/home-assistant-cli/home-assistant-cli-9999.ebuild index e82b4ff61..9ce66592b 100644 --- a/app-misc/home-assistant-cli/home-assistant-cli-9999.ebuild +++ b/app-misc/home-assistant-cli/home-assistant-cli-9999.ebuild @@ -31,7 +31,7 @@ RDEPEND=">=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] >=dev-python/jsonpath-ng-1.5.1[${PYTHON_USEDEP}] >=dev-python/netdisco-2.8.3[${PYTHON_USEDEP}] >=dev-python/regex-2021.4.4[${PYTHON_USEDEP}] - >=dev-python/ruamel-yaml-0.16.5[${PYTHON_USEDEP}] + >=dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}] =dev-python/requests-2.22.0[${PYTHON_USEDEP}] >=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]" @@ -58,7 +58,7 @@ BDEPEND=" )" src_prepare() { - # sed -i -e "s/'ruamel.yaml>=0.16.5,<0.17'/'ruamel.yaml>=0.15.100'/" setup.py || die "Sed version helper failed!" + sed -i -e "s/'ruamel.yaml>=0.16.5,<0.17'/'ruamel.yaml>=0.15.100'/" setup.py || die "Sed version helper failed!" # sed -i -e 's;jsonpath-rw>=1.4.0,<2;jsonpath-ng>=1.5.1;' setup.py || die "Sed on jsonpath-rw in setup-py failed." # sed -i -e 's;jsonpath_rw;jsonpath_ng;' homeassistant_cli/helper.py || die "Sed on helper.py failed." eapply_user