From ad279d7b310bd4ab294d140bf00d8e220445a2aa Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 31 Jan 2020 11:10:22 +0000
Subject: system/abuild: Bump to 3.4

---
 system/abuild/APKBUILD | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'system/abuild/APKBUILD')

diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index b2ccb8f8d..7acfc62bb 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=abuild
-pkgver=3.3.1
-pkgrel=4
+pkgver=3.4
+pkgrel=0
 pkgdesc="Script to build APK packages"
 url="https://code.foxkit.us/adelie/abuild"
 arch="all"
 options="suid !check"
 license="GPL-2.0-only"
+pkggroups="abuild"
 depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 libc-utils
 	attr libarchive-tools pkgconf patch lzip"
 if [ "$CBUILD" = "$CHOST" ]; then
@@ -15,16 +16,12 @@ fi
 makedepends_build="pkgconfig"
 makedepends_host="openssl-dev zlib-dev"
 makedepends="$makedepends_host $makedepends_build"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="abuild-rootbld:_rootbld:noarch $pkgname-doc"
-pkggroups="abuild"
-source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
+install="$pkgname.pre-install $pkgname.pre-upgrade"
+source="https://distfiles.adelielinux.org/source/abuild-$pkgver.tar.xz
 	keyhole.patch
 	auto-dev-symbols.patch
-	bang.patch
-	modernise.patch
 	"
-builddir="$srcdir/$pkgname-$pkgver+adelie"
 
 # secfixes:
 #   3.3.1-r1:
@@ -32,7 +29,6 @@ builddir="$srcdir/$pkgname-$pkgver+adelie"
 
 prepare() {
 	default_prepare
-
 	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
 }
 
@@ -58,8 +54,6 @@ _rootbld() {
 	mkdir -p "$subpkgdir"
 }
 
-sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66  abuild-3.3.1+adelie.tar.xz
+sha512sums="c028641bcba421fd8e58bf3881aec26f6b9b8102af27d8106640a8b2a73e2688b1a9ac8377c9302f1781314137c3c47bf8636e03ef60b8969417eb4c5de6a82a  abuild-3.4.tar.xz
 757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d  keyhole.patch
-2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2  auto-dev-symbols.patch
-0fccb03673f2f72a7bd2d2afd1c79141eeb73b3119e83fff966fb8a2851c0484912be70a7b384be1dc384c344cf27427e2fc2426c2f9bf56aa5625f32436524d  bang.patch
-b5b200da56c4319d332a7c5ddf38879fba0a4af723e1c6492f80a101afc8711d978dd7e1e5c31c80ed7fee15dcb19e7c449c92761b509a8063e417869885edc5  modernise.patch"
+29de3a0c7a60e92fac735782c0e9ebb319813448380ebdf4651ef43a58e6a12074cacc22e8b9ba9be7f7d86e188d4cc486ce51bd2ddb1859114e71e4c44d8874  auto-dev-symbols.patch"
-- 
cgit v1.2.3-70-g09d2