Merge branch 'master' into check

COPYING

@@ -1,4 +1,4 @@
- Copyright (c) 2008-2016 Juan Romero Pardines and contributors
+ Copyright (c) 2008-2017 Juan Romero Pardines and contributors
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

Manual.md

@@ -42,7 +42,6 @@ packages for XBPS, the `Void Linux` native packaging system.
 	* [Contributing via git](#contributing)
 * [Help](#help)
 
-
 <a id="Introduction"></a>
 ## Introduction
 
@@ -54,13 +53,17 @@ The `template files` are `GNU bash` shell scripts that must define some required
 `variables` and `functions` that are processed by `xbps-src` (the package builder)
 to generate the resulting binary packages.
 
+By convention, all templates start with a comment briefly explaining what they
+are. In addition, pkgname and version can't have any characters in them that
+would require them to be quoted, so they are not quoted.
+
 A simple `template` example is as follows:
 
 ```
 # Template file for 'foo'
 
-pkgname="foo"
+pkgname=foo
-version="1.0"
+version=1.0
 revision=1
 build_style=gnu-configure
 short_desc="A short description max 72 chars"
@@ -505,12 +508,22 @@ default all binaries are stripped.
 sonames in shared libraries.
 
 - `nocross` If set, cross compilation won't be allowed and will exit immediately.
+This should be set to a string describing why it fails, or a link to a travis
+buildlog demonstrating the failure.
+
+- `restricted` If set, xbps-src will refuse to build the package unless
+`etc/conf` has `XBPS_ALLOW_RESTRICTED=yes`. The primary builders for Void
+Linux do not have this setting, so the primary repositories will not have any
+restricted package. This is useful for packages where the license forbids
+redistribution.
 
 - `subpackages` A white space separated list of subpackages (matching `foo_package()`)
 to override the guessed list. Only use this if a specific order of subpackages is required,
 otherwise the default would work in most cases.
 
 - `broken` If set, building the package won't be allowed because its state is currently broken.
+This should be set to a string describing why it is broken, or a link to a travis
+buildlog demonstrating the failure.
 
 - `shlib_provides` A white space separated list of additional sonames the package provides on.
 This appends to the generated file rather than replacing it.
@@ -642,7 +655,10 @@ arguments can be passed in via `configure_args`.
 - `gnu-makefile` For packages that use GNU make, build arguments can be passed in via
 `make_build_args` and install arguments via `make_install_args`. The build
 target can be overridden via `make_build_target` and the install target
-via `make_install_target`.
+via `make_install_target`. This build style tries to compensate for makefiles
+that do not respect environment variables, so well written makefiles, those
+that do such things as append (`+=`) to variables, should have `make_use_env`
+set in the body of the template.
 
 - `go` For programs written in Go that follow the standard package
   structure. The variable `go_import_path` must be set to the package's

common/build-profiles/README

@@ -7,3 +7,4 @@ for a specific architecture:
 	- XBPS_TRIPLET		(the compiler triplet)
 	- XBPS_CFLAGS		(C compiler flags for host compiler)
 	- XBPS_CXXFLAGS		(C++ compiler flags for the host compiler)
+	- XBPS_FFLAGS		(Fortran compiler flags for the host compiler)

common/build-profiles/aarch64-musl.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="aarch64-unknown-linux-musl"

common/build-profiles/aarch64.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv8-a"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="aarch64-unknown-linux-gnu"

common/build-profiles/armv6l-musl.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="armv6l-linux-musleabihf"

common/build-profiles/armv6l.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="armv6l-unknown-linux-gnueabihf"

common/build-profiles/armv7l-musl.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_CXXFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="armv7l-linux-musleabihf"

common/build-profiles/armv7l.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="armv7l-unknown-linux-gnueabihf"

common/build-profiles/bootstrap.sh

@@ -1,2 +1,3 @@
 XBPS_CFLAGS="-O2 -pipe"
 XBPS_CXXFLAGS="$XBPS_CFLAGS"
+XBPS_FFLAGS="-fPIC -pipe"

common/build-profiles/i686-musl.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="i686-pc-linux-musl"

common/build-profiles/i686.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-mtune=i686"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="i686-pc-linux-gnu"

common/build-profiles/x86_64-musl.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="x86_64-unknown-linux-musl"

common/build-profiles/x86_64.sh

@@ -1,3 +1,4 @@
 XBPS_TARGET_CFLAGS="-mtune=generic"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
+XBPS_TARGET_FFLAGS=""
 XBPS_TRIPLET="x86_64-unknown-linux-gnu"

common/build-style/gnu-makefile.sh

@@ -4,11 +4,15 @@
 do_build() {
 	: ${make_cmd:=make}
 
-	${make_cmd} \
+	if [ -z "$make_use_env" ]; then
-		CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
+		${make_cmd} \
-		CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \
+			CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-		LDFLAGS="$LDFLAGS" \
+			CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-		${makejobs} ${make_build_args} ${make_build_target}
+			CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+			${makejobs} ${make_build_args} ${make_build_target}
+	else
+		${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+	fi
 }
 
 do_install() {

common/build-style/haskell-stack.sh

@@ -17,11 +17,12 @@ do_build() {
 			stack init --force --resolver ${stackage}
 	fi
 
-	STACK_ROOT=$wrksrc/.stack stack ${makejobs} build ${make_build_args}
+	STACK_ROOT=$wrksrc/.stack stack --system-ghc ${makejobs} build \
+		${make_build_args}
 }
 
 do_install() {
 	vmkdir usr/bin
-	STACK_ROOT=$wrksrc/.stack stack install ${make_build_args} \
+	STACK_ROOT=$wrksrc/.stack stack --system-ghc install \
-		--local-bin-path=${DESTDIR}/usr/bin
+	       	${make_build_args} --local-bin-path=${DESTDIR}/usr/bin
 }

common/build-style/qmake.sh

@@ -2,7 +2,19 @@
 # This helper is for templates using Qt4/Qt5 qmake.
 #
 do_configure() {
-	qmake ${configure_args} \
+	local qmake
+	if [ -x "/usr/lib/qt5/bin/qmake" ]; then
+		# Qt5 qmake
+		qmake="/usr/lib/qt5/bin/qmake"
+	fi
+	if [ -x "/usr/lib/qt/bin/qmake" ]; then
+		# Qt4 qmake
+		qmake="/usr/lib/qt/bin/qmake"
+	fi
+	if [ -z "${qmake}" ]; then
+		msg_error "${pkgver}: Could not find qmake - missing in hostdepends?\n"
+	fi
+	${qmake} ${configure_args} \
 		PREFIX=/usr \
 		LIB=/usr/lib \
 		QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX \

common/cross-profiles/README

@@ -8,6 +8,7 @@ A cross profile file must provide the following variables:
 	- XBPS_CROSS_TRIPLET	(the cross compiler triplet)
 	- XBPS_CROSS_CFLAGS	(C compiler flags for the cross compiler)
 	- XBPS_CROSS_CXXFLAGS	(C++ compiler flags for the cross compiler)
+	- XBPS_CROSS_FFLAGS	(Fortran compiler flags for the cross compiler)
 	- XBPS_CROSS_CPPFLAGS	(Preprocessor flags for the cross compiler)
 	- XBPS_CROSS_LDFLAGS	(Linker flags for the cross compiler)
 

common/cross-profiles/aarch64-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="aarch64-musl"
 XBPS_CROSS_TRIPLET="aarch64-linux-musl"
 XBPS_CROSS_CFLAGS="-march=armv8-a"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/aarch64.sh

@@ -6,3 +6,4 @@ XBPS_CFLAGS="-O2 -pipe" # XXX not yet supported: -fstack-protector-strong
 XBPS_CXXFLAGS="$XBPS_CFLAGS"
 XBPS_CROSS_CFLAGS="-march=armv8-a"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv5tel-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv5tel-musl"
 XBPS_CROSS_TRIPLET="arm-linux-musleabi"
 XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv5tel.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv5tel"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabi"
 XBPS_CROSS_CFLAGS="-march=armv5te -msoft-float -mfloat-abi=soft"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv6l-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv6l-musl"
 XBPS_CROSS_TRIPLET="arm-linux-musleabihf"
 XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv6l.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv6l"
 XBPS_CROSS_TRIPLET="arm-linux-gnueabihf"
 XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv7l-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv7l-musl"
 XBPS_CROSS_TRIPLET="armv7l-linux-musleabihf"
 XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/armv7l.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="armv7l"
 XBPS_CROSS_TRIPLET="armv7l-linux-gnueabihf"
 XBPS_CROSS_CFLAGS="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/i686-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="i686-musl"
 XBPS_CROSS_TRIPLET="i686-linux-musl"
 XBPS_CROSS_CFLAGS="-march=i686"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/i686.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="i686"
 XBPS_CROSS_TRIPLET="i686-pc-linux-gnu"
 XBPS_CROSS_CFLAGS="-march=i686"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/mips-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mips-musl"
 XBPS_CROSS_TRIPLET="mips-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/mipsel-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mipsel-musl"
 XBPS_CROSS_TRIPLET="mipsel-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -msoft-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/mipselhf-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="mipselhf-musl"
 XBPS_CROSS_TRIPLET="mipsel-linux-muslhf"
 XBPS_CROSS_CFLAGS="-mtune=mips32r2 -mabi=32 -mhard-float"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/cross-profiles/x86_64-musl.sh

@@ -4,3 +4,4 @@ XBPS_TARGET_MACHINE="x86_64-musl"
 XBPS_CROSS_TRIPLET="x86_64-linux-musl"
 XBPS_CROSS_CFLAGS="-mtune=generic"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
+XBPS_CROSS_FFLAGS=""

common/environment/setup/misc.sh

@@ -10,8 +10,7 @@ UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool"
 XORG_SITE="http://xorg.freedesktop.org/releases/individual"
 DEBIAN_SITE="http://ftp.debian.org/debian/pool"
 GNOME_SITE="http://ftp.gnome.org/pub/GNOME/sources"
-KERNEL_SITE="http://www.kernel.org/pub/linux"
+KERNEL_SITE="https://www.kernel.org/pub/linux"
-#KERNEL_SITE="http://mirror.be.gbxs.net/pub/linux"
 CPAN_SITE="http://cpan.perl.org/modules/by-module"
 PYPI_SITE="https://files.pythonhosted.org/packages/source"
 MOZILLA_SITE="http://ftp.mozilla.org/pub"

common/environment/setup/sourcepkg.sh

@@ -6,10 +6,10 @@ unset -v pkgname version revision short_desc homepage license maintainer
 unset -v only_for_archs distfiles checksum build_style nocross broken
 unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_cmd make_build_args make_install_args make_build_target make_install_target python_version stackage
-unset -v patch_args disable_parallel_build keep_libtool_archives
+unset -v patch_args disable_parallel_build keep_libtool_archives make_use_env
-unset -v reverts subpackages makedepends hostmakedepends checkdepends depends restricted
+unset -v reverts subpackages makedepends hostmakedepends depends restricted
 unset -v nopie build_options build_options_default bootstrap repository reverts
-unset -v CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
+unset -v CFLAGS CXXFLAGS FFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH
 unset -v CC CXX CPP GCC LD AR AS RANLIB NM OBJDUMP OBJCOPY STRIP READELF
 
 # hooks/do-extract/00-distfiles

common/hooks/pre-pkg/03-rewrite-python-shebang.sh

@@ -19,9 +19,9 @@ hook() {
 	fi
 
 	shebang="#!/usr/bin/python${pyver%.*}"
-	find ${PKGDESTDIR} -type f -print0 | \
+	find "${PKGDESTDIR}" -type f -print0 | \
-		xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([[:space:]]*\|$\)" -- | while IFS=: read -r f off _; do
+		xargs -0 grep -H -b -m 1 "^#!.*\([[:space:]]\|/\)python\([0-9]\.[0-9]\)\?\([[:space:]]\+\|$\)" -- | while IFS=: read -r f off _; do
-		[ -z "$off" ] &&  continue
+		[ -z "$off" ] && continue
 		echo "   Shebang converted to '$shebang': ${f#$PKGDESTDIR}"
 		sed -i "1s@.*python.*@${shebang}@" -- "$f"
 	done

common/options.description

@@ -1,5 +1,6 @@
 desc_option_aalib="Enable support for aalib video output"
 desc_option_acl="Enable support for ACLs and Extended Attributes"
+desc_option_alsa="Enable support for ALSA"
 desc_option_backtrace="Enable support for backtraces via libunwind"
 desc_option_bluetooth="Enable support for bluetooth"
 desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"

common/shlibs

@@ -17,36 +17,36 @@
 # one (order top->bottom) is preferred over the next ones.
 #
 libc.so musl-0.9.9_1
-libc.so.6 glibc-2.8_1
+libc.so.6 glibc-2.25_1
-libm.so.6 glibc-2.8_1
+libm.so.6 glibc-2.25_1
-libpthread.so.0 glibc-2.8_1
+libpthread.so.0 glibc-2.25_1
-librt.so.1 glibc-2.8_1
+librt.so.1 glibc-2.25_1
-libdl.so.2 glibc-2.8_1
+libdl.so.2 glibc-2.25_1
-ld-linux-x86-64.so.2 glibc-2.8_1 x86_64
+ld-linux-x86-64.so.2 glibc-2.25_1 x86_64
-ld-linux.so.2 glibc-2.8_1 i686
+ld-linux.so.2 glibc-2.25_1 i686
-ld-linux.so.3 glibc-2.17_1 armv5tel
+ld-linux.so.3 glibc-2.25_1 armv5tel
-ld-linux-aarch64.so.1 glibc-2.19_1 aarch64
+ld-linux-aarch64.so.1 glibc-2.25_1 aarch64
-ld.so.1 glibc-2.17_1 mips
+ld.so.1 glibc-2.25_1 mips
-ld-linux-armhf.so.3 glibc-2.17_1
+ld-linux-armhf.so.3 glibc-2.25_1
-libresolv.so.2 glibc-2.8_1
+libresolv.so.2 glibc-2.25_1
-libanl.so.1 glibc-2.8_1
+libanl.so.1 glibc-2.25_1
-libthread_db.so.1 glibc-2.8_1
+libthread_db.so.1 glibc-2.25_1
-libutil.so.1 glibc-2.8_1
+libutil.so.1 glibc-2.25_1
-libnsl.so.1 glibc-2.8_1
+libnsl.so.1 glibc-2.25_1
-libnss_db.so.2 glibc-2.22_1
+libnss_db.so.2 glibc-2.25_1
-libnss_files.so.2 glibc-2.8_1
+libnss_files.so.2 glibc-2.25_1
-libnss_compat.so.2 glibc-2.8_1
+libnss_compat.so.2 glibc-2.25_1
-libnss_dns.so.2 glibc-2.8_1
+libnss_dns.so.2 glibc-2.25_1
-libnss_hesiod.so.2 glibc-2.8_1
+libnss_hesiod.so.2 glibc-2.25_1
-libnss_nisplus.so.2 glibc-2.8_1
+libnss_nisplus.so.2 glibc-2.25_1
-libnss_nis.so.2 glibc-2.8_1
+libnss_nis.so.2 glibc-2.25_1
-libcrypt.so.1 glibc-2.8_1
+libcrypt.so.1 glibc-2.25_1
-libBrokenLocale.so.1 glibc-2.8_1
+libBrokenLocale.so.1 glibc-2.25_1
-libmemusage.so glibc-2.8_1
+libmemusage.so glibc-2.25_1
-libSegFault.so glibc-2.8_1
+libSegFault.so glibc-2.25_1
-libpcprofile.so glibc-2.8_1
+libpcprofile.so glibc-2.25_1
-libcidn.so.1 glibc-2.8_1
+libcidn.so.1 glibc-2.25_1
-libmvec.so.1 glibc-2.22_1
+libmvec.so.1 glibc-2.25_1
 libz.so.1 zlib-1.2.3_1
 libbz2.so.1 bzip2-1.0.5_1
 libarchive.so.13 libarchive-3.1.2_1
@@ -360,7 +360,7 @@ libMagickCore-6.Q16.so.4 libmagick-6.9.7.6_1
 libMagickWand-6.Q16.so.4 libmagick-6.9.7.6_1
 libMagick++-6.Q16.so.7 libmagick-6.9.6.8_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.66 poppler-0.50.0_1
+libpoppler.so.67 poppler-0.53.0_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt4.so.4 poppler-qt4-0.22.3_1
@@ -469,7 +469,7 @@ libphysfs.so.1 physfs-2.0.0_1
 libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
-libntfs-3g.so.87 ntfs-3g-2016.2.22_1
+libntfs-3g.so.88 ntfs-3g-2017.3.23_1
 libruby.so.2.4 ruby-2.4.0_1
 libxenctrl.so.4.7 xen-libs-4.7_1
 libxenguest.so.4.7 xen-libs-4.7_1
@@ -488,14 +488,14 @@ libKF5SyntaxHighlighting.so.5 syntax-highlighting-5.29.0_1
 libbabl-0.1.so.0 babl-0.1.10_1
 libbamf3.so.2 bamf-0.5.1_1
 libgegl-0.2.so.0 gegl-0.2.0_1
-libiculx.so.57 icu-libs-57.1_1
+libiculx.so.58 icu-libs-58.2_1
-libicule.so.57 icu-libs-57.1_1
+libicule.so.58 icu-libs-58.2_1
-libicuio.so.57 icu-libs-57.1_1
+libicuio.so.58 icu-libs-58.2_1
-libicui18n.so.57 icu-libs-57.1_1
+libicui18n.so.58 icu-libs-58.2_1
-libicudata.so.57 icu-libs-57.1_1
+libicudata.so.58 icu-libs-58.2_1
-libicutu.so.57 icu-libs-57.1_1
+libicutu.so.58 icu-libs-58.2_1
-libicuuc.so.57 icu-libs-57.1_1
+libicuuc.so.58 icu-libs-58.2_1
-libicutest.so.57 icu-libs-57.1_1
+libicutest.so.58 icu-libs-58.2_1
 libaspell.so.15 aspell-0.60_1
 libpspell.so.15 aspell-0.60_1
 libenchant.so.1 enchant-1.4.2_1
@@ -565,15 +565,14 @@ libical_cxx.so.2 libical-2.0.0_1
 libicalss.so.2 libical-2.0.0_1
 libicalss_cxx.so.2 libical-2.0.0_1
 libicalvcal.so.2 libical-2.0.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
-libcamel-1.2.so.59 evolution-data-server-3.22.0_1
+libcamel-1.2.so.60 evolution-data-server-3.24.0_1
 libedataserver-1.2.so.22 evolution-data-server-3.22.0_1
 libebackend-1.2.so.10 evolution-data-server-3.17.90_1
 libedataserverui-1.2.so.1 evolution-data-server-3.8.0_1
 libebook-contacts-1.2.so.2 evolution-data-server-3.17.90_1
 libedata-book-1.2.so.25 evolution-data-server-3.8.0_1
-libebook-1.2.so.16 evolution-data-server-3.8.0_1
+libebook-1.2.so.19 evolution-data-server-3.24.0_1
 libecal-1.2.so.19 evolution-data-server-3.18.0_1
 libedata-cal-1.2.so.28 evolution-data-server-3.18.0_1
 libgdata.so.19 libgdata-0.15.0_1
@@ -589,38 +588,39 @@ libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
 libpanel-applet-4.so.0 gnome-panel-3.3.92_1
-libboost_context.so.1.62.0 boost-1.62<1.63_1
+libboost_context.so.1.64.0 boost-1.64<1.65_1
-libboost_coroutine.so.1.62.0 boost-1.62<1.63_1
+libboost_coroutine.so.1.64.0 boost-1.64<1.65_1
-libboost_container.so.1.62.0 boost-1.62<1.63_1
+libboost_container.so.1.64.0 boost-1.64<1.65_1
-libboost_prg_exec_monitor.so.1.62.0 boost-1.62<1.63_1
+libboost_prg_exec_monitor.so.1.64.0 boost-1.64<1.65_1
-libboost_signals.so.1.62.0 boost-1.62<1.63_1
+libboost_signals.so.1.64.0 boost-1.64<1.65_1
-libboost_timer.so.1.62.0 boost-1.62<1.63_1
+libboost_timer.so.1.64.0 boost-1.64<1.65_1
-libboost_random.so.1.62.0 boost-1.62<1.63_1
+libboost_random.so.1.64.0 boost-1.64<1.65_1
-libboost_filesystem.so.1.62.0 boost-1.62<1.63_1
+libboost_filesystem.so.1.64.0 boost-1.64<1.65_1
-libboost_unit_test_framework.so.1.62.0 boost-1.62<1.63_1
+libboost_unit_test_framework.so.1.64.0 boost-1.64<1.65_1
-libboost_math_c99f.so.1.62.0 boost-1.62<1.63_1
+libboost_math_c99f.so.1.64.0 boost-1.64<1.65_1
-libboost_math_tr1f.so.1.62.0 boost-1.62<1.63_1
+libboost_math_tr1f.so.1.64.0 boost-1.64<1.65_1
-libboost_regex.so.1.62.0 boost-1.62<1.63_1
+libboost_regex.so.1.64.0 boost-1.64<1.65_1
-libboost_serialization.so.1.62.0 boost-1.62<1.63_1
+libboost_serialization.so.1.64.0 boost-1.64<1.65_1
-libboost_chrono.so.1.62.0 boost-1.62<1.63_1
+libboost_chrono.so.1.64.0 boost-1.64<1.65_1
-libboost_wserialization.so.1.62.0 boost-1.62<1.63_1
+libboost_wserialization.so.1.64.0 boost-1.64<1.65_1
-libboost_graph.so.1.62.0 boost-1.62<1.63_1
+libboost_graph.so.1.64.0 boost-1.64<1.65_1
-libboost_log.so.1.62.0 boost-1.62<1.63_1
+libboost_log.so.1.64.0 boost-1.64<1.65_1
-libboost_locale.so.1.62.0 boost-1.62<1.63_1
+libboost_locale.so.1.64.0 boost-1.64<1.65_1
-libboost_math_tr1l.so.1.62.0 boost-1.62<1.63_1
+libboost_math_tr1l.so.1.64.0 boost-1.64<1.65_1
-libboost_program_options.so.1.62.0 boost-1.62<1.63_1
+libboost_program_options.so.1.64.0 boost-1.64<1.65_1
-libboost_iostreams.so.1.62.0 boost-1.62<1.63_1
+libboost_iostreams.so.1.64.0 boost-1.64<1.65_1
-libboost_system.so.1.62.0 boost-1.62<1.63_1
+libboost_system.so.1.64.0 boost-1.64<1.65_1
-libboost_thread.so.1.62.0 boost-1.62<1.63_1
+libboost_thread.so.1.64.0 boost-1.64<1.65_1
-libboost_log_setup.so.1.62.0 boost-1.62<1.63_1
+libboost_log_setup.so.1.64.0 boost-1.64<1.65_1
-libboost_date_time.so.1.62.0 boost-1.62<1.63_1
+libboost_date_time.so.1.64.0 boost-1.64<1.65_1
-libboost_math_c99.so.1.62.0 boost-1.62<1.63_1
+libboost_math_c99.so.1.64.0 boost-1.64<1.65_1
-libboost_wave.so.1.62.0 boost-1.62<1.63_1
+libboost_wave.so.1.64.0 boost-1.64<1.65_1
-libboost_math_tr1.so.1.62.0 boost-1.62<1.63_1
+libboost_math_tr1.so.1.64.0 boost-1.64<1.65_1
-libboost_atomic.so.1.62.0 boost-1.62<1.63_1
+libboost_atomic.so.1.64.0 boost-1.64<1.65_1
-libboost_math_c99l.so.1.62.0 boost-1.62<1.63_1
+libboost_math_c99l.so.1.64.0 boost-1.64<1.65_1
-libboost_type_erasure.so.1.62.0 boost-1.62<1.63_1
+libboost_type_erasure.so.1.64.0 boost-1.64<1.65_1
-libboost_python.so.1.62.0 boost-python-1.62<1.63_1
+libboost_fiber.so.1.64.0 boost-1.64<1.65_1
+libboost_python.so.1.64.0 boost-python-1.64<1.65_1
 libexempi.so.3 exempi-2.1.1_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2.so.2 libsgutils-1.42_1
@@ -650,9 +650,9 @@ libsasl2.so.3 libsasl-2.1.26_1
 liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
-libevent-2.0.so.5 libevent-2.0.10_1
+libevent-2.1.so.6 libevent-2.1.8_1
-libevent_core-2.0.so.5 libevent-2.0.21_1
+libevent_core-2.1.so.6 libevent-2.1.8_1
-libevent_pthreads-2.0.so.5 libevent-2.0.21_1
+libevent_pthreads-2.1.so.6 libevent-2.1.8_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
@@ -723,6 +723,7 @@ libvala-0.26.so.0 libvala-0.26.2_1
 libvala-0.28.so.0 libvala-0.28.0_1
 libvala-0.30.so.0 libvala-0.30.0_1
 libvala-0.34.so.0 libvala-0.34.0_1
+libvala-0.36.so.0 libvala-0.36.1_1
 libSDL_net-1.2.so.0 SDL_net-1.2.7_1
 libmodplug.so.1 libmodplug-0.8.8_1
 libfetch.so.2 libfetch-2.34_8
@@ -819,10 +820,10 @@ libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.3 libgfortran-4.4.0_1
 libblktapctl.so.1 xen-4.1.2_1
 libmozjs185.so.1.0 js-1.8.5_1
-libwebp.so.6 libwebp-0.5.0_1
+libwebp.so.7 libwebp-0.6.0_1
-libwebpmux.so.2 libwebp-0.5.0_1
+libwebpmux.so.3 libwebp-0.6.0_1
 libwebpdemux.so.2 libwebp-0.5.0_1
-libwebpdecoder.so.2 libwebp-0.5.0_1
+libwebpdecoder.so.3 libwebp-0.6.0_1
 libva-x11.so.1 libva-1.0.14_1
 libva.so.1 libva-1.0.14_1
 libva-glx.so.1 libva-glx-1.5.0_1
@@ -955,6 +956,7 @@ libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.1 confuse-3.0_1
 libclang.so clang-3.4.2_1
+libclang.so.3.9 clang-3.9.1_2
 liblldb.so lldb-3.5.1_1
 libLLVM-3.5.so libllvm-3.5.0_1
 libLLVM-3.6.so libllvm3.6-3.6.0_1
@@ -1380,7 +1382,7 @@ libgda-5.0.so.4 libgda-5.1.2_1
 libgda-report-5.0.so.4 libgda-5.1.2_1
 libgda-ui-5.0.so.4 libgda-5.1.2_1
 libgda-xslt-5.0.so.4 libgda-5.1.2_1
-libdevhelp-3.so.2 devhelp-libs-3.8.2_1
+libdevhelp-3.so.3 devhelp-libs-3.24.0_1
 libunistring.so.2 libunistring-0.9.4_1
 libguile-2.0.so.22 libguile-2.0.9_3
 libopts.so.25 libopts-5.18.4_6
@@ -1542,7 +1544,7 @@ libwx_gtk2u_webview-3.0.so.0 wxWidgets-3.0.2_3
 libmspack.so.0 libmspack-0.4alpha_1
 libslim.so.1.3.6 slim-1.3.6_1
 libmozjs-24.so mozjs24-24.2.0_1
-libmediaart-1.0.so.0 libmediaart-0.3.0_1
+libmediaart-2.0.so.0 libmediaart-1.9.1_1
 libinput.so.10 libinput-1.2.0_1
 libvaladoc.so.0 valadoc-git-20140327_1
 libuhttpmock-0.0.so.0 uhttpmock-0.2.0_1
@@ -1726,14 +1728,17 @@ libcrypto.so.34 libcrypto34-2.2.1_1
 libcrypto.so.35 libcrypto35-2.2.2_1
 libcrypto.so.37 libcrypto37-2.3.3_1
 libcrypto.so.38 libcrypto38-2.4.2_1
+libcrypto.so.41 libcrypto41-2.5.3_1
 libssl.so.33 libssl33-2.2.1_1
 libssl.so.35 libssl35-2.2.2_1
 libssl.so.38 libssl38-2.3.3_1
 libssl.so.39 libssl39-2.4.2_1
+libssl.so.43 libssl43-2.5.3_1
 libtls.so.4 libtls4-2.2.1_1
 libtls.so.6 libtls6-2.2.2_1
 libtls.so.10 libtls10-2.3.3_1
 libtls.so.11 libtls11-2.4.2_1
+libtls.so.15 libtls15-2.5.3_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libsox.so.3 sox-14.4.2_1
@@ -1750,7 +1755,6 @@ libfdisk.so.1 libfdisk-2.26_1
 libspiro.so.0 libspiro-0.2_1
 libopenjp2.so.7 libopenjpeg2-2.1.0_1
 libcln.so.6 cln-1.3.3_1
-libqalculate.so.6 libqalculate-0.9.9_1
 libkfilemetadata.so.4 kfilemetadata-4.13.3_1
 libbaloofiles.so.4 baloo-4.13.3_1
 libbaloocore.so.4 baloo-4.13.3_1
@@ -1790,6 +1794,7 @@ libslab.so.0 libmate-control-center-1.8.2_1
 liblz4.so.1 lz4-1.7.3_1
 libatrilview.so.3 libatril-1.8.0_1
 libatrildocument.so.3 libatril-1.8.0_1
+libjawt.so openjdk-jre-8u20_2
 libawt.so openjdk-jre-8u20_1
 libawt_xawt.so openjdk-jre-8u20_1
 libjava.so openjdk-jre-8u20_1
@@ -1819,7 +1824,7 @@ libgioftp.so.2 fontforge-2.0.20140101_3
 libfontforge.so.2 fontforge-2.0.20140101_3
 libgdraw.so.5 fontforge-2.0.20140101_3
 libfontforgeexe.so.2 fontforge-2.0.20140101_3
-libwraster.so.5 WindowMaker-0.95.6_3
+libwraster.so.6 WindowMaker-0.95.8_1
 libWUtil.so.5 WindowMaker-0.95.6_3
 libWINGs.so.3 WindowMaker-0.95.6_3
 libWMaker.so.1 WindowMaker-0.95.6_3
@@ -1935,7 +1940,7 @@ libglfw.so.3 glfw-3.0.4_1
 libusbmuxd.so.4 libusbmuxd-1.0.10_1
 libimobiledevice.so.6 libimobiledevice-1.2.0_1
 libstfl.so.0 stfl-0.23_1
-libenventor.so.0 enventor-0.4.1_1
+libenventor.so.1 enventor-1.0.0_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
 libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1
 libldns.so.2 libldns-1.7.0_1
@@ -1985,10 +1990,10 @@ libfcitx-qt.so.0 libfcitx-qt-4.2.8_1
 liblastfm.so.1 liblastfm-1.0.9_1
 liblastfm_fingerprint.so.1 liblastfm-1.0.9_1
 libfcitx-qt5.so.0 libfcitx-qt5-0.1.3_1
-libdruntime-ldc-debug.so.70 ldc-runtime-1.0.0_1
+libdruntime-ldc-debug.so.71 ldc-runtime-1.1.1_1
-libdruntime-ldc.so.70 ldc-runtime-1.0.0_1
+libdruntime-ldc.so.71 ldc-runtime-1.1.1_1
-libphobos2-ldc.so.70 ldc-runtime-1.0.0_1
+libphobos2-ldc.so.71 ldc-runtime-1.1.1_1
-libphobos2-ldc-debug.so.70 ldc-runtime-1.0.0_1
+libphobos2-ldc-debug.so.71 ldc-runtime-1.1.1_1
 libmarblewidget.so.19 marble-4.14.3_2
 libastro.so.1 marble-4.14.3_2
 libparrot.so.6.9.0 parrot-6.9.0_1
@@ -2071,7 +2076,7 @@ libcvm-v1client.so.1 cvm-0.97_1
 libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.1 criu-1.5.1_2
-libwebsockets.so.9 libwebsockets-2.1.0_1
+libwebsockets.so.10 libwebsockets-2.2.0_1
 libbitcoinconsensus.so.0 litecoin-0.10.1.2_1
 libnfc.so.0 libnfc-1.7.1_1
 libfuzzy.so.2 libfuzzy-2.12_1
@@ -2086,8 +2091,8 @@ libsfml-graphics.so.2.4 SFML-2.4.1_1
 libclamav.so.7 clamav-0.98.6_1
 libclamunrar.so.7 clamav-0.98.6_1
 libclamunrar_iface.so.7 clamav-0.98.6_1
-libqca.so.2 qca-qt5-2.1.0_1
+libqca-qt5.so.2 qca-qt5-2.1.3_1
-libqt5keychain.so.0 qtkeychain-qt5-0.4.0_1
+libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
 libphonon4qt5.so.4 phonon-qt5-4.8.3_1
 libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
 libtelepathy-qt5.so.0 telepathy-qt5-0.9.5_1
@@ -2097,7 +2102,7 @@ libKF5Attica.so.5 attica-qt5-5.6.0_1
 libechonest5.so.2.3 libechonest-qt5-2.3.0_1
 liblastfm_fingerprint5.so.1 liblastfm-qt5-1.0.9_1
 liblastfm5.so.1 liblastfm-qt5-1.0.9_1
-libquazip.so.1 quazip-qt5-0.7.1_1
+libquazip5.so.1 quazip-qt5-0.7.3_2
 libjreen-qt5.so.1 jreen-qt5-1.2.0_1
 libtomahawk.so.0.8.4 tomahawk-qt5-0.8.4_3
 libtomahawk-playdarapi.so.0.8.4 tomahawk-qt5-0.8.4_3
@@ -2134,12 +2139,11 @@ libopenrawgnome.so.7 libopenraw-0.1.0_1
 libgeda.so.42 geda-1.8.2_1
 libclutter-gst-3.0.so.0 clutter-gst3-3.0.4_1
 libgsound.so.0 gsound-1.0.1_1
-libmediaart-2.0.so.0 libmediaart2-1.9.0_1
 libgegl-0.3.so.0 gegl3-0.3.0_1
 libgegl-npd-0.3.so gegl3-0.3.0_1
 libgegl-sc-0.3.so gegl3-0.3.0_1
 libprocps.so.6 procps-ng-3.3.12_1
-libskarnet.so.2.4 skalibs-2.4.0.0_1
+libskarnet.so.2.5 skalibs-2.5.0.0_1
 libtidy.so.5 libtidy5-5.1.25_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
 libQupZilla.so.2 qupzilla-2.0.0_1
@@ -2165,12 +2169,12 @@ libgtkimageview.so.0 gtkimageview-1.6.4_1
 libgoocanvas.so.3 goocanvas1-1.0.0_1
 libplatform.so.2.0 platform-2.0.1_1
 libp8-platform.so.2.0 p8-platform-2.0.1_1
-libfacter.so.3.6.1 facter-3.6.1_1
+libfacter.so.3.6.2 facter-3.6.2_1
 libOIS-1.3.0.so ois-1.3_1
 libSILLY.so.1 silly-0.1.0_1
 libkeybinder-3.0.so.0 libkeybinder3-0.3.0_1
 libbrlapi.so.0.6 brltty-5.2_1
-liblouis.so.9 liblouis-2.6.4_1
+liblouis.so.12 liblouis-3.1.0_1
 libCEGUIBase-0.7.9.so cegui07-0.7.9_1
 libCEGUIFalagardWRBase-0.7.9.so cegui07-0.7.9_1
 libCEGUIDevILImageCodec-0.7.9.so cegui07-0.7.9_1
@@ -2352,10 +2356,10 @@ libpjsip-ua.so.2 pjproject-2.4.5_1
 libpjsip.so.2 pjproject-2.4.5_1
 libpjsua.so.2 pjproject-2.4.5_1
 libpjsua2.so.2 pjproject-2.4.5_1
-libhdf5_hl.so.10 hdf5-1.8.17_1
+libhdf5_hl.so.10 hdf5-1.8.18_1
-libhdf5.so.10 hdf5-1.8.17_1
+libhdf5.so.10 hdf5-1.8.18_1
-libhdf5_hl_cpp.so.11 hdf5-1.8.17_2
+libhdf5_hl_cpp.so.11 hdf5-1.8.18_1
-libhdf5_cpp.so.12 hdf5-1.8.17_2
+libhdf5_cpp.so.13 hdf5-1.8.18_1
 libcryptmount.so.0 libpam-mount-2.15_1
 libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
@@ -2610,7 +2614,7 @@ libsss_simpleifp.so.0 sssd-1.13.4_1
 libforms.so.2 xforms-1.2.4_2
 libflimage.so.2 xforms-1.2.4_2
 libutilspp.so.0 curlpp-0.7.3_2
-libcurlpp.so.0 curlpp-0.7.3_2
+libcurlpp.so.1 curlpp-0.8.1_1
 libtcd.so.1 libtcd-2.2.7.r2_1
 libaccounts-glib.so.0 libaccounts-glib-1.21_1
 libaccounts-qt5.so.1 libaccounts-qt5-1.14_1
@@ -2789,3 +2793,33 @@ libmutter-cogl-path.so mutter-3.22.0_1
 libmutter-cogl.so mutter-3.22.0_1
 libgeoclue-2.so.0 geoclue2-2.4.4_1
 libgepub.so.0 libgepub-0.4_1
+libslopy.so.0.1.0 slop-5.3.37_1
+libbcunit.so.1 bcunit-3.0_1
+libomxil-bellagio.so.0 libomxil-bellagio-0.9.3_1 
+libomxdynamicloader.so.0 libomxil-bellagio-0.9.3_1 
+libomxaudio_effects.so.0 libomxil-bellagio-0.9.3_1 
+libomxclocksrc.so.0 libomxil-bellagio-0.9.3_1 
+libomxvideosched.so.0 libomxil-bellagio-0.9.3_1 
+libnss_libvirt_guest.so.2 libvirt-3.1.0_1
+libvirt-admin.so.0 libvirt-3.1.0_1
+libnss_libvirt.so.2 libvirt-3.1.0_1
+libassimp.so.3 libassimp-3.3.1_1
+libdouble-conversion.so.1 double-conversion-2.0.1_1
+libspectrum.so.8 libspectrum-1.2.2_1
+libbearssl.so.0 bearssl-0.3_1
+libXfont2.so.2 libXfont2-2.0.1_1
+libqalculate.so.7 libqalculate-0.9.11_1
+libweston-2.so.0 weston-2.0.0_1
+libmutter-0.so.0 mutter-3.24.0_1
+libmutter-clutter-0.so mutter-3.24.0_1
+libmutter-cogl-path-0.so mutter-3.24.0_1
+libmutter-cogl-0.so mutter-3.24.0_1
+libmutter-cogl-pango-0.so mutter-3.24.0_1
+libmozjs-.so mozjs38-38.8.0_1
+libostree-1.so.1 libostree-2017.3_1
+librhash.so.0 rhash-1.3.4_1
+libserialport.so.0 libserialport-0.1.1_1
+libsigrok.so.3 libsigrok-0.4.0_1
+libsigrokcxx.so.3 libsigrok-0.4.0_1
+libsigrokdecode.so.3 libsigrokdecode-0.4.1_1
+libglyr.so.1 glyr-1.0.8_1

common/xbps-src/libexec/build.sh

@@ -33,7 +33,6 @@ show_pkg_build_options
 check_pkg_arch $XBPS_CROSS_BUILD
 
 if [ -z "$XBPS_CROSS_PREPARE" ]; then
-    install_cross_pkg $XBPS_CROSS_BUILD || exit $?
     prepare_cross_sysroot $XBPS_CROSS_BUILD || exit $?
 fi
 if [ -z "$XBPS_DEPENDENCY" -a -z "$XBPS_TEMP_MASTERDIR" -a -n "$XBPS_KEEP_ALL" -a "$XBPS_CHROOT_CMD" = "proot" ]; then
@@ -44,6 +43,10 @@ if [ "$PKGNAME" != "$XBPS_TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
     install_pkg_deps $PKGNAME $XBPS_TARGET_PKG pkg $XBPS_CROSS_BUILD $XBPS_CROSS_PREPARE || exit $?
 fi
 
+if [ -z "$XBPS_CROSS_PREPARE" ]; then
+    install_cross_pkg $XBPS_CROSS_BUILD || exit $?
+fi
+
 # Fetch distfiles after installing required dependencies,
 # because some of them might be required for do_fetch().
 $XBPS_LIBEXECDIR/xbps-src-dofetch.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1

common/xbps-src/shutils/chroot.sh

@@ -1,5 +1,7 @@
 # vim: set ts=4 sw=4 et:
 
+# FIXME: $XBPS_FFLAGS is not set when chroot_init() is run
+# It is set in common/build-profiles/bootstrap.sh but lost somewhere?
 chroot_init() {
     XBPSSRC_CF=$XBPS_MASTERDIR/etc/xbps/xbps-src.conf
 
@@ -15,6 +17,7 @@ _EOF
 XBPS_MASTERDIR=/
 XBPS_CFLAGS="$XBPS_CFLAGS"
 XBPS_CXXFLAGS="$XBPS_CXXFLAGS"
+XBPS_FFLAGS="-fPIC -pipe"
 XBPS_CPPFLAGS="$XBPS_CPPFLAGS"
 XBPS_LDFLAGS="$XBPS_LDFLAGS"
 XBPS_HOSTDIR=/host

common/xbps-src/shutils/common.sh

@@ -219,7 +219,7 @@ setup_pkg() {
     basepkg=${pkg%-32bit}
 
     # Start with a sane environment
-    unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
+    unset -v PKG_BUILD_OPTIONS XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_FFLAGS XBPS_CROSS_CPPFLAGS XBPS_CROSS_LDFLAGS
     unset -v subpackages run_depends build_depends host_build_depends
 
     unset_package_funcs
@@ -249,7 +249,7 @@ setup_pkg() {
 
     else
         export XBPS_TARGET_MACHINE=${XBPS_ARCH:-$XBPS_MACHINE}
-        unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS
+        unset XBPS_CROSS_BASE XBPS_CROSS_LDFLAGS XBPS_CROSS_FFLAGS
         unset XBPS_CROSS_CFLAGS XBPS_CROSS_CXXFLAGS XBPS_CROSS_CPPFLAGS
 
         XBPS_INSTALL_XCMD="$XBPS_INSTALL_CMD"
@@ -380,6 +380,7 @@ setup_pkg() {
 
     export CFLAGS="$XBPS_TARGET_CFLAGS $XBPS_CFLAGS $XBPS_CROSS_CFLAGS $CFLAGS $dbgflags"
     export CXXFLAGS="$XBPS_TARGET_CXXFLAGS $XBPS_CXXFLAGS $XBPS_CROSS_CXXFLAGS $CXXFLAGS $dbgflags"
+    export FFLAGS="$XBPS_TARGET_FFLAGS $XBPS_FFLAGS $XBPS_CROSS_FFLAGS $FFLAGS"
     export CPPFLAGS="$XBPS_TARGET_CPPFLAGS $XBPS_CPPFLAGS $XBPS_CROSS_CPPFLAGS $CPPFLAGS"
     export LDFLAGS="$XBPS_TARGET_LDFLAGS $XBPS_LDFLAGS $XBPS_CROSS_LDFLAGS $LDFLAGS"
 
@@ -388,21 +389,25 @@ setup_pkg() {
     export BUILD_CXXFLAGS="$XBPS_CXXFLAGS"
     export BUILD_CPPFLAGS="$XBPS_CPPFLAGS"
     export BUILD_LDFLAGS="$XBPS_LDFLAGS"
+    export BUILD_FFLAGS="$XBPS_FFLAGS"
 
     export CC_FOR_BUILD="cc"
     export CXX_FOR_BUILD="g++"
     export CPP_FOR_BUILD="cpp"
+    export FC_FOR_BUILD="gfortran"
     export LD_FOR_BUILD="ld"
     export CFLAGS_FOR_BUILD="$XBPS_CFLAGS"
     export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS"
     export CPPFLAGS_FOR_BUILD="$XBPS_CPPFLAGS"
     export LDFLAGS_FOR_BUILD="$XBPS_LDFLAGS"
+    export FFLAGS_FOR_BUILD="$XBPS_FFLAGS"
 
     if [ -n "$cross" ]; then
         # Regular tools names
         export CC="${XBPS_CROSS_TRIPLET}-gcc"
         export CXX="${XBPS_CROSS_TRIPLET}-c++"
         export CPP="${XBPS_CROSS_TRIPLET}-cpp"
+        export FC="${XBPS_CROSS_TRIPLET}-gfortran"
         export GCC="$CC"
         export LD="${XBPS_CROSS_TRIPLET}-ld"
         export AR="${XBPS_CROSS_TRIPLET}-ar"
@@ -418,6 +423,7 @@ setup_pkg() {
         export CXX_target="$CXX"
         export CPP_target="$CPP"
         export GCC_target="$GCC"
+        export FC_target="$FC"
         export LD_target="$LD"
         export AR_target="$AR"
         export AS_target="$AS"
@@ -437,6 +443,7 @@ setup_pkg() {
         export CXX_host="g++"
         export CPP_host="cpp"
         export GCC_host="$CC_host"
+        export FC_host="gfortran"
         export LD_host="ld"
         export AR_host="ar"
         export AS_host="as"
@@ -456,6 +463,7 @@ setup_pkg() {
         export CXX="g++"
         export CPP="cpp"
         export GCC="$CC"
+        export FC="gfortran"
         export LD="ld"
         export AR="ar"
         export AS="as"
@@ -466,10 +474,10 @@ setup_pkg() {
         export NM="nm"
         export READELF="readelf"
         # Unse cross evironment variables
-        unset CC_target CXX_target CPP_target GCC_target LD_target AR_target AS_target
+        unset CC_target CXX_target CPP_target GCC_target FC_target LD_target AR_target AS_target
         unset RANLIB_target STRIP_target OBJDUMP_target OBJCOPY_target NM_target READELF_target
         unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target
-        unset CC_host CXX_host CPP_host GCC_host LD_host AR_host AS_host
+        unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host
         unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host
         unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host
     fi

etc/defaults.conf

@@ -17,7 +17,7 @@
 # [OPTIONAL]
 # Enable optional arguments to xbps-install for the host system.
 # Currently used in the binary-bootstrap bootstrap-update targets.
-XBPS_INSTALL_ARGS="--repository=https://repo.voidlinux.eu/current --repository=https://repo.voidlinux.eu/current/musl"
+XBPS_INSTALL_ARGS="--repository=https://repo.voidlinux.eu/current --repository=https://repo.voidlinux.eu/current/musl --repository=https://repo.voidlinux.eu/current/aarch64"
 
 # [OPTIONAL]
 # Native Compilation/Preprocessor flags for C and C++. Additional settings

srcpkgs/2bwm/template

@@ -1,28 +1,28 @@
 # Template file for '2bwm'
 pkgname=2bwm
-version=0.1
+version=0.2
 revision=1
 build_style=gnu-makefile
-makedepends="libxcb-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel"
+makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel"
 short_desc="Fast floating window manager"
 maintainer='Juan RP <xtraeme@voidlinux.eu>'
 license="ISC"
-homepage="https://github.com/venam/${pkgname}"
+homepage="https://github.com/venam/2bwm"
 distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz"
-checksum="13d98f229545e143f7bc5b54d137d47e08a8608dfa89792cdcd88386ac4ed78c"
+checksum=5d071bdbe6d3b4b79b5462cc1b36afe357030fb70c7e64f88d9c7d541d648439
-replaces="2bwm>=0"
 
 pre_build() {
 	sed -i 's|-Os ||g' Makefile
 	sed -i 's|^CFLAGS+=|override CFLAGS +=|g' Makefile
 	sed -i 's|^LDFLAGS+=|override LDFLAGS +=|g' Makefile
 	sed -i '/#include <stdlib.h>/i#define _GNU_SOURCE' 2bwm.c
+	sed -n 1,17p 2bwm.c >LICENSE
 }
-
 do_install() {
 	vbin 2bwm
 	vbin hidden
 	vman 2bwm.man 2bwm.1
 	vman hidden.man hidden.1
 	vdoc README.md README
+	vlicense LICENSE
 }

srcpkgs/Adapta/template

@@ -1,6 +1,6 @@
 # Template file for 'Adapta'
 pkgname=Adapta
-version=3.89.4.92
+version=3.90.0.108
 revision=1
 build_style=gnu-configure
 wrksrc="adapta-gtk-theme-$version"
@@ -11,7 +11,7 @@ maintainer="demiaster <marta.celeste.feriani@gmail.com>"
 license="GPL-2"
 homepage="https://github.com/tista500/$pkgname"
 distfiles="$homepage/archive/$version.tar.gz"
-checksum=720a7c2f8950225b3785fe6bd557074cf54a0a455ebcef50195542abb9c72172
+checksum=d79d1790f6c2826920fdaebeb2d153a8b8eb246439a2678dfb51e949822b6a47
 
 noarch=y
 

srcpkgs/Autodia/template

@@ -8,7 +8,7 @@ hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 depends="${makedepends} perl-Template-Toolkit"
 short_desc="UML diagram generator for dia"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 homepage="http://search.cpan.org/dist/Autodia"
 license="Artistic, GPL-1"
 distfiles="http://search.cpan.org/CPAN/authors/id/T/TE/TEEJAY/Autodia-${version}.tar.gz"

srcpkgs/Bear/template

@@ -7,6 +7,6 @@ depends="python"
 short_desc="A tool that generates a compilation database for clang tooling"
 maintainer="Alain Kalker <a.c.kalker@gmail.com>"
 license="GPL-3"
-homepage="https://github.com/rizsotto/${pkgname}"
+homepage="https://github.com/rizsotto/Bear"
-distfiles="https://github.com/rizsotto/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=bfe711fae29f173f9d33a7d8c42434a2f40d0247fbb6ff618fdd91c878f76a7b

srcpkgs/CopyQ/template

@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=2.9.0
+version=3.0.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-tools-devel"
@@ -10,5 +10,5 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3"
 homepage="https://hluk.github.io/CopyQ/"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=4cdd953dbff5755b8c6a08bbd6e4f4b41694d622a31e34e149498fa1b96a3dbc
+checksum=10137a47e506cde74a76236ef5d040a2d31b824325a90c7b7b39d54a9a63611c
 configure_args="-DWITH_QT5=TRUE"

srcpkgs/ETL/template

@@ -1,11 +1,11 @@
 # Template file for 'ETL'
 pkgname=ETL
-version=0.04.19
+version=0.04.22
 revision=1
 build_style=gnu-configure
 short_desc="Extended Template Library"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3"
 homepage="http://www.synfig.org/"
-distfiles="http://download.tuxfamily.org/synfig/releases/1.0.1/${pkgname}-${version}.tar.gz"
+distfiles="https://downloads.sourceforge.net/project/synfig/releases/1.2.0/source/${pkgname}-${version}.tar.gz"
-checksum=21696881fab1b9a3458aaa77a8b10c899c297b2d132e3ed4cfb7ffa29cd8b8fe
+checksum=ac5aeb9b8ec2c69dd455c6c72e104ff20c43e1e5dde6c0cd87f3f7d1b41d2746

srcpkgs/EmulationStation/template

@@ -1,7 +1,7 @@
 # Template file for 'EmulationStation'
 pkgname=EmulationStation
 version=2.0.1a
-revision=3
+revision=4
 _githash=93f6e11c95f9e7a0c00d3a70c744b22d9a931127
 build_style=cmake
 makedepends="libcurl-devel MesaLib-devel freetype-devel freeimage-devel

srcpkgs/FeedReader/template

@@ -0,0 +1,23 @@
+# Template file for 'FeedReader'
+pkgname=FeedReader
+version=2.0.2
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config intltool itstool glib-devel vala
+ $(vopt_if gir gobject-introspection)"
+makedepends="gtk+3-devel vala-devel json-glib-devel libgee08-devel libsoup-devel
+ sqlite-devel libsecret-devel libnotify-devel libxml2-devel rest-devel
+ webkit2gtk-devel gstreamer-devel libpeas-devel libcurl-devel
+ gnome-online-accounts-devel gst-plugins-base1-devel"
+short_desc="Modern desktop RSS desktop client"
+maintainer="Enno Boland <gottox@voidlinux.eu>"
+license="GPL-3"
+homepage="https://jangernert.github.io/FeedReader/"
+distfiles="https://github.com/jangernert/$pkgname/archive/v$version.tar.gz"
+checksum=949262912bc07f8d1ec72dfa1bbeafb0ed1cea992589e1ee5901e0630c714261
+make_build_args="VERBOSE=1"
+
+pre_build() {
+	: sed '/\/usr\/bin\/valac/s#--pkg=goa-#--pkg=Goa-#' \
+		-i $(find build -name build.make)
+}

srcpkgs/FreeRADIUS/template

@@ -2,7 +2,7 @@
 # Template file for 'FreeRADIUS'
 pkgname=FreeRADIUS
 version=3.0.12
-revision=1
+revision=2
 wrksrc=freeradius-server-${version}
 build_style=gnu-configure
 nocross=yes # Not supported by upstream

srcpkgs/GraphicsMagick/template

@@ -1,7 +1,7 @@
 # Template file for 'GraphicsMagick'
 pkgname=GraphicsMagick
 version=1.3.25
-revision=1
+revision=2
 keep_libtool_archives=yes
 build_style=gnu-configure
 configure_args="--with-quantum-depth=16 --with-gs-font-dir=/usr/share/fonts/Type1

srcpkgs/Ice/template

@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
 version=3.5.1
-revision=14
+revision=15
 build_wrksrc=cpp
 homepage="http://www.zeroc.com"
 # XXX: other language bindings

srcpkgs/ImageMagick/template

@@ -1,7 +1,7 @@
 # Template file for 'ImageMagick'
 pkgname=ImageMagick
-_majorver=6.9.7
+_majorver=6.9.8
-_patchver=10
+_patchver=4
 version=${_majorver}.${_patchver}
 revision=1
 wrksrc=${pkgname}-${_majorver}-${_patchver}
@@ -16,7 +16,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.imagemagick.org/"
 license="ImageMagick"
 distfiles="http://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz"
-checksum=0bfb2e3459b739669845c20ee1b6014a1a3c429fb0cb9777a8b65cd5c3effb09
+checksum=a6c24f6badc30ba624f1dda14e7927fa3109dea7dd6a7e4408e127f65107cb11
 
 subpackages="libmagick libmagick-devel"
 

srcpkgs/Lucene++/template

@@ -1,9 +1,10 @@
 # Template file for 'Lucene++'
 pkgname=Lucene++
 version=3.0.7
-revision=3
+revision=5
 wrksrc=LucenePlusPlus-rel_$version
 build_style=cmake
+configure_args="-Wno-dev"
 makedepends="boost-devel gtest-devel"
 short_desc="A C++ port of the popular text search engine"
 maintainer="Enno Boland <gottox@voidlinux.eu>"

srcpkgs/NetworkManager/template

@@ -44,8 +44,6 @@ make_dirs="
  /etc/NetworkManager/dispatcher.d/pre-down.d 0750 root root
 "
 case "$XBPS_TARGET_MACHINE" in
-	aarch64-musl) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/1391/steps/shell_3/logs/stdio"
-		;;
 	*-musl) CFLAGS+=" -DHAVE_SECURE_GETENV -Dsecure_getenv=getenv -D__USE_POSIX199309"
 		;;
 esac

srcpkgs/R/template

@@ -1,6 +1,6 @@
 # Template file for 'R'
 pkgname=R
-version=3.3.3
+version=3.4.0
 revision=1
 nocross=yes
 build_style=gnu-configure
@@ -19,7 +19,7 @@ license="GPL-2"
 homepage="http://www.r-project.org/"
 _changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="http://cran.r-project.org/src/base/R-3/${pkgname}-${version}.tar.gz"
-checksum=5ab768053a275084618fb669b4fbaadcc39158998a87e8465323829590bcfc6c
+checksum=288e9ed42457c47720780433b3d5c3c20983048b789291cc6a7baa11f9428b91
 shlib_provides="libR.so"
 
 pre_configure() {

srcpkgs/ReText/template

@@ -1,7 +1,7 @@
 # Template file for 'ReText'
 pkgname=ReText
-version=6.0.2
+version=7.0.0
-revision=4
+revision=1
 noarch=yes
 build_style=python3-module
 pycompile_module="ReText"
@@ -13,7 +13,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-3"
 homepage="http://retext.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/retext/ReText-${version%.*}/ReText-${version}.tar.gz"
-checksum=ce28b20673627bd4e17c750d71b73e073776e291b2a1736dd561a1a24aa7f70b
+checksum=01eaf11768f27ba1da2572f2dbcf9b6857d5baa3ca1f50d1cacad894a228f032
 
 post_install() {
 	lrelease locale/*.ts

srcpkgs/SDL2_image/template

@@ -1,7 +1,7 @@
 # Template file for 'SDL2_image'
 pkgname=SDL2_image
 version=2.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --disable-jpg-shared
  --disable-png-shared --disable-webp-shared --disable-tif-shared"

srcpkgs/SDL_gfx/template

@@ -1,7 +1,7 @@
 # Template file for 'SDL_gfx'
 pkgname=SDL_gfx
-version=2.0.25
+version=2.0.26
-revision=2
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="SDL-devel"
@@ -9,8 +9,8 @@ short_desc="Graphics drawing primitives for SDL"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="BSD"
 homepage="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
-distfiles="http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.25.tar.gz"
+distfiles="http://www.ferzkopp.net/Software/SDL_gfx-${version%.*}/SDL_gfx-${version}.tar.gz"
-checksum=556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0
+checksum=7ceb4ffb6fc63ffba5f1290572db43d74386cd0781c123bc912da50d34945446
 
 pre_configure() {
 	case "${XBPS_TARGET_MACHINE}" in

srcpkgs/SFML/template

@@ -8,7 +8,7 @@ makedepends="libsndfile-devel libXrandr-devel libjpeg-turbo-devel
  libopenal-devel glew-devel freetype-devel MesaLib-devel glu-devel
  xcb-util-image-devel"
 short_desc="Simple and Fast Multimedia Library"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="zlib"
 homepage="http://www.sfml-dev.org/"
 distfiles="https://github.com/LaurentGomila/${pkgname}/archive/${version}.tar.gz"

srcpkgs/SMC/template

@@ -1,7 +1,7 @@
 # Template file for 'SMC'.
 pkgname=SMC
 version=1.9
-revision=3
+revision=4
 wrksrc=${pkgname,,}-${version}
 build_style=gnu-configure
 hostmakedepends="automake libtool gettext-devel pkg-config unzip"

srcpkgs/TSC/template

@@ -1,7 +1,7 @@
 # Template file for 'TSC'
 pkgname=TSC
 version=2.0.0
-revision=3
+revision=4
 build_style=cmake
 build_wrksrc=tsc
 configure_args="-DFIXED_DATA_DIR=/usr/share/TSC -DBINARY_DIR=/usr/bin"

srcpkgs/VirtualGL/template

@@ -1,6 +1,6 @@
 # Template file for 'VirtualGL'
 pkgname=VirtualGL
-version=2.5.1
+version=2.5.2
 revision=1
 build_style=cmake
 configure_args="-DTJPEG_INCLUDE_DIR=/usr/include
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.virtualgl.org/"
 license="LGPL-2.1"
 distfiles="${SOURCEFORGE_SITE}/virtualgl/${version}/${pkgname}-${version}.tar.gz"
-checksum=da342e0157257cd7b7c9c6705c7f2b9853f28f6bb6c51c90c710cc14257f3659
+checksum=4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238
 
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 

srcpkgs/WindowMaker/template

@@ -1,7 +1,7 @@
 # Template file for 'WindowMaker'
 pkgname=WindowMaker
-version=0.95.7
+version=0.95.8
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-xinerama --localedir=/usr/share/locale
  --enable-usermenu --enable-modelock --enable-xrandr --enable-wmreplace
@@ -21,7 +21,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="http://www.windowmaker.org/"
 distfiles="http://windowmaker.org/pub/source/release/${pkgname}-${version}.tar.gz"
-checksum=842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
+checksum=9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
 
 pre_configure() {
 	autoreconf -fi

srcpkgs/abootimg/template

@@ -7,7 +7,7 @@ build_style=gnu-makefile
 wrksrc="abootimg-$_commit-$_commit"
 makedepends="libblkid-devel"
 short_desc="Manipulate Android Boot Images"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://gitorious.org/ac100/abootimg"
 distfiles="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$_commit>archive.tar.gz"

srcpkgs/acbuild/template

@@ -1,7 +1,7 @@
 # Template file for 'acbuild'
 pkgname=acbuild
 version=0.4.0
-revision=3
+revision=4
 wrksrc="build-${version}"
 build_style=go
 go_import_path=github.com/appc/acbuild

srcpkgs/accountsservice/template

@@ -1,7 +1,7 @@
 # Template file for 'accountsservice'
 pkgname=accountsservice
-version=0.6.43
+version=0.6.45
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-systemd $(vopt_enable gir introspection)
  ac_cv_file__etc_redhat_release=no ac_cv_file__etc_debian_version=no"
@@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://cgit.freedesktop.org/accountsservice/"
 license="GPL-3"
 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
-checksum=ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc
+checksum=fb0fc293aa75d59f5ef5db719d37a21831c4dd74a97526ee7e51ce936311ef26
 
 # Package build options
 build_options="gir"

srcpkgs/acct/template

@@ -1,7 +1,7 @@
 # Template file for 'acct'
 pkgname=acct
-version=6.6.2
+version=6.6.3
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
 short_desc="GNU Accounting Utilities"
@@ -9,7 +9,7 @@ homepage="https://www.gnu.org/software/acct/"
 license="GPL-3"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101
+checksum=5eae79323bf1ce403704d2b70483c46e7c853276ee7b5ad561ec3ccae9fca093
 nocross=yes
 
 post_install() {

srcpkgs/ack/template

@@ -1,15 +1,15 @@
-# Template build file for 'ack'.
+# Template file for 'ack'
 pkgname=ack
-version=2.14
+version=2.18
-revision=3
+revision=1
+noarch=yes
 build_style=perl-module
-hostmakedepends="perl perl-File-Next"
+hostmakedepends="perl-File-Next"
 makedepends="${hostmakedepends}"
 depends="${makedepends}"
-noarch="yes"
+short_desc="Tool like grep, optimized for programmers"
-short_desc="A Perl-based grep replacement, aimed at programmers with large trees of heterogeneous source code"
 maintainer="Jan S. <jan.schreib@gmail.com>"
-homepage="http://betterthangrep.com/"
+homepage="https://beyondgrep.com/"
-license="PerlArtistic"
+license="Artistic-2.0"
-distfiles="http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/${pkgname}-${version}.tar.gz"
+distfiles="${CPAN_SITE}/App/ack-${version}.tar.gz"
-checksum=8549a833efec158dc85bc6334b3a384ae5a389896942eab9a58c6e630c181b3f
+checksum=fb4a0a11a5411cba5764163b8d074a447c2a753758821151b31dc7533663f058

srcpkgs/acme-client/template

@@ -1,7 +1,7 @@
 # Template file for 'acme-client'
 pkgname=acme-client
 version=0.1.11
-revision=2
+revision=3
 _distver=VERSION_${version//./_}
 wrksrc=acme-client-portable-${_distver}
 build_style=gnu-makefile

srcpkgs/acmetool/template

@@ -1,7 +1,7 @@
 # Template file for 'acmetool'
 pkgname=acmetool
 version=0.0.59
-revision=1
+revision=2
 wrksrc="acme-${version}"
 build_style=go
 go_import_path=github.com/hlandau/acme

srcpkgs/acpi_call-dkms/template

@@ -3,7 +3,7 @@ pkgname=acpi_call-dkms
 version=1.2.0
 revision=1
 wrksrc=acpi_call-${version}
-only_for_archs="i686 x86_64"
+only_for_archs="i686 x86_64 x86_64-musl"
 short_desc="Kernel module allowing calls to ACPI methods through /proc/acpi/call"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="GPL-3"

srcpkgs/acpica-utils/template

@@ -1,19 +1,19 @@
 # Template file for 'acpica-utils'
 pkgname=acpica-utils
-version=20161222
+version=20170303
 revision=1
 wrksrc="acpica-unix-${version}"
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 hostmakedepends="flex"
 short_desc="Intel ACPI CA Unix utilities"
 homepage="https://www.acpica.org/"
-license="GPL-2"
+license="GPL-2, 3-clause-BSD"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"
-checksum=0cfe1b622b8663ff9c46dd23b8c2fe7c7191d8b433cd6decdce6403321b37120
+checksum=c093c9eabd1f8c51d79364d829975c5335c8028c4816a7a80dfb8590f31889b5
 
 do_build() {
-	sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config
+	sed -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' -i generate/unix/Makefile.config generate/unix/iasl/Makefile
 
 	case "$XBPS_TARGET_MACHINE" in
 		i686*) make BITS=32;;

srcpkgs/adobe-flash-plugin/template

@@ -1,6 +1,6 @@
 # Template file for 'adobe-flash-plugin'
 pkgname=adobe-flash-plugin
-version=24.0.0.221
+version=25.0.0.148
 revision=1
 # The EULA file
 _eula="https://www.adobe.com/content/dam/Adobe/en/legal/licenses-terms/pdf/PlatformClients_PC_WWEULA-en_US-20150407_1357.pdf"
@@ -8,10 +8,10 @@ _eulacksum=91e504a9e99ebd988ffa95ce0d5feaf340410c03709348297301a22dc11df1a8
 _url=http://fpdownload.adobe.com/get/flashplayer/pdc/${version}
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_disttarball="${_url}/flash_player_npapi_linux.x86_64.tar.gz"
-	_distcksum=087048af5fa3c46a8c283403a341d4684ef4b966f4e407195b43c24bf5ae64b1
+	_distcksum=72f93bf2d2f6b6e7ed34321de8324f14d9ddff8bc9f42717691b8904be50e758
 else
 	_disttarball="${_url}/flash_player_npapi_linux.i386.tar.gz"
-	_distcksum=7495689ad778cae778f19ac085d362cbae63c7a4ad806fd9ece1844040ba9eed
+	_distcksum=7d9ffcdca435429d8578adf348ff6e2c336787d2cfca4d28742c92adce8061b1
 fi
 distfiles="${_eula} ${_disttarball}"
 checksum="${_eulacksum} ${_distcksum}"

srcpkgs/adwaita-icon-theme/template

@@ -1,7 +1,7 @@
 # Template build file for 'adwaita-icon-theme'.
 pkgname=adwaita-icon-theme
-version=3.22.0
+version=3.24.0
-revision=3
+revision=1
 noarch=yes
 build_style=gnu-configure
 configure_args="--enable-icon-mapping"
@@ -12,4 +12,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
-checksum=c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7
+checksum=ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a

srcpkgs/afl/template

@@ -1,6 +1,6 @@
 # Template file for 'afl'
 pkgname=afl
-version=2.39b
+version=2.41b
 revision=1
 build_style=gnu-makefile
 # x86 only currently
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="Apache-2.0"
 homepage="http://lcamtuf.coredump.cx/afl/"
 distfiles="http://lcamtuf.coredump.cx/afl/releases/afl-${version}.tgz"
-checksum=968eceae4d013eee62bc8f2fdddbb7060b92e03a0175153b0285ec7f5c78f141
+checksum=0670b13235264e688a7ccfbeeee257e9c57dcc86ead676247d92d199c194968f
 nopie=yes  # clang flags
 
 nostrip_files="small_archive.a small_exec.elf"

srcpkgs/aha/template

@@ -1,6 +1,6 @@
 # Template file for 'aha'
 pkgname=aha
-version=0.4.10.5
+version=0.4.10.6
 revision=1
 build_style=gnu-makefile
 short_desc="Converts SGR-colored Input to W3C conform HTML-Code"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="LGPL-2, MPL"
 homepage="https://github.com/theZiz/aha"
 distfiles="https://github.com/theZiz/aha/archive/$version.tar.gz"
-checksum=b2cd7a1a0f7b3a70c37446d7157b4b58e2939535cdd71112a2228b2e78f7e620
+checksum=747e939787dca7a9620869fefc17b60f5e29f0ea3965548d15dc9b2a1f31c3f6
 
 do_configure() {
 	sed -i 's/gcc/$(CC)/' Makefile

srcpkgs/aircrack-ng/template

@@ -3,7 +3,7 @@ pkgname=aircrack-ng
 _aircrack_ver=1.2
 _aircrack_rc=rc4
 version="${_aircrack_ver}${_aircrack_rc}"
-revision=4
+revision=5
 wrksrc="${pkgname}-${_aircrack_ver}-${_aircrack_rc}"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel libressl-devel sqlite-devel libnl3-devel"

srcpkgs/akonadi/template

@@ -1,7 +1,7 @@
 # Template file for 'akonadi'
 pkgname=akonadi
 version=1.13.0
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE -DDATABASE_BACKEND=SQLITE -DWITH_SOPRANO=OFF"
 hostmakedepends="automoc4 pkg-config libxslt"

srcpkgs/alacritty/template

@@ -1,8 +1,8 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.1.0.20170303
+version=0.1.0.20170417
 revision=1
-_commit=aa76b29ff7dbf4af8d83c9f461889249fe53ea77
+_commit=d372f2e591020b5824797db826159351d19c3906
 wrksrc="$pkgname-$_commit"
 hostmakedepends="rust cargo cmake pkg-config"
 makedepends="freetype-devel fontconfig-devel"
@@ -12,7 +12,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/jwilm/alacritty"
 distfiles="$homepage/archive/${_commit}.tar.gz"
-checksum=af1871b77576f4877a8e0c30d03df1901f9b7daa2d57a54bfac9a287dc2ba472
+checksum=a78476e49270212c138551a6644ba17ad3eabb7567c9ca5407392b0f0093e54a
 
 nocross=yes
 

srcpkgs/albert/template

@@ -1,6 +1,6 @@
 # Template file for 'albert'
 pkgname=albert
-version=0.9.3
+version=0.11.1
 revision=1
 build_style=cmake
 makedepends="muparser-devel qt5-svg-devel qt5-x11extras-devel qt5-plugin-mysql
@@ -10,8 +10,8 @@ short_desc="Lightweight desktop environment agnostic launcher"
 maintainer="Nemh <nemh@protonmail.com>"
 license="GPL-3"
 homepage="https://github.com/ManuelSchneid3r/albert"
-distfiles="https://github.com/ManuelSchneid3r/${pkgname}/archive/v${version}.tar.gz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5e16e369e38267e861407e5315c841e07ee04cf14caf0294e8c33d837c1931f4
+checksum=d214b73bf154bef59d36a4b128493b5dd9ecc7ba059a606f9b4659b57741f390
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-svg-devel qt5-x11extras-devel"

srcpkgs/alfred/template

@@ -1,6 +1,6 @@
 # Template file for 'alfred'
 pkgname=alfred
-version=2016.5
+version=2017.0
 revision=1
 build_style=gnu-makefile
 short_desc="Daemon for distributing arbitrary information over a batman mesh"
@@ -8,7 +8,7 @@ maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="GPL-2, ISC"
 homepage="http://www.open-mesh.org/projects/open-mesh/wiki/Alfred"
 distfiles="http://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-${version}.tar.gz"
-checksum=37b3babf7f37643cf296be11fb82d5730cf441a5a56f72fba96edae9f149c9d2
+checksum=f8d6d83d2ce30b2238354ce12073285387c0f4ca1a28060390ff50b411b50fa8
 hostmakedepends="pkg-config"
 makedepends="libcap-devel libnl3-devel"
 make_build_args="CONFIG_ALFRED_GPSD=n"

srcpkgs/alpine/template

@@ -1,24 +1,24 @@
 # Template file for 'alpine'
 pkgname=alpine
-version=2.20
+version=2.21
-revision=6
+revision=2
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--without-passfile --without-tcl --disable-shared
- --with-ssl-dir=${XBPS_CROSS_BASE}/usr
+ --with-ssl-dir=${XBPS_CROSS_BASE}/usr alpine_SSLPROVIDER=libressl
  --with-system-pinerc=/etc/${pkgname}.d/pine.conf
  --with-system-fixed-pinerc=/etc/${pkgname}.d/pine.conf.fixed"
 hostmakedepends="hunspell"
 makedepends="pam-devel ncurses-devel gettext-devel libldap-devel mit-krb5-devel"
 short_desc="Apache-licensed PINE mail user agent (with Chappa patches)"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://patches.freeiz.com/alpine/"
 distfiles="http://patches.freeiz.com/${pkgname}/patches/${pkgname}-${version}/all.patch.gz
  http://patches.freeiz.com/${pkgname}/release/src/${pkgname}-${version}.tar.xz"
-checksum="31c75e13d47d9dbf92839e2dca503a13316d720a6b64eac0857f4bb726f3daf8
+checksum="590e6774c60c6738e31b0bd440b28c54bff25c5f87be9aa2d8d4671fdf1e3450
- ed639b6e5bb97e6b0645c85262ca6a784316195d461ce8d8411999bf80449227"
+ 6030b6881b8168546756ab3a5e43628d8d564539b0476578e287775573a77438"
 
 post_extract() {
 	patch -Np0 <all.patch

srcpkgs/android-tools/patches/android-tools-uchar.patch

@@ -0,0 +1,10 @@
+--- core/include/cutils/jstring.h.orig	2017-04-13 09:40:53.139449328 +0200
++++ core/include/cutils/jstring.h	2017-04-13 09:39:36.520748834 +0200
+@@ -19,6 +19,7 @@
+ 
+ #include <stdint.h>
+ #include <stddef.h>
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {

srcpkgs/android-tools/template

@@ -5,7 +5,7 @@ _distver=7.0.0_r5
 #       of android used by android-tools. Check for diff with:
 #         curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
 version=${_distver/_/}
-revision=4
+revision=5
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="git"

srcpkgs/anjuta/template

@@ -1,7 +1,7 @@
 # Template file for 'anjuta'
 pkgname=anjuta
 version=3.22.0
-revision=3
+revision=4
 build_style=gnu-configure
 build_options="gir"
 configure_args="$(vopt_enable gir introspection)"

srcpkgs/ansible/template

@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=2.2.1.0
+version=2.3.0.0
 revision=1
 noarch=yes
 build_style=python2-module
@@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
 homepage="https://www.ansible.com/"
 distfiles="https://releases.ansible.com/ansible/${pkgname}-${version}.tar.gz"
-checksum=63a12ea784c0f90e43293b973d5c75263634c7415e463352846cd676c188e93f
+checksum=299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458
 
 post_install() {
 	for f in examples/*; do

srcpkgs/aoeui/template

@@ -1,15 +1,17 @@
 # Template file for 'aoeui'
 pkgname=aoeui
 version=1.7
-revision=5
+revision=6
+_githash=4e5dee93ebbaf5bd7bd7da80ce34b2eef196cd08
+wrksrc="${pkgname}-${_githash}"
 build_style=gnu-makefile
 hostmakedepends="m4"
 short_desc="Lightweight UNIX-friendly text editor"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"
-homepage="http://sites.google.com/site/aoeuiandasdfg/Home"
+homepage="https://github.com/pklausler/aoeui"
-distfiles="https://github.com/adnelson/aoeui/raw/master/${pkgname}-${version}.tgz"
+distfiles="https://github.com/pklausler/aoeui/archive/${_githash}.tar.gz"
-checksum=f4c067ad2c3b95ad130411195dd53ea49300e8e3496ecf0deceff20350c7670d
+checksum=3b06c7950b0fcbdfe57e78de8cb9b9d7af141932459a32d72a029f96839d667f
 
 post_extract() {
 	echo 'LIBS += $(LDFLAGS)' >>Makefile

srcpkgs/apache/template

@@ -1,7 +1,7 @@
 # Template file for 'apache'
 pkgname=apache
 version=2.4.25
-revision=2
+revision=3
 wrksrc=httpd-${version}
 build_style=gnu-configure
 configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all

srcpkgs/apk-tools/patches/vfs.patch

@@ -0,0 +1,11 @@
+--- src/database.c.orig
++++ src/database.c
+@@ -26,6 +26,8 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/mount.h>
++#include <sys/statvfs.h>
++#include <sys/sysmacros.h>
+ #include <linux/magic.h>
+ 
+ #include "apk_defines.h"

srcpkgs/apk-tools/template

@@ -1,17 +1,17 @@
 # Template file for 'apk-tools'
 pkgname=apk-tools
-version=2.6.8
+version=2.7.1
 revision=1
 build_style=gnu-makefile
 make_build_args="LUAAPK="
 hostmakedepends="pkg-config"
 makedepends="libressl-devel zlib-devel libfetch-devel"
 short_desc="Alpine Package Keeper (Alpine package manager)"
-maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2"
 homepage="http://git.alpinelinux.org/cgit/apk-tools"
 distfiles="http://git.alpinelinux.org/cgit/${pkgname}/snapshot/${pkgname}-${version}.tar.bz2"
-checksum=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b
+checksum=5abac5f1f19d64ce7201e66fcd86b430240895d3002323a4a11ad17c6f4b44e7
 CFLAGS=-Wno-error
 
 post_extract() {

srcpkgs/apl/template

@@ -0,0 +1,17 @@
+# Template file for 'apl'
+pkgname=apl
+version=1.7
+revision=2
+build_style=gnu-configure
+makedepends="ncurses-devel sqlite-devel"
+short_desc="GNU interpreter for APL (A Programming Language)"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="GPL-3"
+homepage="http://www.gnu.org/software/apl"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=8ff6e28256d7a3cdfa9dc6025e3905312310b27a43645ef5d617fd4a5b43b81f
+
+post_install() {
+	vdoc support-files/Dyalog-Keyboard/apl.xkb
+	vdoc support-files/Dyalog-Keyboard/apl.xmodmap
+}

srcpkgs/apr-util/template

@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
 version=1.5.4
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="
  --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config --with-pgsql --with-ldap

srcpkgs/apulse/template

@@ -1,6 +1,6 @@
 # Template file for 'apulse'
 pkgname=apulse
-version=0.1.7
+version=0.1.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="MIT"
 homepage="http://github.com/i-rinat/apulse"
 distfiles="https://codeload.github.com/i-rinat/${pkgname}/tar.gz/v${version}>${pkgname}-${version}.tar.gz"
-checksum=fc0e4853684ca5145950690405b0d4f89bf3a5aef7a86addec451561fb5f3e1b
+checksum=4f8aa9059d07bac1006e920a4a6b875ad63fdde973b83c138507812c00dd5cd6
 
 post_install() {
 	vlicense LICENSE.MIT

srcpkgs/ardour/template

@@ -7,7 +7,7 @@ configure_args="--with-backends=jack,alsa --libjack=weak --optimize --docs"
 hostmakedepends="python git graphviz doxygen pkg-config clang perl"
 makedepends="boost-devel liblrdf-devel liblo-devel lilv-devel suil-devel taglib-devel aubio-devel rubberband-devel alsa-lib-devel libsndfile-devel vamp-plugin-sdk-devel fftw-devel jack-devel libsamplerate-devel lv2 sratom-devel gtkmm2-devel"
 short_desc="Professional-grade digital audio workstation"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://ardour.org"
 CXXFLAGS="-std=c++11"

srcpkgs/argyllcms/template

@@ -1,7 +1,7 @@
 # Template file for 'argyllcms'
 pkgname=argyllcms
 version=1.9.2
-revision=1
+revision=2
 wrksrc="Argyll_V${version}"
 hostmakedepends="ftjam zip unzip"
 makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel

srcpkgs/aria2/template

@@ -1,7 +1,7 @@
 # Template file for 'aria2'
 pkgname=aria2
 version=1.31.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-openssl --with-libexpat --without-gnutls
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt

srcpkgs/ark/template

@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="automoc4"
 makedepends="kdelibs-devel libarchive-devel phonon-devel"
 short_desc="KDE Archiving Tool"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2"
 homepage="http://kde.org/applications/utilities/ark"
 distfiles="http://download.kde.org/Attic/applications/${version}/src/${pkgname}-${version}.tar.xz"

srcpkgs/ark/update

@@ -1,3 +1,3 @@
 site="http://download.kde.org/stable/applications/"
 pattern='href="\K[\d\.]+(?=/")'
-ignore="15.* 16.*" # can't compile until we port new kde libs
+ignore="15.* 16.* 17.*" # can't compile until we port new kde libs

srcpkgs/arpwatch/template

@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Ethernet/FDDI station activity monitor"
-maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD"
 homepage="ftp://ftp.ee.lbl.gov"
 distfiles="ftp://ftp.ee.lbl.gov/$pkgname-$version.tar.gz"