From ed7df1ae1d5a58661b2afdcbab342d4e99b38c97 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 2 Aug 2013 14:09:13 +0000
Subject: main/abuild: upgrade to 2.16.0

---
 main/abuild/0001-abuild-fix-ldpath-handling.patch | 27 -----------------------
 main/abuild/APKBUILD                              | 19 ++++++----------
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 main/abuild/0001-abuild-fix-ldpath-handling.patch

(limited to 'main/abuild')

diff --git a/main/abuild/0001-abuild-fix-ldpath-handling.patch b/main/abuild/0001-abuild-fix-ldpath-handling.patch
deleted file mode 100644
index d9acce449..000000000
--- a/main/abuild/0001-abuild-fix-ldpath-handling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f43f6d312b52702ce8020477960ab0521018b745 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 30 Jul 2013 12:16:44 +0000
-Subject: [PATCH] abuild: fix ldpath handling
-
-it wrongly scanned /lib instead of $datadir/lib, causing bad things to
-happen when scanning provides
----
- abuild.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/abuild.in b/abuild.in
-index 8c93658..51b4a6a 100755
---- a/abuild.in
-+++ b/abuild.in
-@@ -1020,7 +1020,7 @@ find_scanelf_paths() {
- 	local datadir="$1"
- 	local paths="$datadir/lib:$datadir/usr/lib" i= rpaths=
- 	if [ -n "$ldpath" ]; then
--		paths="$paths:$(echo "$ldpath" | sed "s|\(^\|:\)|\1$datadir|g")"
-+		paths="$paths:$(echo "${datadir}${ldpath}" | sed "s|:|:$datadir|g")"
- 	fi
- 	# search in all rpaths
- 	for rpaths in "$pkgbasedir"/.control.*/.rpaths; do
--- 
-1.8.3.4
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 4dccaa792..171e41bca 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.15.0
+pkgver=2.16.0
 _ver=${pkgver%_git*}
-pkgrel=2
+pkgrel=0
 url=http://git.alpinelinux.org/cgit/abuild/
 depends="fakeroot sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper
 	libc-utils"
@@ -16,8 +16,7 @@ subpackages="apkbuild-cpan:cpan"
 pkggroups="abuild"
 arch="all"
 license=GPL-2
-source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz
-	0001-abuild-fix-ldpath-handling.patch"
+source="http://dev.alpinelinux.org/archive/abuild/abuild-$pkgver.tar.xz"
 
 _builddir="$srcdir/$pkgname-$_ver"
 prepare() {
@@ -30,8 +29,7 @@ prepare() {
 			;;
 		esac
 	done
-	sed -i -e "s/^CARCH=.*/CARCH=$CARCH/" \
-		-e "s/^CBUILD=.*/CBUILD=$CBUILD/" abuild.conf
+	sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf
 }
 
 build() {
@@ -54,9 +52,6 @@ cpan() {
 	mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
 }
 
-md5sums="ba2a10bed1efbe31c52de6f64dd9bbf2  abuild-2.15.0.tar.xz
-b0ab439f64579ad231de83e5979d6214  0001-abuild-fix-ldpath-handling.patch"
-sha256sums="5518079b8897746d9603cf3692400ec1c6b6af5f57fb003c27edcbd35511dd74  abuild-2.15.0.tar.xz
-3658b6a34747f77e91706568d594aa2a9c250dfcbfa0d5da53379d00c527cc6a  0001-abuild-fix-ldpath-handling.patch"
-sha512sums="d7f2c38f81743e2c8c787d2a9a7c7fa7ec2fbf89c32e72e8a84e66fd517686456e201108388f36250d37804b422ecfacbca4a463172d05359deb9d65e6b20426  abuild-2.15.0.tar.xz
-79eddd7fb2ca3a9cd9bd61aa54578b16bdd711471d9915b0236896562b1233aec1c03246aa2306ce70113847f0dcc959825c01ac93410927732fe4ed48b64cdb  0001-abuild-fix-ldpath-handling.patch"
+md5sums="6e3588034d8451a748e9e8c8a590df52  abuild-2.16.0.tar.xz"
+sha256sums="b1d02fdd89cce15f208f7aea950cd9df9f83af89089bc959e71f9d572755387f  abuild-2.16.0.tar.xz"
+sha512sums="10b018971a1cd3a0f60258540a33244dab1aea316df071574c3c59c759e26680409adb14faa33fbcbb61ae565321380c252c1946803446c1bb821612545a7052  abuild-2.16.0.tar.xz"
-- 
cgit v1.2.3