Merge pull request #1803 from chneukirchen/boost-1.58

Boost 1.58

common/shlibs

@@ -568,35 +568,37 @@ libnm-glib.so.4 libnm-0.9.1.90_1
 libnm-glib-vpn.so.1 libnm-0.9.1.90_1
 libnm.so.0 libnm-1.0.0_1
 libpanel-applet-4.so.0 gnome-panel-3.3.92_1
-libboost_context.so.1.54.0 boost-1.54<1.55_1
+libboost_context.so.1.58.0 boost-1.58<1.59_1
-libboost_prg_exec_monitor.so.1.54.0 boost-1.54<1.55_1
+libboost_coroutine.so.1.58.0 boost-1.58<1.59_1
-libboost_signals.so.1.54.0 boost-1.54<1.55_1
+libboost_container.so.1.58.0 boost-1.58<1.59_1
-libboost_timer.so.1.54.0 boost-1.54<1.55_1
+libboost_prg_exec_monitor.so.1.58.0 boost-1.58<1.59_1
-libboost_random.so.1.54.0 boost-1.54<1.55_1
+libboost_signals.so.1.58.0 boost-1.58<1.59_1
-libboost_filesystem.so.1.54.0 boost-1.54<1.55_1
+libboost_timer.so.1.58.0 boost-1.58<1.59_1
-libboost_unit_test_framework.so.1.54.0 boost-1.54<1.55_1
+libboost_random.so.1.58.0 boost-1.58<1.59_1
-libboost_math_c99f.so.1.54.0 boost-1.54<1.55_1
+libboost_filesystem.so.1.58.0 boost-1.58<1.59_1
-libboost_math_tr1f.so.1.54.0 boost-1.54<1.55_1
+libboost_unit_test_framework.so.1.58.0 boost-1.58<1.59_1
-libboost_regex.so.1.54.0 boost-1.54<1.55_1
+libboost_math_c99f.so.1.58.0 boost-1.58<1.59_1
-libboost_serialization.so.1.54.0 boost-1.54<1.55_1
+libboost_math_tr1f.so.1.58.0 boost-1.58<1.59_1
-libboost_chrono.so.1.54.0 boost-1.54<1.55_1
+libboost_regex.so.1.58.0 boost-1.58<1.59_1
-libboost_wserialization.so.1.54.0 boost-1.54<1.55_1
+libboost_serialization.so.1.58.0 boost-1.58<1.59_1
-libboost_graph.so.1.54.0 boost-1.54<1.55_1
+libboost_chrono.so.1.58.0 boost-1.58<1.59_1
-libboost_log.so.1.54.0 boost-1.54<1.55_1
+libboost_wserialization.so.1.58.0 boost-1.58<1.59_1
-libboost_locale.so.1.54.0 boost-1.54<1.55_1
+libboost_graph.so.1.58.0 boost-1.58<1.59_1
-libboost_math_tr1l.so.1.54.0 boost-1.54<1.55_1
+libboost_log.so.1.58.0 boost-1.58<1.59_1
-libboost_program_options.so.1.54.0 boost-1.54<1.55_1
+libboost_locale.so.1.58.0 boost-1.58<1.59_1
-libboost_iostreams.so.1.54.0 boost-1.54<1.55_1
+libboost_math_tr1l.so.1.58.0 boost-1.58<1.59_1
-libboost_system.so.1.54.0 boost-1.54<1.55_1
+libboost_program_options.so.1.58.0 boost-1.58<1.59_1
-libboost_thread.so.1.54.0 boost-1.54<1.55_1
+libboost_iostreams.so.1.58.0 boost-1.58<1.59_1
-libboost_log_setup.so.1.54.0 boost-1.54<1.55_1
+libboost_system.so.1.58.0 boost-1.58<1.59_1
-libboost_date_time.so.1.54.0 boost-1.54<1.55_1
+libboost_thread.so.1.58.0 boost-1.58<1.59_1
-libboost_math_c99.so.1.54.0 boost-1.54<1.55_1
+libboost_log_setup.so.1.58.0 boost-1.58<1.59_1
-libboost_wave.so.1.54.0 boost-1.54<1.55_1
+libboost_date_time.so.1.58.0 boost-1.58<1.59_1
-libboost_math_tr1.so.1.54.0 boost-1.54<1.55_1
+libboost_math_c99.so.1.58.0 boost-1.58<1.59_1
-libboost_atomic.so.1.54.0 boost-1.54<1.55_1
+libboost_wave.so.1.58.0 boost-1.58<1.59_1
-ibboost_math_c99l.so.1.54.0 boost-1.54<1.55_1
+libboost_math_tr1.so.1.58.0 boost-1.58<1.59_1
-libboost_python.so.1.54.0 boost-python-1.54<1.55_1
+libboost_atomic.so.1.58.0 boost-1.58<1.59_1
+libboost_math_c99l.so.1.58.0 boost-1.58<1.59_1
+libboost_python.so.1.58.0 boost-python-1.58<1.59_1
 libexempi.so.3 exempi-2.1.1_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2.so.2 libsgutils-1.28_1

srcpkgs/Lucene++/template

@@ -1,7 +1,7 @@
 # Template file for 'Lucene++'
 pkgname=Lucene++
 version=3.0.7
-revision=1
+revision=2
 wrksrc=LucenePlusPlus-rel_$version
 build_style=cmake
 hostmakedepends="cmake"
@@ -13,6 +13,10 @@ homepage="https://github.com/luceneplusplus/LucenePlusPlus"
 distfiles="https://github.com/luceneplusplus/LucenePlusPlus/archive/rel_${version}.tar.gz"
 checksum=6c19f203311e4b44a0ccf7b1127db77436eb47159ea1c54f7531a0b1ca585e0c
 
+post_extract() {
+	sed -i 's/boost::get/boost::relaxed_get/' include/VariantUtils.h
+}
+
 pre_configure() {
 	# Disable tests
 	echo > CMakeExternal.txt

srcpkgs/akonadi/template

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

srcpkgs/bitcoin/template

@@ -1,7 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.10.2
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="pkg-config yasm"
 makedepends="db-devel protobuf-devel libressl-devel boost-devel miniupnpc-devel"

srcpkgs/blender/template

@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=2.74
-revision=2
+revision=3
 hostmakedepends="cmake"
 makedepends="
  libgomp-devel libpng-devel tiff-devel python3.4-devel glu-devel

srcpkgs/boost/patches/boost-1.54.0-Fix-macro-for-int128-detection.patch

@@ -1,31 +0,0 @@
---- boost/lexical_cast.hpp	(revision 84136)
-+++ boost/lexical_cast.hpp	(revision 84965)
-@@ -70,8 +70,8 @@
- #endif
- 
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
--
- 
- namespace boost
---- libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 83717)
-+++ libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 84965)
-@@ -49,5 +49,5 @@
- #endif
- 
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
-@@ -445,6 +445,6 @@
- 
-     // Overflow test case from David W. Birdsall
--    std::string must_owerflow_str = "160000000000000000000";
--    std::string must_owerflow_negative_str = "-160000000000000000000";
-+    std::string must_owerflow_str =             (sizeof(T) < 16 ?  "160000000000000000000" :  "1600000000000000000000000000000000000000");
-+    std::string must_owerflow_negative_str =    (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
-     for (int i = 0; i < 15; ++i) {
-         BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);

srcpkgs/boost/patches/fix-new-glibc.patch

@@ -1,12 +0,0 @@
---- boost/cstdint.hpp	(revision 84805)
-+++ boost/cstdint.hpp	(revision 84950)
-@@ -42,5 +42,8 @@
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H)					\
-+  && (!defined(__GLIBC__)					\
-+      || defined(__GLIBC_HAVE_LONG_LONG)			\
-+      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
- 
- // The following #include is an implementation artifact; not part of interface.

srcpkgs/boost/template

@@ -1,15 +1,16 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.54.0
+version=1.58.0
-revision=6
+revision=1
 wrksrc="${pkgname}_${version//\./_}"
+hostmakedepends="bzip2-devel"
 makedepends="zlib-devel bzip2-devel icu-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.boost.org/"
 license="Boost Software License 1.0"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2"
-checksum=047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d
+checksum=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5
 
 subpackages="boost-build boost-devel"
 
@@ -19,49 +20,48 @@ if [ -z "$CROSS_BUILD" ]; then
 	subpackages+=" boost-jam boost-python"
 fi
 
+_abi=sysv
+_toolset=gcc
+case "$XBPS_TARGET_MACHINE" in
+	arm*) _arch=arm; _toolset="gcc-arm"; _abi=aapcs;;
+	aarch64*) _arch=aarch64; _toolset="gcc-aarch64"; _abi=aapcs;;
+	mips*) _arch=mips; _toolset="gcc-mips"; _abi=o32;;
+esac
+
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
-		case "$XBPS_TARGET_MACHINE" in
+		echo "using gcc : ${_arch} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" > user-config.jam
-			arm*) _arch=arm; _toolset="gcc-arm";;
-			mips*) _arch=mips; _toolset="gcc-mips";;
-		esac
-		echo "using gcc : ${_arch} : ${XBPS_CROSS_TRIPLET}-g++ ${CXXFLAGS} ;" > \
-			tools/build/v2/user-config.jam
 	else
-		_toolset=gcc
+		echo "using gcc : : g++ ${CXXFLAGS} ;" > user-config.jam
-		echo "using gcc : : g++ ${CXXFLAGS} ;" > tools/build/v2/user-config.jam
 	fi
 	./bootstrap.sh -prefix=${DESTDIR}/usr
-	./bjam --toolset=${_toolset} ${makejobs}
+	./bjam --toolset=${_toolset} ${makejobs} abi=$_abi \
+		--user-config=${wrksrc}/user-config.jam
 }
 
 do_install() {
 	# Install bjam
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) _bindir="bin.linuxx86";;
-		x86_64*) _bindir="bin.linuxx86_64";;
-		arm*) _bindir="bin.linuxarm";;
-	esac
 	if [ -z "$CROSS_BUILD" ]; then
-		vinstall bjam 755 usr/bin
+		vbin bjam
 	fi
 
 	# Install headers/libs
-	./bjam --prefix=${DESTDIR}/usr install
+	./bjam --prefix=${DESTDIR}/usr abi=$_abi \
+		--user-config=${wrksrc}/user-config.jam install
 
 	# Install Boost.Build stuff.
 	vmkdir usr/share/boost-build
-	cd ${wrksrc}/tools/build/v2 && cp -a . ${DESTDIR}/usr/share/boost-build
+	cd ${wrksrc}/tools/build && cp -a . ${DESTDIR}/usr/share/boost-build
 	find ${DESTDIR}/usr/share/boost-build \
 		-type f -name \*.orig -exec rm -f {} \;
 	( echo '# System wide configuration file for Boost.Build.' ; \
 	  echo ; \
 	  echo 'using gcc ;' ; ) >${wrksrc}/site-config.jam
 	cd $wrksrc
-	vinstall site-config.jam 644 etc
+	vconf site-config.jam
 
 	# license
-	vinstall LICENSE_1_0.txt 644 usr/share/licenses/boost
+	vlicense LICENSE_1_0.txt
 }
 
 boost-jam_package() {

srcpkgs/cclive/template

@@ -1,7 +1,7 @@
 # Template file for 'cclive'
 pkgname=cclive
 version=0.7.16
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"

srcpkgs/encfs/template

@@ -1,7 +1,7 @@
 # Template file for 'encfs'
 pkgname=encfs
 version=1.7.4
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config perl"
 makedepends="fuse-devel libressl-devel librlog-devel boost-devel"

srcpkgs/gource/template

@@ -1,7 +1,7 @@
 # Template file for 'gource'
 pkgname=gource
 version=0.43
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF"
 hostmakedepends="pkg-config"

srcpkgs/hugin/patches/hugin-2013-boost-156.diff

@@ -0,0 +1,81 @@
+--- src/tools/ParseExp.cpp	2013-10-27 10:19:02.000000000 +0100
++++ src/tools/ParseExp.cpp	2014-09-12 01:41:15.468973470 +0200
+@@ -50,37 +50,45 @@
+ //power function
+ struct lazy_pow_
+ {
+-    template <typename X, typename Y>
+-    struct result { typedef X type; };
++    template<class> struct result;
++
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y)> { typedef X& type; };
+ 
+     template <typename X, typename Y>
+-    X operator()(X x, Y y) const
++    X& operator()(X& x, Y y) const
+     {
+-        return std::pow(x, y);
++        x= std::pow(x, y);
++        return x;
+     }
+ };
+ 
+ // modulus for double values
+ struct lazy_mod_
+ {
+-    template <typename X, typename Y>
+-    struct result { typedef X type; };
++    template<class> struct result;
++
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y)> { typedef X& type; };
+ 
+     template <typename X, typename Y>
+-    X operator()(X x, Y y) const
++    X& operator()(X& x, Y y) const
+     {
+-        return std::fmod(x,y);
++        x= std::fmod(x,y);
++        return x;
+     }
+ };
+ 
+ // if statement
+ struct lazy_if_
+ {
+-    template <typename X, typename Y, typename Z>
+-    struct result { typedef Y type; };
++    template<class> struct result;
+ 
+-    template <typename X, typename Y, typename Z>
+-    X operator()(X x, Y y, Z z) const
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y,Y)> { typedef Y& type; };
++
++    template <typename X, typename Y>
++    Y& operator()(X x, Y& y, Y& z) const
+     {
+         return x ? y : z;
+     }
+@@ -89,13 +97,16 @@
+ // wrapper for unary function
+ struct lazy_ufunc_
+ {
+-    template <typename F, typename A1>
+-    struct result { typedef A1 type; };
++    template<class> struct result;
++
++    template<typename F, typename F1, typename A1>
++    struct result<F(F1,A1)> { typedef A1& type; };
+ 
+     template <typename F, typename A1>
+-    A1 operator()(F f, A1 a1) const
++    A1& operator()(F f, A1& a1) const
+     {
+-        return f(a1);
++        a1= f(a1);
++        return a1;
+     }
+ };
+ 

srcpkgs/hugin/template

@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2014.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
 maintainer="Dominik Honnef <dominik@honnef.co>"

srcpkgs/ledger/patches/417.diff

@@ -0,0 +1,109 @@
+https://patch-diff.githubusercontent.com/raw/ledger/ledger/pull/417.diff
+
+diff --git src/account.h src/account.h
+index 7fae93e..8d0fb1d 100644
+--- src/account.h
++++ src/account.h
+@@ -261,11 +261,7 @@ class account_t : public supports_flags<>, public scope_t
+   mutable optional<xdata_t> xdata_;
+ 
+   bool has_xdata() const {
+-#if BOOST_VERSION >= 105600
+-    return xdata_ != NULL;
+-#else
+-    return xdata_;
+-#endif
++    return xdata_ != boost::none;
+   }
+   void clear_xdata();
+   xdata_t& xdata() {
+diff --git src/filters.cc src/filters.cc
+index 2f97a0e..b6530c0 100644
+--- src/filters.cc
++++ src/filters.cc
+@@ -707,7 +707,7 @@ namespace {
+     insert_prices_in_map(price_map_t& _all_prices)
+       : all_prices(_all_prices) {}
+ 
+-    void operator()(datetime_t& date, const amount_t& price) {
++    void operator()(const datetime_t& date, const amount_t& price) {
+       all_prices.insert(price_map_t::value_type(date, price));
+     }
+   };
+diff --git src/item.h src/item.h
+index ba81217..2c349bd 100644
+--- src/item.h
++++ src/item.h
+@@ -174,11 +174,7 @@ class item_t : public supports_flags<uint_least16_t>, public scope_t
+   static bool use_aux_date;
+ 
+   virtual bool has_date() const {
+-#if BOOST_VERSION >= 105600
+-    return _date != NULL;
+-#else
+-    return _date;
+-#endif
++    return _date != boost::none;
+   }
+ 
+   virtual date_t date() const {
+diff --git src/iterators.cc src/iterators.cc
+index 21bec5d..0225e21 100644
+--- src/iterators.cc
++++ src/iterators.cc
+@@ -96,7 +96,7 @@ namespace {
+       TRACE_DTOR(create_price_xact);
+     }
+ 
+-    void operator()(datetime_t& date, const amount_t& price) {
++    void operator()(const datetime_t& date, const amount_t& price) {
+       xact_t * xact;
+       string   symbol = price.commodity().symbol();
+ 
+diff --git src/parser.h src/parser.h
+index e46fc71..25c4a7e 100644
+--- src/parser.h
++++ src/parser.h
+@@ -118,7 +118,7 @@ class expr_t::parser_t : public noncopyable
+ 
+   ptr_op_t parse(std::istream&           in,
+                  const parse_flags_t&    flags           = PARSE_DEFAULT,
+-                 const optional<string>& original_string = NULL);
++                 const optional<string>& original_string = boost::none);
+ };
+ 
+ } // namespace ledger
+diff --git src/post.h src/post.h
+index 0fb45e9..3fa67e5 100644
+--- src/post.h
++++ src/post.h
+@@ -205,11 +205,7 @@ class post_t : public item_t
+   mutable optional<xdata_t> xdata_;
+ 
+   bool has_xdata() const {
+-#if BOOST_VERSION >= 105600
+-    return xdata_ != NULL;
+-#else
+-    return xdata_;
+-#endif
++    return xdata_ != boost::none;
+   }
+   void clear_xdata() {
+     xdata_ = none;
+diff --git src/times.h src/times.h
+index 421d146..cc98085 100644
+--- src/times.h
++++ src/times.h
+@@ -500,11 +500,7 @@ class date_interval_t : public equality_comparable<date_interval_t>
+   void   stabilize(const optional<date_t>& date = none);
+ 
+   bool   is_valid() const {
+-#if BOOST_VERSION >= 105600
+-    return start != NULL;
+-#else
+-    return start;
+-#endif
++    return start != boost::none;
+   }
+ 
+   /** Find the current or next period containing date.  Returns false if

srcpkgs/ledger/template

@@ -1,7 +1,7 @@
 # Template file for 'ledger'
 pkgname=ledger
 version=3.1
-revision=1
+revision=2
 build_style=cmake
 maintainer="Dominik Honnef <dominik@honnef.co>"
 hostmakedepends="cmake git"

srcpkgs/libcmis/template

@@ -1,7 +1,7 @@
 # Template file for 'libcmis'
 pkgname=libcmis
 version=0.5.0
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel libxml2-devel libcppunit-devel boost-devel"

srcpkgs/libogre/template

@@ -1,7 +1,7 @@
 # Template file for 'ogre'
 pkgname=libogre
 version=1.9.0
-revision=1
+revision=2
 build_style=cmake
 _hgrev=dd30349ea6670e3cd962d9d41a8039de3a3482d3
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
@@ -13,7 +13,7 @@ configure_args="-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE=Release"
 hostmakedepends="cmake pkg-config graphviz doxygen dejavu-fonts-ttf"
 makedepends="boost-devel freetype-devel libXaw-devel libXrandr-devel
-	MesaLib-devel zziplib-devel libcppunit-devel glu-devel"
+ MesaLib-devel zziplib-devel libcppunit-devel glu-devel libatomic-devel"
 short_desc="scene-oriented, flexible 3D engine"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.ogre3d.org"

srcpkgs/libtorrent-rasterbar/template

@@ -1,7 +1,7 @@
 # Template file for 'libtorrent-rasterbar'
 pkgname=libtorrent-rasterbar
 version=0.16.19
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-python-binding --with-libgeoip"
 hostmakedepends="pkg-config intltool python-devel"

srcpkgs/litecoin/template

@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.10.2.1
-revision=1
+revision=2
 wrksrc="${pkgname}-${version}"
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static --disable-tests"

srcpkgs/mongodb/template

@@ -1,7 +1,7 @@
 # Template file for 'mongodb'
 pkgname=mongodb
 version=3.0.3
-revision=1
+revision=2
 hostmakedepends="scons"
 makedepends="boost-devel pcre-devel snappy-devel libressl-devel libpcap-devel gperftools-devel"
 conf_files="/etc/mongodb/mongodb.conf"

srcpkgs/mupen64plus/template

@@ -1,7 +1,7 @@
 # Template file for 'mupen64plus'
 pkgname=mupen64plus
 version=2.5
-revision=3
+revision=4
 wrksrc="mupen64plus-bundle-src-${version}"
 hostmakedepends="pkg-config"
 makedepends="boost-devel SDL-devel speexdsp-devel freetype-devel glu-devel libpng-devel libsamplerate-devel"

srcpkgs/ncmpcpp/template

@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.6.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  BOOST_LIB_SUFFIX= --enable-clock --enable-outputs --enable-unicode

srcpkgs/openimageio/template

@@ -1,7 +1,7 @@
 # Template file for 'openimageio'
 pkgname=openimageio
 version=1.5.13
-revision=3
+revision=4
 wrksrc=oiio-Release-${version}
 build_style=cmake
 configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0"

srcpkgs/pingus/template

@@ -1,7 +1,7 @@
 # Template file for 'pingus'
 pkgname=pingus
 version=0.7.6
-revision=3
+revision=4
 hostmakedepends="scons pkg-config"
 makedepends="SDL_image-devel SDL_mixer-devel boost-devel libpng-devel libXi-devel zlib-devel"
 short_desc="Free Lemmings-like puzzle game"

srcpkgs/poedit/template

@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=1.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-3.0"
 hostmakedepends="pkg-config"

srcpkgs/schroot/template

@@ -1,7 +1,7 @@
 # Template file for 'schroot'
 pkgname=schroot
 version=1.6.10
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="
 	--enable-dchroot

srcpkgs/sigil/template

@@ -1,7 +1,7 @@
 # Template file for 'sigil'
 pkgname=sigil
 version=0.8.6
-revision=1
+revision=2
 wrksrc="Sigil-${version}"
 build_style=cmake
 hostmakedepends="cmake pkg-config unzip"

srcpkgs/source-highlight/template

@@ -1,7 +1,7 @@
 # Template file for 'source-highlight'
 pkgname=source-highlight
 version=3.1.8
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
  --with-bash-completion=/usr/share/bash-completion/completions"

srcpkgs/tomahawk/template

@@ -1,7 +1,7 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk
 version=0.8.4
-revision=1
+revision=2
 build_style=cmake
 build_options="upower hatchet kde xmpp"
 desc_option_hatchet="Enable support for http://hatchet.is"

srcpkgs/wesnoth/template

@@ -1,7 +1,7 @@
 # Template file for 'wesnoth'
 pkgname=wesnoth
 version=1.12.2
-revision=1
+revision=2
 #wrksrc="${pkgname}-${version}.0"
 build_style=cmake
 configure_args="-DENABLE_OMP=1"