Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

2 files changed, 84 insertions, 54 deletions

diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index d3c906563..a25c555d6 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL
-# Copyright 2007-2008, 2013, 2014 Heinz Wiesinger, Amsterdam, NL
-# Copyright 2008, 2009, 2010, 2013, 2014, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2008, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, NL
+# Copyright 2008, 2009, 2010, 2013, 2014, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,10 @@
 # Script modified by Robby Workman - no copyright claims or added terms
 # Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=boost
-VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
+VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
 BUILD=${BUILD:-1}
 
 PKG_VERSION=$(echo $VERSION | tr _ .)	# Leave this alone
@@ -46,6 +47,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$PKG_VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -63,7 +72,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
+PYTHON_VERSION=$(python -c 'import sys; print(sys.version[:3])')
+PYTHON3_VERSION=$(python3 -c 'import sys; print(sys.version[:3])')
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-boost
 
@@ -71,7 +82,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf boost_$VERSION
-tar xvf $CWD/boost_$VERSION.tar.?z* || exit 1
+tar xvf $CWD/boost_$VERSION.tar.?z || exit 1
 cd boost_$VERSION || exit 1
 
 chown -R root:root .
@@ -81,72 +92,91 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Don't allow MOC to process this incompatible header:
-sed -e '1 i#ifndef Q_MOC_RUN' \
-  -e '$ a#endif' \
-  -i boost/type_traits/detail/has_binary_operator.hpp
-
-# This is the python we build against:
-PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
-PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
-
 # First build bjam, the boost build system:
-cd tools/build/src/engine
-  CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc
-cd -
-
-BJAM=$(find tools/build/src/engine/ -name b2 -a -type f)
-
-# Create build subdirectory
-mkdir obj
-
-# Next, we build boost using bjam
-$BJAM \
-  release \
-  $NUMJOBS \
-  "-sNO_COMPRESSION=0" \
-  "-sZLIB_INCLUDE=/usr/include" \
-  "-sZLIB_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  "-sBZIP2_INCLUDE=/usr/include" \
-  "-sBZIP2_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
-  "-sEXPAT_INCLUDE=/usr/include" \
-  "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
+./bootstrap.sh \
+  --with-toolset=gcc \
+  --with-icu \
+  --with-python=/usr/bin/python2 || exit 1
+
+# # Next, we build boost using bjam
+./b2 \
   --layout=system \
-  --builddir=obj \
+  --build-dir=build-python2 \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --build-type=minimal \
   toolset=gcc \
   variant=release \
+  debug-symbols=off \
   link=shared \
   threading=multi \
   runtime-link=shared \
+  python=$PYTHON_VERSION \
   cflags="$SLKCFLAGS" \
   cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \
-  $PYTHON_FLAGS \
-  stage
+  stage || exit 1
 
-# And then install boost..
-mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,include}
+# # And then install boost..
+./b2 \
+  --layout=system \
+  --build-dir=build-python2 \
+  --prefix=$PKG/usr \
+  --libdir=$PKG/usr/lib$LIBDIRSUFFIX \
+  --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  debug-symbols=off \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
+  python=$PYTHON_VERSION \
+  cflags="$SLKCFLAGS" \
+  cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \
+  install || exit 1
+
+# one more run to build libboost_python3..
+sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \
+  -i bootstrap.sh
+
+./bootstrap.sh \
+  --with-toolset=gcc \
+  --with-icu \
+  --with-python=/usr/bin/python3 \
+  --with-libraries=python || exit 1
+
+./b2 \
+  --layout=system \
+  --build-dir=build-python3 \
+  --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --build-type=minimal \
+  toolset=gcc \
+  variant=release \
+  debug-symbols=off \
+  link=shared \
+  threading=multi \
+  runtime-link=shared \
+  python=$PYTHON3_VERSION \
+  cflags="$SLKCFLAGS" \
+  cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \
+  stage || exit 1
 
-$BJAM \
-  release \
-  "-sEXPAT_INCLUDE=/usr/include" \
-  "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \
+./b2 \
   --layout=system \
-  --builddir=obj \
+  --build-dir=build-python3 \
   --prefix=$PKG/usr \
-  --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \
+  --libdir=$PKG/usr/lib$LIBDIRSUFFIX \
   --build-type=minimal \
   toolset=gcc \
   variant=release \
+  debug-symbols=off \
   link=shared \
   threading=multi \
   runtime-link=shared \
+  python=$PYTHON3_VERSION \
   cflags="$SLKCFLAGS" \
   cxxflags="$SLKCFLAGS $EXTRA_CXXFLAGS" \
-  $PYTHON_FLAGS \
-  install
+  install || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/l/boost/slack-desc b/source/l/boost/slack-desc
index 1b3142ace..28fe3b49b 100644
--- a/source/l/boost/slack-desc
+++ b/source/l/boost/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
@@ -10,10 +10,10 @@ boost: boost (Boost C++ Libraries)
 boost:
 boost: Boost provides free peer-reviewed portable C++ source libraries.
 boost: The emphasis is on libraries that work well with the C++ Standard
-boost: Library.  One goal is to establish "existing practice" and provide
+boost: Library. One goal is to establish "existing practice" and provide
 boost: reference implementations so that the Boost libraries are suitable
 boost: for eventual standardization.
 boost:
-boost: Homepage:  http://www.boost.org/
+boost: Homepage: http://www.boost.org/
 boost:
 boost: