From 66307c89bbe21c7d1a3945f347329b22bab114bd Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:59:26 -0400
Subject: testing/boost-build: upgrade to 1.69.0

---
 testing/boost-build/APKBUILD | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/testing/boost-build/APKBUILD b/testing/boost-build/APKBUILD
index 8c4cd06612..ba541a2ea7 100644
--- a/testing/boost-build/APKBUILD
+++ b/testing/boost-build/APKBUILD
@@ -2,35 +2,45 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=boost-build
-pkgver=1.68.0
-pkgrel=1
+pkgver=1.69.0
+pkgrel=0
 pkgdesc="Boost.Build makes it easy to build C++ projects, everywhere"
 url="https://boost.org/build"
-arch="all"
+arch="noarch"
 options="!check"
 license="custom:boost"
-depends="boost-dev"
+depends="boost"
 makedepends=""
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/boostorg/${pkgname#*-}/archive/${pkgname%%-*}-$pkgver.tar.gz
-	$pkgname-$pkgver-LICENSE.txt::https://boost.org/LICENSE_1_0.txt"
+	$pkgname-LICENSE.txt::https://boost.org/LICENSE_1_0.txt"
 builddir="$srcdir/${pkgname#*-}-${pkgname%%-*}-$pkgver"
 
 build() {
 	cd "$builddir"
-	./bootstrap.sh
+
+	# we bootstrapped with boost already
+	local _b2="$(command -v b2)"
+	local _bjam="$(command -v bjam)"
+	cp -p "${_b2:-NOT_INSTALLED}" .
+	cp -p "${_bjam:-NOT_INSTALLED}" .
 }
 
 package() {
 	cd "$builddir"
 
-	./b2 install --prefix="$pkgdir"/usr
-	install -Dm644 "$srcdir"/$pkgname-$pkgver-LICENSE.txt \
-		"$pkgdir"/usr/share/doc/$pkgname/LICENSE
+	b2 install --prefix="$pkgdir"/usr
+
+	cd "$pkgdir"
+
+	# we don't need the copies of the boost binaries
+	rm -v -rf ./usr/bin
+
+	install -Dm644 "$srcdir/$pkgname-LICENSE.txt" \
+		"./usr/share/doc/$pkgname/LICENSE"
 
-	mv "$pkgdir"/usr/share/$pkgname/example "$pkgdir"/usr/share/doc/$pkgname
-	rm "$pkgdir"/usr/bin/bjam
+	mv "usr/share/$pkgname/example" "usr/share/doc/$pkgname"
 }
 
-sha512sums="ede4ea6bba966bfdc590ea21b8787f090c690db851fd6eb19644f089de8828b6cec504a7f4be203d57017de2a0288f0e12772e50d9017287221520dca1676a79  boost-build-1.68.0.tar.gz
-d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8  boost-build-1.68.0-LICENSE.txt"
+sha512sums="e8d89e75c83a08bab29f52b5100fccf1d2ddf492a532ae4cb8121a5f49819aebb8157d1a1fd7d514bd8a0fe444e5ebb1103b10c8579d5c234ab81110d9c334a8  boost-build-1.69.0.tar.gz
+d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8  boost-build-LICENSE.txt"
-- 
cgit v1.2.3