main/lxc: improve abuild

1 files changed, 19 insertions, 23 deletions

diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index d837dcbb71..967862c023 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -3,40 +3,33 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lxc
 pkgver=2.0.3
-_mypkgver=${pkgver/_rc/.rc}
+_pkgver=${pkgver/_rc/.rc}
 pkgrel=0
-pkgdesc="linux containers - tools"
-url="http://lxc.sourceforge.net/"
+pkgdesc="Userspace interface for the Linux kernel containment features"
+url="https://linuxcontainers.org/lxc/"
 arch="all"
 license="GPL"
 depends="gzip"
 depends_dev="libcap-dev"
 makedepends="$depends_dev lvm2 util-linux automake autoconf libtool lua5.2-dev
 	linux-headers bash tar docbook2x"
-install=""
 options="suid"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52
 	$pkgname-templates $pkgname-libs"
-source="https://github.com/lxc/lxc/archive/lxc-$_mypkgver.tar.gz
+source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz
 	version.patch
 	download-template-tmpfs.patch
 	lxc.initd
 	"
+builddir="$srcdir/lxc-lxc-$_pkgver"
 
-_builddir="${srcdir}/lxc-lxc-${_mypkgver}"
 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
+	default_prepare || return 1
 	./autogen.sh
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	LUA_VERSION=5.2 \
 	./configure \
 		--build=$CBUILD \
@@ -53,24 +46,26 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 	install -d "$pkgdir"/var/lib/lxc
 	install -Dm755 "$srcdir"/lxc.initd "$pkgdir"/etc/init.d/lxc
 }
 
 lvm() {
-	pkgdesc="linux containers lvm support"
+	pkgdesc="LVM support for LXC"
 	depends="lvm2 util-linux lxc"
 	arch="noarch"
+
 	mkdir "$subpkgdir"
 }
 
 _lua52() {
 	pkgdesc="Lua 5.2 module for LXC"
-	for i in lib share; do
-		mkdir -p "$subpkgdir"/usr/$i || return 1
-		mv "$pkgdir"/usr/$i/lua "$subpkgdir"/usr/$i/ || return 1
+
+	local dir; for dir in lib share; do
+		mkdir -p "$subpkgdir"/usr/$dir || return 1
+		mv "$pkgdir"/usr/$dir/lua "$subpkgdir"/usr/$dir/ || return 1
 	done
 }
 
@@ -78,15 +73,16 @@ templates() {
 	pkgdesc="Templates for LXC"
 	arch="noarch"
 	depends="bash tar"
+
 	mkdir -p "$subpkgdir"/usr/share/lxc
 	mv "$pkgdir"/usr/share/lxc/templates "$subpkgdir"/usr/share/lxc/
 }
 
 dev() {
-	default_dev
-	#fix abuild smartness
-	mv "$subpkgdir"/usr/bin/lxc-config \
-		"$pkgdir"/usr/bin/ || return 1
+	default_dev || return 1
+
+	# fix abuild smartness
+	mv "$subpkgdir"/usr/bin/lxc-config "$pkgdir"/usr/bin/
 }
 
 md5sums="839887923e097df640a40fe6ee842251  lxc-2.0.3.tar.gz