[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-07-14 Thread Sam James
commit: 632c67be19ade509287fbfe48442f97afd899d1d
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 04:30:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 04:30:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632c67be

app-emulation/cloud-init: drop 22.2.2, 22.4

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/Manifest |  2 -
 app-emulation/cloud-init/cloud-init-22.2.2.ebuild | 95 ---
 app-emulation/cloud-init/cloud-init-22.4.ebuild   | 95 ---
 3 files changed, 192 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index e09f96458f80..cabaa649916e 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,4 +1,2 @@
-DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
-DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 
5f961c895c0d6c78a7cee47d2b52acd57d959baeb5172cea89d75ffe23424e3a8a3170a0ecdcad729c6cb0c898477ea94c43a5f8bdf200fc3f122c32fdb2e96d
 SHA512 
6151d1d5e4be241219cb5804ca2bad2dd790f366bc847d286a8840faad1fb4adf5d780c9418ce574c2cfcefc16851a49961f33c5da1fbc84bb8299cf138bfcfc
 DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 
0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359
 SHA512 
34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13
 DIST cloud-init-24.2.tar.gz 1786275 BLAKE2B 
21f5209a77ef401d12271f6ea695d84065b22f40b7273dd8709dee5fadc7038a0f59a9a3dd53b73812a44a603b5cdc7fb36b71fcdb1f2d4295d87d2cc6069fcd
 SHA512 
72de351b3e978e01a4695b58987d942cc1b2faee749ac0df2024a839e0e1539c9b1f0a9e5cf1930e33c36344d152b7580cfe2dd55f95ad4f669df9b4dda4648d

diff --git a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
deleted file mode 100644
index a1d0ec08c413..
--- a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Disabled for now: bug #850628
-# https://bugs.launchpad.net/cloud-init/+bug/1978328
-#DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 )
-
-inherit distutils-r1 udev
-
-if [[ ${PV} == * ]]; 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 arm64 ppc64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-   ${CDEPEND}
-   test? (
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest-mock[${PYTHON_USEDEP}]
-   dev-python/responses[${PYTHON_USEDEP}]
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-   selinux? ( sec-policy/selinux-cloudinit )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-   # Fix location of documentation installation
-   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-
-   if [[ ${PV} == * ]] ; then
-   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
-   fi
-   distutils-r1_python_prepare_all
-}
-
-python_install() {
-   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   # installs as non-executable
-   chmod +x "${D}"/etc/init.d/* || die
-}
-
-pkg_prerm() {
-   udev_reload
-}
-
-pkg_postinst() {
-   udev_reload
-
-   elog "cloud-init-local needs to be run in the boot runlevel because it"
-   elog "modifies services in the default runlevel.  When a runlevel is 
started"
-   elog "it is ca

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-07-14 Thread Sam James
commit: 6b698840d76c9b61973e6c152635b37a5a7cd0dd
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 04:23:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 04:23:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b698840

app-emulation/cloud-init: Stabilize 23.4 ppc64, #932918

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index 57f427a0fce4..b70eaafef16b 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 arm64 ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-07-14 Thread Sam James
commit: 2c045bdc0be0abb70ab6327b7cf015708a1b67c2
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 04:23:13 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 04:23:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c045bdc

app-emulation/cloud-init: Stabilize 23.4 arm64, #932918

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index d9af1ace0ad9..57f427a0fce4 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-07-14 Thread Sam James
commit: a5bd6899150f316feaf0ca255cfc7219c63773ac
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 04:23:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 04:23:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5bd6899

app-emulation/cloud-init: Stabilize 23.4 x86, #932918

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index b70eaafef16b..2e3478cac607 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="amd64 arm64 ppc64 ~x86"
+   KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-07-14 Thread Sam James
commit: 265e3dd6c9c3df8268606c0b91ed1dac549cb44a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 15 04:20:56 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 15 04:21:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265e3dd6

app-emulation/cloud-init: add 24.2

Closes: https://bugs.gentoo.org/675724
Closes: https://bugs.gentoo.org/708716
Closes: https://bugs.gentoo.org/762172
Closes: https://bugs.gentoo.org/841128
Closes: https://bugs.gentoo.org/926830
Closes: https://bugs.gentoo.org/934571
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/Manifest | 1 +
 .../cloud-init/{cloud-init-.ebuild => cloud-init-24.2.ebuild} | 8 +++-
 app-emulation/cloud-init/cloud-init-.ebuild   | 8 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index a1fdc85deb9c..e09f96458f80 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,4 @@
 DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
 DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 
5f961c895c0d6c78a7cee47d2b52acd57d959baeb5172cea89d75ffe23424e3a8a3170a0ecdcad729c6cb0c898477ea94c43a5f8bdf200fc3f122c32fdb2e96d
 SHA512 
6151d1d5e4be241219cb5804ca2bad2dd790f366bc847d286a8840faad1fb4adf5d780c9418ce574c2cfcefc16851a49961f33c5da1fbc84bb8299cf138bfcfc
 DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 
0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359
 SHA512 
34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13
+DIST cloud-init-24.2.tar.gz 1786275 BLAKE2B 
21f5209a77ef401d12271f6ea695d84065b22f40b7273dd8709dee5fadc7038a0f59a9a3dd53b73812a44a603b5cdc7fb36b71fcdb1f2d4295d87d2cc6069fcd
 SHA512 
72de351b3e978e01a4695b58987d942cc1b2faee749ac0df2024a839e0e1539c9b1f0a9e5cf1930e33c36344d152b7580cfe2dd55f95ad4f669df9b4dda4648d

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-24.2.ebuild
similarity index 91%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-24.2.ebuild
index 7bb69ee6336a..a5af2bf3bfc1 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-24.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
@@ -55,6 +55,12 @@ RDEPEND="
selinux? ( sec-policy/selinux-cloudinit )
 "
 
+EPYTEST_IGNORE=(
+   # Can't find file
+   tests/unittests/config/test_apt_configure_sources_list_v1.py
+   tests/unittests/config/test_apt_configure_sources_list_v3.py
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 7bb69ee6336a..a5af2bf3bfc1 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
@@ -55,6 +55,12 @@ RDEPEND="
selinux? ( sec-policy/selinux-cloudinit )
 "
 
+EPYTEST_IGNORE=(
+   # Can't find file
+   tests/unittests/config/test_apt_configure_sources_list_v1.py
+   tests/unittests/config/test_apt_configure_sources_list_v3.py
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-06-05 Thread Eray Aslan
commit: 8c84239cbd28424196b5a53e1a5dbfdbf2383ca6
Author: Eray Aslan  gentoo  org>
AuthorDate: Wed Jun  5 06:40:38 2024 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Wed Jun  5 07:24:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c84239c

app-emulation/cloud-init: Stabilize 23.4 amd64, #932918

Signed-off-by: Eray Aslan  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index eba8a0ee55f0..d9af1ace0ad9 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-04-13 Thread Matthew Thode
commit: 4af10db28e50a0e1e4f2a7041aee96b00fca3eb0
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Apr 13 15:32:53 2024 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sat Apr 13 15:33:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af10db2

app-emulation/cloud-init: enable py3.12

Closes: https://bugs.gentoo.org/929305

Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 4 ++--
 app-emulation/cloud-init/cloud-init-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index a0b8bf1f21f8..eba8a0ee55f0 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
 #DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_10 python3_11 )
+PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
 
 inherit distutils-r1 udev
 

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index e3c6b940635d..7bb69ee6336a 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_10 python3_11 )
+PYTHON_COMPAT=( python3_10 python3_11 python3_12 )
 
 inherit distutils-r1 udev
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2024-01-20 Thread Sam James
commit: bd4b6eaf80d3fab84a00b3c15bfb82eab8dd5f40
Author: Brett Holman  gmail  com>
AuthorDate: Wed Jan 10 00:02:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 13:27:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4b6eaf

app-emulation/cloud-init: Update test deps

Signed-off-by: Brett Holman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34726
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
index fa85ccaf08ca..a0b8bf1f21f8 100644
--- a/app-emulation/cloud-init/cloud-init-23.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -40,8 +40,8 @@ CDEPEND="
 BDEPEND="
${CDEPEND}
test? (
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/passlib[${PYTHON_USEDEP}]
dev-python/pytest-mock[${PYTHON_USEDEP}]
dev-python/responses[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 2e9caef4c225..e3c6b940635d 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -39,8 +39,8 @@ CDEPEND="
 BDEPEND="
${CDEPEND}
test? (
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/passlib[${PYTHON_USEDEP}]
dev-python/pytest-mock[${PYTHON_USEDEP}]
dev-python/responses[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2023-12-12 Thread Matthew Thode
commit: 2a7ec3d53ca5e133431d731c41c09b1a0e222860
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Dec 12 19:46:46 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Dec 12 19:46:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7ec3d5

app-emulation/cloud-init: add 23.4

Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest   |  1 +
 app-emulation/cloud-init/cloud-init-23.4.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 5d51001c005b..a1fdc85deb9c 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
 DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 
5f961c895c0d6c78a7cee47d2b52acd57d959baeb5172cea89d75ffe23424e3a8a3170a0ecdcad729c6cb0c898477ea94c43a5f8bdf200fc3f122c32fdb2e96d
 SHA512 
6151d1d5e4be241219cb5804ca2bad2dd790f366bc847d286a8840faad1fb4adf5d780c9418ce574c2cfcefc16851a49961f33c5da1fbc84bb8299cf138bfcfc
+DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 
0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359
 SHA512 
34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13

diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild 
b/app-emulation/cloud-init/cloud-init-23.4.ebuild
new file mode 100644
index ..fa85ccaf08ca
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_10 python3_11 )
+
+inherit distutils-r1 udev
+
+if [[ ${PV} == * ]]; 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 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   ${CDEPEND}
+   test? (
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+   selinux? ( sec-policy/selinux-cloudinit )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+
+   if [[ ${PV} == * ]] ; then
+   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
+   fi
+   distutils-r1_python_prepare_all
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+   udev_reload
+}
+
+pkg_postinst() {
+   udev_reload
+
+   elog "cloud-init-local needs to be run in the boot runlevel because it"
+   elog "modifies services in the default runlevel.  When a runlevel is 
started"
+   elog "it is cached, so modifications that happen to the current 
runlevel"
+   elog "while you are in it are not acted upon."
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2023-02-13 Thread Matthew Thode
commit: 1190a1be0a06e0481bda98ad5be46a3cbb84bcfe
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Feb 13 15:38:43 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Feb 13 15:38:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1190a1be

app-emulation/cloud-init: re-add py3.10

Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.4.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.4.ebuild 
b/app-emulation/cloud-init/cloud-init-22.4.ebuild
index 8ab2c561a20e..839d6105a832 100644
--- a/app-emulation/cloud-init/cloud-init-22.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
 #DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_10 python3_11 )
 
 inherit distutils-r1 udev
 

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 9e43ae61d54e..2e9caef4c225 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_10 python3_11 )
 
 inherit distutils-r1 udev
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2023-02-06 Thread Matthew Thode
commit: 34c5cda3ced1a8de77a4263e9f8ea3e0912067b7
Author: Skyler Mäntysaari  samip  fi>
AuthorDate: Mon Feb  6 08:42:38 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Feb  6 22:51:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c5cda3

app-emulation/cloud-init: add 22.4

Bug: https://bugs.gentoo.org/890742
Signed-off-by: Skyler Mäntysaari  samip.fi>
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest   |  1 +
 app-emulation/cloud-init/cloud-init-22.4.ebuild | 95 +
 2 files changed, 96 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 683f977d1154..5d51001c005b 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1 +1,2 @@
 DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
+DIST cloud-init-22.4.tar.gz 1494295 BLAKE2B 
5f961c895c0d6c78a7cee47d2b52acd57d959baeb5172cea89d75ffe23424e3a8a3170a0ecdcad729c6cb0c898477ea94c43a5f8bdf200fc3f122c32fdb2e96d
 SHA512 
6151d1d5e4be241219cb5804ca2bad2dd790f366bc847d286a8840faad1fb4adf5d780c9418ce574c2cfcefc16851a49961f33c5da1fbc84bb8299cf138bfcfc

diff --git a/app-emulation/cloud-init/cloud-init-22.4.ebuild 
b/app-emulation/cloud-init/cloud-init-22.4.ebuild
new file mode 100644
index ..8ab2c561a20e
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-22.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_11 )
+
+inherit distutils-r1 udev
+
+if [[ ${PV} == * ]]; 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 arm64 ppc64 x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   ${CDEPEND}
+   test? (
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+   selinux? ( sec-policy/selinux-cloudinit )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+
+   if [[ ${PV} == * ]] ; then
+   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
+   fi
+   distutils-r1_python_prepare_all
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+   udev_reload
+}
+
+pkg_postinst() {
+   udev_reload
+
+   elog "cloud-init-local needs to be run in the boot runlevel because it"
+   elog "modifies services in the default runlevel.  When a runlevel is 
started"
+   elog "it is cached, so modifications that happen to the current 
runlevel"
+   elog "while you are in it are not acted upon."
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2023-02-06 Thread Matthew Thode
commit: 30357df721ecacdd3b7ba5cfa902f8c6434a4725
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Feb  6 22:52:39 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Mon Feb  6 22:52:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30357df7

app-emulation/cloud-init: enable py3.11 and disable py3.10

Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/cloud-init-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index db06a885bdae..9e43ae61d54e 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_10 )
+PYTHON_COMPAT=( python3_11 )
 
 inherit distutils-r1 udev
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2023-01-10 Thread Michał Górny
commit: 8006af8013dd7dc79ae53a77048de2c7d6ba2e43
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 10 14:31:38 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 10 14:35:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8006af80

app-emulation/cloud-init: Remove Python < 3.10

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.2.ebuild | 4 ++--
 app-emulation/cloud-init/cloud-init-.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
index fd7315e5a33e..a1d0ec08c413 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
 #DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit distutils-r1 udev
 

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 2f759e423a9f..db06a885bdae 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
 # https://bugs.launchpad.net/cloud-init/+bug/1978328
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_10 )
 
 inherit distutils-r1 udev
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-12-23 Thread Kenton Groombridge
commit: 97c6b03bbfaca6a8a38940099087702db4cc533d
Author: Kenton Groombridge  gentoo  org>
AuthorDate: Fri Dec 23 18:46:27 2022 +
Commit: Kenton Groombridge  gentoo  org>
CommitDate: Fri Dec 23 20:08:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c6b03b

app-emulation/cloud-init: add USE=selinux

Signed-off-by: Kenton Groombridge  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.2.ebuild | 3 ++-
 app-emulation/cloud-init/cloud-init-.ebuild   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
index 082f34e59987..fd7315e5a33e 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
+IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
@@ -53,6 +53,7 @@ RDEPEND="
sys-apps/iproute2
sys-fs/growpart
virtual/logger
+   selinux? ( sec-policy/selinux-cloudinit )
 "
 
 distutils_enable_tests pytest

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 0c21e628855e..2f759e423a9f 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://launchpad.net/cloud-init";
 
 LICENSE="GPL-3"
 SLOT="0"
+IUSE="selinux"
 
 CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
@@ -51,6 +52,7 @@ RDEPEND="
sys-apps/iproute2
sys-fs/growpart
virtual/logger
+   selinux? ( sec-policy/selinux-cloudinit )
 "
 
 distutils_enable_tests pytest



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/

2022-07-14 Thread Sam James
commit: a1db98aefb0393f15cd74a49b92fa3aec03c1770
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jul  7 14:31:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 15 01:29:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1db98ae

app-emulation/cloud-init: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26264
Signed-off-by: Sam James  gentoo.org>

 .../18.4-add-support-for-package_upgrade.patch |  54 ---
 .../18.4-fix-filename-for-storing-locale.patch |  30 --
 .../18.4-fix-update_package_sources-function.patch |  26 --
 .../22.1-add-support-for-package_upgrade.patch |  48 --
 .../22.1-fix-update_package_sources-function.patch |  21 -
 .../cloud-init-18.4-fix-packages-module.patch  |  25 -
 ...it-20.4-gentoo-support-upstream-templates.patch |  86 --
 ...it-21.2-gentoo-support-upstream-templates.patch | 101 -
 8 files changed, 391 deletions(-)

diff --git 
a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch 
b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
deleted file mode 100644
index 9c542cfc0777..
--- a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Wed, 14 Nov 2018 15:58:30 +0100
-Subject: [PATCH 5/5] gentoo: add support for package_upgrade
-

- cloudinit/distros/gentoo.py | 25 ++---
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 7b838e82..22ad2cf3 100644
 a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -189,23 +189,26 @@ class Distro(distros.Distro):
- distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
- 
- def package_command(self, command, args=None, pkgs=None):
--if pkgs is None:
--pkgs = []
--
- cmd = ['emerge']
- # Redirect output
- cmd.append("--quiet")
- 
--if args and isinstance(args, str):
--cmd.append(args)
--elif args and isinstance(args, list):
--cmd.extend(args)
-+if command == "upgrade":
-+cmd.extend(["--update", "world"])
-+else:
-+if pkgs is None:
-+pkgs = []
-+
-+if args and isinstance(args, str):
-+cmd.append(args)
-+elif args and isinstance(args, list):
-+cmd.extend(args)
- 
--if command:
--cmd.append(command)
-+if command:
-+cmd.append(command)
- 
--pkglist = util.expand_package_list('%s-%s', pkgs)
--cmd.extend(pkglist)
-+pkglist = util.expand_package_list('%s-%s', pkgs)
-+cmd.extend(pkglist)
- 
- # Allow the output of this to flow outwards (ie not be captured)
- util.subp(cmd, capture=False)
--- 
-2.19.1
-

diff --git 
a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch 
b/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch
deleted file mode 100644
index a5bbf6034ac5..
--- a/app-emulation/cloud-init/files/18.4-fix-filename-for-storing-locale.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3756cdea3e844b9611de321a8075df80e7dbf74d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Wed, 14 Nov 2018 15:28:22 +0100
-Subject: [PATCH 3/5] gentoo: fix filename for storing locale
-
-There must have been a misunderstanding as locale.gen is meant to
-contain locales to be generated if no argument is passed to locale-gen.
-
-When using openrc, Gentoo stores system locale in /etc/env.d/02locale
-which is generally manipulated through eselect.

- cloudinit/distros/gentoo.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
-index 98ac41ca..50bb61fb 100644
 a/cloudinit/distros/gentoo.py
-+++ b/cloudinit/distros/gentoo.py
-@@ -20,7 +20,7 @@ LOG = logging.getLogger(__name__)
- 
- 
- class Distro(distros.Distro):
--locale_conf_fn = '/etc/locale.gen'
-+locale_conf_fn = '/etc/env.d/02locale'
- network_conf_fn = '/etc/conf.d/net'
- resolve_conf_fn = '/etc/resolv.conf'
- hostname_conf_fn = '/etc/conf.d/hostname'
--- 
-2.19.1
-

diff --git 
a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch 
b/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch
deleted file mode 100644
index d90258d1bc48..
--- 
a/app-emulation/cloud-init/files/18.4-fix-update_package_sources-function.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b15c4c4b24

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-30 Thread Matthew Thode
commit: 58a86ca18609bc67bfddc39d51f5744737605c71
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jul  1 02:10:52 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jul  1 02:10:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a86ca1

app-emulation/cloud-init: cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  4 -
 app-emulation/cloud-init/cloud-init-20.4.ebuild| 93 -
 app-emulation/cloud-init/cloud-init-21.2.ebuild| 93 -
 app-emulation/cloud-init/cloud-init-22.1-r1.ebuild | 88 
 app-emulation/cloud-init/cloud-init-22.2-r1.ebuild | 94 --
 app-emulation/cloud-init/cloud-init-22.2.ebuild| 83 ---
 6 files changed, 455 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 6d04e1bfaced..683f977d1154 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,5 +1 @@
-DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
-DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
-DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B 
ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55
 SHA512 
485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
 DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
-DIST cloud-init-22.2.tar.gz 1348736 BLAKE2B 
ae95bf04a0229ed0c7bbf6dc6889793eb020ffe6e6223b02f4003b3f38253781a1ed22a41f535b5064a8ba4bde20b197d58eb5d55789d4decd9b39aabd46d1c3
 SHA512 
07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
deleted file mode 100644
index 31a7326ac086..
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == * ]];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 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-"
-
-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}-20.4-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
-)
-
-python_prepare_all() {
-   # Fix location of documentation installation
-   sed -i "s:USR + '/share/doc/cloud-init:USR + '/sha

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-30 Thread Matthew Thode
commit: 149ff338b0861cd0f1d8370f0f36f31ccb739dc3
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jul  1 02:08:23 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Jul  1 02:08:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149ff338

app-emulation/cloud-init: 22.2.2 bumped from 22.2-r1

straight to stable for minor diff and security fix

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest |  1 +
 app-emulation/cloud-init/cloud-init-22.2.2.ebuild | 94 +++
 2 files changed, 95 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 042f59bcb1c1..6d04e1bfaced 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,4 +1,5 @@
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
 DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B 
ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55
 SHA512 
485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
+DIST cloud-init-22.2.2.tar.gz 1349451 BLAKE2B 
fdb6669e9762984614fefe787834f20f056345d304327679fa8bc7b4d6566509a23ecc4a7ac4e6368b9b9078a72fe6fe35533a67e7aeb0c0accbf5ad014f8aae
 SHA512 
18b75ebbb5e808e19df5ceddb6402cc881c33443fb169f736f54837254ba43836994f2392a26febbd8df3342b3467ee72759b6942cfeb96d07c0e452c11dd0bf
 DIST cloud-init-22.2.tar.gz 1348736 BLAKE2B 
ae95bf04a0229ed0c7bbf6dc6889793eb020ffe6e6223b02f4003b3f38253781a1ed22a41f535b5064a8ba4bde20b197d58eb5d55789d4decd9b39aabd46d1c3
 SHA512 
07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f

diff --git a/app-emulation/cloud-init/cloud-init-22.2.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
new file mode 100644
index ..082f34e59987
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-22.2.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 udev
+
+if [[ ${PV} == * ]]; 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 arm64 ppc64 x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+   ${CDEPEND}
+   test? (
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+
+   if [[ ${PV} == * ]] ; then
+   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
+   fi
+   distutils-r1_python_prepare_all
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-10 Thread Sam James
commit: adda29b617e2c0c8b0283860bce3302e20e19918
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 11 05:18:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 11 05:18:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adda29b6

app-emulation/cloud-init: add link to upstream bug re PEP517

Bug: https://bugs.gentoo.org/850628
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2-r1.ebuild | 1 +
 app-emulation/cloud-init/cloud-init-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
index b253c34820df..082f34e59987 100644
--- a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 # Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
 #DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 9c937d818458..0c21e628855e 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 # Disabled for now: bug #850628
 #DISTUTILS_USE_PEP517=setuptools
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 udev



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-09 Thread Sam James
commit: 44cfdb3c49f7ebce1e66324ad5ac68285d8d08bb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 10 02:44:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 10 02:44:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cfdb3c

app-emulation/cloud-init: restore OpenRC files

broken w/ PEP517 for now

Bug: https://bugs.gentoo.org/850628
Signed-off-by: Sam James  gentoo.org>

 ...-init-.ebuild => cloud-init-22.2-r1.ebuild} | 22 +++--
 app-emulation/cloud-init/cloud-init-.ebuild| 23 +++---
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
similarity index 84%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
index f8fc9fc2c079..b253c34820df 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+# Disabled for now: bug #850628
+#DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1
+inherit distutils-r1 udev
 
-if [[ ${PV} == * ]];then
+if [[ ${PV} == * ]]; 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 ~arm64 ~x86"
+   KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
@@ -58,7 +59,10 @@ distutils_enable_tests pytest
 python_prepare_all() {
# Fix location of documentation installation
sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-   sed -i 's/version=get_version(),/version=,/g' setup.py || die
+
+   if [[ ${PV} == * ]] ; then
+   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
+   fi
distutils-r1_python_prepare_all
 }
 
@@ -72,10 +76,16 @@ python_install_all() {
distutils-r1_python_install_all
 
# installs as non-executable
-   chmod +x "${D}"/etc/init.d/*
+   chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+   udev_reload
 }
 
 pkg_postinst() {
+   udev_reload
+
elog "cloud-init-local needs to be run in the boot runlevel because it"
elog "modifies services in the default runlevel.  When a runlevel is 
started"
elog "it is cached, so modifications that happen to the current 
runlevel"

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index f8fc9fc2c079..9c937d818458 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+# Disabled for now: bug #850628
+#DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1
+inherit distutils-r1 udev
 
-if [[ ${PV} == * ]];then
+if [[ ${PV} == * ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
@@ -21,8 +22,6 @@ HOMEPAGE="https://launchpad.net/cloud-init";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
@@ -58,7 +57,11 @@ distutils_enable_tests pytest
 python_prepare_all() {
# Fix location of documentation installation
sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-   sed -i 's/version=get_version(),/version=,/g' setup.py || die
+
+   if [[ ${PV} == * ]] ; then
+   sed -i 's/version=get_version(),/version=,/g' setup.py || 
die
+   fi
+
distutils-r1_python_prepare_all
 }
 
@@ -72,10 +75,16 @@ python_install_all() {
distutils-r1_python_install_all
 
# installs as non-executable
-   chmod +x "${D}"/etc/init.d/*
+   chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+   udev_reload
 }
 
 pkg_postinst() {
+   udev_reload
+
elog "cloud-init-local needs to be run in the boot runlevel because it"
elog "modifies services in the default runlevel.  When a runlevel is 
started"
elog "it is cached, so modifications that happen to the current 
runlevel"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-07 Thread Jakov Smolić
commit: 3b4cf85d5d4224de5c1e2c3d610669a9c985be36
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun  7 09:38:28 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun  7 09:38:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4cf85d

app-emulation/cloud-init: Stabilize 22.2 ppc64, #850190

Signed-off-by: Jakov Smolić  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.ebuild
index 8b4532829868..071baaffc9f0 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]];then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="amd64 arm64 x86"
+   KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-07 Thread Jakov Smolić
commit: e066b4706acf48b9d56d605ffe720ef48c52a489
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun  7 08:38:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun  7 08:38:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e066b470

app-emulation/cloud-init: Stabilize 22.2 arm64, #850190

Signed-off-by: Jakov Smolić  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.ebuild
index 03e5259a9ffb..8b4532829868 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]];then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="amd64 ~arm64 x86"
+   KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-06 Thread Sam James
commit: 1409b3b4f1cb1afb8a85a8f2350e81543f8666ad
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 01:15:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 01:15:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1409b3b4

app-emulation/cloud-init: Stabilize 22.2 amd64, #850160

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.ebuild
index 85958a3b8e79..03e5259a9ffb 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]];then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-06-06 Thread Sam James
commit: 1fab959142293169c34b2391997d0a1910a3513f
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  7 01:14:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  7 01:14:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fab9591

app-emulation/cloud-init: Stabilize 22.2 x86, #850160

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-22.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.2.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.ebuild
index f8fc9fc2c079..85958a3b8e79 100644
--- a/app-emulation/cloud-init/cloud-init-22.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == * ]];then
EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 else
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-05-19 Thread Matthew Thode
commit: a4caaa5473195ba2541e403d2e7063f7053ca83e
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri May 20 01:46:04 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 20 01:46:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4caaa54

app-emulation/cloud-init: add missing manifest

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 2daed96816fa..042f59bcb1c1 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,4 @@
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
 DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B 
ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55
 SHA512 
485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
+DIST cloud-init-22.2.tar.gz 1348736 BLAKE2B 
ae95bf04a0229ed0c7bbf6dc6889793eb020ffe6e6223b02f4003b3f38253781a1ed22a41f535b5064a8ba4bde20b197d58eb5d55789d4decd9b39aabd46d1c3
 SHA512 
07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-05-19 Thread Matthew Thode
commit: 95913aa6f77799e19c77245a5205000afb9e0ef7
Author: Brett Holman  gmail  com>
AuthorDate: Fri May 20 00:33:27 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri May 20 01:44:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95913aa6

app-emulation/cloud-init: Update test deps, add 22.2 release

Signed-off-by: Matthew Thode  gentoo.org>

 .../cloud-init/{cloud-init-.ebuild => cloud-init-22.2.ebuild}   | 2 ++
 app-emulation/cloud-init/cloud-init-.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-22.2.ebuild
similarity index 96%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-22.2.ebuild
index e1b50da6f06a..f8fc9fc2c079 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
)
 "

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index e1b50da6f06a..f8fc9fc2c079 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest-mock[${PYTHON_USEDEP}]
+   dev-python/responses[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
)
 "



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-14 Thread Matthew Thode
commit: fb41388267456c4be95af50579a62eeb48fc7acc
Author: Brett Holman  gmail  com>
AuthorDate: Tue Apr 12 15:38:55 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Apr 14 16:18:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb413882

app-emulation/cloud-init: Drop patches

Upstream took patches, remove them from ebuild

Signed-off-by: Brett Holman  gmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/cloud-init-.ebuild | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 6dbdf8e71fe9..e1b50da6f06a 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -51,13 +51,6 @@ RDEPEND="
virtual/logger
 "
 
-PATCHES=(
-   # Fix Gentoo support
-   # 
https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
-   "${FILESDIR}"/22.1-fix-update_package_sources-function.patch
-   "${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
-)
-
 distutils_enable_tests pytest
 
 python_prepare_all() {



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-11 Thread Sam James
commit: e7b03d201f4ccc710011e3b6aae3a5b5fbe1aabb
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 12 01:14:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 12 01:14:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b03d20

app-emulation/cloud-init: fix IncorrectCopyright

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.4.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-21.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 63d26e689413..31a7326ac086 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 0a9661be7209..f99af619353e 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-11 Thread Sam James
commit: 88dfac80462255c1e714f2539fefa96964b53627
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 12 01:08:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 12 01:08:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88dfac80

app-emulation/cloud-init: sync live ebuild, revbump for RDEPEND change

See: https://github.com/gentoo/gentoo/pull/24980
Signed-off-by: Sam James  gentoo.org>

 .../{cloud-init-22.1.ebuild => cloud-init-22.1-r1.ebuild}  | 6 +++---
 app-emulation/cloud-init/cloud-init-.ebuild| 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-22.1.ebuild 
b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
similarity index 97%
rename from app-emulation/cloud-init/cloud-init-22.1.ebuild
rename to app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
index fcd8771ebb89..667839f99352 100644
--- a/app-emulation/cloud-init/cloud-init-22.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,8 +35,8 @@ CDEPEND="
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/netifaces[${PYTHON_USEDEP}]
 "
-DEPEND="
-   ${CDEPEND}
+BDEPEND="
+   ${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 437a19fce005..6dbdf8e71fe9 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -34,10 +34,9 @@ CDEPEND="
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/netifaces[${PYTHON_USEDEP}]
-
 "
-DEPEND="
-   ${CDEPEND}
+BDEPEND="
+   ${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
@@ -59,7 +58,7 @@ PATCHES=(
"${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
 )
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_prepare_all() {
# Fix location of documentation installation



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-11 Thread Sam James
commit: c8e61d9aeb9e101fbb37aee80cabe613ae036373
Author: Brett Holman  gmail  com>
AuthorDate: Sun Apr 10 18:01:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 12 01:07:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e61d9a

app-emulation/cloud-init: Backport package dep fixes

These were changed in upstream commits:

4d2684848722cb2d469ad4fa60999bf81cf7056e - May 2, 2020 - six removed
986f37b017134ced5d9dd38b420350916297002b - Mar 10, 2020 - nose -> pytest
8b4a9bc7b81e61943af873bad92e2133f8275b0b - Aug 9, 2021 - netifaces added

Closes: https://github.com/gentoo/gentoo/pull/24980
Signed-off-by: Brett Holman  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.4.ebuild | 7 +++
 app-emulation/cloud-init/cloud-init-21.2.ebuild | 7 +++
 app-emulation/cloud-init/cloud-init-22.1.ebuild | 5 ++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 89910008a34f..63d26e689413 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -32,14 +32,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
 "
@@ -69,8 +68,8 @@ python_prepare_all() {
 }
 
 python_test() {
-   # Do not use Makefile target as it does not setup environment correclty
-   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+   # Do not use Makefile target as it does not setup environment correctly
+   esetup.py pytest -v cloudinit/ tests/unittests || die
 }
 
 python_install() {

diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 55f12c07641e..0a9661be7209 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -32,14 +32,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
 "
@@ -69,8 +68,8 @@ python_prepare_all() {
 }
 
 python_test() {
-   # Do not use Makefile target as it does not setup environment correclty
-   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+   # Do not use Makefile target as it does not setup environment correctly
+   esetup.py pytest -v cloudinit tests/unittests || die
 }
 
 python_install() {

diff --git a/app-emulation/cloud-init/cloud-init-22.1.ebuild 
b/app-emulation/cloud-init/cloud-init-22.1.ebuild
index ace04bcfa721..fcd8771ebb89 100644
--- a/app-emulation/cloud-init/cloud-init-22.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.1.ebuild
@@ -33,14 +33,13 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/netifaces[${PYTHON_USEDEP}]
 "
 DEPEND="
${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
)
 "
@@ -59,7 +58,7 @@ PATCHES=(
"${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
 )
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_prepare_all() {
# Fix location of documentation installation



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-10 Thread Sam James
commit: e5a9911d50918b1606373f96bd8011d4e147b244
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 10 16:29:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 10 16:29:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a9911d

app-emulation/cloud-init: fix IncorrectCopyright

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 91e4dacb8e84..437a19fce005 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2022-04-10 Thread Sam James
commit: 9b02d96b3e38c45af0c6d4c2464260cf5d6ea86e
Author: Brett Holman  gmail  com>
AuthorDate: Sat Apr  9 02:01:31 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 10 16:26:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b02d96b

app-emulation/cloud-init: Update package dependencies

Closes: https://bugs.gentoo.org/837329
Signed-off-by: Brett Holman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24960
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index ace04bcfa721..91e4dacb8e84 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -33,15 +33,15 @@ CDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/netifaces[${PYTHON_USEDEP}]
+
 "
 DEPEND="
${CDEPEND}
test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/setuptools[${PYTHON_USEDEP}]
)
 "
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2022-04-08 Thread Matthew Thode
commit: f4c814c4c7ee3b4d9740fecb99394208213fb3d5
Author: Thomas Bettler  gmail  com>
AuthorDate: Thu Apr  7 22:13:10 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Apr  8 19:03:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c814c4

app-emulation/cloud-init: bump to 22.1

Closes: https://github.com/gentoo/gentoo/pull/24949

Signed-off-by: Thomas Bettler  gmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 ...oud-init-.ebuild => cloud-init-22.1.ebuild} | 23 ---
 app-emulation/cloud-init/cloud-init-.ebuild| 23 ---
 .../22.1-add-support-for-package_upgrade.patch | 48 ++
 .../22.1-fix-update_package_sources-function.patch | 21 ++
 5 files changed, 88 insertions(+), 28 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 52f471a1757f..2daed96816fa 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
+DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B 
ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55
 SHA512 
485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-22.1.ebuild
similarity index 79%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-22.1.ebuild
index c355c9f901de..ace04bcfa721 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-22.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -35,8 +36,8 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   test? (
${CDEPEND}
+   test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
@@ -54,13 +55,12 @@ RDEPEND="
 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}-21.2-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
+   "${FILESDIR}"/22.1-fix-update_package_sources-function.patch
+   "${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
 )
 
+distutils_enable_tests nose
+
 python_prepare_all() {
# Fix location of documentation installation
sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
@@ -68,11 +68,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
-python_test() {
-   # Do not use Makefile target as it does not setup environment correclty
-   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
-}
-
 python_install() {
distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
 }

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index c355c9f901de..ace04bcfa721 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -35,8 +36,8 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   test? (
${CDEPEND}
+   test? (
 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2021-11-11 Thread Sam James
commit: d3d9a05421fbb80c960aa728a623f275713cfda3
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 12 01:43:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 01:43:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d9a054

app-emulation/cloud-init: include more in BDEPEND

We try to install files using the tool so let's include BDEPEND for
now unless we can come up with a more refined approach.

Closes: https://bugs.gentoo.org/823206
Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-21.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 50cd368122d..55f12c07641 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -35,8 +35,8 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   test? (
${CDEPEND}
+   test? (
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/

2021-07-10 Thread Conrad Kostecki
commit: c0ab018ccd813e45dcf4637182869622888587ca
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Jun 16 18:11:41 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jul 10 21:12:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ab018c

app-emulation/cloud-init: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21270
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...it-20.1-gentoo-support-upstream-templates.patch | 93 --
 1 file changed, 93 deletions(-)

diff --git 
a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
 
b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
deleted file mode 100644
index c840f4fde3e..000
--- 
a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Wed, 24 Oct 2018 10:52:46 +0200
-Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
-

- config/cloud.cfg.tmpl   |  8 ++--
- templates/hosts.gentoo.tmpl | 24 
- tools/render-cloudcfg   |  2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
- create mode 100644 templates/hosts.gentoo.tmpl
-
-diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 1fef133a..3f5a41a2 100644
 a/config/cloud.cfg.tmpl
-+++ b/config/cloud.cfg.tmpl
-@@ -134,7 +134,7 @@ cloud_final_modules:
- # (not accessible to handlers/transforms)
- system_info:
-# This will affect which distro class gets used
--{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", 
"rhel", "suse", "ubuntu"] %}
-+{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", 
"gentoo", "rhel", "suse", "ubuntu"] %}
-distro: {{ variant }}
- {% else %}
-# Unknown/fallback distro.
-@@ -172,7 +172,7 @@ system_info:
-  primary: http://ports.ubuntu.com/ubuntu-ports
-  security: http://ports.ubuntu.com/ubuntu-ports
-ssh_svcname: ssh
--{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
-+{% elif variant in ["amazon", "arch", "centos", "fedora", "gentoo", "rhel", 
"suse"] %}
-# Default user name + that default users groups (if added/used)
-default_user:
-  name: {{ variant }}
-@@ -180,6 +180,10 @@ system_info:
- {% endif %}
- {% if variant == "suse" %}
-  groups: [cdrom, users]
-+{% elif variant == "gentoo" %}
-+ groups: [users, wheel]
-+ primary_group: users
-+ no_user_group: true
- {% elif variant == "arch" %}
-  groups: [wheel, users]
- {% else %}
-diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
-new file mode 100644
-index ..cd045fa6
 /dev/null
-+++ b/templates/hosts.gentoo.tmpl
-@@ -0,0 +1,24 @@
-+## template:jinja
-+{#
-+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
-+if enabled in cloud-config.  Specifically, in order to enable it
-+you need to add the following to config:
-+  manage_etc_hosts: True
-+-#}
-+# Your system has configured 'manage_etc_hosts' as True.
-+# As a result, if you wish for changes to this file to persist
-+# then you will need to either
-+# a.) make changes to the master file in 
/etc/cloud/templates/hosts.gentoo.tmpl
-+# b.) change or remove the value of 'manage_etc_hosts' in
-+# /etc/cloud/cloud.cfg or cloud-config from user-data
-+# 
-+# The following lines are desirable for IPv4 capable hosts
-+127.0.0.1 {{fqdn}} {{hostname}}
-+127.0.0.1 localhost.localdomain localhost
-+127.0.0.1 localhost4.localdomain4 localhost4
-+
-+# The following lines are desirable for IPv6 capable hosts
-+::1 {{fqdn}} {{hostname}}
-+::1 localhost.localdomain localhost
-+::1 localhost6.localdomain6 localhost6
-+
-diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 8b7cb875..d109044e 100755
 a/tools/render-cloudcfg
-+++ b/tools/render-cloudcfg
-@@ -4,7 +4,7 @@ import argparse
- import os
- import sys
- 
--VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel",
--"suse", "ubuntu", "unknown"]
-+VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd",
-+"gentoo", "rhel", "suse", "ubuntu", "unknown"]
- 
- if "avoid-pep8-E402-import-not-top-of-file":
- _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
--- 
-2.19.1
-



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2021-07-05 Thread Michał Górny
commit: 1ab7c9a70ef779e600ed8ee6e7d5ce572a66f669
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul  5 13:40:28 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul  5 13:40:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab7c9a7

app-emulation/cloud-init: Remove stale dep on contextlib2

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.4.ebuild | 1 -
 app-emulation/cloud-init/cloud-init-21.2.ebuild | 1 -
 app-emulation/cloud-init/cloud-init-.ebuild | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index dab8bb6dfd6..89910008a34 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -41,7 +41,6 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
)
 "
 RDEPEND="

diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 0fa383aa7c5..50cd368122d 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -41,7 +41,6 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
)
 "
 RDEPEND="

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index e3c1ea78c7f..c355c9f901d 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -41,7 +41,6 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
)
 "
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2021-07-05 Thread Michał Górny
commit: 893d6ebcbafd8dd9b684f2c9f11f6b06b1395825
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul  5 13:33:40 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul  5 13:35:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893d6ebc

app-emulation/cloud-init: Remove stale dep on unittest2

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.4.ebuild | 3 +--
 app-emulation/cloud-init/cloud-init-21.2.ebuild | 1 -
 app-emulation/cloud-init/cloud-init-.ebuild | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 9ad56e71193..dab8bb6dfd6 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ DEPEND="
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/contextlib2[${PYTHON_USEDEP}]
)

diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 438857afbaf..0fa383aa7c5 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -40,7 +40,6 @@ DEPEND="
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/contextlib2[${PYTHON_USEDEP}]
)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index a7f5c65396a..e3c1ea78c7f 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -40,7 +40,6 @@ DEPEND="
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/contextlib2[${PYTHON_USEDEP}]
)



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2021-06-13 Thread Matthew Thode
commit: 05925c5bc799b6b6f53094a2f61d7eaf8973add7
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jun 13 23:26:55 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Jun 13 23:26:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05925c5b

app-emulation/cloud-init: 21.2 stable amd64/x86 with cleanup

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest   |  1 -
 app-emulation/cloud-init/cloud-init-20.1.ebuild | 96 -
 app-emulation/cloud-init/cloud-init-21.2.ebuild |  2 +-
 3 files changed, 1 insertion(+), 98 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index e01f048a607..52f471a1757 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,2 @@
-DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 
1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7
 SHA512 
ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d

diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
deleted file mode 100644
index 4a00e092c2b..000
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-if [[ ${PV} == * ]];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 ~arm64 x86"
-fi
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-"
-
-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}-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
-)
-
-python_prepare_all() {
-   # Fix location of documentation installation
-   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-   sed -i 's/version=get_version(),/version=,/g' setup.py || die
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   # Do not use Makefile target as it does not setup environment correclty
-   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
-}
-
-python_install() {
-   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   # installs as non-executable
-   chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-   elog "cloud-init-local needs to be run in t

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2021-06-03 Thread Matthew Thode
commit: 6705fbfc997785396daa3d79f3db1067f3f1d38e
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun  3 14:34:06 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Jun  3 14:34:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6705fbfc

app-emulation/cloud-init: 21.2 bump with py39

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |   1 +
 ...oud-init-.ebuild => cloud-init-21.2.ebuild} |   8 +-
 app-emulation/cloud-init/cloud-init-.ebuild|   8 +-
 ...it-21.2-gentoo-support-upstream-templates.patch | 101 +
 4 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index d58fd680a08..e01f048a607 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 
1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7
 SHA512 
ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
+DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 
74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc
 SHA512 
8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-21.2.ebuild
similarity index 93%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-21.2.ebuild
index 406e3ee664a..a7f5c65396a 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]];then
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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
@@ -57,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}-20.1-gentoo-support-upstream-templates.patch"
+   "${FILESDIR}/${PN}-21.2-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

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 406e3ee664a..a7f5c65396a 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]];then
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"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"
@@ -57,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}-20.1-gentoo-support-upstream-templates.patch"
+   "${FILESDIR}/${PN}-21.2-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

diff --git 
a/app-emulation/cloud-init/f

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2021-05-31 Thread Michał Górny
commit: 3367feff74eaf6dffae02cca54e9214fe9a648ab
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 31 20:09:15 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 31 20:18:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3367feff

app-emulation/cloud-init: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 -
 app-emulation/cloud-init/cloud-init-19.4.ebuild| 90 -
 ...it-19.4-gentoo-support-upstream-templates.patch | 93 --
 .../files/cloud-init-19.4_CVE-2020-8631.patch  | 25 --
 4 files changed, 209 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 7398ca2b26d..d58fd680a08 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,2 @@
-DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 
2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df
 SHA512 
e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
 DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 
1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7
 SHA512 
ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9

diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild 
b/app-emulation/cloud-init/cloud-init-19.4.ebuild
deleted file mode 100644
index f83d948d016..000
--- a/app-emulation/cloud-init/cloud-init-19.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Cloud instance initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-"
-
-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}/${P}-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
-   "${FILESDIR}/${P}_CVE-2020-8631.patch"
-)
-
-src_prepare() {
-   # Fix location of documentation installation
-   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-   distutils-r1_src_prepare
-}
-
-python_test() {
-   # Do not use Makefile target as it does not setup environment correclty
-   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
-}
-
-python_install() {
-   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   # installs as non-executable
-   chmod +x "${D}"/etc/init.d/*
-}
-
-pkg_postinst() {
-   elog "cloud-init-local needs to be run in the boot runlevel because it"
-   elog "modifies services in the default runlevel.  When a runlevel is 
started"
-   elog "it is cached, so modifications that happen to the current 
runlevel"
- 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2020-12-27 Thread Matthew Thode
commit: f27f129c3bc02dd371ac62b1531992971e8873b0
Author: Jonathan Davies  protonmail  com>
AuthorDate: Sun Dec 27 18:30:14 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Dec 27 22:06:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27f129c

app-emulation/cloud-init: Version updated to 20.4, with changes:

* PYTHON_COMPAT: Dropped 3.6.
* Adapted gentoo-support-upstream-templates for new version.

Signed-off-by: Jonathan Davies  protonmail.com>
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-20.4.ebuild| 96 ++
 ...it-20.4-gentoo-support-upstream-templates.patch | 86 +++
 3 files changed, 183 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index c613182719d..7398ca2b26d 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 
2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df
 SHA512 
e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
 DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 
1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7
 SHA512 
ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
+DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B 
c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b
 SHA512 
da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9

diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild 
b/app-emulation/cloud-init/cloud-init-20.4.ebuild
new file mode 100644
index 000..9ad56e71193
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == * ]];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 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+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}-20.4-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
+)
+
+python_prepare_all() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+   sed -i 's/version=get_version(),/version=,/g' setup.py || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   # Do not use Makefile target as it does not setup environment correclty
+   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+  

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-10-02 Thread Matthew Thode
commit: bc0e39bd0d78a5e28c50c6d99c65c3b3945d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct  2 20:50:47 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct  2 20:51:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc0e39ee

app-emulation/cloud-init: use DISTUTILS_USE_SETUPTOOLS

closes: https://bugs.gentoo.org/746074
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/cloud-init-19.4.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-20.1.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild 
b/app-emulation/cloud-init/cloud-init-19.4.ebuild
index 97718a899ce..6ece034faa1 100644
--- a/app-emulation/cloud-init/cloud-init-19.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_6 python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -28,7 +29,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]

diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
index 15cdfecdd9c..2ab63c9b960 100644
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index f1f5ed321e9..581d49cdff1 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-08-19 Thread Sam James
commit: 24679b8ffcb55a2abad206ff1d13567d971f01f8
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 19 19:34:16 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 19 19:34:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24679b8f

app-emulation/cloud-init: Keyword 20.1 arm64, #738048

Signed-off-by: Sam James  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
index 537807a82be..15cdfecdd9c 100644
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]];then
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"
+   KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-08-17 Thread Agostino Sarubbo
commit: 26820ed5b347f40d79834b5a96cf016c50af4fc7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 13:49:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 13:50:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26820ed5

app-emulation/cloud-init: amd64 stable wrt bug #737292

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
index 18be2c852cd..537807a82be 100644
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]];then
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"
+   KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-08-17 Thread Agostino Sarubbo
commit: bc8440a84fec59bf9d5d2aeeddc4dbd0428a1a89
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 10:00:33 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 10:00:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8440a8

app-emulation/cloud-init: x86 stable wrt bug #737292

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
index f1f5ed321e9..18be2c852cd 100644
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]];then
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"
+   KEYWORDS="~amd64 x86"
 fi
 
 DESCRIPTION="Cloud instance initialisation magic"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/

2020-06-11 Thread Aaron Bauman
commit: 3f6d8071054571c09029e4bc709a0eb12a979e48
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Jun  9 18:24:12 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Jun 11 22:41:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6d8071

app-emulation/cloud-init: remove unused files

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16145
Signed-off-by: Aaron Bauman  gentoo.org>

 app-emulation/cloud-init/files/cloud.cfg | 79 
 app-emulation/cloud-init/files/hosts.gentoo.tmpl | 23 ---
 2 files changed, 102 deletions(-)

diff --git a/app-emulation/cloud-init/files/cloud.cfg 
b/app-emulation/cloud-init/files/cloud.cfg
deleted file mode 100644
index d62e3a22241..000
--- a/app-emulation/cloud-init/files/cloud.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-# The top level settings are used as module
-# and system configuration.
-
-# A set of users which may be applied and/or used by various modules
-# when a 'default' entry is found it will reference the 'default_user'
-# from the distro configuration specified below
-users:
-   - default
-
-# If this is set, 'root' will not be able to ssh in and they 
-# will get a message to login instead as the above $user (ubuntu)
-disable_root: true
-ssh_pwauth:   false
-
-# This will cause the set+update hostname module to not operate (if true)
-# preserve_hostname: false
-
-syslog_fix_perms: root:root
-
-ssh_deletekeys: false
-ssh_genkeytypes: [rsa, dsa] 
-
-cloud_init_modules:
- - seed_random
- - bootcmd
- - write-files
- - growpart
- - resizefs
- - set_hostname
- - update_hostname
- - update_etc_hosts
- - ca-certs
- - users-groups
- - ssh
-
-cloud_config_modules:
- - disk_setup
- - mounts
- - ssh-import-id
- - set-passwords
- - timezone
- - puppet
- - chef
- - salt-minion
- - mcollective
- - disable-ec2-metadata
- - runcmd
-
-cloud_final_modules:
- - scripts-vendor
- - scripts-per-once
- - scripts-per-boot
- - scripts-per-instance
- - scripts-user
- - ssh-authkey-fingerprints
- - keys-to-console
- - phone-home
- - final-message
- - power-state-change
-
-# System and/or distro specific settings
-# (not accessible to handlers/transforms)
-system_info:
-   # This will affect which distro class gets used
-   distro: gentoo
-   # Default user name + that default users groups (if added/used)
-   default_user:
- name: gentoo
- lock_passwd: True
- gecos: Gentoo
- groups: [users, wheel]
- primary_group: users
- no-user-group: true
- sudo: ["ALL=(ALL) NOPASSWD:ALL"]
- shell: /bin/bash
-   # Other config here will be given to the distro class and/or path classes
-   paths:
-  cloud_dir: /var/lib/cloud/
-  templates_dir: /etc/cloud/templates/

diff --git a/app-emulation/cloud-init/files/hosts.gentoo.tmpl 
b/app-emulation/cloud-init/files/hosts.gentoo.tmpl
deleted file mode 100644
index bc0bca47c5c..000
--- a/app-emulation/cloud-init/files/hosts.gentoo.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-## template:jinja
-{#
-This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
-if enabled in cloud-config.  Specifically, in order to enable it
-you need to add the following to config:
-  manage_etc_hosts: template
--#}
-# Your system has configured 'manage_etc_hosts' as 'template'.
-# As a result, if you wish for changes to this file to persist
-# then you will need to either
-# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
-# b.) change or remove the value of 'manage_etc_hosts' in
-# /etc/cloud/cloud.cfg or cloud-config from user-data
-# 
-# The following lines are desirable for IPv4 capable hosts
-127.0.0.1 {{fqdn}} {{hostname}}
-127.0.0.1 localhost.localdomain localhost
-127.0.0.1 localhost4.localdomain4 localhost4
-
-# The following lines are desirable for IPv6 capable hosts
-::1 {{fqdn}} {{hostname}}
-::1 localhost.localdomain localhost
-::1 localhost6.localdomain6 localhost6
\ No newline at end of file



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2020-04-19 Thread Matthew Thode
commit: b144df77b41ff1ebf099898140cdbbb68eb4bde1
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Apr 19 17:32:54 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Apr 19 17:32:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b144df77

app-emulation/cloud-init: 20.1 bump with py37/38 support

Closes: https://bugs.gentoo.org/718208
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 ...oud-init-.ebuild => cloud-init-20.1.ebuild} | 18 +++--
 app-emulation/cloud-init/cloud-init-.ebuild| 18 +++--
 ...it-20.1-gentoo-support-upstream-templates.patch | 93 ++
 4 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index dcc617fd5bc..c613182719d 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1 +1,2 @@
 DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 
2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df
 SHA512 
e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
+DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 
1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7
 SHA512 
ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-20.1.ebuild
similarity index 87%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-20.1.ebuild
index 6c2ca0f3c26..f1f5ed321e9 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.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} == * ]];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

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 6c2ca0f3c26..f1f5ed321e9 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.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} == * ]];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

diff --git 
a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-suppor

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2020-02-25 Thread Matthew Thode
commit: 1aa00da6a419e83bab5c59c8163e391d9844adff
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Feb 25 17:51:58 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Feb 25 17:52:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa00da6

app-emulation/cloud-init: cleanup

Bug: https://bugs.gentoo.org/708738
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  3 -
 app-emulation/cloud-init/cloud-init-17.2.ebuild| 80 ---
 app-emulation/cloud-init/cloud-init-18.4-r1.ebuild | 89 -
 app-emulation/cloud-init/cloud-init-18.5.ebuild| 91 --
 app-emulation/cloud-init/cloud-init-.ebuild|  4 +-
 .../files/18.5-fix-invalid-string-format.patch | 46 ---
 ...it-18.4-gentoo-support-upstream-templates.patch | 91 --
 7 files changed, 2 insertions(+), 402 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 41552972418..dcc617fd5bc 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,4 +1 @@
-DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
-DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 
2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4
 SHA512 
730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
-DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 
0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979
 SHA512 
f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
 DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 
2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df
 SHA512 
e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3

diff --git a/app-emulation/cloud-init/cloud-init-17.2.ebuild 
b/app-emulation/cloud-init/cloud-init-17.2.ebuild
deleted file mode 100644
index a6362ee9668..000
--- a/app-emulation/cloud-init/cloud-init-17.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="cloud initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="test"
-
-# remove pretytable in 17.2
-CDEPEND="
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
-   dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/contextlib2[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-"
-
-PATCHES=(  )
-
-python_test() {
-   emake test
-}
-
-python_install() {
-   distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   # installs as non-executable
-   chmod +x "${D}"/etc/init.d/*
-
-   insinto /etc/cloud/templates
-   doins "${FILESDIR}/hosts.gentoo.tmpl"
-   insinto /etc/cloud
-   doins "${FILESDIR}/cloud.cfg"
-}
-
-pkg_postinst() {
-   elog "cloud-init-local needs to be run in the boot runlevel because it"
-   elog "modifies services in the default runlevel.  When a runlevel is 
started"
-   elog "it is cached, so modifications that happen to the current 
runlevel"
-   elog "while you are in it a

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-02-25 Thread Agostino Sarubbo
commit: 65717e1473c21d6842a8934f8bba8a4af3322214
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 25 15:02:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 25 15:02:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65717e14

app-emulation/cloud-init: x86 stable wrt bug #708738

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-19.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild 
b/app-emulation/cloud-init/cloud-init-19.4.ebuild
index 2b4126077bf..97718a899ce 100644
--- a/app-emulation/cloud-init/cloud-init-19.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-02-25 Thread Agostino Sarubbo
commit: 95c238e6971d15527739beb57dc1b52caff5d25c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Feb 25 14:57:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Feb 25 14:57:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c238e6

app-emulation/cloud-init: amd64 stable wrt bug #708738

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-19.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild 
b/app-emulation/cloud-init/cloud-init-19.4.ebuild
index 67e494f94a8..2b4126077bf 100644
--- a/app-emulation/cloud-init/cloud-init-19.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2020-02-11 Thread Matthew Thode
commit: 353ead38dc41437704919d82b9bc4e64ed294cdc
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Feb 11 18:12:01 2020 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Feb 11 18:12:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353ead38

app-emulation/cloud-init: 19.4 bump

includes fix for CVE-2020-{8631,8632}
Bug: https://bugs.gentoo.org/708738
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-19.4.ebuild| 90 +
 ...it-19.4-gentoo-support-upstream-templates.patch | 93 ++
 .../files/cloud-init-19.4_CVE-2020-8631.patch  | 25 ++
 app-emulation/cloud-init/metadata.xml  |  2 +-
 5 files changed, 210 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 4f2aa6f1599..41552972418 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,4 @@
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 
2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4
 SHA512 
730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
 DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 
0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979
 SHA512 
f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
+DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 
2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df
 SHA512 
e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3

diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild 
b/app-emulation/cloud-init/cloud-init-19.4.ebuild
new file mode 100644
index 000..67e494f94a8
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+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}/${P}-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
+   "${FILESDIR}/${P}_CVE-2020-8631.patch"
+)
+
+src_prepare() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   # Do not use Makefile target as it does not setup environment correclty
+   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+   dist

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2020-02-05 Thread Michał Górny
commit: 3834273bee59c04f0069d16cb6a64c2ce55019bd
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Feb  5 14:16:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  5 14:24:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3834273b

app-emulation/cloud-init: Remove py2

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/cloud-init/cloud-init-17.2.ebuild| 2 +-
 app-emulation/cloud-init/cloud-init-18.4-r1.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-18.5.ebuild| 2 +-
 app-emulation/cloud-init/cloud-init-.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-17.2.ebuild 
b/app-emulation/cloud-init/cloud-init-17.2.ebuild
index 56da3017045..a6362ee9668 100644
--- a/app-emulation/cloud-init/cloud-init-17.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-17.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils multilib systemd
 

diff --git a/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
index e5d422dac7e..a9eb0b9556f 100644
--- a/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/app-emulation/cloud-init/cloud-init-18.5.ebuild 
b/app-emulation/cloud-init/cloud-init-18.5.ebuild
index 0a187c90fe7..b2591bcafde 100644
--- a/app-emulation/cloud-init/cloud-init-18.5.ebuild
+++ b/app-emulation/cloud-init/cloud-init-18.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index c3781411c4f..bf9be29d7df 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2018-12-18 Thread Gilles Dartiguelongue
commit: dd445b3181973262fa41a591286ec101c9cf486a
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Dec 18 22:22:31 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Dec 18 22:41:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd445b31

app-emulation/cloud-init: 18.4-r1 → 18.5

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-18.5.ebuild| 90 ++
 .../files/18.5-fix-invalid-string-format.patch | 46 +++
 3 files changed, 137 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 6a289ecfa8c..4f2aa6f1599 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 
2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4
 SHA512 
730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
+DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 
0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979
 SHA512 
f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb

diff --git a/app-emulation/cloud-init/cloud-init-18.5.ebuild 
b/app-emulation/cloud-init/cloud-init-18.5.ebuild
new file mode 100644
index 000..c4ff15cbfd9
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-18.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+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}-18.4-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
+   # From master
+   "${FILESDIR}"/${PV}-fix-invalid-string-format.patch
+)
+
+src_prepare() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   # Do not use Makefile target as it does not setup environment correclty
+   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+   elog "cloud-init-local needs to be run in the boot runlevel because it"
+   elog "modifies services in the default runlevel.  When a runlevel is 
started"
+   elog "it is cached, so 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2018-12-01 Thread Gilles Dartiguelongue
commit: a8cac99e095e98bb65382ff941a427eec178d5c8
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Dec  1 17:06:27 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Dec  1 17:09:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cac99e

app-emulation/cloud-init: cleanup old revisions

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 app-emulation/cloud-init/Manifest  |  2 -
 app-emulation/cloud-init/cloud-init-0.7.9.ebuild   | 94 --
 app-emulation/cloud-init/cloud-init-17.1.ebuild| 81 ---
 app-emulation/cloud-init/cloud-init-18.4.ebuild| 84 ---
 .../cloud-init/files/cloud-init-0.7.9-tests.patch  | 13 ---
 5 files changed, 274 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 96b57fd0e5e..6a289ecfa8c 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,4 +1,2 @@
-DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B 
c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641
 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
-DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 
10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b
 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
 DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 
2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4
 SHA512 
730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103

diff --git a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
deleted file mode 100644
index df1fcce2069..000
--- a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="cloud initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/configobj[${PYTHON_USEDEP}]
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/prettytable[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/cheetah[$(python_gen_usedep 'python2_7')]
-"
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   dev-python/unittest2[${PYTHON_USEDEP}]
-   dev-python/pep8[${PYTHON_USEDEP}]
-   dev-python/flake8[${PYTHON_USEDEP}]
-   dev-python/hacking[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   net-analyzer/macchanger
-   sys-apps/iproute2
-   sys-fs/growpart
-   virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.9-tests.patch" )
-
-python_prepare_all() {
-   sed -i '/^argparse/d' requirements.txt || die
-   sed -i '/^hacking/d' test-requirements.txt || die
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   emake test
-}
-
-python_install() {
-   distutils-r1_python_install "--init-system=sysvinit_openrc"
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   chmod +x "${D}"/etc/init.d/cloud-config
-   chmod +x "${D}"/etc/init.d/cloud-final
-   chmod +x "${D}"/etc/init.d/cloud-init
-   chmod +x "${D}"/etc/init.d/cloud-init-local
-
-   insinto /etc/cloud/templates
-   doins "${FILESDIR}/hosts.gentoo.tmpl"
-   insinto /etc/cloud
-   doins "${FILESDIR}/cloud.cfg"
-
-   systemd_dounit "${S}"/systemd/cloud-config.servic

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2018-11-20 Thread Gilles Dartiguelongue
commit: e98de08886fcfdc46109c1d38048247174a9e0ac
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Nov 20 11:12:16 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Nov 20 11:13:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e98de088

app-emulation/cloud-init: update gentoo fixes

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 ...-init-.ebuild => cloud-init-18.4-r1.ebuild} | 20 
 app-emulation/cloud-init/cloud-init-.ebuild|  5 ++
 .../18.4-add-support-for-package_upgrade.patch | 54 ++
 .../18.4-fix-filename-for-storing-locale.patch | 30 
 .../18.4-fix-update_package_sources-function.patch | 26 +++
 ...it-18.4-gentoo-support-upstream-templates.patch | 10 ++--
 6 files changed, 132 insertions(+), 13 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
similarity index 77%
copy from app-emulation/cloud-init/cloud-init-.ebuild
copy to app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
index 0b0b7bcaac9..34fd8b7e077 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
@@ -4,15 +4,15 @@
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="Cloud instance initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init";
-EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 CDEPEND="
@@ -47,15 +47,19 @@ RDEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-18.4-fix-packages-module.patch
-   "${FILESDIR}"/${PN}-18.4-gentoo-support-upstream-templates.patch
+   # Fix Gentoo support
+   # 
https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+   "${FILESDIR}"/${P}-fix-packages-module.patch
+   "${FILESDIR}"/${P}-gentoo-support-upstream-templates.patch
+   "${FILESDIR}"/${PV}-fix-filename-for-storing-locale.patch
+   "${FILESDIR}"/${PV}-fix-update_package_sources-function.patch
+   "${FILESDIR}"/${PV}-add-support-for-package_upgrade.patch
 )
 
-python_prepare_all() {
+src_prepare() {
# Fix location of documentation installation
sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
-   sed -i 's/version=get_version(),/version=,/g' setup.py || die
-   distutils-r1_python_prepare_all
+   distutils-r1_src_prepare
 }
 
 python_test() {

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 0b0b7bcaac9..141eb23c883 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -47,8 +47,13 @@ RDEPEND="
 "
 
 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}-18.4-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
 )
 
 python_prepare_all() {

diff --git 
a/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch 
b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
new file mode 100644
index 000..9c542cfc077
--- /dev/null
+++ b/app-emulation/cloud-init/files/18.4-add-support-for-package_upgrade.patch
@@ -0,0 +1,54 @@
+From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Wed, 14 Nov 2018 15:58:30 +0100
+Subject: [PATCH 5/5] gentoo: add support for package_upgrade
+
+---
+ cloudinit/distros/gentoo.py | 25 ++---
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
+index 7b838e82..22ad2cf3 100644
+--- a/cloudinit/distros/gentoo.py
 b/cloudinit/distros/gentoo.py
+@@ -189,23 +189,26 @@ class Distro(distros.Distro):
+ distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
+ 
+ def package_command(self, command, args=None, pkgs=None):
+-if pkgs is None:
+-pkgs = []
+-
+ cmd = ['emerge']
+ # Redirect output
+ cmd.append("--quiet")
+ 
+-if args and isinstance(args, str):
+-cmd.append(args)
+-elif args and isinstance(args, list):
+-cmd.extend(args)
++if command == "upgrade":
++cmd.extend(["--update", "world"])
++else:
++if 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2018-10-25 Thread Gilles Dartiguelongue
commit: c918a84082945588ba2363960d25e1d5ffa11343
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Wed Oct 24 16:35:38 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Oct 25 16:35:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c918a840

app-emulation/cloud-init: cleanup old revisions

Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 .../cloud-init/cloud-init-0.7.6-r1.ebuild  | 102 -
 .../cloud-init/cloud-init-0.7.6-r2.ebuild  |  76 ---
 .../cloud-init/cloud-init-0.7.6_p1212-r1.ebuild|  79 
 .../cloud-init/cloud-init-0.7.6_p1212.ebuild   |  78 
 app-emulation/cloud-init/cloud-init-0.7.7.ebuild   |  87 --
 .../cloud-init/cloud-init-0.7.8-r2.ebuild  |  94 ---
 .../cloud-init/files/cloud-init-0.7.6-gentoo.patch |  51 ---
 .../files/cloud-init-0.7.6_p1212-gentoo.patch  |  33 ---
 .../files/cloud-init-0.7.7-gentooinit.patch|  42 -
 .../files/cloud-init-0.7.8-gentooinit.patch|  38 
 10 files changed, 680 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
deleted file mode 100644
index 9af4ed7a5fd..000
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="EC2 initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-   dev-python/cheetah[${PYTHON_USEDEP}]
-   dev-python/configobj[${PYTHON_USEDEP}]
-   dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/oauth[${PYTHON_USEDEP}]
-   dev-python/prettytable[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   test? (
-   ${CDEPEND}
-   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-   dev-python/mocker[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   ~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-   dev-python/pyflakes[${PYTHON_USEDEP}]
-   sys-apps/iproute2
-   )
-"
-RDEPEND="
-   ${CDEPEND}
-   sys-fs/growpart
-   virtual/logger
-"
-
-python_prepare_all() {
-   # Note: Gentoo places ip in /sbin/ not /bin/
-   ebegin 'patching cloudinit/sources/DataSourceOpenNebula.py'
-   sed \
-   -e '438s/sbin/bin/' \
-   -i cloudinit/sources/DataSourceOpenNebula.py
-   STATUS=$?
-   eend ${STATUS}
-   [[ ${STATUS} -gt 0 ]] && die
-
-   # https://bugs.launchpad.net/cloud-init/+bug/1380424
-   ebegin 'patching tests/unittests/test_distros/test_netconfig.py'
-   sed \
-   -e '177s/test_simple_write_freebsd/_&/' \
-   -i tests/unittests/test_distros/test_netconfig.py
-   STATUS=$?
-   eend ${STATUS}
-   [[ ${STATUS} -gt 0 ]] && die
-
-   # Note Gentoo installs its own RC files
-   ebegin 'patching setup.py'
-   sed \
-   -e "144 s/'tests'/'tests.*', &/" \
-   -e '163,167 d' \
-   -i setup.py
-   STATUS=$?
-   eend ${STATUS}
-   [[ ${STATUS} -gt 0 ]] && die
-
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   emake test
-}
-
-python_install_all() {
-   keepdir /etc/cloud
-
-   distutils-r1_python_install_all
-
-   doinitd "${S}"/sysvinit/gentoo/cloud-config
-   doinitd "${S}"/sysvinit/gentoo/cloud-final
-   doinitd "${S}"/sysvinit/gentoo/cloud-init
-   doinitd "${S}"/sysvinit/gentoo/cloud-init-local
-   insinto /etc/cloud/templates
-   doins "${FILESDIR}/hosts.gentoo.tmpl"
-   insinto /etc/cloud
-   doins "${FILESDIR}/cloud.cfg"
-
-   systemd_dounit "${S}"/systemd/cloud-config.service
-   systemd_dounit "${S}"/systemd/cloud-config.target
-   systemd_dounit "${S}"/systemd/cloud-final.service
-   systemd_dounit "${S}"/systemd/cloud-init-local.service
-   systemd_dounit "${S}"/systemd/cloud-init.service
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
deleted file mode 100644
index f97fbc9cf6d..000
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-10-25 Thread Gilles Dartiguelongue
commit: ccb7e88d71d067708d3fc2900bd9b490404f5b0e
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Wed Oct 24 18:06:14 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Oct 25 16:35:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb7e88d

app-emulation/cloud-init: update live ebuild

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 app-emulation/cloud-init/Manifest   |  4 --
 app-emulation/cloud-init/cloud-init-.ebuild | 58 -
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 1ed457e3bf6..96b57fd0e5e 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,7 +1,3 @@
-DIST cloud-init-0.7.6.tar.gz 515670 BLAKE2B 
edaab1c731d5ac0ce1f0a3a82b1fed9cca54ac555f2704a4bf0bab2627d54d8f090610fa6aed79d0e2f131abff4016fb8ed55c0c0822ca45c602eabc80548ca9
 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
-DIST cloud-init-0.7.6_p1212.tar.gz 451717 BLAKE2B 
0b2136e36b78de38a700f9abad0639cfd3f49ca5a0e43aa7673afd0f9aa365a7ebe2b5767b076e481d4eb3521a0e8a04d581d1aa3de5537bbd09bcead867d3ee
 SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
-DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B 
eade80cff35e545a619f7d0beafadde145777c5ae581325a4588436ad8becc95a5945c216d8c3c814331099dd4b5cfafe62ee411329f4dce9897ab816ce5ba1f
 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
-DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 
7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d
 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B 
c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641
 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 
10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b
 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 4072bd36f06..0b0b7bcaac9 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
-inherit distutils-r1 eutils git-r3 multilib systemd
+inherit distutils-r1 git-r3
 
-DESCRIPTION="cloud initialisation magic"
+DESCRIPTION="Cloud instance initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init";
 EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 
@@ -16,15 +16,15 @@ KEYWORDS=""
 IUSE="test"
 
 CDEPEND="
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/configobj[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
dev-python/oauthlib[${PYTHON_USEDEP}]
-   dev-python/prettytable[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
@@ -34,33 +34,37 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
-   dev-python/pep8[${PYTHON_USEDEP}]
-   dev-python/flake8[${PYTHON_USEDEP}]
-   dev-python/hacking[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-10-24 Thread Gilles Dartiguelongue
commit: 4b5c62dfe789f9a34c18f05a603502dd2bcdab12
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Wed Oct 24 13:15:44 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Wed Oct 24 13:19:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5c62df

app-emulation/cloud-init: add myself to maintainers

As discussed with prometheanfire.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 app-emulation/cloud-init/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-emulation/cloud-init/metadata.xml 
b/app-emulation/cloud-init/metadata.xml
index 0516fdb4ff9..ac6c94ad067 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -5,6 +5,10 @@
 prometheanf...@gentoo.org
 Matthew Thode
   
+  
+e...@gentoo.org
+Gilles Dartiguelongue
+  
   
 Package provides configuration and customization of cloud instance.
   



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2018-10-24 Thread Gilles Dartiguelongue
commit: aa3309442f544a16e542cfaae4e9d130b541e2cd
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Wed Oct 24 13:14:01 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Wed Oct 24 13:19:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa330944

app-emulation/cloud-init: version bump 17.2 → 18.4

Fix running unittests. Remove unused inherits. Rely on build system for
cloud.cfg, templates and documentation installation. Add patches for
Gentoo specifics.

Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --force
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-18.4.ebuild| 84 
 .../cloud-init-18.4-fix-packages-module.patch  | 25 ++
 ...it-18.4-gentoo-support-upstream-templates.patch | 91 ++
 4 files changed, 201 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 62e79395b58..1ed457e3bf6 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -5,3 +5,4 @@ DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 
7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb
 DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B 
c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641
 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 
10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b
 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
+DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 
2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4
 SHA512 
730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103

diff --git a/app-emulation/cloud-init/cloud-init-18.4.ebuild 
b/app-emulation/cloud-init/cloud-init-18.4.ebuild
new file mode 100644
index 000..331c102da1a
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-18.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# remove prettytable in 17.2
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-packages-module.patch
+   "${FILESDIR}"/${P}-gentoo-support-upstream-templates.patch
+)
+
+src_prepare() {
+   # Fix location of documentation installation
+   sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" 
setup.py || die
+   distutils-r1_src_prepare
+}
+
+python_test() {
+   # Do not use Makefile target as it does not setup environment correclty
+   esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+   distutils-r1_python_install --init-system=sysvinit_openrc,systemd 
--distro gentoo
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-06-28 Thread Matt Thode
commit: 932ab6be62219c3e914434fd8564458f74f73fed
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Jun 28 19:09:04 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Jun 28 19:51:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932ab6be

app-emulation/cloud-init: stable 17.2 amd64 and x86

Closes: https://bugs.gentoo.org/659524
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-emulation/cloud-init/cloud-init-17.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-17.2.ebuild 
b/app-emulation/cloud-init/cloud-init-17.2.ebuild
index d5d1c2d9d37..d041da0ca5d 100644
--- a/app-emulation/cloud-init/cloud-init-17.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-17.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-06-28 Thread Pacho Ramos
commit: bac4fe9bb322fcab679f26aedd761ef85e859115
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jun 28 19:05:06 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jun 28 19:17:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac4fe9b

app-emulation/cloud-init: Support python3.6

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 app-emulation/cloud-init/cloud-init-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 20a2e5936f9..4072bd36f06 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1 eutils git-r3 multilib systemd
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-03-16 Thread Matt Turner
commit: 836ec5b15d8dc45e699b09734bc27902981aadc2
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Mar 17 06:07:26 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Mar 17 06:45:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836ec5b1

app-emulation/cloud-init: Drop ppc64 keyword

 app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
index 2254a19a64c..f97fbc9cf6d 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2018-02-13 Thread Matt Thode
commit: 12780a103c8965a21ec93527e1fd797756821e42
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Feb 13 19:17:43 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Feb 13 19:28:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12780a10

app-emulation/cloud-init: 17.2 bup

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/cloud-init/Manifest   |  1 +
 app-emulation/cloud-init/cloud-init-17.2.ebuild | 80 +
 2 files changed, 81 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index a1db0042fee..62e79395b58 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -4,3 +4,4 @@ DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B 
eade80cff35e545a619f7d0beafadde14577
 DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 
7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d
 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B 
c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641
 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 
10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b
 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
+DIST cloud-init-17.2.tar.gz 810821 BLAKE2B 
df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5
 SHA512 
ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38

diff --git a/app-emulation/cloud-init/cloud-init-17.2.ebuild 
b/app-emulation/cloud-init/cloud-init-17.2.ebuild
new file mode 100644
index 000..d5d1c2d9d37
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-17.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+# remove pretytable in 17.2
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=(  )
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}"/etc/init.d/*
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+}
+
+pkg_postinst() {
+   elog "cloud-init-local needs to be run in the boot runlevel because it"
+   elog "modifies services in the default runlevel.  When a runlevel is 
started"
+   elog "it is cached, so modifications that happen to the current 
runlevel"
+   elog "while you are in it are not acted upon."
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-12-02 Thread Matt Thode
commit: 4aae72be00074f5c93687d4ae16d142f4a28663b
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Dec  3 00:28:09 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Dec  3 00:54:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aae72be

app-emulation/cloud-init: update for missing dep

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-emulation/cloud-init/Manifest   | 8 
 app-emulation/cloud-init/cloud-init-17.1.ebuild | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index a7aca5062f6..cf5203a8045 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,6 +1,6 @@
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
 WHIRLPOOL 
639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
 WHIRLPOOL 
d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
-DIST cloud-init-0.7.7.tar.gz 477287 SHA256 
d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
 WHIRLPOOL 
9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
-DIST cloud-init-0.7.8.tar.gz 508777 SHA256 
4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 WHIRLPOOL 
1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
-DIST cloud-init-0.7.9.tar.gz 602188 SHA256 
76edb80bf1bdbda68f8014bc057a303ae438a139bdf394e825e548d6ae39d472 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 WHIRLPOOL 
02093161cd3c6930b868ed18ca2e649ebbfac57b4ba3e8dcf4cb3107775cf052c739a0aee40ac79c69511efe5b3dfe60cbc2d55d9bbad74512cdf3a31fb77261
-DIST cloud-init-17.1.tar.gz 780532 SHA256 
80f3bf5e8f57b67ac599aba2856568aeb30bd25187c7a363bed157a1e4d63e01 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 WHIRLPOOL 
13a62d556a0d96bb81ccf0daa7dc4f4527aa9d3380e542b9d5cf00efc1f18c57ecb23aedf88ceb7a85ba04e11b8addd2f779e88f53a2a971a9e95e8a1b457938
+DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B 
eade80cff35e545a619f7d0beafadde145777c5ae581325a4588436ad8becc95a5945c216d8c3c814331099dd4b5cfafe62ee411329f4dce9897ab816ce5ba1f
 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
+DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 
7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d
 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
+DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B 
c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641
 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
+DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 
10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b
 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564

diff --git a/app-emulation/cloud-init/cloud-init-17.1.ebuild 
b/app-emulation/cloud-init/cloud-init-17.1.ebuild
index 9a77fbe6022..193f0cbe21f 100644
--- a/app-emulation/cloud-init/cloud-init-17.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-17.1.ebuild
@@ -16,11 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="test"
 
+# remove pretytable in 17.2
 CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/oauthlib[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   >=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
dev-python

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-10-24 Thread Matt Thode
commit: b366565d8b55c58bf888bd0a4c39b19341c52dc8
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Oct 24 18:30:38 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Oct 24 18:31:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b366565d

app-emulation/cloud-init: restricting tests

cloud-init's requires installation to test, distutils_install_for_testing
is normally used, but fails here.  cloud-init's setup.py is hard coding
some paths, which prevent the use of distutils_install_for_testing.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-emulation/cloud-init/cloud-init-17.1.ebuild | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-17.1.ebuild 
b/app-emulation/cloud-init/cloud-init-17.1.ebuild
index e42af05c2a4..9a77fbe6022 100644
--- a/app-emulation/cloud-init/cloud-init-17.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-17.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test"
 
 CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
@@ -26,8 +27,6 @@ CDEPEND="
dev-python/jsonschema[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
 "
-#  dev-python/prettytable[${PYTHON_USEDEP}]
-#  dev-python/cheetah[$(python_gen_usedep 'python2_7')]
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
@@ -40,9 +39,6 @@ DEPEND="
dev-python/contextlib2[${PYTHON_USEDEP}]
)
 "
-#  dev-python/pep8[${PYTHON_USEDEP}]
-#  dev-python/flake8[${PYTHON_USEDEP}]
-#  dev-python/hacking[${PYTHON_USEDEP}]
 RDEPEND="
${CDEPEND}
net-analyzer/macchanger



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-10-24 Thread Matt Thode
commit: 6e0bbc38b68700af2b13b32edc067d5c565bcf30
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Oct 24 15:27:28 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Oct 24 15:27:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0bbc38

app-emulation/cloud-init: 17.1 bup

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-emulation/cloud-init/Manifest   |  1 +
 app-emulation/cloud-init/cloud-init-17.1.ebuild | 83 +
 app-emulation/cloud-init/metadata.xml   | 24 +++
 3 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 37637ecd997..a7aca5062f6 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -3,3 +3,4 @@ DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0c
 DIST cloud-init-0.7.7.tar.gz 477287 SHA256 
d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
 WHIRLPOOL 
9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
 DIST cloud-init-0.7.8.tar.gz 508777 SHA256 
4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 WHIRLPOOL 
1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
 DIST cloud-init-0.7.9.tar.gz 602188 SHA256 
76edb80bf1bdbda68f8014bc057a303ae438a139bdf394e825e548d6ae39d472 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 WHIRLPOOL 
02093161cd3c6930b868ed18ca2e649ebbfac57b4ba3e8dcf4cb3107775cf052c739a0aee40ac79c69511efe5b3dfe60cbc2d55d9bbad74512cdf3a31fb77261
+DIST cloud-init-17.1.tar.gz 780532 SHA256 
80f3bf5e8f57b67ac599aba2856568aeb30bd25187c7a363bed157a1e4d63e01 SHA512 
988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 WHIRLPOOL 
13a62d556a0d96bb81ccf0daa7dc4f4527aa9d3380e542b9d5cf00efc1f18c57ecb23aedf88ceb7a85ba04e11b8addd2f779e88f53a2a971a9e95e8a1b457938

diff --git a/app-emulation/cloud-init/cloud-init-17.1.ebuild 
b/app-emulation/cloud-init/cloud-init-17.1.ebuild
new file mode 100644
index 000..e42af05c2a4
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-17.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+"
+#  dev-python/prettytable[${PYTHON_USEDEP}]
+#  dev-python/cheetah[$(python_gen_usedep 'python2_7')]
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/contextlib2[${PYTHON_USEDEP}]
+   )
+"
+#  dev-python/pep8[${PYTHON_USEDEP}]
+#  dev-python/flake8[${PYTHON_USEDEP}]
+#  dev-python/hacking[${PYTHON_USEDEP}]
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=(  )
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc,systemd"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   # installs as non-executable
+   chmod +x "${D}"/etc/init.d/*
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+}
+
+pkg_postinst() {
+   elog "cloud-init-local needs 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-09-06 Thread Michał Górny
commit: c02a461d8753aff160a8c23f5f2dbba0ba505fcc
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  6 21:19:35 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  6 21:25:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02a461d

app-emulation/cloud-init: Use https for dev.g.o

 app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild | 2 +-
 app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild| 4 ++--
 app-emulation/cloud-init/cloud-init-0.7.7.ebuild  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
index 13ce91449db..91ce7346914 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
@@ -14,7 +14,7 @@ if [ "x$BZRTGZ" != x1 ]; then
 else
# Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
# 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
-   SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
+   SRC_URI="mirror://gentoo/${P}.tar.gz 
https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
 fi
 

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
index 07789217b6f..737e56a5494 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [ "x$BZRTGZ" != x1 ]; then
 else
# Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
# 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
-   SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
+   SRC_URI="mirror://gentoo/${P}.tar.gz 
https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
 fi
 

diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
index ff83a712cf1..389eb6402e3 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="cloud initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init";
 # Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
 # 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.tar.gz";
+SRC_URI="mirror://gentoo/${P}.tar.gz 
https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-02-07 Thread Sebastian Pipping
commit: 3251ffaa0d7bd82dcb7571eacfb66748229013a3
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Tue Feb  7 23:00:25 2017 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Tue Feb  7 23:03:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3251ffaa

app-emulation/cloud-init: Fix init script permissions

With unfixed 0.7.6_p1212 you got:

$ rc-update add cloud-init-local default
 * rc-update: service `cloud-init-local' is not executeable

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../cloud-init/cloud-init-0.7.6_p1212-r1.ebuild| 80 ++
 1 file changed, 80 insertions(+)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
new file mode 100644
index ..12d4f69
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+BZRTGZ=1
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="EC2 initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+if [ "x$BZRTGZ" != x1 ]; then
+   SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+else
+   # Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
+   # 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
+   SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
+   S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/cheetah[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauth[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mocker[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   ~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+   dev-python/pyflakes[${PYTHON_USEDEP}]
+   sys-apps/iproute2
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.6_p1212-gentoo.patch" )
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+   chmod +x "${D}"/etc/init.d/* || die
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2017-01-17 Thread Matt Thode
commit: 388479c93dbe64bb9f6fd1660de71f9ccd5806ca
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Jan 17 18:32:35 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Jan 17 18:32:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388479c9

app-emulation/cloud-init: 0.7.9 stable amd64 and x86

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/cloud-init-0.7.9.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
index 746ae04..ff96674 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2016-12-23 Thread Matt Thode
commit: 85d88604737fdf165aa6521cbdcb5a3851c4e48b
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Dec 24 02:00:47 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sat Dec 24 02:01:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d88604

app-emulation/cloud-init: bup

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-0.7.9.ebuild   | 95 ++
 .../cloud-init/files/cloud-init-0.7.9-tests.patch  | 13 +++
 3 files changed, 109 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 350a943..37637ec 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -2,3 +2,4 @@ DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
 WHIRLPOOL 
d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
 DIST cloud-init-0.7.7.tar.gz 477287 SHA256 
d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
 WHIRLPOOL 
9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
 DIST cloud-init-0.7.8.tar.gz 508777 SHA256 
4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 WHIRLPOOL 
1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
+DIST cloud-init-0.7.9.tar.gz 602188 SHA256 
76edb80bf1bdbda68f8014bc057a303ae438a139bdf394e825e548d6ae39d472 SHA512 
ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 WHIRLPOOL 
02093161cd3c6930b868ed18ca2e649ebbfac57b4ba3e8dcf4cb3107775cf052c739a0aee40ac79c69511efe5b3dfe60cbc2d55d9bbad74512cdf3a31fb77261

diff --git a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
new file mode 100644
index ..746ae04
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/cheetah[$(python_gen_usedep 'python2_7')]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/pep8[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/hacking[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   net-analyzer/macchanger
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.9-tests.patch" )
+
+python_prepare_all() {
+   sed -i '/^argparse/d' requirements.txt || die
+   sed -i '/^hacking/d' test-requirements.txt || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   chmod +x "${D}"/etc/init.d/cloud-config
+   chmod +x "${D}"/etc/init.d/cloud-final
+   chmod +x "${D}"/etc/init.d/cloud-init
+   chmod +x "${D}"/etc/init.d/cloud-init-local
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-12-23 Thread Matt Thode
commit: 3f1d2bacbde5569a886853a76f5595ad8670b202
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Dec 23 21:49:10 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Dec 23 21:49:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1d2bac

app-emulation/cloud-init: add macchanger dep

Package-Manager: portage-2.3.0
RepoMan-Options: --force

 app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
index b2c892e..45219e6 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
@@ -43,6 +43,7 @@ DEPEND="
 "
 RDEPEND="
${CDEPEND}
+   net-analyzer/macchanger
sys-apps/iproute2
sys-fs/growpart
virtual/logger



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-12-23 Thread Matt Thode
commit: dcd9d8b9a9d4e5e2f1fb808c4bd582ac98e07742
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Dec 23 21:11:31 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Dec 23 21:11:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd9d8b9

app-emulation/cloud-init: fixing missing dep on cheetah

Package-Manager: portage-2.3.0
RepoMan-Options: --force

 .../{cloud-init-0.7.8-r1.ebuild => cloud-init-0.7.8-r2.ebuild}   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
similarity index 97%
rename from app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
rename to app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
index b537380..b2c892e 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
@@ -26,6 +26,7 @@ CDEPEND="
dev-python/pyserial[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
+   dev-python/cheetah[$(python_gen_usedep 'python2_7')]
 "
 DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-10-07 Thread Matt Thode
commit: e1aa2f369ccf97d90dd51901573c84a182d5fc8f
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct  7 16:11:36 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Oct  7 16:12:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1aa2f36

app-emulation/cloud-init: stable amd64 x86

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
index f3a40a9..b537380 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2016-10-07 Thread Matt Thode
commit: 69e8a6f8023958ca82d4f8d2692ce100ad29cf5d
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct  7 16:10:50 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Oct  7 16:12:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e8a6f8

app-emulation/cloud-init: fixing runlevel stuff

Package-Manager: portage-2.3.0

 ...nit-0.7.8.ebuild => cloud-init-0.7.8-r1.ebuild} |  9 +++-
 .../files/cloud-init-0.7.8-gentooinit.patch| 25 ++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
similarity index 87%
rename from app-emulation/cloud-init/cloud-init-0.7.8.ebuild
rename to app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
index 2a4ecb7..f3a40a9 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 CDEPEND="
@@ -84,3 +84,10 @@ python_install_all() {
systemd_dounit "${S}"/systemd/cloud-init-local.service
systemd_dounit "${S}"/systemd/cloud-init.service
 }
+
+pkg_postinst() {
+   elog "cloud-init-local needs to be run in the boot runlevel because it"
+   elog "modifies services in the default runlevel.  When a runlevel is 
started"
+   elog "it is cached, so modifications that happen to the current 
runlevel"
+   elog "while you are in it are not acted upon."
+}

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch 
b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
index b80a60a..ff0e014 100644
--- a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
@@ -11,3 +11,28 @@ index bbadd7b..1578a3d 100755
  scripts=['tools/cloud-init-per'],
  license='GPLv3',
  data_files=data_files,
+diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
+index 5afc0f2..531a715 100644
+--- a/sysvinit/gentoo/cloud-init
 b/sysvinit/gentoo/cloud-init
+@@ -2,6 +2,7 @@
+ # add depends for network, dns, fs etc
+ depend() {
+   after cloud-init-local
++  after net
+   before cloud-config
+   provide cloud-init
+ }
+diff --git a/sysvinit/gentoo/cloud-init-local 
b/sysvinit/gentoo/cloud-init-local
+index 9bd0b56..0f8cf65 100644
+--- a/sysvinit/gentoo/cloud-init-local
 b/sysvinit/gentoo/cloud-init-local
+@@ -2,7 +2,7 @@
+ 
+ depend() {
+   after localmount
+-  after netmount
++  before net
+   before cloud-init
+   provide cloud-init-local
+ }



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-10-06 Thread Matt Thode
commit: c60024b0baf66539785e94ebab14fdbaf75613df
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Oct  6 16:27:43 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Oct  6 16:27:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c60024b0

app-emulation/cloud-init: updating 

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/cloud-init-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
index 1d41994..b7bd6bf 100644
--- a/app-emulation/cloud-init/cloud-init-.ebuild
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -9,8 +9,7 @@ inherit distutils-r1 eutils git-r3 multilib systemd
 
 DESCRIPTION="cloud initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init";
-EGIT_REPO_URI="https://github.com/prometheanfire/cloud-init.git";
-EGIT_BRANCH="gentoo-integration"
+EGIT_REPO_URI="https://git.launchpad.net/cloud-init";
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -48,7 +47,7 @@ RDEPEND="
virtual/logger
 "
 
-PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
+PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
 
 python_prepare_all() {
sed -i 's/version=get_version(),/version=,/g' setup.py || die



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-10-06 Thread Matt Thode
commit: a115633b4c3e3a645920df1f3ae4868a5ceedb38
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Oct  6 16:21:29 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Oct  6 16:21:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a115633b

app-emulation/cloud-init: fast stable to fix broken networking

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/cloud-init-0.7.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
index ef5ffad..2a4ecb7 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

2016-10-06 Thread Matt Thode
commit: aa259547b800e5e02df62cafd324a32201b430c5
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Oct  6 16:20:23 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Oct  6 16:20:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa259547

app-emulation/cloud-init: bump

Package-Manager: portage-2.3.0

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-0.7.8.ebuild   | 86 ++
 .../files/cloud-init-0.7.8-gentooinit.patch| 13 
 3 files changed, 100 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 343c268..350a943 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,3 +1,4 @@
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
 WHIRLPOOL 
639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
 WHIRLPOOL 
d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
 DIST cloud-init-0.7.7.tar.gz 477287 SHA256 
d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
 WHIRLPOOL 
9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
+DIST cloud-init-0.7.8.tar.gz 508777 SHA256 
4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 
ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 WHIRLPOOL 
1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
new file mode 100644
index ..ef5ffad
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/pep8[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/hacking[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
+
+python_prepare_all() {
+   sed -i '/^argparse/d' requirements.txt || die
+   sed -i '/^hacking/d' test-requirements.txt || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   chmod +x "${D}"/etc/init.d/cloud-config
+   chmod +x "${D}"/etc/init.d/cloud-final
+   chmod +x "${D}"/etc/init.d/cloud-init
+   chmod +x "${D}"/etc/init.d/cloud-init-local
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+
+   systemd_dounit "${S}"/systemd/cloud-config.service
+   systemd_dounit "${S}"/systemd/clo

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-08-21 Thread Matt Thode
commit: 900b6267698341e90547d67305df2a5761256ec6
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Aug 21 23:34:25 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Aug 21 23:34:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900b6267

app-emulation/cloud-init: adding  version for gentoo dev work

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/cloud-init-.ebuild | 88 +
 1 file changed, 88 insertions(+)

diff --git a/app-emulation/cloud-init/cloud-init-.ebuild 
b/app-emulation/cloud-init/cloud-init-.ebuild
new file mode 100644
index 000..1d41994
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils git-r3 multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+EGIT_REPO_URI="https://github.com/prometheanfire/cloud-init.git";
+EGIT_BRANCH="gentoo-integration"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+CDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/pep8[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/hacking[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
+
+python_prepare_all() {
+   sed -i 's/version=get_version(),/version=,/g' setup.py || die
+   sed -i '/^argparse/d' requirements.txt || die
+   sed -i '/^hacking/d' test-requirements.txt || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   chmod +x "${D}"/etc/init.d/cloud-config
+   chmod +x "${D}"/etc/init.d/cloud-final
+   chmod +x "${D}"/etc/init.d/cloud-init
+   chmod +x "${D}"/etc/init.d/cloud-init-local
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+
+   systemd_dounit "${S}"/systemd/cloud-config.service
+   systemd_dounit "${S}"/systemd/cloud-config.target
+   systemd_dounit "${S}"/systemd/cloud-final.service
+   systemd_dounit "${S}"/systemd/cloud-init-local.service
+   systemd_dounit "${S}"/systemd/cloud-init.service
+}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-08-20 Thread Matt Thode
commit: c791298c0bff83d31db6568ba095dd0bb759fc83
Author: Matthew Thode  gentoo  org>
AuthorDate: Sat Aug 20 16:44:04 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sat Aug 20 16:44:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c791298c

app-emulation/cloud-init: don't use argparse or hacking

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/cloud-init-0.7.7.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
index 1453bb7..9a770c9 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
@@ -52,6 +52,8 @@ RDEPEND="
 PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
 
 python_prepare_all() {
+   sed -i '/^argparse/d' requirements.txt || die
+   sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/

2016-08-18 Thread Matt Thode
commit: 3fd25247a2740bf64477f851d1f3f4c278c26639
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 18 21:43:29 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Aug 18 21:43:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd25247

app-emulation/cloud-init: fixing the /bin/ip thing in opennebula

Package-Manager: portage-2.2.28

 .../files/cloud-init-0.7.7-gentooinit.patch| 26 ++
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch 
b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
index 8378810..ddb4f38 100644
--- a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
@@ -1,13 +1,21 @@
+diff --git a/cloudinit/sources/DataSourceOpenNebula.py 
b/cloudinit/sources/DataSourceOpenNebula.py
+index 7b3a76b..635a836 100644
+--- a/cloudinit/sources/DataSourceOpenNebula.py
 b/cloudinit/sources/DataSourceOpenNebula.py
+@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
+ # http://opennebula.org/documentation:rel3.8:cong#network_configuration
+ for k in context:
+ if re.match(r'^ETH\d+_IP$', k):
+-(out, _) = util.subp(['/sbin/ip', 'link'])
++(out, _) = util.subp(['ip', 'link'])
+ net = OpenNebulaNetwork(out, context)
+ results['network-interfaces'] = net.gen_conf()
+ break
 diff --git a/setup.py b/setup.py
-index 4abbb67..4885cb5 100755
+index bbadd7b..1578a3d 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # vi: ts=4 expandtab
- #
- #Distutils magic for ec2-init
-@@ -74,6 +75,7 @@ INITSYS_FILES = {
+@@ -74,6 +74,7 @@ INITSYS_FILES = {
  'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
  'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
  'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
@@ -15,7 +23,7 @@ index 4abbb67..4885cb5 100755
  'systemd': [f for f in (glob('systemd/*.service') +
  glob('systemd/*.target')) if is_f(f)],
  'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
-@@ -83,6 +85,7 @@ INITSYS_ROOTS = {
+@@ -83,6 +84,7 @@ INITSYS_ROOTS = {
  'sysvinit': '/etc/rc.d/init.d',
  'sysvinit_freebsd': '/usr/local/etc/rc.d',
  'sysvinit_deb': '/etc/init.d',
@@ -23,7 +31,7 @@ index 4abbb67..4885cb5 100755
  'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
  'systemd.generators': pkg_config_read('systemd',
'systemdsystemgeneratordir'),
-@@ -203,7 +206,7 @@ setuptools.setup(
+@@ -205,7 +207,7 @@ setuptools.setup(
  author='Scott Moser',
  author_email='scott.mo...@canonical.com',
  url='http://launchpad.net/cloud-init/',



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2016-08-18 Thread Matt Thode
commit: 43d54c0b1029a18779588b23fb6cdbe5fa0fa4ba
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Aug 18 21:12:23 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Aug 18 21:13:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d54c0b

app-emulation/cloud-init: bup

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/Manifest  |  1 +
 app-emulation/cloud-init/cloud-init-0.7.7.ebuild   | 86 ++
 .../files/cloud-init-0.7.7-gentooinit.patch| 34 +
 3 files changed, 121 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 6a04d99..343c268 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
 WHIRLPOOL 
639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
 WHIRLPOOL 
d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
+DIST cloud-init-0.7.7.tar.gz 477287 SHA256 
d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 
06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
 WHIRLPOOL 
9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09

diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
new file mode 100644
index 000..1453bb7
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+# Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
+# 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauthlib[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/unittest2[${PYTHON_USEDEP}]
+   dev-python/pep8[${PYTHON_USEDEP}]
+   dev-python/flake8[${PYTHON_USEDEP}]
+   dev-python/hacking[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   sys-apps/iproute2
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install() {
+   distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   chmod +x "${D}"/etc/init.d/cloud-config
+   chmod +x "${D}"/etc/init.d/cloud-final
+   chmod +x "${D}"/etc/init.d/cloud-init
+   chmod +x "${D}"/etc/init.d/cloud-init-local
+
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+
+   systemd_dounit "${S}"/systemd/cloud-config.service
+   systemd_dounit "${S}"/systemd/cloud-config.target
+   systemd_dounit "${S}"/systemd/cloud-final.service
+   systemd_dounit "${S}"/systemd/cloud-init-local.service
+   systemd_dounit "${S}"/systemd/cloud-init.service
+}

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooi

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-04-28 Thread Robin H. Johnson
commit: 440936978e129d0b18425fc256bcf8740fdb26b9
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Thu Apr 28 17:33:17 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Thu Apr 28 17:33:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44093697

app-emulation/cloud-init: launchpad makes bad tarballs, host it ourselves

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
index 5254c05..0faedc0 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -13,7 +13,9 @@ HOMEPAGE="https://launchpad.net/cloud-init";
 if [ "x$BZRTGZ" != x1 ]; then
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 else
-   
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
+   # Launchpad does not provide consistent checksums 
https://bugs.launchpad.net/launchpad/+bug/1576338
+   # 
SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} 
-> ${P}.tar.gz"
+   SRC_URI="mirror://gentoo/${P}.tar.gz 
http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz";
S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2016-04-25 Thread Robin H. Johnson
commit: 6739e8b6037fca09a444eb4726a2eb739322588f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 25 23:04:21 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 25 23:17:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6739e8b6

app-emulation/cloud-init: whitespace.

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
index 9c9d081..5254c05 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-
 CDEPEND="
dev-python/cheetah[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2016-04-25 Thread Robin H. Johnson
commit: ed5ad859b368e86d00025c26556b12d31e8b7f0d
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Apr 25 23:03:09 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Apr 25 23:17:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5ad859

app-emulation/cloud-init: version bump to upstream snapshot release, improve 
install script.

Package-Manager: portage-2.2.28

 app-emulation/cloud-init/Manifest  |  1 +
 .../cloud-init/cloud-init-0.7.6-r2.ebuild  | 77 +
 .../cloud-init/cloud-init-0.7.6_p1212.ebuild   | 78 ++
 .../cloud-init/files/cloud-init-0.7.6-gentoo.patch | 51 ++
 .../files/cloud-init-0.7.6_p1212-gentoo.patch  | 33 +
 5 files changed, 240 insertions(+)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 4f0a651..6a04d99 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1 +1,2 @@
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
 WHIRLPOOL 
639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
+DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 
d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 
25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
 WHIRLPOOL 
d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
new file mode 100644
index 000..495d67b
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="EC2 initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   dev-python/cheetah[${PYTHON_USEDEP}]
+   dev-python/configobj[${PYTHON_USEDEP}]
+   dev-python/jinja[${PYTHON_USEDEP}]
+   dev-python/jsonpatch[${PYTHON_USEDEP}]
+   dev-python/oauth[${PYTHON_USEDEP}]
+   dev-python/prettytable[${PYTHON_USEDEP}]
+   dev-python/pyserial[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   ${CDEPEND}
+   >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+   dev-python/mocker[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   ~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
+   dev-python/pyflakes[${PYTHON_USEDEP}]
+   sys-apps/iproute2
+   )
+"
+RDEPEND="
+   ${CDEPEND}
+   sys-fs/growpart
+   virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.6-gentoo.patch" )
+
+python_prepare_all() {
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   emake test
+}
+
+python_install_all() {
+   keepdir /etc/cloud
+
+   distutils-r1_python_install_all
+
+   doinitd "${S}"/sysvinit/gentoo/cloud-config
+   doinitd "${S}"/sysvinit/gentoo/cloud-final
+   doinitd "${S}"/sysvinit/gentoo/cloud-init
+   doinitd "${S}"/sysvinit/gentoo/cloud-init-local
+   insinto /etc/cloud/templates
+   doins "${FILESDIR}/hosts.gentoo.tmpl"
+   insinto /etc/cloud
+   doins "${FILESDIR}/cloud.cfg"
+
+   systemd_dounit "${S}"/systemd/cloud-config.service
+   systemd_dounit "${S}"/systemd/cloud-config.target
+   systemd_dounit "${S}"/systemd/cloud-final.service
+   systemd_dounit "${S}"/systemd/cloud-init-local.service
+   systemd_dounit "${S}"/systemd/cloud-init.service
+}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
new file mode 100644
index 000..9c9d081
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+BZRTGZ=1
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="EC2 initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init";
+if [ "x$BZRTGZ" != x1 ]; then
+   SRC_URI="https://launchpad.net/${PN}/trunk/$

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/, app-emulation/cloud-init/files/

2016-01-31 Thread Matt Thode
commit: 03cde2b911bc4aee23bd284a93cfc96021ef4650
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 31 23:37:05 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Jan 31 23:38:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cde2b9

app-emulation/cloud-init: split out growpart

Package-Manager: portage-2.2.26

 app-emulation/cloud-init/Manifest  |   1 -
 .../cloud-init/cloud-init-0.7.5-r1.ebuild  |  52 --
 .../cloud-init/cloud-init-0.7.5-r2.ebuild  |  84 ---
 .../cloud-init/cloud-init-0.7.5-r3.ebuild  |  88 ---
 .../cloud-init/cloud-init-0.7.6-r1.ebuild  |   6 +-
 app-emulation/cloud-init/cloud-init-0.7.6.ebuild   |  98 ---
 .../files/cloud-init-0.7.5-tests-exclude.patch |  12 -
 app-emulation/cloud-init/files/growpart| 778 -
 8 files changed, 2 insertions(+), 1117 deletions(-)

diff --git a/app-emulation/cloud-init/Manifest 
b/app-emulation/cloud-init/Manifest
index 93c02cd..4f0a651 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1 @@
-DIST cloud-init-0.7.5.tar.gz 503717 SHA256 
a92bb83809c139a7db378916414c18b0819e306852d6c60dd89388868857ed33 SHA512 
79e1e4a9e1130a3a9deb0482278215baf5ed41e02beebed0a2c6fac4e215340a9537158bd259758a2e074f334c0c0b9e7b936c23eeb9c848c67f7e7835cf0f5d
 WHIRLPOOL 
7d92a0e1b6a3faf550bc442b02c117280c47d160e7e318d9fb859d6d8b59a0ef947d057dfb615bd925420a25ca28852742ee87ffd604faf640ca53a13073
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 
9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 
aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
 WHIRLPOOL 
639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5

diff --git a/app-emulation/cloud-init/cloud-init-0.7.5-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.5-r1.ebuild
deleted file mode 100644
index a01d1dc..000
--- a/app-emulation/cloud-init/cloud-init-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Package provides configuration and customization of cloud 
instance"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/cheetah[${PYTHON_USEDEP}]
-   >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-   dev-python/oauth[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-   dev-python/configobj[${PYTHON_USEDEP}]
-   dev-python/pyyaml[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-   test? ( ${RDEPEND}
-   sys-apps/iproute2 )"
-
-PATCHES=( "${FILESDIR}"/${P}-tests-exclude.patch )
-
-#python_prepare_all() {
-#  distutils-r_python_prepare_all
-#}
-
-python_test() {
-   # These tests are not broken but expect to locate an installed exe file
-   # other than where a gentoo system installs it;  (/bin/ip sought in 
/sbin)
-   # See cloudinit/sources/DataSourceOpenNebula.py for possible patching
-   sed -e 's:test_hostname:_&:' \
-   -e 's:test_network_interfaces:_&:' \
-   -i tests/unittests/test_datasource/test_opennebula.py
-   emake test
-}
-
-python_install() {
-   distutils-r1_python_install
-   for svc in config final init init-local; do
-   newinitd "${WORKDIR}/${P}/sysvinit/gentoo/cloud-${svc}" 
"cloud-${svc}"
-   done
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild
deleted file mode 100644
index d53ccc6..000
--- a/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=TRUE
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="Cloud instance initialization"
-HOMEPAGE="https://launchpad.net/cloud-init";
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="
-   dev-python/cheetah[${PYTHON_USEDEP}]
-   dev-python/configobj[${PYTHON_USEDEP}]
-   dev-python/jsonpatch[${PYTHON_USEDEP}]
-   dev-python/oauth[${PYTHON_USEDEP}]
-   >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-   dev-python/pyserial[${PYTHON_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2015-12-25 Thread Agostino Sarubbo
commit: e8dca9e32e255eebd4510ae94b94e4a39594ed37
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 25 16:46:40 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 25 16:46:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8dca9e3

app-emulation/cloud-init: x86 stable wrt bug #568596

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
index 8bcd832..4ba95f2 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/

2015-12-21 Thread Agostino Sarubbo
commit: fc44578e528e8abc372299269a8771970fa6bc71
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 21 12:40:11 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 21 12:40:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc44578e

app-emulation/cloud-init: amd64 stable wrt bug #568596

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild 
b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
index ce39735..8bcd832 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz";
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 CDEPEND="