From a7bf170c587b259a52ffb2be513eb6a0865da3af Mon Sep 17 00:00:00 2001
From: tcely <tcely@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:59:24 -0400
Subject: main/boost: upgrade to 1.68.0

---
 main/boost/APKBUILD | 65 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 20 deletions(-)

(limited to 'main/boost/APKBUILD')

diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 9a5af385ab6..5f7d177a30b 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -1,21 +1,21 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=boost
-pkgver=1.67.0
+pkgver=1.68.0
 _pkgver="${pkgver//./_}"
-pkgrel=2
+pkgrel=0
 pkgdesc="Free peer-reviewed portable C++ source libraries"
 url="http://www.boost.org/"
 arch="all"
 license="custom"
-depends=""
-depends_dev="linux-headers"
+depends="$pkgname-libs"
+depends_dev="$pkgname linux-headers"
 makedepends="$depends_dev python2-dev>=2.6 python3-dev flex bison bzip2-dev zlib-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://dl.bintray.com/boostorg/release/$pkgver/source/${pkgname}_$_pkgver.tar.bz2
 	boost-1.57.0-python-abi_letters.patch
 	boost-1.57.0-python-libpython_dep.patch
 	revert-wifsignaled-static-assert.patch
-	fix-fgetc-define.patch	
+	fix-fgetc-define.patch
 	"
 options="!checkroot"
 builddir="$srcdir/${pkgname}_${_pkgver}"
@@ -46,27 +46,38 @@ _libs="
 	filesystem
 	graph
 	iostreams
+	locale
+	log_setup
+	log
 	math
 	prg_exec_monitor
 	program_options
 	python3
-	python
+	python2
 	random
 	regex
 	serialization
 	signals
+	stacktrace_basic
+	stacktrace_noop
 	system
 	thread
+	timer
+	type_erasure
 	unit_test_framework
 	wave
 	wserialization
 	"
 for _lib in $_libs; do
-	case "$_options_carch" in
-		*$_lib*) continue;;
-	esac
-	subpackages="$subpackages $pkgname-$_lib:_boostlib"
-done
+	_skip_lib=0
+	for _option in $_options_carch; do
+		case "$_option" in --without-${_lib}) _skip_lib=1; break ;; esac
+	done; unset -v _option
+	if [ ${_skip_lib:-0} -eq 0 ]; then
+		subpackages="$subpackages ${pkgname}-${_lib}:_boostlib"
+	fi
+done; unset -v _lib _skip_lib
+subpackages="$subpackages $pkgname-libs"
 
 _set_options() {
 	[ -n "$PY2_VERSION" ] || PY2_VERSION="$(_pyversion python2)"
@@ -154,28 +165,42 @@ package() {
 }
 
 static() {
-	pkgdesc="Static libraries for boost"
+	pkgdesc="Boost static libraries"
+	depends="$depends_static"
+
 	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/lib*.a "$subpkgdir"/usr/lib/
 }
 
 _boostlib() {
 	local name="${subpkgname#$pkgname-}"
-	pkgdesc="Boost $name library"
-	case "$name" in
-	python*) depends="$depends $name"
-	esac
+	pkgdesc="Boost $name shared library"
+	depends="$depends__boostlib"
 
 	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/libboost_$name* "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/libboost_$name*.so.[0-9]* "$subpkgdir"/usr/lib/
+}
+
+libs() {
+	default_libs
+
+	pkgdesc="Boost shared libraries"
+	depends="$depends_libs"
+	local _pkg; for _pkg in $origsubpackages; do
+		case "$_pkg" in
+			*:_boostlib) depends="$depends ${_pkg%%:*}" ;;
+		esac
+	done
+
+	mkdir -p "$subpkgdir"
 	rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || :
 }
 
 _pyversion() {
-	"$(command -v "$1")" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
+	"$1" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))'
 }
 
-sha512sums="82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8  boost_1_67_0.tar.bz2
+sha512sums="f5ca2e0425af40eca7722712b985b863c88780e5be5ac24c78bcfdc63651bb67a39605d4f84089d76cab344fd34113fcb7befaa9a90481b381f6c53e9612b5f9  boost_1_68_0.tar.bz2
 d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66  boost-1.57.0-python-abi_letters.patch
 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02  boost-1.57.0-python-libpython_dep.patch
 1cae6ab9b3b97e0328aa5b85ee2220bb1e88b99256b31bc4a2d06275cf70704c8f4f1bd6abd77386d0490bb14a0393ae981be8e95f2cc054a1dc07de8847e8d5  revert-wifsignaled-static-assert.patch
-- 
cgit v1.2.3