diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
| commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
| tree | f82923fbca262493e83dd1382e561a2fae24cc46 /app-emulation/cloud-init/cloud-init-9999.ebuild | |
| parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
| parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'app-emulation/cloud-init/cloud-init-9999.ebuild')
| -rw-r--r-- | app-emulation/cloud-init/cloud-init-9999.ebuild | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index 6c2ca0f3c26a..f1f5ed321e91 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -1,18 +1,24 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_6 ) +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -inherit distutils-r1 git-r3 +inherit distutils-r1 + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/cloud-init" +else + SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="Cloud instance initialisation magic" HOMEPAGE="https://launchpad.net/cloud-init" -EGIT_REPO_URI="https://git.launchpad.net/cloud-init" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" IUSE="test" RESTRICT="!test? ( test )" @@ -51,7 +57,7 @@ PATCHES=( # Fix Gentoo support # https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777 "${FILESDIR}/${PN}-18.4-fix-packages-module.patch" - "${FILESDIR}/${PN}-19.4-gentoo-support-upstream-templates.patch" + "${FILESDIR}/${PN}-20.1-gentoo-support-upstream-templates.patch" "${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch "${FILESDIR}"/18.4-fix-update_package_sources-function.patch "${FILESDIR}"/18.4-add-support-for-package_upgrade.patch |