testing/cloud-init: upgrade to 18.3, modernize

1 files changed, 41 insertions, 61 deletions

diff --git a/testing/cloud-init/APKBUILD b/testing/cloud-init/APKBUILD
index a86ffb6889..1628885a4d 100644
--- a/testing/cloud-init/APKBUILD
+++ b/testing/cloud-init/APKBUILD
@@ -1,52 +1,44 @@
 # Contributor: Matt Dainty <matt+alpine@bodgit-n-scarper.com>
-# Maintainer:
+# Maintainer: 
 pkgname=cloud-init
-pkgver=0.7.6
-pkgrel=2
+pkgver=18.3
+pkgrel=0
 pkgdesc="Cloud instance init scripts"
-url="http://launchpad.net/cloud-init"
+url="https://cloud-init.io"
 arch="noarch"
-depends="e2fsprogs-extra python2 py-cheetah py-configobj py-jinja2 py-jsonpatch py-oauth2 py-prettytable py-requests py-serial py-yaml"
-makedepends="py-setuptools"
-install="$pkgname.pre-install $pkgname.post-install"
-subpackages="$pkgname-doc"
-source="
-	https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
 license="Apache-2.0 GPL-3.0-only"
-	10-setup.patch
-	20-alpine.patch
-	cloud-init-local.initd
-	cloud-init.initd
-	cloud-config.initd
-	cloud-final.initd
+depends="e2fsprogs-extra python3 py3-configobj py3-jinja2 py3-jsonpatch py3-jsonschema
+	py3-oauthlib py3-requests py3-serial py3-six py3-yaml"
+makedepends="py3-setuptools"
+subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch $pkgname-openrc"
+source="https://launchpad.net/cloud-init/trunk/18.3/+download/$pkgname-$pkgver.tar.gz
+	add_distro-alpine.patch
 	cloud.cfg
 	hosts.alpine.tmpl
+	alpine.py
 	"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	cd "$builddir"
+	default_prepare
+
+	install -m644 "$srcdir"/alpine.py \
+		"$builddir"/cloudinit/distros/
 }
 
 build() {
-	cd "$_builddir"
-	python2 setup.py build || return 1
+	cd "$builddir"
+	python3 setup.py build
 }
 
-package() {
-	cd "$_builddir"
-	python2 setup.py install --prefix=/usr --root="$pkgdir" || return 1
+check() {
+	cd "$builddir"
+	python3 setup.py check
+}
 
-	for i in init-local init config final; do
-		install -m755 -D "$srcdir"/cloud-$i.initd \
-			"$pkgdir"/etc/init.d/cloud-$i || return 1
-	done
+package() {
+	cd "$builddir"
+	python3 setup.py install --prefix=/usr --root="$pkgdir" --init-system=sysvinit_openrc
 
 	install -m644 "$srcdir"/cloud.cfg \
 		"$pkgdir"/etc/cloud/
@@ -55,30 +47,18 @@ package() {
 		"$pkgdir"/etc/cloud/templates/
 }
 
-md5sums="cd392e943dd0165e90a6d56afd0e4ad3  cloud-init-0.7.6.tar.gz
-90a78c24b1a2ed537d5e7c28c48780d5  10-setup.patch
-214a3c1a58bd6649bed43998ca50e023  20-alpine.patch
-80892c13e65a5040f32b4d86e848b6bb  cloud-init-local.initd
-0041569a737713ea01a154d98007c2e5  cloud-init.initd
-3ff3ae1e27950abf3064da60c23669ba  cloud-config.initd
-0824fad27c2bf1b966e8820f51d2fde0  cloud-final.initd
-ea4ccef56c030b694ad799fb03e3e462  cloud.cfg
-3e700738d75419687128a93cbdc35857  hosts.alpine.tmpl"
-sha256sums="9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7  cloud-init-0.7.6.tar.gz
-a26154be7b331859660c620ad56f59910b1a832fff3a1d0597a1d8204e1b7846  10-setup.patch
-73dc3a201c4e208c28e5119c3cd5ff276bfec6f6b87746113876558acf240609  20-alpine.patch
-0fc8f79a4675e57b9475ac8fbe92898b17284f6ad903ec1ea9a795783e70ed33  cloud-init-local.initd
-ce227ff37516fc08702996903762704dd255a16d391ed2853fe5d5b88d28231d  cloud-init.initd
-3581bf4d4a0b7011edef76c40237517c3fb350c477ffaead1abcdcf4bb8bbe24  cloud-config.initd
-1e5fe801a9981a721e4cb6ebc1f7fd9df2dec1683dae9ab6fd15f8e8338fb7d3  cloud-final.initd
-4f688c5d3780f7b9883694323b0222b92b14d4edbe25d08aa2ca9da3b42e65c9  cloud.cfg
-43bcfcd5ff1117a9b54be22f5e50f04aa78fe6574271be7c01d472921d3f04c3  hosts.alpine.tmpl"
-sha512sums="aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d  cloud-init-0.7.6.tar.gz
-502de73eb899d751f025d7d268d3a4eb086177a86da5d6e223b7243ecdb30b93bd3ecb974cfa1f900d2adc8ce2bbc8cd1be23a10115e709b1f2cc22b704d575d  10-setup.patch
-c0ef63ff95f6d8d12ea3f55758fd6ba1dbd7ef2100577135b1f54bb3c239ac37aabba5644742bbf865ba379256efe08847731e8379cff27613b29ac07edd131b  20-alpine.patch
-f3131d9fb8b59fb44be1bb9293cfc1809c370efd4c4d215f5a3b337305bf4982d98d4905bcf077b32edfb4d0b605a4db5704779ac667c3546a9cbdd54a95e28e  cloud-init-local.initd
-dccdbbe2e8ff7cdf28da2f6ddbbcda3f3c29c99d8b89476d03cb2e46e158614f7a5deea2284d807938e9d12600f642747cd020bd88412d6f3906195d78aa9f5e  cloud-init.initd
-644b583eb96ec93bfe71fea27408f29ef432b7535d70dc3eb4b2a99b5131c30310971e4502d100047f0909ce00f58ef42fd9be907a99388dc9f7b98ba3f27ebf  cloud-config.initd
-22970d575b5576689b638badfc1248b4710edb33421470b42d0d838a99806b01cefd9346033dc22a062c9eb6c52625966d73722386da9ad632f65fdcd2f10d93  cloud-final.initd
-1b83382a0f1aa8044eed5b7390b81897c9f6a3601577396cc803f15b1840419eda3cef37b15d2dee226d9a27434b0a899466ed6860cccdfb244b60edd9bed281  cloud.cfg
-813a67d446ee65f5ef5a45fe60bef4d0e404c5d1f9cb732bc0ec0b706a0274f4bc1e7f87e676da1ca9366c2f933163f620ee296ed783372869438dd8a928117b  hosts.alpine.tmpl"
+bashcomp() {
+	depends="bash"
+	pkgdesc="Bash completions for $pkgname"
+	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+
+	cd "$builddir"
+	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+	cp bash_completion/$pkgname "$subpkgdir"/usr/share/bash-completion/completions/$pkgname
+}
+
+sha512sums="e066c48f74ed21d4bd673dbeb17fabbacc107369c5c10e656b166257313f50cf9ab6af5ec69f2e8cc2abf22261c4fa86ca88e41c98c66985439f9af144d7c8cc  cloud-init-18.3.tar.gz
+4ab37323e7662445af90ce2654199fe3080e256571e8e12b121ebde791b98e68d368b10c5f22b7e8840c0ba9593dd0a6e37ec60724cd0ae4c806944a826741e3  add_distro-alpine.patch
+7dd8c3a2050af5536154e77cc3913d34b7d85d02130ea9b9f5b54710f96cd22cb4c255af34f3c710a1319f9bd0f667441482695e9bad927026f952d0cf39de41  cloud.cfg
+813a67d446ee65f5ef5a45fe60bef4d0e404c5d1f9cb732bc0ec0b706a0274f4bc1e7f87e676da1ca9366c2f933163f620ee296ed783372869438dd8a928117b  hosts.alpine.tmpl
+301e99d25cbe3607f6187ef477e15c8ffc356456117fcd662528194d880a989ba79622208eb84c27decf19060c3810c9ff11441d041c2061feced823e453acaf  alpine.py"