Merge branch 'master' of git://github.com/voidlinux/xbps-packages

Conflicts:
	srcpkgs/odroid-u2-kernel/template

common/environment/0002-cross.sh

@@ -5,4 +5,7 @@
 export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
 export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/lib/pkgconfig:$XBPS_CROSS_BASE/usr/share/pkgconfig"
 export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/lib/pkgconfig"
-export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+
+if [ "$build_style" = "gnu-configure" -o -z "$build_style" ]; then
+	export configure_args+=" --host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE --with-libtool-sysroot=$XBPS_CROSS_BASE "
+fi

common/shlibs

@@ -105,9 +105,11 @@ libXrender.so.1 libXrender-0.9.4_1
 libXrandr.so.2 libXrandr-1.3.0_1
 libGLU.so.1 glu-9.0.0_1
 libEGL.so.1 libEGL-7.11_1
+libEGL.so libEGL-1.0_1
+libGLESv1_CM.so libGLES-1.0_1
+libGLESv1_CM.so.1 libGLES-1.0_1
+libGLESv2.so libGLES-1.0_1
 libwayland-egl.so.1 libwayland-egl-9.0.1_4
-libGLESv1_CM.so.1 libGLES-9.0.1_1
-libGLESv2.so.2 libGLES-9.0.1_1
 libGL.so.1 libGL-7.11_1
 libglapi.so.0 libglapi-7.11_1
 libOpenVG.so.1 libOpenVG-7.11_1
@@ -1193,8 +1195,6 @@ libtaginfo_c.so.0 libtaginfo-0.1.3_1
 libaa.so.1 aalib-1.4rc4_2
 libbsd.so.0 libbsd-0.4.2_1
 libWFC.so rpi-firmware-20130228_1
-libGLESv2.so rpi-firmware-20130228_1
-libEGL.so rpi-firmware-20130228_1
 libbcm_host.so rpi-firmware-20130228_1
 libopenmaxil.so rpi-firmware-20130228_1
 libvchiq_arm.so rpi-firmware-20130228_1
@@ -1454,3 +1454,5 @@ libnotmuch.so.3 libnotmuch-0.17_2
 libdri2.so.1 libdri2-0.1_1
 libUMP.so libump-1.0_1
 libUMP.so.3 libump-1.0_1
+libatomic_ops_gpl.so.0 libatomic_ops-7.2e_1
+libatomic_ops.so.0 libatomic_ops-7.2e_1

srcpkgs/NetworkManager/files/tmpfilesd

@@ -0,0 +1,3 @@
+d /etc/NetworkManager/dispatcher.d 0755 root root -
+d /etc/NetworkManager/system-connections 0755 root root -
+d /var/lib/NetworkManager 0700 root root -

srcpkgs/NetworkManager/template

@@ -1,7 +1,7 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.8.8
-revision=2
+revision=4
 build_style=gnu-configure
 configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
@@ -19,20 +19,41 @@ license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
 checksum=8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55
 
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool"
 makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel
  ModemManager-devel dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant bluez>5
  mobile-broadband-provider-info"
 
+depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
+conf_files="/etc/${pkgname}/${pkgname}.conf"
+systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 pre_configure() {
 	# Full switch to /run to not depend on /var/run being a symlink.
 	sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
 }
 
 post_install() {
-	# Install config file.
 	vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
+	vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
+	# remove unused stuff
 	rm -rf ${DESTDIR}/etc/init.d
 }
 
@@ -41,7 +62,9 @@ libnm_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
-		vmove "usr/lib/girepository-*"
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 	}
 }
 
@@ -52,20 +75,9 @@ NetworkManager-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 	}
 }
-
-NetworkManager_package() {
-	make_dirs="
-		/etc/${pkgname}/dispatcher.d 0755 root root
-		/etc/${pkgname}/system-connections 0755 root root
-		/var/lib/${pkgname} 0700 root root"
-	depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
-	conf_files="/etc/${pkgname}/${pkgname}.conf"
-	systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
-	pkg_install() {
-		vmove all
-	}
-}

srcpkgs/akonadi/template

@@ -1,13 +1,13 @@
 # Template file for 'akonadi'
 pkgname=akonadi
-version=1.10.3
-revision=2
+version=1.11.0
+revision=1
 short_desc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://community.kde.org/KDE_PIM/Akonadi"
-distfiles="http://download.kde.org/stable/${pkgname}/src/${pkgname}-${version}-1.tar.bz2"
-checksum=a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0
+distfiles="http://download.kde.org/stable/${pkgname}/src/${pkgname}-${version}.tar.bz2"
+checksum=0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d
 
 build_style=cmake
 configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
@@ -21,7 +21,7 @@ depends="shared-mime-info"
 
 akonadi-devel_package() {
 	short_desc+=" - development files"
-	depends="qt-devel ${sourcepkg}-${version}_${revision}"
+	depends="qt-devel ${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/cmake

srcpkgs/bind/template

@@ -1,21 +1,24 @@
 # Template file for 'bind'
 pkgname=bind
-_distver=9.9.4
-_patchver=P2
-version=${_distver}${_patchver}
-wrksrc=${pkgname}-${_distver}-${_patchver}
+#_distver=9.9.4
+#_patchver=P2
+#version=${_distver}${_patchver}
+#wrksrc=${pkgname}-${_distver}-${_patchver}
+version=9.9.5
 revision=1
 short_desc="Berkeley Internet Name Domain server"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
 homepage="http://www.isc.org/software/bind/"
-distfiles="http://ftp.isc.org/isc/bind9/${_distver}-${_patchver}/bind-${_distver}-${_patchver}.tar.gz"
-checksum=50f3c6431e26d3f322b69092a49c92e163e73029fe4a1933ce532dc97ec40a89
-long_desc="
- BIND is by far the most widely used DNS software on the Internet. It provides
- a robust and stable platform on top of which organizations can build
- distributed computing systems with the knowledge that those systems are fully
- compliant with published DNS standards."
+distfiles="http://ftp.isc.org/isc/bind9/${version}/bind-${version}.tar.gz"
+checksum=d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1
+
+build_style=gnu-configure
+configure_args="--disable-static --enable-threads --enable-largefile
+ --with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll --with-gost=no
+ --enable-ipv6 --with-randomdev=/dev/urandom --with-ecdsa=yes --with-libtool
+ --with-openssl=$XBPS_CROSS_BASE/usr --with-gssapi=$XBPS_CROSS_BASE/usr
+ --with-libxml2=$XBPS_CROSS_BASE/usr"
 
 hostmakedepends="automake libtool perl libxml2-devel"
 makedepends="openssl-devel mit-krb5-devel libxml2-devel libcap-devel readline-devel shadow"
@@ -35,27 +38,7 @@ pre_configure() {
 	autoreconf -fi
 }
 
-do_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-openssl=$XBPS_CROSS_BASE
-			--with-gssapi=$XBPS_CROSS_BASE
-			--with-libxml2=$XBPS_CROSS_BASE"
-	fi
-
-	./configure ${configure_args} --disable-static \
-		--enable-threads --enable-largefile \
-		--with-libtool --enable-atomic --sysconfdir=/etc/named \
-		--enable-epoll --with-gost=no --enable-ipv6 \
-		--with-randomdev=/dev/urandom --with-ecdsa=yes
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=$DESTDIR install
-
+post_install() {
 	vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
 	vinstall ${FILESDIR}/named.conf 640 etc/named

srcpkgs/bluefish/template

@@ -1,6 +1,6 @@
 # Template file for 'bluefish'
 pkgname=bluefish
-version=2.2.4
+version=2.2.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-spell-check --disable-update-databases --disable-xml-catalog-update"
@@ -14,4 +14,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://bluefish.openoffice.nl/"
 distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2"
-checksum=771621d848af6342fbab50a52bc7d6fddb29c4616f31ab939c508175c146b3a3
+checksum=7fbd0b51b32fceae2c0074e03be547b44b74ca9be17b883ce720b1a5f49eaef2

srcpkgs/chromium/template

@@ -1,22 +1,15 @@
 # Template file for 'chromium'
 pkgname=chromium
 #See http://www.chromium.org/developers/calendar for the latest version
-version=30.0.1599.66
+version=32.0.1700.102
 revision=1
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.chromium.org/"
 license="BSD"
-long_desc="
- Chromium is an open-source browser project that aims to build a safer,
- faster, and more stable way for all Internet users to experience the web.
-
- Chromium serves as a base for Google Chrome, which is Chromium rebranded
- (name and logo) with very few additions such as usage tracking and an
- auto-updater system."
 
 _url_base="https://commondatastorage.googleapis.com"
-_toolchains_rev=12029
+_toolchains_rev=12181
 
 create_srcdir=yes
 
@@ -27,11 +20,11 @@ distfiles="
  ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz
  ${_url_base}/nativeclient-archive2/toolchain/${_toolchains_rev}/naclsdk_pnacl_translator.tgz.sha1hash"
 checksum="
- 8fe8262fd69b59c759916d17eaf4225d1d5b64c468629cb9a684144d3cd15724
- 641e2acf0e755bfe052016164e9e0198104130b612a042eacf259a2f2630d6cd
- 6ce53b1af8fef34c1557c7fbb764cfbca29cb70b8ee3367746a31976cf115e01
- 0b7afcbad1461336e7062d7c8d64e67e670a1fce07214e24313204af1f3a5a70
- d6c5ed767ee9ee4e92b4de958cd32b0152783f170c1483fe99d2199fc2623813"
+ da13d46517053541fc110acbbdc3b529f96a31a68f7d9b75dc1198c64e83bc4b
+ cb4ac159f61de5e75d339813c0fc74f986156310a2c43a30ba40125951e72450
+ ad229b69a5af72a9fa7cf2167ee48560cc11049206e4ef919cb31d1273d6409f
+ fdb8309ef2b1c8600d63c4420ac02d66d85ab9befe98d99e9706828870730077
+ 162cf456b0a1cb4ce505004f828a09164ee3e3c8274739c6d5e972bf0ef1cfe9"
 skip_extraction="
  naclsdk_linux_x86.tgz
  naclsdk_pnacl_linux_x86.tgz
@@ -44,13 +37,13 @@ makedepends="libpng-devel>=1.6 gtk+-devel nss-devel GConf-devel pciutils-devel
  libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
  libXScrnSaver-devel alsa-lib-devel icu-devel protobuf-devel snappy-devel
  libxml2-devel libxslt-devel opus-devel pulseaudio-devel nss-devel
- libXcursor-devel libflac-devel speex-devel libmtp-devel v8-devel>=3.20
+ libXcursor-devel libflac-devel speex-devel libmtp-devel
  libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel
- libwebp-devel minizip-devel jsoncpp-devel zlib-devel hwids"
+ libwebp-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel hwids"
 depends="desktop-file-utils hicolor-icon-theme"
 nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe"
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	makedepends+=" gcc-c++-multilib"
 fi
 
@@ -79,11 +72,9 @@ do_configure() {
 		-Dgoogle_default_client_id=858256686058.apps.googleusercontent.com
 		-Dgoogle_default_client_secret=sMVx271L_MAz23TW2ek3AASn"
 
-	# Never tell the build system to "enable" SSE2, it has a few unexpected issues.
-	conf+=" -Ddisable_sse2=1"
-
 	# Disable glibc Native Client toolchain.
 	conf+=" -Ddisable_glibc=1"
+	conf+=" -Dlinux_use_tcmalloc=0"
 
 	# Use system-provided libraries.
 	# TODO: use_system_hunspell (upstream changes needed).
@@ -91,7 +82,9 @@ do_configure() {
 	# TODO: use_system_libusb (http://crbug.com/266149).
 	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: -Duse_system_libwebp=1 (currently broken with with 0.3.1)
 	conf+="
+		-Dpython_ver=2.7
 		-Duse_system_bzip2=1
 		-Duse_system_flac=1
 		-Duse_system_harfbuzz=1
@@ -100,7 +93,6 @@ do_configure() {
 		-Duse_system_libevent=1
 		-Duse_system_libjpeg=1
 		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
 		-Duse_system_libxml=1
 		-Duse_system_libxslt=1
 		-Duse_system_minizip=1
@@ -110,7 +102,6 @@ do_configure() {
 		-Duse_system_re2=1
 		-Duse_system_snappy=1
 		-Duse_system_speex=1
-		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
 		-Duse_system_zlib=1
 		-Duse_system_yasm=1
@@ -147,9 +138,6 @@ do_configure() {
 	# the build to fail because of that.
 	conf+=" -Dwerror="
 
-	# Disable tcmalloc.
-	conf+=" -Dlinux_use_tcmalloc=0"
-
 	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
 	conf+=" -Dlogging_like_official_build=1"
 

srcpkgs/chrony/files/chrony.conf

@@ -273,7 +273,7 @@ cmdallow 127.0.0.1
 # You need to have 'enhanced RTC support' compiled into your Linux
 # kernel.  (Note, these options apply only to Linux.)
 
-rtcfile /var/db/chrony/rtc
+! rtcfile /var/db/chrony/rtc
 
 # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
 # time.  (Local time means UTC +/- the effect of your timezone.)  If you
@@ -309,4 +309,4 @@ rtconutc
 # for extreme clock stability.  Works only on Linux.  Note that the "-m"
 # command-line switch will also enable this feature.
 
-lock_all
+! lock_all

srcpkgs/chrony/template

@@ -1,11 +1,11 @@
 # Template file for 'chrony'
 pkgname=chrony
-version=1.29
+version=1.29.1
 revision=1
 build_style=gnu-configure
 configure_args="--without-nss"
 hostmakedepends="pkg-config"
-makedepends="libtomcrypt-devel libcap-devel readline-devel"
+makedepends="libtomcrypt-devel libcap-devel libedit-devel"
 conf_files="/etc/chrony.conf"
 system_accounts="chrony"
 systemd_services="chrony.service on"
@@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://chrony.tuxfamily.org/"
 distfiles="http://download.tuxfamily.org/chrony/$pkgname-$version.tar.gz"
-checksum=c685f072ba0663ab026a7f56870ab2c246bd97ca4629dd2e1899617bd16ad39b
+checksum=658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27
 
 post_install() {
 	vinstall ${FILESDIR}/chrony.conf 644 etc

srcpkgs/chroot-bash/template

@@ -1,7 +1,7 @@
 # Template build file for 'chroot-bash'.
 pkgname=chroot-bash
 version=4.2
-revision=4
+revision=5
 wrksrc="bash-${version}"
 build_style=gnu-configure
 configure_args="--without-bash-malloc --enable-static-link
@@ -22,23 +22,13 @@ homepage="http://www.gnu.org/software/bash/bash.html"
 license="GPL-3"
 distfiles="http://ftp.gnu.org/gnu/bash/bash-${version}.tar.gz"
 checksum=a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8
-long_desc="
- Bash is an sh-compatible shell that incorporates useful features from
- the Korn shell (ksh) and C shell (csh). It is intended to conform to
- the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
-
- It offers functional improvements over sh for both programming and
- interactive use; these include command line editing, unlimited size
- command history, job control, shell functions and aliases, indexed
- arrays of unlimited size, and integer arithmetic in any base from two
- to sixty-four. In addition, most sh scripts can be run by Bash without
- modification."
 
 broken_as_needed=yes
 bootstrap=yes
-provides="bash-4.2"
+provides="bash-${version}_${revision}"
 conflicts="bash>=0"
 
 post_install() {
+	ln -s /bin/bash ${DESTDIR}/usr/bin/sh
 	rm -rf ${DESTDIR}/usr/share
 }

srcpkgs/cmus/template

@@ -1,7 +1,7 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.5.0
-revision=4
+revision=5
 wrksrc="cmus-v${version}"
 short_desc="Small, fast and powerful console music player"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,24 +10,17 @@ homepage="http://cmus.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cmus/cmus-v${version}.tar.bz2"
 checksum=2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf
 
+build_style=configure
+configure_args="prefix=/usr"
 hostmakedepends="pkg-config"
-makedepends="faad2-devel libflac-devel libao-devel libmad-devel
+makedepends="ncurses-devel faad2-devel libflac-devel libao-devel libmad-devel
  libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel
- opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel>=2.1
- ncurses-devel"
-
-do_configure() {
-	./configure prefix=/usr
-}
+ opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel>=2.1"
 
 do_build() {
 	make GCC=$CC CC=$CC LD=$CC ${makejobs}
 }
 
-do_install() {
-	make DESTDIR=$DESTDIR install
-}
-
 cmus-libao_package() {
 	short_desc+=" - libao output plugin"
 	pkg_install() {

srcpkgs/colord/template

@@ -1,13 +1,13 @@
 # Template file for 'colord'
 pkgname=colord
-version=1.0.4
+version=1.0.6
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile
  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-vala
  --with-udevrulesdir=/usr/lib/udev/rules.d --disable-bash-completion
  --enable-polkit --enable-volume-search --with-daemon-user=colord"
-hostmakedepends="pkg-config intltool gobject-introspection docbook2x"
+hostmakedepends="pkg-config intltool docbook2x"
 makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel
  libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel shared-color-profiles"
 depends="shared-color-profiles shadow"
@@ -22,12 +22,31 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/software/colord"
 license="GPL-2"
 distfiles="$homepage/releases/$pkgname-$version.tar.xz"
-checksum=e716d5c284031f7cc6a3fc7aeceab5df2bc5bb17920a57e37b2d800ce26d8bdc
+checksum=a40bbceaa3d3b1d6fd2777b181bf641b4eb49ad249796823585136c146ad7e8e
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 libcolord_package() {
 	short_desc+=" - runtime library"
-	replaces="colord<0.1.23_3"
+	replaces="colord<1.0.6"
 	pkg_install() {
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0
+		fi
 		vmove "usr/lib/*.so.*"
 	}
 }
@@ -39,7 +58,9 @@ colord-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/vala
 	}
 }

srcpkgs/connman/template

@@ -1,6 +1,6 @@
 # Template file for 'connman'
 pkgname=connman
-version=1.20
+version=1.21
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pie --enable-threads --enable-ethernet
@@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://connman.net/"
 distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz"
-checksum=4e638443be959913a5ce0d51df10018448ed08d06e4f8a47ce4b3c705bc78ac1
+checksum=e80f4e9c639ef016e9c497c122c349dbc9e6dc78a9976f986134739ee208c08a
 
 post_install() {
 	# Install the client connmanctl.

srcpkgs/cross-vpkg-dummy/template

@@ -1,6 +1,6 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.3
+version=0.4
 revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -11,8 +11,29 @@ homepage="http://www.voidlinux.eu"
 noarch=yes
 depends="base-directories xbps-triggers"
 provides="
- binutils-2.23.51.0.3 bash-4.2 coreutils-8.17 diffutils-3.2
- fakeroot-1.18.4_1 findutils-4.4.2 gawk-4.0.0 libgcc-4.7.2 libstdc++-4.7.2
- libstdc++-devel-4.7.2 gcc-4.7.2 gcc-c++-4.7.2 gettext-0.18.1.1
- glibc-2.17 glibc-devel-2.17 musl-0.9.9 grep-2.10 gzip-1.4 m4-1.4.16 make-3.82
- patch-2.7.1 sed-4.2.1 tar-1.26 texinfo-4.13a util-linux-2.21 xz-5.0.4"
+	binutils-2.24_1
+	libgcc-4.7.3_10
+	libstdc++-4.7.3_10
+	libstdc++-devel-4.7.3_10
+	gcc-4.7.3_10
+	gcc-c++-4.7.3_10
+	glibc-2.18_1
+	glibc-devel-2.18_1
+	musl-0.9.15_1
+	bash-4.2_1
+	coreutils-8.17_1
+	diffutils-3.2_1
+	fakeroot-1.18.4_1
+	findutils-4.4.2_1
+	gawk-4.0.0
+	gettext-0.18.1.1_1
+	grep-2.10_1
+	gzip-1.4_1
+	m4-1.4.16_1
+	make-3.82_1
+	patch-2.7.1_1
+	sed-4.2.1_1
+	tar-1.26_1
+	texinfo-4.13a_1
+	util-linux-2.21_1
+	xz-5.0.4_1"

srcpkgs/cubieboard2-kernel/files/config

@@ -446,7 +446,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART is not set
 

srcpkgs/cubieboard2-kernel/template

@@ -6,7 +6,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=cubieboard2-kernel
 version=3.4.75
-revision=3
+revision=4
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"

srcpkgs/curl/template

@@ -1,20 +1,20 @@
 # Template build file for 'curl'.
 pkgname=curl
-version=7.34.0
+version=7.35.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-ldaps --with-gssapi=/usr
+configure_args="--disable-ldaps --with-gssapi=${XBPS_CROSS_BASE}/usr
  --enable-threaded-resolver --enable-ipv6
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config perl groff"
-makedepends="libidn-devel openssl-devel mit-krb5-devel"
+makedepends="libidn-devel openssl-devel mit-krb5-devel ca-certificates"
 depends="ca-certificates"
 short_desc="Client that groks URLs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://curl.haxx.se"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
-checksum=10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b
+checksum=d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83
 
 libcurl_package() {
 	short_desc="The multiprotocol file transfer library"

srcpkgs/dbus-python/template

@@ -1,9 +1,10 @@
 # Template file for 'dbus-python'
 pkgname=dbus-python
 version=1.2.0
-revision=1
-hostmakedepends="pkg-config"
-makedepends="glib-devel dbus-glib-devel python-devel python3-devel>=3.3.2_2"
+revision=2
+build_style=gnu-configure
+hostmakedepends="pkg-config python-devel"
+makedepends="glib-devel dbus-glib-devel python-devel"
 depends="python"
 pycompile_module="dbus"
 short_desc="D-Bus Python bindings"
@@ -14,50 +15,23 @@ distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.g
 checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
 
 do_configure() {
-	mkdir build-python2 build-python3
-
-	cd $wrksrc/build-python2
-	PYTHON=python2 ../configure --prefix=/usr
-
-	cd $wrksrc/build-python3
-	PYTHON=python3 ../configure --prefix=/usr
+	if [ "$CROSS_BUILD" ]; then
+		# create a python-config wrapper to fake --includes
+		install -m755 ${XBPS_SRCPKGDIR}/py2cairo/files/python-config ${wrksrc}
+		export PATH=${wrksrc}:$PATH
+	fi
+	env PYTHON=python ./configure ${configure_args}
 }
 
-do_build() {
-	cd $wrksrc/build-python2
-	make ${makejobs}
-
-	cd $wrksrc/build-python3
-	make ${makejobs}
-}
-
-do_install() {
-	cd $wrksrc/build-python2
-	make DESTDIR=${DESTDIR} install
-
+post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 }
 
 dbus-python-devel_package() {
-	depends="python-devel
-		 python3-devel>=3.3.2_2
-		 dbus-python>=${version}
-		 dbus-python3>=${version}"
+	depends="python-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 	}
 }
-
-dbus-python3_package() {
-	short_desc="D-Bus Python3 bindings"
-	depends="python3"
-	pkg_install() {
-		cd $wrksrc/build-python3
-		make DESTDIR=${PKGDESTDIR} install
-		rm -rf ${PKGDESTDIR}/usr/include
-		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
-		rm -rf ${PKGDESTDIR}/usr/share/doc
-	}
-}

srcpkgs/dbus-python3

@@ -1 +0,0 @@
-dbus-python

srcpkgs/dbus-python3/template

@@ -0,0 +1,22 @@
+# Template file for 'dbus-python3'
+pkgname=dbus-python3
+version=1.2.0
+revision=2
+wrksrc="${pkgname/3/}-${version}"
+build_style=gnu-configure
+configure_args="PYTHON=python3"
+hostmakedepends="pkg-config python3-devel"
+makedepends="glib-devel dbus-glib-devel python3-devel"
+depends="python3"
+short_desc="D-Bus Python bindings"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
+distfiles="http://dbus.freedesktop.org/releases/${pkgname/3/}/${pkgname/3/}-${version}.tar.gz"
+checksum=e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df
+
+post_install() {
+	rm -rf ${DESTDIR}/usr/share/doc
+	# Remove development files, provided by dbus-python-devel.
+	rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig
+}

srcpkgs/deadbeef/template

@@ -1,21 +1,22 @@
 # Template file for 'deadbeef'.
 pkgname=deadbeef
-version=0.5.6
-revision=2
+version=0.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3 --disable-gtk2"
-makedepends="pkg-config intltool gtk+3-devel libSM-devel libICE-devel
+hostmakedepends="pkg-config intltool yasm"
+makedepends="desktop-file-utils hicolor-icon-theme libSM-devel libICE-devel
  alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel imlib2-devel
  libjpeg-turbo-devel libpng-devel libmad-devel libflac-devel wavpack-devel
  libsndfile-devel libcdio-devel libcddb-devel libX11-devel dbus-devel
- pulseaudio-devel faad2-devel libsamplerate-devel yasm"
+ pulseaudio-devel faad2-devel libsamplerate-devel glu-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Ultimate Music Player For GNU/Linux"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="GPL-2,LGPL-2.1"
 homepage="http://deadbeef.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=17c123eb50e33c89403d8d3035b9132463a227a6905fd42bcbb2a3a5616cea5b
+checksum=78a684bd50f3bae2cb3913a7d9c1b06549d0718b37f923fbb0ea523fd9e7826a
 
 post_install() {
 	vinstall ${FILESDIR}/deadbeef-queue.desktop 644 usr/share/applications

srcpkgs/desmume/patches/glx_3Demu.cpp.patch

@@ -0,0 +1,16 @@
+Function returning void should not return a value :-)
+
+--- src/gtk/glx_3Demu.cpp.orig	2014-02-01 16:26:52.801231527 +0100
++++ src/gtk/glx_3Demu.cpp	2014-02-01 16:27:17.632357063 +0100
+@@ -41,11 +41,7 @@ void deinit_glx_3Demu(void)
+         glXDestroyContext(dpy, ctx);
+ 
+         XCloseDisplay(dpy);
+-
+-        return true;
+     }
+-
+-    return false;
+ }
+ 
+ int init_glx_3Demu(void) 

srcpkgs/desmume/template

@@ -1,10 +1,10 @@
 # Template file for 'desmume'
 pkgname=desmume
-version=0.9.9
+version=0.9.10
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool SDL-devel"
 makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
  agg-devel zziplib-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -13,13 +13,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=cd2ad70cdde1236eba5a4ff8cea838f42b7dc470e32ac938263f49f12a55d754
-
-if [ "$CROSS_BUILD" ]; then
-	# XXX needs sdl-config
-	hostmakedepends+=" SDL-devel"
-fi
-
-pre_configure() {
-	sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
-}
+checksum=8900a7a1fc849fdd33b014748dd97a6cda4c32548b8d2e06511e6ed8d5ba7445

srcpkgs/dracut/template

@@ -1,7 +1,7 @@
 # Template file for 'dracut'
 pkgname=dracut
-version=034
-revision=2
+version=036
+revision=1
 hostmakedepends="libxslt docbook-xsl asciidoc"
 makedepends="psmisc cpio xz systemd"
 depends="${makedepends}"
@@ -14,7 +14,7 @@ short_desc="A new initramfs infrastructure"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 distfiles="${KERNEL_SITE}/utils/boot/$pkgname/$pkgname-$version.tar.xz"
-checksum=6a03d054f78bdf6e0ff6b66f374a24381fe12537f9e86a383f4486db48d1caeb
+checksum=6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b3528793ef117820049b6fcd3
 
 do_build() {
 	make ${makejobs} sysconfdir=/etc systemdsystemunitdir=/usr/lib/systemd/system

srcpkgs/efl/template

@@ -1,6 +1,6 @@
 # Template file for 'efl'
 pkgname=efl
-version=1.8.4
+version=1.8.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-xinput22 --enable-multisense --enable-systemd
@@ -21,7 +21,7 @@ short_desc="Enlightenment Foundation Libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz"
-checksum=c24dc307f16d7e7f5c140db14c1efe89545188e0282724e36171fc2858fa3796
+checksum=7e514c0a972feea1c44c9074a4b58c14821d93dc91ff6f51066528f12ab42fe5
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host edje_cc

srcpkgs/elementary/template

@@ -1,6 +1,6 @@
 # Template file for 'elementary'
 pkgname=elementary
-version=1.8.3
+version=1.8.4
 revision=1
 hostmakedepends="pkg-config"
 makedepends="efl-devel>=${version} desktop-file-utils"
@@ -12,7 +12,7 @@ short_desc="Enlightenment's widget set"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=1b3941fc1be5606bdc4c00e659ea905c1bc18688e7b49e76389a6fd7c71ede1b
+checksum=b3597896cd977387172e300c3df43404b6bf48c423610416b350043d4c270cb5
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host elm_prefs_cc

srcpkgs/emotion_generic_players/template

@@ -1,13 +1,13 @@
 # Template file for 'emotion_generic_players'
 pkgname=emotion_generic_players
-version=1.8.0
-revision=3
+version=1.8.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="vlc-devel efl-devel>=1.8.4"
+makedepends="vlc-devel efl-devel>=1.8.5"
 homepage="http://enlightenment.org"
 short_desc="Additional generic players for EFL"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=5e1e77d7d833ddd4b8d0125b275dde69804d9ab410a5bab2a10e83e3c6c368e7
+checksum=e4a104589034f2132430da754a011814329e65fe8807bd1c4a724227a2fcccbb

srcpkgs/enlightenment/template

@@ -1,12 +1,12 @@
 # Template file for 'enlightenment'
 pkgname=enlightenment
-version=0.18.2
+version=0.18.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pam"
 hostmakedepends="pkg-config efl>=1.8"
 makedepends="
- pam-devel efl-devel>=1.8.1 elementary-devel>=1.8.0 evas_generic_loaders>=1.8
+ pam-devel efl-devel>=1.8.5 elementary-devel>=1.8.4 evas_generic_loaders>=1.8
  emotion_generic_players>=1.8 hicolor-icon-theme desktop-file-utils"
 depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8"
 conf_files="/etc/enlightenment/sysactions.conf"
@@ -16,7 +16,7 @@ short_desc="Enlightenment desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a481cccc83c638aeb0b4ae5e0a34ae5cf1cbf366df26a2a6d4378dc2ad02e28e
+checksum=c8f269c0e1d02fdcd5ed74576056a14485ff8ed51b131f1b252faddd2fb66773
 
 post_install() {
 	vmkdir usr/share/licenses/${pkgname}
@@ -26,7 +26,7 @@ post_install() {
 }
 
 enlightenment-devel_package() {
-	depends="efl-devel>=1.8.1 elementary-devel>=1.8.0 ${sourcepkg}>=${version}_${revision}"
+	depends="efl-devel>=1.8.5 elementary-devel>=1.8.4 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/evas_generic_loaders/template

@@ -1,10 +1,10 @@
 # Template file for 'evas_generic_loaders'
 pkgname=evas_generic_loaders
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="efl-devel>=${version}"
+makedepends="efl-devel>=1.8.5"
 homepage="http://enlightenment.org"
 short_desc="Additional generic loaders for Evas"
 maintainer="Juan RP <xtraeme@gmail.com>"

srcpkgs/exfat-utils/template

@@ -1,8 +1,8 @@
 # Template file for 'exfat-utils'
 pkgname=exfat-utils
 version=1.0.0
-revision=1
-makedepends="scons"
+revision=2
+hostmakedepends="scons"
 short_desc="Utilities for exFAT file system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -11,10 +11,7 @@ distfiles="http://exfat.googlecode.com/files/${pkgname}-${version}.tar.gz"
 checksum=9079c6fa1eea33ca635252985c226141968d88445abf0255a4119bf54028df1d
 
 do_install() {
-	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
-		DESTDIR="${DESTDIR}/usr/bin" install
-
+	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " DESTDIR="${DESTDIR}/usr/bin" install
 	vmkdir usr/share/man/man8
-	install -m444 {dump,fsck,mkfs,label}/*.8 \
-		${DESTDIR}/usr/share/man/man8
+	install -m444 {dump,fsck,mkfs,label}/*.8 ${DESTDIR}/usr/share/man/man8
 }

srcpkgs/fluxbox/template

@@ -1,17 +1,24 @@
 # Template file for 'fluxbox'
 pkgname=fluxbox
-version=1.3.4
+version=1.3.5
 revision=1
 build_style=gnu-configure
+configure_args="--enable-randr --enable-nls
+ --with-pkg-exec-prefix=/usr --with-imlib2-prefix=${XBPS_CROSS_BASE}/usr
+ ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
+ ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
+ ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
 hostmakedepends="pkg-config"
-makedepends="libXrender-devel libXft-devel libXpm-devel imlib2-devel
+makedepends="libSM-devel libXrender-devel libXft-devel libXpm-devel imlib2-devel>=1.4.6_2
  libXext-devel libXinerama-devel libXrandr-devel fribidi-devel"
 short_desc="Highly configurable and low resource X11 Window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.fluxbox.org"
 license="MIT"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=8893516ec7743c0b6be8853cec08141ef40bf3d4c6e7e78f5a593b63ced67dc3
+checksum=164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983
 
 post_install() {
 	vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions

srcpkgs/freerdp-devel

@@ -0,0 +1 @@
+freerdp

srcpkgs/freerdp/patches/ffmpeg2.0.patch

@@ -0,0 +1,75 @@
+--- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-01-02 22:46:59.000000000 +0100
++++ channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c	2013-07-22 18:12:18.001576713 +0200
+@@ -28,6 +28,8 @@
+ #include "tsmf_constants.h"
+ #include "tsmf_decoder.h"
+ 
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
++
+ /* Compatibility with older FFmpeg */
+ #if LIBAVUTIL_VERSION_MAJOR < 50
+ #define AVMEDIA_TYPE_VIDEO 0
+@@ -39,7 +41,7 @@ typedef struct _TSMFFFmpegDecoder
+ 	ITSMFDecoder iface;
+ 
+ 	int media_type;
+-	enum CodecID codec_id;
++	enum AVCodecID codec_id;
+ 	AVCodecContext* codec_context;
+ 	AVCodec* codec;
+ 	AVFrame* frame;
+@@ -54,7 +56,7 @@ static boolean tsmf_ffmpeg_init_context(
+ {
+ 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ 
+-	mdecoder->codec_context = avcodec_alloc_context();
++	mdecoder->codec_context = avcodec_alloc_context3(NULL);
+ 	if (!mdecoder->codec_context)
+ 	{
+ 		DEBUG_WARN("avcodec_alloc_context failed.");
+@@ -88,16 +90,6 @@ static boolean tsmf_ffmpeg_init_audio_st
+ 	mdecoder->codec_context->channels = media_type->Channels;
+ 	mdecoder->codec_context->block_align = media_type->BlockAlign;
+ 
+-#ifdef AV_CPU_FLAG_SSE2
+-	mdecoder->codec_context->dsp_mask = AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_MMX2;
+-#else
+-#if LIBAVCODEC_VERSION_MAJOR < 53
+-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMXEXT;
+-#else
+-	mdecoder->codec_context->dsp_mask = FF_MM_SSE2 | FF_MM_MMX2;
+-#endif
+-#endif
+-
+ 	return true;
+ }
+ 
+@@ -174,7 +166,7 @@ static boolean tsmf_ffmpeg_prepare(ITSMF
+ {
+ 	TSMFFFmpegDecoder* mdecoder = (TSMFFFmpegDecoder*) decoder;
+ 
+-	if (avcodec_open(mdecoder->codec_context, mdecoder->codec) < 0)
++	if (avcodec_open2(mdecoder->codec_context, mdecoder->codec, NULL) < 0)
+ 	{
+ 		DEBUG_WARN("avcodec_open failed.");
+ 		return false;
+@@ -372,8 +364,9 @@ static boolean tsmf_ffmpeg_decode_audio(
+ 			av_init_packet(&pkt);
+ 			pkt.data = (uint8*) src;
+ 			pkt.size = src_size;
+-			len = avcodec_decode_audio3(mdecoder->codec_context,
+-				(int16_t*) dst, &frame_size, &pkt);
++			AVFrame * frame = avcodec_alloc_frame (); 
++			len = avcodec_decode_audio4(mdecoder->codec_context,
++				frame, &frame_size, &pkt);
+ 		}
+ #endif
+ 		if (len <= 0 || frame_size <= 0)
+@@ -499,7 +492,6 @@ TSMFDecoderEntry(void)
+ 
+ 	if (!initialized)
+ 	{
+-		avcodec_init();
+ 		avcodec_register_all();
+ 		initialized = true;
+ 	}

srcpkgs/freerdp/patches/patch_numblock.patch

@@ -0,0 +1,11 @@
+--- include/freerdp/kbd/vkcodes.h	2013-09-19 12:46:07.124339712 +0200
++++ include/freerdp/kbd/vkcodes.h	2013-09-19 12:45:51.621005583 +0200
+@@ -434,7 +434,7 @@
+ 	{ 0x00, 0, "VK_SEPARATOR"        , NULL   },
+ 	{ 0x4A, 0, "VK_SUBTRACT"         , "KPSU" },
+ 	{ 0x53, 0, "VK_DECIMAL"          , "KPDL" },
+-	{ 0x35, 0, "VK_DIVIDE"           , "KPDV" },
++	{ 0x35, 1, "VK_DIVIDE"           , "KPDV" },
+ 	{ 0x3B, 0, "VK_F1"               , "FK01" },
+ 	{ 0x3C, 0, "VK_F2"               , "FK02" },
+ 	{ 0x3D, 0, "VK_F3"               , "FK03" },

srcpkgs/freerdp/template

@@ -0,0 +1,35 @@
+# Template file for 'freerdp'
+pkgname=freerdp
+version=1.0.2
+revision=1
+create_srcdir=yes
+wrksrc="FreeRDP-${version}"
+build_style=cmake
+configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON
+ -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON
+ -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=OFF -DWITH_ALSA=ON
+ -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DCMAKE_INSTALL_LIBDIR=lib"
+hostmakedepends="pkg-config cmake"
+makedepends="alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel
+ libXext-devel libXcursor-devel libXi-devel libXrender-devel libXv-devel
+ libxkbfile-devel ffmpeg-devel openssl-devel"
+short_desc="A Free RDP (Remote Desktop Protocol) client"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Apache-2.0"
+homepage="http://freerdp.sourceforge.net"
+distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
+checksum=c0f137df7ab6fb76d7e7d316ae4e0ca6caf356e5bc0b5dadbdfadea5db992df1
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) configure_args+=" -DWITH_SSE2=ON";;
+esac
+
+freerdp-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/fuse-exfat/template

@@ -1,7 +1,7 @@
 # Template file for 'fuse-exfat'
 pkgname=fuse-exfat
 version=1.0.0
-revision=1
+revision=2
 hostmakedepends="scons"
 makedepends="fuse-devel exfat-utils>=${version}"
 depends="exfat-utils>=${version}"
@@ -13,9 +13,6 @@ distfiles="http://exfat.googlecode.com/files/${pkgname}-${version}.tar.gz"
 checksum=18c0dafed64596e536c5d47604585ff353a2e4bb067066e3ec5963a5a170f4a5
 
 do_install() {
-	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " \
-		DESTDIR="${DESTDIR}/usr/bin" install
-
-	install -Dm444 fuse/mount.exfat-fuse.8 \
-		${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8
+	scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS} " DESTDIR="${DESTDIR}/usr/bin" install
+	install -Dm444 fuse/mount.exfat-fuse.8 ${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8
 }

srcpkgs/gc/template

@@ -1,24 +1,16 @@
 # Template file for 'gc'
 pkgname=gc
-_majorver=7.2
-version="${_majorver}e"
+version=7.4.0
 revision=1
-wrksrc="gc-${_majorver}"
 build_style=gnu-configure
-hostmakedepends="libtool"
+hostmakedepends="pkg-config libtool"
+makedepends="libatomic_ops-devel"
 short_desc="A garbage collector for C and C++"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 license="GPL-2"
 distfiles="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-$version.tar.gz"
-checksum=09315b48a82d600371207691126ad058c04677281ac318d86fa84c98c3c9af4b
-long_desc="
- The Boehm-Demers-Weiser conservative garbage collector can be used as a
- garbage collecting replacement for C malloc or C++ new. It allows you to
- allocate memory basically as you normally would, without explicitly 
- deallocating memory that is no longer useful. The collector automatically 
- recycles memory when it determines that it can no longer be otherwise 
- accessed."
+checksum=61f8fc6991f8cb003a0d3c7d251c5b9a76093615ef793e0c588a4661e0b5e283
 
 pre_configure() {
 	libtoolize -f

srcpkgs/geary/template

@@ -1,16 +1,16 @@
 # Template file for 'geary'
 pkgname=geary
-version=0.4.2
+version=0.5.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config intltool cmake desktop-file-utils"
 makedepends="vala-devel webkitgtk-devel libgee08-devel libsecret-devel
  libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel
- libcanberra-devel libgirepository-devel"
+ libcanberra-devel libgirepository-devel hicolor-icon-theme desktop-file-utils"
 depends="gir-freedesktop hicolor-icon-theme desktop-file-utils"
 short_desc="A lightweight email program for the GNOME desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://yorba.org/geary/"
-distfiles="http://yorba.org/download/geary/${version%.*}/geary-${version}.tar.xz"
-checksum=e111e1f650afb8fe35d3a9f8ce19f698ee41263d5b21b31bf0b5bd4a24a207b3
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/geary-${version}.tar.xz"
+checksum=12561187c7d2b8aa1115ca52d8959270ff38dd6db774df1cd39c9719a76bb1d1

srcpkgs/gnome-online-accounts/template

@@ -1,12 +1,12 @@
 # Template file for 'gnome-online-accounts'
 pkgname=gnome-online-accounts
 version=3.10.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="
  --enable-google --enable-kerberos --enable-flickr --enable-telepathy
  --enable-facebook --disable-static --enable-exchange  --enable-imap-smtp
- --enable-owncloud --enable-windows-live --enable-twitter --enable-yahoo"
+ --enable-owncloud --enable-windows-live --disable-twitter --enable-yahoo"
 hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection"
 makedepends="
  libsoup-gnome-devel>=2.44 webkitgtk-devel>=2.1 json-glib-devel

srcpkgs/gsettings-desktop-schemas/template

@@ -1,9 +1,9 @@
 # Template file for 'gsettings-desktop-schemas'
 pkgname=gsettings-desktop-schemas
 version=3.10.1
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool gobject-introspection"
+hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libglib-devel"
 short_desc="Collection of GSettings schemas"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -11,16 +11,31 @@ license="GPL-2"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=452378c4960a145747ec69f8c6a874e5b7715454df3e2452d1ff1a0a82e76811
-long_desc="
- ${pkgname} contains a collection of GSettings schemas for
- settings shared by various components of a desktop."
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 gsettings-desktop-schemas-devel_package() {
-	depends="${sourcepkg}>=${version}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 	}
 }

srcpkgs/gstreamer-vaapi/template

@@ -1,6 +1,6 @@
 # Template file for 'gstreamer-vaapi'
 pkgname=gstreamer-vaapi
-version=0.5.7
+version=0.5.8
 revision=1
 hostmakedepends="pkg-config"
 makedepends="libXrandr-devel libva-devel>=1:1.1.0 MesaLib-devel
@@ -10,13 +10,20 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
 distfiles="http://www.freedesktop.org/software/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=d5a71179669dfc1d529e0248e6929e5136c6b3bbe634826b796f559dae974b88
-long_desc="
- ${pkgname} is a collection of GStreamer plugins and helper libraries that
- allow hardware accelerated video decoding through VA-API."
+checksum=24fee8a1ca4cb99ed7739d876b17a4085e81b28550350867dee5105300d343c6
 
 only_for_archs="i686 x86_64"
 
+pre_configure() {
+	url1=https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.c
+        url2=https://gitorious.org/vaapi/gstreamer-videoutils/raw/f56f0ca70eaa39dc8f66f61e991094b385ed71ff:gst-libs/gst/video/gstvideoencoder.h
+
+	for f in ${url1} ${url2}; do
+		$XBPS_FETCH_CMD ${f}
+		cp $(basename ${f}) ext/videoutils/gst-libs/gst/video/
+	done
+}
+
 do_configure() {
 	mkdir build-0.10 build-1.0
 

srcpkgs/gtk+3/template

@@ -1,7 +1,7 @@
 # Template build file for 'gtk+3'.
 pkgname=gtk+3
-version=3.10.6
-revision=2
+version=3.10.7
+revision=1
 wrksrc="gtk+-${version}"
 build_style=gnu-configure
 configure_args="--enable-cups --disable-schemas-compile --enable-gtk2-dependency --enable-colord"
@@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gtk.org/"
 license="LGPL-2.1"
 distfiles="${GNOME_SITE}/gtk+/3.10/gtk+-${version}.tar.xz"
-checksum=3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a
+checksum=b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427
 
 hostmakedepends="pkg-config glib-devel>=2.38"
 makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-atk-devel>=2.8
@@ -58,11 +58,6 @@ else
 	configure_args+=" --disable-x11-backend"
 fi
 
-pre_configure() {
-	# protocols too new; made with a wayland from git, not 1.3.0
-	rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c}
-}
-
 post_install() {
 	rm -f ${DESTDIR}/usr/share/man/man1/gtk-update-icon-cache.1
 	# Provide a default (icon)theme.

srcpkgs/gtksourceview/template

@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview'
 pkgname=gtksourceview
-version=3.10.1
+version=3.10.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -11,10 +11,10 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01
+checksum=045d244b1fd6a2d1b91a40712cbbfb18c6e44844c266a0a16ac5ec1800add8f5
 
 gtksourceview-devel_package() {
-	depends="gtk+3-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
+	depends="gtk+3-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/i3status/template

@@ -1,7 +1,7 @@
 # Template file for 'i3status'
 pkgname=i3status
-version=2.7
-revision=2
+version=2.8
+revision=1
 build_style=gnu-makefile
 hostmakedepends="asciidoc pkg-config"
 makedepends="yajl-devel confuse-devel wireless_tools-devel alsa-lib-devel libcap-devel"
@@ -12,20 +12,9 @@ maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
 homepage="http://i3.zekjur.net/i3status/"
 distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
-checksum=073f4e5de3bc5afc1f23c52ea52e2aa4b90ca8a012f28ba2c5fac3c33474a632
-
-do_build() {
-	export CFLAGS="$CFLAGS -std=c99"
-	if [ "$CROSS_BUILD" ]; then
-		export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
-		export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
-	fi
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} install
+checksum=ab06c5dd454354e6fc64354082616115082b70dc3906361bce5a02beb0f807fe
 
+post_install() {
 	# detect dhcpcd.
 	sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}

srcpkgs/imlib2-tools

@@ -0,0 +1 @@
+imlib2

srcpkgs/imlib2/template

@@ -1,37 +1,39 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
-version=1.4.5
-revision=6
+version=1.4.6
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --sysconfdir=/etc/imlib2
- --enable-visibility-hiding"
-hostmakedepends="pkg-config"
+configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
+hostmakedepends="libtool pkg-config"
 makedepends="freetype-devel libjpeg-turbo-devel libpng-devel>=1.6
- tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel"
+ tiff-devel libid3tag-devel giflib-devel>=5.0.1 libXext-devel libSM-devel"
 short_desc="Image manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-$version.tar.gz"
 homepage="http://sourceforge.net/projects/enlightenment/"
 license="BSD"
-checksum=6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
+checksum=17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e
 
-if [ "$CROSS_BUILD" ]; then
-	# XXX needs freetype-config
-	hostmakedepends+=" automake libtool freetype-devel"
-	pre_configure() {
-		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
-		sed -e 's,AM_PROG_CC_STDC,AC_PROG_CC,g' -i configure.ac
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	libtoolize -f
+	sed -e 's,@my_libs@,@LIBS@,g' -i imlib2-config.in
+}
 
-imlib2-devel_package() {
-	depends="imlib2-${version}_${revision}"
-	short_desc+=" - development files"
+imlib2-tools_package() {
+	short_desc+=" - utilities"
 	pkg_install() {
 		vmove usr/bin
+	}
+}
+
+imlib2-devel_package() {
+	depends="imlib2>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/imlib2-config
 		vmove usr/include
 		vmove usr/share
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

srcpkgs/iptraf-ng/template

@@ -1,10 +1,10 @@
 # Template file for 'iptraf-ng'
 pkgname=iptraf-ng
 version=1.1.4
-revision=1
+revision=2
+LDFLAGS="-lncursesw -lpanelw -lmenuw"
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin"
-hostmakedepends="ncurses-devel>=5.9_7"
 makedepends="ncurses-devel"
 short_desc="IP traffic monitor (iptraf-3.0.0 fork)"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,22 +12,3 @@ license="GPL-2"
 homepage="https://fedorahosted.org/iptraf-ng/"
 distfiles="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$version.tar.gz"
 checksum=79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09
-long_desc="
- $pkgname is a fork of original iptraf-3.0.0.
-
- IPTraf-ng is a console-based network monitoring utility. IPTraf-ng gathers
- data like TCP connection packet and byte counts, interface statistics and
- activity indicators, TCP/UDP traffic breakdowns, and LAN station packet
- and byte counts. IPTraf-ng features include an IP traffic monitor which
- shows TCP flag information, packet and byte counts, ICMP details, OSPF
- packet types, and oversized IP packet warnings; interface statistics showing
- IP, TCP, UDP, ICMP, non-IP and other IP packet counts, IP checksum errors,
- interface activity and packet size counts; a TCP and UDP service monitor
- showing counts of incoming and outgoing packets for common TCP and UDP
- application ports, a LAN statistics module that discovers active hosts and
- displays statistics about their activity; TCP, UDP and other protocol
- display filters so you can view just the traffic you want; logging; support
- for Ethernet, FDDI, ISDN, SLIP, PPP, and loopback interfaces; and
- utilization of the built-in raw socket interface of the Linux kernel, so it
- can be used on a wide variety of supported network cards."
-

srcpkgs/libatomic_ops-devel

@@ -0,0 +1 @@
+libatomic_ops

srcpkgs/libatomic_ops/template

@@ -0,0 +1,33 @@
+# Template file for 'libatomic_ops'
+pkgname=libatomic_ops
+version=7.2e
+revision=1
+wrksrc="${pkgname}-${version/e/}"
+build_style=gnu-configure
+hostmakedepends="automake libtool"
+short_desc="Provides semi-portable access to hardware provided atomic memory operations"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, MIT"
+homepage="https://github.com/ivmai/libatomic_ops"
+distfiles="http://www.hpl.hp.com/research/linux/atomic_ops/download/${pkgname}-${version}.tar.gz"
+checksum=e524cdb5603a66e28127bbd767cc6840e9854b449f7b3bcf6585e0f1391e757b
+
+pre_configure() {
+	sed -i 's#AM_CONFIG_HEADER#AC_CONFIG_HEADERS#' configure.ac
+	sed -i 's#AC_PROG_RANLIB#AC_LIBTOOL_DLOPEN\nAC_PROG_LIBTOOL#' configure.ac
+	sed -i 's#b_L#b_LTL#;s#\.a#.la#g;s#_a_#_la_#' src/Makefile.am
+	sed -i 's#\.a#.so#g;s#\.\./src/#../src/.libs/#g' tests/Makefile.am
+	sed -i 's#pkgdata#doc#' doc/Makefile.am
+	autoreconf -fi
+}
+
+libatomic_ops-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/libcroco/template

@@ -1,7 +1,7 @@
 # Template build file for 'libcroco'.
 pkgname=libcroco
 version=0.6.8
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libglib-devel libxml2-devel"
@@ -11,19 +11,15 @@ license="LGPL-2.1"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/0.6/$pkgname-$version.tar.xz"
 checksum=ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570
-long_desc="
- The Libcroco project is a generic Cascading Style Sheet (CSS)
- parsing and manipulation toolkit. It provides a Simple Api for CSS
- and Cascading Style Sheet Object Model parser, a CSS2 selection
- engine, and an XML/CSS layout/rendering engine."
 
 libcroco-devel_package() {
-	depends="glib-devel libxml2-devel ${sourcepkg}-${version}_${revision}"
+	depends="glib-devel libxml2-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/share
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove "usr/bin/croco-*config"
 	}

srcpkgs/libglade/template

@@ -1,44 +1,30 @@
 # Template build file for 'libglade'.
 pkgname=libglade
 version=2.6.4
-revision=10
+revision=11
 build_style=gnu-configure
 configure_args="--disable-static --without-xml-catalog"
 hostmakedepends="pkg-config python"
 makedepends="libxml2-devel gtk+-devel xmlcatmgr"
+depends="xmlcatmgr"
 short_desc="Runtime interpreter for GLADE GUI files"
 homepage="http://www.jamesh.id.au/software/libglade/"
 license="LGPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2"
 checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec
-long_desc="
- Libglade is a library that performs a similar job to the C source
- output routines in the GLADE user interface builder. Whereas GLADE's
- output routines create C code that can then be compiled, libglade builds
- the interface from an XML file (GLADE's save format) at runtime. This
- way you can change the look of a program without needing to recompile.
 
- Currently it supports all the widgets in current releases, together
- with support for keyboard accelerators and automatic signal
- connection."
+# Register DTDs with xmlcatmgr.
+xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
 
 libglade-devel_package() {
-	depends="libxml2-devel gtk+-devel ${sourcepkg}-${version}_${revision}"
+	depends="libxml2-devel gtk+-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"
 	pkg_install() {
 		vmove usr/bin
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 	}
 }
-
-libglade_package() {
-	# Register DTDs with xmlcatmgr.
-	xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd"
-	depends="xmlcatmgr"
-	pkg_install() {
-		vmove usr
-	}
-}

srcpkgs/libsoup/template

@@ -1,11 +1,11 @@
 # Template file for 'libsoup'
 pkgname=libsoup
 version=2.44.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool gobject-introspection"
-makedepends="libxml2-devel sqlite-devel glib-networking"
+hostmakedepends="pkg-config intltool glib-devel libtool"
+makedepends="libglib-devel libxml2-devel sqlite-devel glib-networking"
 depends="glib-networking"
 short_desc="HTTP library implementation in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,12 +14,34 @@ license="LGPL-2.1"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3
 
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
+pre_configure() {
+	libtoolize -f
+}
+
 libsoup-devel_package() {
 	depends="libglib-devel libxml2-devel libsoup>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/lib/pkgconfig/libsoup-2.4.pc
-		vmove usr/share/gir-1.0/Soup-2.4.gir
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0/Soup-2.4.gir
+		fi
 		vmove usr/include/libsoup-2.4
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/libsoup-2.4.so"
@@ -32,7 +54,9 @@ libsoup-gnome-devel_package() {
 	pkg_install() {
 		vmove "usr/include/libsoup-gnome*"
 		vmove "usr/lib/pkgconfig/*gnome*"
-		vmove "usr/share/gir-1.0/SoupGNOME*"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/share/gir-1.0/SoupGNOME*"
+		fi
 		vmove "usr/lib/libsoup-gnome*.so"
 	}
 }
@@ -41,6 +65,8 @@ libsoup-gnome_package() {
 	short_desc+=" - GNOME libraries"
 	pkg_install() {
 		vmove "usr/lib/libsoup-gnome*.so.*"
-		vmove "usr/lib/girepository-1.0/SoupGNOME*"
+		if [ "$build_option_gir" ]; then
+			vmove "usr/lib/girepository-1.0/SoupGNOME*"
+		fi
 	}
 }

srcpkgs/libump-devel-git

@@ -1 +0,0 @@
-libump-git

srcpkgs/libump-git/template

@@ -1,34 +0,0 @@
-# Template file for 'libump-git'
-pkgname=libump-git
-version=20140127
-revision=2
-build_style=gnu-configure
-short_desc="ARMs unified memory provider library"
-maintainer="Juan RP <xtraeme@gmail.com>"
-license="Apache-2.0"
-homepage="https://github.com/libv/libump"
-
-only_for_archs="armv6l armv7l"
-provides="libump-1.0_1"
-replaces="libump>=0"
-hostmakedepends="automake libtool pkg-config"
-
-do_fetch() {
-	git clone git://github.com/libv/libump ${pkgname}-${version}
-}
-
-pre_configure() {
-	autoreconf -fi
-}
-
-libump-devel-git_package() {
-	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
-	provides="libump-devel-1.0_1"
-	replaces="libump-devel>=0"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.a"
-		vmove usr/lib/pkgconfig
-	}
-}

srcpkgs/linux3.11-headers

@@ -1 +0,0 @@
-linux3.11

srcpkgs/linux3.11/template

@@ -1,218 +0,0 @@
-# Template file for 'linux3.11'
-#
-pkgname=linux3.11
-version=3.11.10
-revision=1
-wrksrc="linux-${version}"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://www.kernel.org"
-license="GPL-2"
-short_desc="The Linux kernel and modules (3.11 series)"
-distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
-checksum=cb7f1b137c53446a65b257f2e52f50ced5a0314694b6fa53fddf572de7cae401
-
-_kernver="${version}_${revision}"
-
-nostrip=yes
-noverifyrdeps=yes
-preserve=yes
-only_for_archs="i686 x86_64"
-makedepends="bc perl kmod>=11_2 openssl which elfutils"
-depends="dracut linux-firmware kmod>=11_2"
-triggers="kernel-hooks"
-# These files could be modified when an external module is built.
-mutable_files="
-	/usr/lib/modules/${_kernver}/modules.dep
-	/usr/lib/modules/${_kernver}/modules.dep.bin
-	/usr/lib/modules/${_kernver}/modules.symbols
-	/usr/lib/modules/${_kernver}/modules.symbols.bin
-	/usr/lib/modules/${_kernver}/modules.alias
-	/usr/lib/modules/${_kernver}/modules.alias.bin
-	/usr/lib/modules/${_kernver}/modules.devname"
-
-do_configure() {
-	# If there's a file called <arch>-dotconfig, use it to
-	# configure the kernel; otherwise use arch defaults and all stuff
-	# as modules (defconfig+allmodconfig).
-	local arch
-
-	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
-		arch=i386
-	else
-		arch=x86_64
-	fi
-
-	if [ -f ${FILESDIR}/${arch}-dotconfig-custom ]; then
-		msg_normal "Detected a custom .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${arch}-dotconfig-custom .config
-		make ${makejobs} oldconfig
-	elif [ -f ${FILESDIR}/${arch}-dotconfig ]; then
-		msg_normal "Detected a .config file for your arch, using it.\n"
-		cp -f ${FILESDIR}/${arch}-dotconfig .config
-		make ${makejobs} oldconfig
-	else
-		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
-		make ${makejobs} defconfig
-		make ${makejobs} allmodconfig
-	fi
-	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
-	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-
-do_build() {
-	make ${makejobs} prepare
-	make ${makejobs} bzImage modules
-}
-
-do_install() {
-	local arch hdrdest
-
-	if [ "$XBPS_TARGET_MACHINE" != "x86_64" ]; then
-		arch=i386
-	else
-		arch=x86_64
-	fi
-
-	# Run depmod after compressing modules.
-	sed -i '2iexit 0' scripts/depmod.sh
-
-	# Install kernel, firmware and modules
-	make INSTALL_MOD_PATH=${DESTDIR} modules_install
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
-
-	install -Dm644 .config ${DESTDIR}/boot/config-${_kernver}
-	install -Dm644 arch/x86/boot/bzImage \
-		${DESTDIR}/boot/vmlinuz-${_kernver}
-	install -Dm644 System.map \
-		${DESTDIR}/boot/System.map-${_kernver}
-
-	# Switch to /usr.
-	vmkdir usr
-	mv ${DESTDIR}/lib ${DESTDIR}/usr
-
-	cd ${DESTDIR}/usr/lib/modules/${_kernver}
-	rm -f source build
-	ln -sf ../../../src/kernel-headers-${_kernver} build
-
-	cd ${wrksrc}
-	# Install required headers to build external modules
-	install -Dm644 Makefile ${hdrdest}/Makefile
-	install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
-	install -Dm644 .config ${hdrdest}/.config
-	mkdir -p ${hdrdest}/include
-	# Remove firmware stuff provided by the "linux-firmware" pkg.
-	rm -rf ${DESTDIR}/usr/lib/firmware
-
-	for i in acpi asm-generic config crypto drm generated linux math-emu \
-		media net pcmcia scsi sound trace uapi video xen; do
-		if [ -d include/$i ]; then
-			cp -a include/$i ${hdrdest}/include
-		fi
-	done
-
-	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/x86
-	cp -a arch/x86/include ${hdrdest}/arch/x86
-
-	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${hdrdest}
-	cp -a scripts ${hdrdest}
-
-	mkdir -p ${hdrdest}/arch/x86/kernel
-	cp arch/x86/Makefile ${hdrdest}/arch/x86
-	if [ "$arch" = "i386" ]; then
-		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
-	fi
-	cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
-
-	# add headers for lirc package
-	# pci
-	for i in bt8xx cx88 saa7134; do
-		mkdir -p ${hdrdest}/drivers/media/pci/${i}
-		cp -a drivers/media/pci/${i}/*.h ${hdrdest}/drivers/media/pci/${i}
-	done
-	# usb
-	for i in cpia2 em28xx pwc sn9c102; do
-		mkdir -p ${hdrdest}/drivers/media/usb/${i}
-		cp -a drivers/media/usb/${i}/*.h ${hdrdest}/drivers/media/usb/${i}
-	done
-	# i2c
-	mkdir -p ${hdrdest}/drivers/media/i2c
-	cp drivers/media/i2c/*.h ${hdrdest}/drivers/media/i2c
-	for i in cx25840; do
-		mkdir -p ${hdrdest}/drivers/media/i2c/${i}
-		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
-	done
-
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
-	# Add md headers
-	mkdir -p ${hdrdest}/drivers/md
-	cp drivers/md/*.h ${hdrdest}/drivers/md
-
-	# Add inotify.h
-	mkdir -p ${hdrdest}/include/linux
-	cp include/linux/inotify.h ${hdrdest}/include/linux
-
-	# Add wireless headers
-	mkdir -p ${hdrdest}/net/mac80211/
-	cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/drivers/media/dvb-core
-	cp drivers/media/dvb-core/*.h ${hdrdest}/drivers/media/dvb-core/
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
-	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
-	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
-
-	# add dvb headers
-	mkdir -p ${hdrdest}/drivers/media/usb/dvb-usb
-	cp drivers/media/usb/dvb-usb/*.h ${hdrdest}/drivers/media/usb/dvb-usb/
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/*.h ${hdrdest}/drivers/media/dvb-frontends/
-	mkdir -p ${hdrdest}/drivers/media/tuners
-	cp drivers/media/tuners/*.h ${hdrdest}/drivers/media/tuners/
-
-	# Add xfs and shmem for aufs building
-	mkdir -p ${hdrdest}/fs/xfs
-	mkdir -p ${hdrdest}/mm
-	cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
-
-	# Copy in Kconfig files
-	for i in $(find . -name "Kconfig*"); do
-		mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
-		cp $i ${hdrdest}/$i
-	done
-
-	# Remove unneeded architectures
-	for arch in alpha arm* avr32 blackfin cris frv h8300 \
-		ia64 m* p* s* um v850 xtensa; do
-		rm -rf ${hdrdest}/arch/${arch}
-	done
-
-	# Compress all modules with gzip to save a few MBs.
-	msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
-	find ${DESTDIR} -name '*.ko' -exec gzip -9 {} \;
-
-	# ... and run depmod again.
-	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-linux3.11-headers_package() {
-	preserve=yes
-	nostrip=yes
-	noverifyrdeps=yes
-	short_desc+=" - source headers for 3rd party modules"
-	pkg_install() {
-		vmove usr/src
-		vmove usr/lib/modules/${_kernver}/build
-	}
-}

srcpkgs/linux3.13/template

@@ -1,15 +1,15 @@
 # Template file for 'linux3.13'
 #
 pkgname=linux3.13
-version=3.13.0
+version=3.13.1
 revision=1
-wrksrc="linux-${version%.*}"
+wrksrc="linux-${version}"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel and modules (3.13 series)"
-distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version%.*}.tar.xz"
-checksum=4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2
+distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
+checksum=784b4400294bbef76bc60cce3cba84d81d5e41a2302a05764e079a63fe9a713e
 
 _kernver="${version}_${revision}"
 

srcpkgs/mpg123/template

@@ -1,6 +1,6 @@
 # Template file for 'mpg123'
 pkgname=mpg123
-version=1.17.0
+version=1.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-module-suffix=.so --with-optimization=4
@@ -13,12 +13,7 @@ maintainer="davehome <davehome@redthumb.info.tm>"
 homepage="http://www.mpg123.de/"
 license="LGPL-2.1"
 distfiles="http://www.${pkgname}.de/download/${pkgname}-${version}.tar.bz2"
-checksum=b22e2b1f8700ff2d0998a80d6251988ac472a643b3c4a04fad4777d80c32f5f9
-long_desc="
- This is the fast and Free (LGPL license) real time MPEG Audio Layer 1, 2 and
- 3 decoding library and console player. It uses floating point or integer
- math, along with several special optimizations (3DNow, SSE, ARM, ...) to make
- it most efficient."
+checksum=45612282d585afbdf83267b0be477ca42d8a82d77a17af687f8fc1e371617cce
 
 mpg123-jack_package() {
 	depends="libmpg123>=${version}"
@@ -59,17 +54,18 @@ mpg123-alsa_package() {
 libmpg123_package() {
 	short_desc+=" - Runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 		vmove usr/lib/mpg123/output_dummy.so
 		vmove usr/lib/mpg123/output_oss.so
 	}
 }
 
 mpg123-devel_package() {
-	depends="libmpg123>=${version}"
+	depends="libmpg123>=${version}_${revision}"
 	short_desc+=" - Development files"
 	pkg_install() {
         	vmove usr/include
         	vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

srcpkgs/mpv/template

@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.2.4
+version=0.3.4
 revision=1
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -8,7 +8,8 @@ license="GPL-2"
 homepage="http://mpv.io"
 
 build_style=configure
-configure_args="--prefix=/usr --confdir=/etc/mpv --disable-lircc --disable-joystick
+configure_script="./old-configure"
+configure_args="--prefix=/usr --confdir=/etc/mpv --enable-joystick
  --disable-radio --disable-radio-capture --disable-radio-v4l2 --disable-rpath
  --disable-libbs2b --disable-direct3d --disable-corevideo --disable-cocoa
  --disable-coreaudio --disable-portaudio --disable-ossaudio --disable-sdl

srcpkgs/ntfs-3g/template

@@ -1,7 +1,7 @@
 # Template file for 'ntfs-3g'
 pkgname=ntfs-3g
 version=2013.1.13
-revision=2
+revision=3
 wrksrc="${pkgname}_ntfsprogs-${version}"
 build_style=gnu-configure
 configure_args="--exec-prefix=/usr --disable-static --with-fuse=external
@@ -23,11 +23,12 @@ post_install() {
 }
 
 ntfs-3g-devel_package() {
-	depends="fuse-devel ntfs-3g>=${version}"
-	short_desc="${short_desc} -- development files"
+	depends="fuse-devel ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
 	replaces="ntfsprogs-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

srcpkgs/obmenu/template

@@ -0,0 +1,16 @@
+# Template file for 'obmenu'
+pkgname=obmenu
+version=1.0
+revision=2
+noarch=yes
+pycompile_module="obxml.py"
+build_style=python-module
+hostmakedepends="python"
+makedepends="python pygtk>=2.24_10 openbox"
+depends="${makedepends}"
+short_desc="An Openbox menu editor"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://obmenu.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=c9cea64d40d461a34ea3bdaec9867487c819d5f9814e1cc54db607d4d3c20e27

srcpkgs/odroid-u2-kernel/files/u2-dotconfig-custom

@@ -557,7 +557,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
 
 #
 # Boot options

srcpkgs/openssh/files/sshdgenkeys.service

@@ -1,11 +1,13 @@
 [Unit]
 Description=OpenSSH server Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_key
+ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
 

srcpkgs/openssh/template

@@ -2,7 +2,7 @@
 _desc="The OpenSSH implementation of SSH protocol"
 
 pkgname=openssh
-version=6.4p1
+version=6.5p1
 revision=1
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
@@ -19,7 +19,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
 license="BSD"
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
-checksum=5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2
+checksum=a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-kerberos5=$XBPS_CROSS_BASE"

srcpkgs/opusfile/template

@@ -1,17 +1,16 @@
 # Template file for 'opusfile'
 pkgname=opusfile
-version=0.2
-revision=2
+version=0.5
+revision=1
 build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libogg-devel opus-devel openssl-devel"
 short_desc="Library for opening, seeking, and decoding .opus files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.opus-codec.org/"
 license="BSD"
 distfiles="http://downloads.xiph.org/releases/opus/${pkgname}-${version}.tar.gz"
-checksum=b4a678b3b6c4adfb6aff1f67ef658becfe146ea7c7ff228e99543762171557f9
-
-hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel openssl-devel"
+checksum=2ce52d006aeeec9f10260dbe3073c4636954a1ab19c82b8baafefe0180aa4a39
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/share
@@ -19,11 +18,12 @@ post_install() {
 }
 
 opusfile-devel_package() {
-	depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}"
+	depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }

srcpkgs/p11-kit/template

@@ -1,32 +1,25 @@
 # Template file for 'p11-kit'
 pkgname=p11-kit
-version=0.20.1
+version=0.20.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-module-path=/usr/lib/pkcs11 --without-trust-paths"
+hostmakedepends="pkg-config"
+makedepends="libtasn1-devel libffi-devel"
+conf_files="/etc/pkcs11/pkcs11.conf"
 short_desc="Provides a way to load and enumerate PKCS#11 modules"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 homepage="http://p11-glue.freedesktop.org"
 distfiles="$homepage/releases/$pkgname-$version.tar.gz"
-checksum=524548f0a3bfa1b5712721165b49f0300fb244c907533677e88a9c9743eb4a53
-long_desc="
- Provides a standard configuration setup for installing PKCS#11 modules in
- such a way that they're discoverable.
-
- Also solves problems with coordinating the use of PKCS#11 by different
- components or libraries living in the same process."
-
-hostmakedepends="pkg-config"
-makedepends="libtasn1-devel libffi-devel"
-conf_files="/etc/pkcs11/pkcs11.conf"
+checksum=04ed51d92fc46c2b632e13d73e0293090e9f8aa29c8aa8c6bc95c12475e5ef7c
 
 post_install() {
 	mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf
 }
 
 p11-kit-devel_package() {
-	depends="p11-kit>=${version}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/pekwm/template

@@ -1,8 +1,14 @@
 # Template build file for 'pekwm'.
 pkgname=pekwm
 version=0.1.17
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-pkg-exec-prefix=/usr
+ ac_cv_lib_X11_XOpenDisplay=yes ac_cv_lib_Xft_XftFontOpen=yes
+ ac_cv_lib_Xrender_XRenderCreatePicture=yes ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+ ac_cv_lib_Xinerama_XineramaQueryScreens=yes ac_cv_lib_Xext_XShapeCombineShape=yes
+ ac_cv_lib_Xrandr_XRRQueryExtension=yes ac_cv_lib_fribidi_fribidi_version_info=yes
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
 short_desc="Window manager based on aewm++"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,7 +18,7 @@ checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
 
 hostmakedepends="pkg-config"
 makedepends="libjpeg-turbo-devel libpng-devel>=1.6 libXinerama-devel
- libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
+ libSM-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel"
 conf_files="
 	/etc/pekwm/vars
 	/etc/pekwm/mouse

srcpkgs/pidgin/patches/pidgin-2.10.7-link-libirc-to-libsasl2.patch

@@ -1,11 +0,0 @@
---- libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
-+++ libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
-@@ -27,7 +27,7 @@ else
- st =
- pkg_LTLIBRARIES   = libirc.la
- libirc_la_SOURCES = $(IRCSOURCES)
--libirc_la_LIBADD  = $(GLIB_LIBS)
-+libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
- 
- endif
- 

srcpkgs/pidgin/template

@@ -1,22 +1,18 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.10.7
-revision=2
+version=2.10.8
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --disable-vv
- --with-system-ssl-certs=/etc/ssl/certs --disable-tk
- --disable-gnutls --disable-tcl
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
+ --with-system-ssl-certs=/etc/ssl/certs --disable-tk --disable-tcl
+ --disable-gnutls"
 short_desc="Multi-protocol instant messaging client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192
-long_desc="
- Pidgin is an easy to use and free chat client used by millions. Connect to
- AIM, MSN, Yahoo, and more chat networks all at once."
+checksum=b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227
 
 hostmakedepends="pkg-config intltool automake libtool gettext-devel"
 makedepends="libglib-devel gtk+-devel libXext-devel
@@ -33,29 +29,27 @@ pre_configure() {
 }
 
 post_install() {
-	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
-	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/purple.schemas \
-		--domain purple ${wrksrc}/*.schemas
+	rm -rf ${DESTDIR}/etc/gconf
 }
 
 libpurple_package() {
 	short_desc="IM library extracted from Pidgin"
 	pkg_install() {
 		vmove "usr/bin/purple-*"
-		vmove "usr/lib/libpurple*.so*"
+		vmove "usr/lib/libpurple*.so.*"
 		vmove usr/lib/purple-2
 		vmove usr/share/purple
 		vmove usr/share/sounds/purple
-		vmove usr/share/gconf
 	}
 }
 
 libpurple-devel_package() {
-	depends="libglib-devel libpurple>=${version}"
-	short_desc="IM library extracted from Pidgin -- development files"
+	depends="libglib-devel libpurple>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin - development files"
 	pkg_install() {
 		vmove usr/include/libpurple
 		vmove usr/lib/pkgconfig/purple.pc
+		vmove usr/lib/libpurple.so
 		vmove usr/share/aclocal/purple.m4
 		vmove usr/share/man/man3/Purple.3p
 	}
@@ -71,11 +65,12 @@ libgnt_package() {
 }
 
 libgnt-devel_package() {
-	depends="libglib-devel libgnt>=${version}"
-	short_desc="IM library extracted from Pidgin (GNT) -- development files"
+	depends="libglib-devel libgnt>=${version}_${revision}"
+	short_desc="IM library extracted from Pidgin (GNT) - development files"
 	pkg_install() {
 		vmove usr/include/gnt
 		vmove usr/lib/pkgconfig/gnt.pc
+		vmove usr/lib/libgnt.so
 	}
 }
 
@@ -88,8 +83,8 @@ finch_package() {
 }
 
 finch-devel_package() {
-	depends="libgnt-devel>=${version} libpurple-devel>=${version}"
-	short_desc="A ncurses-based messaging client -- development files"
+	depends="libgnt-devel>=${version} libpurple-devel>=${version}_${revision}"
+	short_desc="A ncurses-based messaging client - development files"
 	pkg_install() {
 		vmove usr/include/finch
 		vmove usr/lib/pkgconfig/finch.pc
@@ -97,8 +92,8 @@ finch-devel_package() {
 }
 
 pidgin-devel_package() {
-	depends="gtk+-devel libpurple-devel>=${version}"
-	short_desc="${short_desc} -- development files"
+	depends="gtk+-devel libpurple-devel>=${version}_${revision}"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

srcpkgs/py2cairo/files/python-config

@@ -6,4 +6,4 @@ if [ "$1" = "--includes" ]; then
 	echo "-I${XBPS_CROSS_BASE}/usr/include/python2.7"
 fi
 
-return 0
+exit 0

srcpkgs/pygtk/template

@@ -1,11 +1,11 @@
 # Template file for 'pygtk'
 pkgname=pygtk
 version=2.24.0
-revision=9
+revision=10
 build_style=gnu-configure
 # XXX: missing python-numpy build dep
 hostmakedepends="pkg-config pygobject2-devel>=2.28.6_6"
-makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel>=2.28.6_6"
+makedepends="python-devel gtk+-devel libxml2-devel libglade-devel pygobject2-devel>=2.28.6_6"
 depends="python pygobject2 py2cairo"
 pycompile_module="gtk-2.0/gtk"
 short_desc="Python bindings for the GTK+ toolkit"
@@ -30,7 +30,7 @@ post_install() {
 }
 
 pygtk-devel_package() {
-	depends="python-devel gtk+-devel pygobject2-devel py2cairo-devel pygtk>=${version}_${revision}"
+	depends="python-devel gtk+-devel pygobject2-devel py2cairo-devel libglade-devel pygtk>=${version}_${revision}"
 	short_desc+=" - development files"
 	pycompile_module="demos"
 	pkg_install() {

srcpkgs/python-efl/template

@@ -1,9 +1,9 @@
 # Template file for 'python-efl'
 pkgname=python-efl
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=python-module
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config python-devel"
 makedepends="efl-devel>=${version} elementary-devel>=${version} dbus-python-devel"
 depends="dbus-python"
 pycompile_modules="evas efl edje emotion ecore elementary e_dbus"
@@ -15,4 +15,4 @@ short_desc="Python2 bindings for Enlightenment Foundation Libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 distfiles="http://download.enlightenment.org/rel/bindings/python/${pkgname}-${version}.tar.gz"
-checksum=8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7
+checksum=90ea20d0a90448fd1dcd56210bf34cb9a78905852d83620617bf164f1cef5edc

srcpkgs/rpi-firmware/template

@@ -1,8 +1,8 @@
 # Template file for 'rpi-firmware'
-_githash="9babf5f"
+_githash="c27ddfa"
 
 pkgname=rpi-firmware
-version=20140110
+version=20140129
 revision=1
 noarch=yes
 short_desc="Firmware files for the Raspberry Pi (git ${_githash})"
@@ -11,6 +11,9 @@ license="Propietary - see /usr/share/licences/${pkgname}/"
 homepage="https://github.com/raspberrypi/firmware"
 conf_files="/boot/cmdline.txt /boot/config.txt"
 
+provides="libEGL-1.0_1 libGLES-1.0_1"
+replaces="libEGL>=0 libGLES>=0"
+
 do_fetch() {
 	local url="git://github.com/raspberrypi/firmware.git"
 	git clone --depth 1 $url ${pkgname}-${version}

srcpkgs/rpi-kernel/template

@@ -1,11 +1,11 @@
 # Template file for 'rpi-kernel'
 #
 # Latest commit as of 20140120
-_githash="943b563ec9961b53b77a0e7b6c07289826c082a5"
+_githash="e79a3f89627c9ff65d5d183229bc68ecc51e6e2f"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
-version=3.10.27
+version=3.10.28
 revision=1
 wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,7 +13,7 @@ homepage="http://www.kernel.org"
 license="GPL-2"
 short_desc="The Linux kernel and modules for the Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
-checksum=f32e41c0bfbc6fb8ed5714d386bcc520f155ea0fdf53227f59db795d603622fd
+checksum=63976cbafe60da85c2aa048ab59c005dae9a4a637101f6df7b9ea4e1efa547df
 
 _kernver="${version}_${revision}"
 

srcpkgs/socat/template

@@ -1,21 +1,13 @@
 # Template file for 'socat'
 pkgname=socat
-version=1.7.2.2
+version=1.7.2.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-libwrap --enable-fips"
 makedepends="readline-devel openssl-devel"
-short_desc="Multipurpose relay"
+short_desc="Relay for bidirectional data transfer between two independent data channels"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.dest-unreach.org/socat/"
 distfiles="http://www.dest-unreach.org/socat/download/socat-$version.tar.bz2"
-checksum=9a167af11a4d3809cbc66f5e2dcb39b6e371251282ef5de6ea6ff0c4be8a953c
-long_desc="
- socat is a relay for bidirectional data transfer between two independent data
- channels. Each of these data channels may be a file, pipe, device (serial line
- etc. or a pseudo terminal), a socket (UNIX, IP4, IP6 - raw, UDP, TCP), an
- SSL socket, proxy CONNECT connection, a file descriptor (stdin etc.), the GNU
- line editor (readline), a program, or a combination of two of these. 
- These modes include generation of "listening" sockets, named pipes, and pseudo
- terminals."
+checksum=0598ac54af7b138cda9e3c141bcf0cc63eeb2ab31f468a772dc3f7eb3896aad0

srcpkgs/sunxi-mali/patches/make-tabs.patch

@@ -0,0 +1,29 @@
+--- lib/mali/Makefile.split.orig	2014-01-29 13:32:24.446817426 +0100
++++ lib/mali/Makefile.split	2014-01-29 13:33:03.822133629 +0100
+@@ -1,16 +1,16 @@
+ # Makefile for when everything is split up nicely.
+ 
+ install: libMali.so libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0
+-        $(INSTALL_DATA) $^ $(libdir)
++	$(INSTALL_DATA) $^ $(libdir)
+ 
+-        $(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
+-        $(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
+-        $(LN) libEGL.so.1 $(libdir)libEGL.so
++	$(RM) $(libdir)libEGL.so.1 $(libdir)libEGL.so
++	$(LN) libEGL.so.1.4 $(libdir)libEGL.so.1
++	$(LN) libEGL.so.1 $(libdir)libEGL.so
+ 
+-        $(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
+-        $(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
+-        $(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
++	$(RM) $(libdir)libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
++	$(LN) libGLESv1_CM.so.1.1 $(libdir)libGLESv1_CM.so.1
++	$(LN) libGLESv1_CM.so.1 $(libdir)libGLESv1_CM.so
+ 
+-        $(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
+-        $(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
+-        $(LN) libGLESv2.so.2 $(libdir)libGLESv2.so
++	$(RM) $(libdir)libGLESv2.so.2 $(libdir)libGLESv2.so
++	$(LN) libGLESv2.so.2.0 $(libdir)libGLESv2.so.2
++	$(LN) libGLESv2.so.2 $(libdir)libGLESv2.so

srcpkgs/sunxi-mali/template

@@ -1,7 +1,7 @@
 # Template file for 'sunxi-mali'
 pkgname=sunxi-mali
 version=20140127
-revision=1
+revision=3
 build_style=gnu-makefile
 short_desc="Linux sunxi MALI userpace propietary libraries"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,25 +16,24 @@ checksum=9ec11a65f61980f542f7b079bb9975bba6939efca0647cc0f73a64df55e5a8a4
 only_for_archs="armv7l"
 hostmakedepends="pkg-config perl"
 makedepends="libXfixes-devel libdri2-devel-git libdrm-devel"
-provides="libEGL-1.0_1 libGLES-1.0_1"
-replaces="libEGL>=0 libGLES>=0"
+provides="libump-1.0_1 libEGL-1.0_1 libGLES-1.0_1"
+replaces="libump>=0 libump-git>=0 libEGL>=0 libGLES>=0"
 
 do_build() {
-        VERSION=r3p1 ABI=armhf EGL_TYPE=x11 make config
+	VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config
 	make ${makejobs}
 }
 
 do_install() {
 	vmkdir usr/lib
 	make DESTDIR=${DESTDIR} install
-	# Remove libUMP, provided by libump.
-	rm ${DESTDIR}/usr/lib/libUMP*
-	rm -r ${DESTDIR}/usr/include/ump
 }
 
 sunxi-mali-devel_package() {
 	short_desc+=" - development files"
 	depends="libXfixes-devel libdri2-devel-git libdrm-devel ${sourcepkg}>=${version}_${revision}"
+	provides="libump-devel-1.0_1"
+	replaces="libump-devel>=0 libump-devel-git>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/libEGL*.so"

srcpkgs/telepathy-glib/template

@@ -1,30 +1,43 @@
 # Template file for 'telepathy-glib'
 pkgname=telepathy-glib
-version=0.22.0
+version=0.22.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vala-bindings --disable-static"
-hostmakedepends="pkg-config intltool libxslt gobject-introspection"
+hostmakedepends="pkg-config intltool libxslt"
 makedepends="dbus-glib-devel vala-devel"
 short_desc="Library for GLib-based Telepathy components"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
 homepage="http://telepathy.freedesktop.org"
 distfiles="$homepage/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=62081bac04d3d390793d08f6763880b522fbad632a08bf41a9191cfe95c01957
-long_desc="
- Telepathy is a D-Bus framework for unifying real time communication,
- including instant messaging, voice calls and video calls. It abstracts
- differences between protocols to provide a unified interface for
- applications."
+checksum=e82891404793b88407f3696ffb540b28d5949c4ed6f70a9aefb69477606ec26d
+
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
 
 telepathy-glib-devel_package() {
-	depends="vala-devel dbus-glib-devel ${sourcepkg}-${version}_${revision}"
+	depends="vala-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 		vmove usr/share/vala
 		vmove "usr/lib/*.so"

srcpkgs/valgrind/template

@@ -2,7 +2,7 @@
 pkgname=valgrind
 version=3.9.0
 revision=1
-only_for_archs="i686 x86_64"
+only_for_archs="i686 x86_64 armv7l"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"
 hostmakedepends="perl pkg-config"
@@ -15,6 +15,10 @@ license="GPL-2"
 distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
 checksum=e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0
 
+if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+	configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
+fi
+
 valgrind-devel_package() {
 	depends="valgrind>=${version}"
 	short_desc+=" - development files"

srcpkgs/webkitgtk/template

@@ -1,23 +1,39 @@
 # Template file for 'webkitgtk'
 pkgname=webkitgtk
-version=2.2.3
+version=2.2.4
 revision=1
 build_style=gnu-configure
-configure_args="--with-gtk=3.0 --enable-introspection"
+configure_args="--with-gtk=3.0"
 short_desc="GTK+3 port of the WebKit browser engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://webkitgtk.org/"
 license="LGPL-2.1, Simplified BSD (2 clause)"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
-checksum=94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605
+checksum=5e1aee1bfca3602cb02920d6984c584c775c661b30c33955e35ff9a21b4c4d74
 
-hostmakedepends="perl pkg-config intltool which gperf flex ruby gobject-introspection"
+hostmakedepends="perl pkg-config intltool which gperf flex ruby"
 makedepends="
  libjpeg-turbo-devel libpng-devel>=1.6 sqlite-devel harfbuzz-devel>=0.9.19
  gst-plugins-base1-devel libsoup-devel>=2.42 libxslt-devel icu-devel>=49
  enchant-devel dbus-glib-devel geoclue-devel libwebp-devel libsecret-devel
  gtk+-devel gtk+3-devel>=3.8 libgudev-devel libXt-devel"
 
+# Package build options
+build_options="gir"
+desc_option_gir="Enable support for building gobject introspection data"
+
+# Disable gir for cross builds.
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="gir"
+fi
+
+if [ "$build_option_gir" ]; then
+	configure_args+=" --enable-introspection"
+	hostmakedepends+=" gobject-introspection"
+else
+	configure_args+=" --disable-introspection"
+fi
+
 webkitgtk-devel_package() {
 	replaces="webkit-gtk3-devel>=0"
 	provides="webkit-gtk3-devel-${version}"
@@ -26,7 +42,9 @@ webkitgtk-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gir-1.0
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/share/gtk-doc
 		vmove "usr/lib/*.so"
 	}

srcpkgs/weechat/template

@@ -1,11 +1,11 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=0.4.2
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="cmake pkg-config python-devel libgcrypt-devel"
 makedepends="tcl-devel>=8.6 aspell-devel libgcrypt-devel gnutls-devel>=3.1.5
- python-devel ruby-devel>=2.0 lua-devel>=5.2 libcurl-devel perl"
+ python-devel ruby-devel>=2.0 lua-devel>=5.2 libcurl-devel perl>=5.18"
 short_desc="Fast, light and extensible IRC client (curses UI)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"

srcpkgs/xbps-git/template

@@ -1,21 +1,24 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
-version=20140122
-revision=1
-build_style=configure
-configure_script="env HAVE_VASPRINTF=1 ./configure"
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests"
-hostmakedepends="which pkg-config"
-makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
-depends="xbps-triggers libxbps-git-${version}_${revision}"
-provides="xbps-${version}_${revision}"
-replaces="xbps>=0 xbps-devel>=0"
-conf_files="/etc/xbps/xbps.conf"
+version=20140201
+revision=2
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.voidlinux.eu/xbps"
 license="Simplified BSD"
 
+build_style=configure
+configure_script="env HAVE_VASPRINTF=1 ./configure"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests"
+
+hostmakedepends="which pkg-config"
+makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
+
+depends="xbps-triggers libxbps-git-${version}_${revision}"
+provides="xbps-${version}_${revision}"
+replaces="xbps>=0 xbps-devel>=0"
+conf_files="/etc/xbps/xbps.conf"
+
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
 	msg_normal "Fetching source from $url ...\n"

srcpkgs/xbps-src/INSTALL

@@ -0,0 +1,7 @@
+case "${ACTION}" in
+post)
+	# Setup correct permissions to the chroot helper.
+	chgrp xbuilder usr/libexec/xbps-src-chroot-helper 
+	chmod 4750 usr/libexec/xbps-src-chroot-helper
+	;;
+esac

srcpkgs/xbps-src/template

@@ -1,7 +1,7 @@
 # Template file for 'xbps-src'
 pkgname=xbps-src
-version=20140128
-revision=1
+version=20140201
+revision=4
 bootstrap=yes
 conf_files="/etc/xbps/xbps-src.conf"
 depends="bash xbps-triggers>=0.54 fakeroot"

srcpkgs/xbps/patches/0001-Make-sure-that-all-symlinks-in-a-package-are-removed.patch

@@ -1,125 +0,0 @@
-From 292be5c4200ef1866885e3933a2740777c024f7f Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Sun, 12 Jan 2014 17:10:07 +0100
-Subject: [PATCH] Make sure that all symlinks in a package are removed, not
- just dangling symlinks.
-
----
- NEWS                                    |  5 +++++
- lib/package_remove.c                    | 18 ----------------
- tests/xbps/libxbps/shell/remove_test.sh | 38 ++++++++++++++++++++++++++++++++-
- 3 files changed, 42 insertions(+), 19 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 640a275..c8d1586 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,8 @@
-+xbps-0.30 (??):
-+
-+ * Fixed a bug where in some cases valid symlinks in a package were not removed
-+   (just dangling symlinks were removed).
-+
- xbps-0.29 (2014-01-09):
- 
-  * Added XBPS_ARCH environment variable to override tha native architecture
-diff --git a/lib/package_remove.c b/lib/package_remove.c
-index 2bfa2fc..4bd7646 100644
---- a/lib/package_remove.c
-+++ b/lib/package_remove.c
-@@ -54,13 +54,11 @@ xbps_remove_pkg_files(struct xbps_handle *xhp,
- 		      const char *key,
- 		      const char *pkgver)
- {
--	struct stat st;
- 	xbps_array_t array;
- 	xbps_object_iterator_t iter;
- 	xbps_object_t obj;
- 	const char *file, *sha256, *curobj = NULL;
- 	char *path = NULL;
--	char buf[PATH_MAX];
- 	int rv = 0;
- 	bool found;
- 
-@@ -137,22 +135,6 @@ xbps_remove_pkg_files(struct xbps_handle *xhp,
- 				free(path);
- 				break;
- 			}
--		} else if (strcmp(key, "links") == 0) {
--			/*
--			 * All regular files from package were removed at this
--			 * point, so we will only remove dangling symlinks.
--			 */
--			if (realpath(path, buf) == NULL) {
--				if (errno != ENOENT && errno != ELOOP) {
--					free(path);
--					rv = errno;
--					break;
--				}
--			}
--			if (stat(buf, &st) == 0) {
--				free(path);
--				continue;
--			}
- 		}
- 		/*
- 		 * Make sure to not remove any symlink of root directory.
-diff --git a/tests/xbps/libxbps/shell/remove_test.sh b/tests/xbps/libxbps/shell/remove_test.sh
-index 37d3f26..d049f6e 100644
---- a/tests/xbps/libxbps/shell/remove_test.sh
-+++ b/tests/xbps/libxbps/shell/remove_test.sh
-@@ -20,7 +20,7 @@ keep_base_symlinks_body() {
- 	xbps-rindex -a *.xbps
- 	atf_check_equal $? 0
- 	cd ..
--	xbps-install -r root --repository=$PWD/some_repo -y foo
-+	xbps-install -r root -C null.conf --repository=$PWD/some_repo -y foo
- 	atf_check_equal $? 0
- 	xbps-remove -r root -y foo
- 	atf_check_equal $? 0
-@@ -32,6 +32,42 @@ keep_base_symlinks_body() {
- 	atf_check_equal $rv 0
- }
- 
-+# 2nd test: make sure that all symlinks are removed.
-+atf_test_case remove_symlinks
-+
-+remove_symlinks_head() {
-+	atf_set "descr" "Tests for package removal: symlink cleanup test"
-+}
-+
-+remove_symlinks_body() {
-+	mkdir some_repo
-+	mkdir -p pkg_A/usr/lib pkg_B/usr/lib
-+	touch -f pkg_A/usr/lib/libfoo.so.1.2.0
-+	ln -sfr pkg_A/usr/lib/libfoo.so.1.2.0 pkg_A/usr/lib/libfoo.so.1
-+	ln -sfr pkg_B/usr/lib/libfoo.so.1 pkg_B/usr/lib/libfoo.so
-+
-+	cd some_repo
-+	xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
-+	atf_check_equal $? 0
-+	xbps-create -A noarch -n B-1.0_1 --dependencies "A>=0" -s "B pkg" ../pkg_B
-+	atf_check_equal $? 0
-+	xbps-rindex -a *.xbps
-+	atf_check_equal $? 0
-+	cd ..
-+	xbps-install -r root -C null.conf --repository=$PWD/some_repo -y B
-+	atf_check_equal $? 0
-+	xbps-pkgdb -r root -m manual A
-+	atf_check_equal $? 0
-+	xbps-remove -r root -Ryv B
-+	atf_check_equal $? 0
-+	rv=0
-+	if [ -h root/usr/lib/libfoo.so ]; then
-+	        rv=1
-+	fi
-+	atf_check_equal $rv 0
-+}
-+
- atf_init_test_cases() {
- 	atf_add_test_case keep_base_symlinks
-+	atf_add_test_case remove_symlinks
- }
--- 
-1.8.5.2
-

srcpkgs/xbps/patches/0002-Remove-the-config.h-kludge-and-override-vasprintf-de.patch

@@ -1,399 +0,0 @@
-From 5eea259c1371448be362ccf1bc123da784aef39d Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Mon, 20 Jan 2014 18:50:33 +0100
-Subject: [PATCH] Remove the config.h kludge and override vasprintf detection
- via HAVE_VASPRINTF.
-
----
- Makefile                          |  4 ++--
- bin/xbps-install/fetch_cb.c       |  1 -
- bin/xbps-query/search.c           |  4 +---
- configure                         | 32 +++++++++++++++++---------------
- include/compat.h                  |  2 +-
- include/xbps_api_impl.h           |  2 +-
- lib/cb_util.c                     |  4 ----
- lib/external/dewey.c              |  3 ---
- lib/external/fexec.c              |  4 +++-
- lib/fetch/common.c                |  5 ++---
- lib/fetch/fetch.c                 |  5 ++---
- lib/fetch/file.c                  |  5 ++---
- lib/fetch/ftp.c                   |  5 ++---
- lib/fetch/http.c                  |  5 ++---
- lib/package_configure.c           |  1 -
- lib/package_unpack.c              |  4 ----
- lib/portableproplib/prop_object.c |  4 +---
- lib/util.c                        |  4 ----
- 18 files changed, 36 insertions(+), 58 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 16e8851..f6e6c89 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ endif
- 
- .PHONY: all
- all:
--	@if test ! -e config.h; then \
-+	@if test ! -e config.mk; then \
- 		echo "You didn't run ./configure ... exiting."; \
- 		exit 1; \
- 	fi
-@@ -45,4 +45,4 @@ clean:
- 	@for dir in $(SUBDIRS); do		\
- 		$(MAKE) -C $$dir clean || exit 1;	\
- 	done
--	-rm -f config.h config.mk _ccflag.{,c,err}
-+	-rm -f config.mk _ccflag.{,c,err}
-diff --git a/bin/xbps-install/fetch_cb.c b/bin/xbps-install/fetch_cb.c
-index de671cf..162fcf7 100644
---- a/bin/xbps-install/fetch_cb.c
-+++ b/bin/xbps-install/fetch_cb.c
-@@ -42,7 +42,6 @@
- 
- #include <xbps.h>
- #include "defs.h"
--#include "config.h"
- 
- static void
- get_time(struct timeval *tvp)
-diff --git a/bin/xbps-query/search.c b/bin/xbps-query/search.c
-index d2358cc..4f91ca4 100644
---- a/bin/xbps-query/search.c
-+++ b/bin/xbps-query/search.c
-@@ -27,9 +27,7 @@
- # define _GNU_SOURCE    /* for strcasestr(3) */
- #endif
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
- 
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/configure b/configure
-index 299e826..89c3049 100755
---- a/configure
-+++ b/configure
-@@ -111,7 +111,6 @@ _which()
- 	return 1
- }
- 
--CONFIG_H=config.h
- CONFIG_MK=config.mk
- 
- if [ -z "$BUILD" ]; then
-@@ -138,9 +137,8 @@ if [ -z "$OS" ]; then
- fi
- 
- echo "Configuring xbps for ... $OS"
--rm -f $CONFIG_H $CONFIG_MK
-+rm -f $CONFIG_MK
- echo "# Common vars used by XBPS on $OS." >$CONFIG_MK
--echo "/* $OS */" >$CONFIG_H
- 
- echo "VERSION = $VERSION" >>$CONFIG_MK
- echo "TOPDIR ?=	$TOPDIR" >>$CONFIG_MK
-@@ -186,7 +184,6 @@ echo "CFLAGS = -O2 -pthread" >>$CONFIG_MK
- 
- echo "LDFLAGS =  	-L\$(TOPDIR)/lib" >>$CONFIG_MK
- echo "CPPFLAGS = 	-I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
--echo "CPPFLAGS +=	-DHAVE_CONFIG_H" >>$CONFIG_MK
- echo "CPPFLAGS +=	-DXBPS_SYSCONF_PATH=\\\"${ETCDIR}\\\"" >>$CONFIG_MK
- echo "CPPFLAGS +=	-DXBPS_VERSION=\\\"${VERSION}\\\"" >>$CONFIG_MK
- echo "CPPFLAGS +=	-D_unused=\"__attribute__((__unused__))\"" >>$CONFIG_MK
-@@ -206,7 +203,7 @@ fi
- 
- case "$OS" in
- linux)
--	echo "CPPFLAGS +=       -D_XOPEN_SOURCE=700" >>$CONFIG_MK
-+	echo "CPPFLAGS += 	-D_XOPEN_SOURCE=700" >>$CONFIG_MK
- 	echo "CPPFLAGS += 	-D_FILE_OFFSET_BITS=64" >> $CONFIG_MK
- 	;;
- *)
-@@ -346,22 +343,31 @@ echo "STATIC_LIBS +=	-lpthread" >>$CONFIG_MK
- #
- func=vasprintf
- printf "Checking for $func() ... "
--cat <<EOF >_$func.c
-+if test -n "$HAVE_VASPRINTF"; then
-+	echo "yes (cached)."
-+else
-+	cat <<EOF >_$func.c
-+#define _GNU_SOURCE
- #include <stdio.h>
- int main(void) {
- 	vasprintf(NULL, NULL, NULL);
- 	return 0;
- }
- EOF
--if $XCC -D_GNU_SOURCE _$func.c -o _$func 2>/dev/null; then
--	echo yes.
-+
-+	if $XCC _$func.c -o _$func 2>/dev/null; then
-+		echo yes.
-+		HAVE_VASPRINTF=1
-+	else
-+		echo no.
-+	fi
-+	rm -f _$func.c _$func
-+fi
-+if test -n "$HAVE_VASPRINTF"; then
- 	echo "CPPFLAGS +=	-DHAVE_VASPRINTF" >> $CONFIG_MK
- else
--	echo no.
- 	echo "COMPAT_SRCS+=	compat/vasprintf.o" >>$CONFIG_MK
--	echo "#include \"compat.h\"" >>$CONFIG_H
- fi
--rm -f _$func.c _$func
- 
- #
- # Check for strcasestr().
-@@ -384,7 +390,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- 	echo no.
- 	echo "COMPAT_SRCS +=	compat/strcasestr.o" >>$CONFIG_MK
--	echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func _$func.c
- 
-@@ -408,7 +413,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- 	echo no.
- 	echo "COMPAT_SRCS +=	compat/strlcpy.o" >>$CONFIG_MK
--	echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
- 
-@@ -431,7 +435,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
- else
- 	echo no.
- 	echo "COMPAT_SRCS +=	compat/strlcat.o" >>$CONFIG_MK
--	echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
- 
-@@ -454,7 +457,6 @@ if $XCC -lutil _$func.c -o _$func 2>/dev/null; then
- else
- 	echo no.
- 	echo "COMPAT_SRCS+=	compat/humanize_number.o" >>$CONFIG_MK
--	echo "#include \"compat.h\"" >>$CONFIG_H
- fi
- rm -f _$func.c _$func
- 
-diff --git a/include/compat.h b/include/compat.h
-index 9f057f9..235000a 100644
---- a/include/compat.h
-+++ b/include/compat.h
-@@ -22,7 +22,7 @@ size_t HIDDEN strlcpy(char *, const char *, size_t);
- char HIDDEN *strcasestr(const char *, const char *);
- #endif
- 
--#if !defined(HAVE_VASPRINTF) && !defined(_GNU_SOURCE)
-+#ifndef HAVE_VASPRINTF
- int HIDDEN vasprintf(char **, const char *, va_list);
- #endif
- 
-diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h
-index 497477e..e45350a 100644
---- a/include/xbps_api_impl.h
-+++ b/include/xbps_api_impl.h
-@@ -30,7 +30,7 @@
- #include <assert.h>
- #include <confuse.h>
- #define LIBXBPS_PRIVATE
--#include <xbps.h>
-+#include "xbps.h"
- 
- /*
-  * By default all public functions have default visibility, unless
-diff --git a/lib/cb_util.c b/lib/cb_util.c
-index 9cf65ac..1aa0f07 100644
---- a/lib/cb_util.c
-+++ b/lib/cb_util.c
-@@ -34,10 +34,6 @@
- #include <stdarg.h>
- #include <errno.h>
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include "xbps_api_impl.h"
- 
- #ifdef __clang__
-diff --git a/lib/external/dewey.c b/lib/external/dewey.c
-index fb8dabf..f6502d4 100644
---- a/lib/external/dewey.c
-+++ b/lib/external/dewey.c
-@@ -37,9 +37,6 @@
- #include <ctype.h>
- 
- #include "xbps_api_impl.h"
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
- 
- #define PKG_PATTERN_MAX 1024
- 
-diff --git a/lib/external/fexec.c b/lib/external/fexec.c
-index 6261f59..cbdb0d5 100644
---- a/lib/external/fexec.c
-+++ b/lib/external/fexec.c
-@@ -29,13 +29,15 @@
- 
- #define _BSD_SOURCE	/* for vfork and chroot */
- #include <sys/types.h>
-+#include <unistd.h>
-+
- #include <sys/wait.h>
- #include <errno.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
--#include <unistd.h>
- 
-+#undef _BSD_SOURCE
- #include "xbps_api_impl.h"
- 
- static int
-diff --git a/lib/fetch/common.c b/lib/fetch/common.c
-index dde3682..8d7d3f5 100644
---- a/lib/fetch/common.c
-+++ b/lib/fetch/common.c
-@@ -30,9 +30,8 @@
-  * $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $
-  */
- 
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/fetch.c b/lib/fetch/fetch.c
-index e0bc07f..9b1ac27 100644
---- a/lib/fetch/fetch.c
-+++ b/lib/fetch/fetch.c
-@@ -30,9 +30,8 @@
-  * $FreeBSD: fetch.c,v 1.41 2007/12/19 00:26:36 des Exp $
-  */
- 
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/file.c b/lib/fetch/file.c
-index 4e4b6a4..14640be 100644
---- a/lib/fetch/file.c
-+++ b/lib/fetch/file.c
-@@ -30,9 +30,8 @@
-  * $FreeBSD: file.c,v 1.18 2007/12/14 10:26:58 des Exp $
-  */
- 
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/ftp.c b/lib/fetch/ftp.c
-index 9426e43..c104d5f 100644
---- a/lib/fetch/ftp.c
-+++ b/lib/fetch/ftp.c
-@@ -57,9 +57,8 @@
-  *
-  */
- 
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/fetch/http.c b/lib/fetch/http.c
-index 4b2b558..d405a6a 100644
---- a/lib/fetch/http.c
-+++ b/lib/fetch/http.c
-@@ -63,9 +63,8 @@
-  * SUCH DAMAGE.
-  */
- 
--#if HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
-+
- #ifndef NETBSD
- #include <nbcompat.h>
- #endif
-diff --git a/lib/package_configure.c b/lib/package_configure.c
-index 79c313a..1ded640 100644
---- a/lib/package_configure.c
-+++ b/lib/package_configure.c
-@@ -29,7 +29,6 @@
- #include <errno.h>
- 
- #include "xbps_api_impl.h"
--
- /**
-  * @file lib/package_configure.c
-  * @brief Package configuration routines
-diff --git a/lib/package_unpack.c b/lib/package_unpack.c
-index 5de73db..84565af 100644
---- a/lib/package_unpack.c
-+++ b/lib/package_unpack.c
-@@ -23,10 +23,6 @@
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <sys/stat.h>
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/lib/portableproplib/prop_object.c b/lib/portableproplib/prop_object.c
-index bc1aaa2..05dc256 100644
---- a/lib/portableproplib/prop_object.c
-+++ b/lib/portableproplib/prop_object.c
-@@ -29,9 +29,7 @@
-  * POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
-+#include "compat.h"
- 
- #include <prop/prop_object.h>
- #include "prop_object_impl.h"
-diff --git a/lib/util.c b/lib/util.c
-index dcea8a9..761d888 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -27,10 +27,6 @@
- # define _GNU_SOURCE	/* for vasprintf(3) */
- #endif
- 
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <stdio.h>
- #include <stdbool.h>
- #include <stdlib.h>
--- 
-1.8.5.3
-

srcpkgs/xbps/template

@@ -1,8 +1,8 @@
 # Template file for 'xbps'
 pkgname=xbps
-version=0.29
-revision=4
-patch_args="-Np1"
+version=0.31
+revision=1
+#patch_args="-Np1"
 bootstrap=yes
 conf_files="/etc/xbps/xbps.conf"
 replaces="xbps>=0"

srcpkgs/xcb-util-wm/template

@@ -1,7 +1,7 @@
 # Template build for 'xcb-util-wm'.
 pkgname=xcb-util-wm
-version=0.3.9
-revision=2
+version=0.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config"
@@ -12,15 +12,14 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"
 license="GPL-2"
 distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
-checksum=038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030
-long_desc="
- This package provides client and window-manager helpers for ICCCM for XCB."
+checksum=66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f
 
 xcb-util-wm-devel_package() {
-	depends="libxcb-devel xcb-util-wm>=${version}"
+	depends="libxcb-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 	}
 }

srcpkgs/xf86-video-fbturbo-git/template

@@ -1,32 +0,0 @@
-# Template build file for 'xf86-video-fbturbo-git'.
-# Latest commit as of 20140124
-_githash=8dec039ed5f2205cb1306f57e0af27a1d4f2dfec
-
-pkgname=xf86-video-fbturbo-git
-version=20140124
-revision=3
-build_style=gnu-configure
-create_srcdir=yes
-distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${_githash}.tar.gz"
-checksum="5470d35dc726f37dbcd6cbf0fb02b0d8aa1bbe42270375b07564647181bcc918"
-wrksrc="xf86-video-fbturbo-${_githash}"
-short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
-homepage="http://github.com/ssvb/xf86-video-fbturbo"
-license="MIT, GPL"
-maintainer="Juan RP <xtraeme@gmail.com>"
-
-only_for_archs="armv6l armv7l"
-hostmakedepends="automake libtool pkg-config xorg-util-macros xorg-server-devel"
-makedepends="libump-devel-git libXrandr-devel xorg-server-devel>=1.14"
-depends="xserver-abi-video-14_1"
-provides="xf86-video-fbturbo-${version}_${revision}"
-replaces="xf86-video-fbturbo>=0"
-
-pre_configure() {
-	cp /usr/include/xorg/dri2.h src
-	autoreconf -fi
-}
-
-post_install() {
-	vinstall xorg.conf 644 etc/X11/xorg.conf.d 99-fbturbo.conf
-}

srcpkgs/xf86-video-fbturbo/template

@@ -1,7 +1,7 @@
 # Template build file for 'xf86-video-fbturbo'.
 pkgname=xf86-video-fbturbo
 version=0.4.0
-revision=2
+revision=3
 build_style=gnu-configure
 short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices"
 homepage="http://github.com/ssvb/xf86-video-fbturbo"
@@ -13,10 +13,14 @@ checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
 
 only_for_archs="armv6l armv7l"
 hostmakedepends="pkg-config xorg-server-devel>=1.14"
-makedepends="libump-devel-git libXrandr-devel xorg-server-devel>=1.14"
+makedepends="libXrandr-devel xorg-server-devel>=1.14"
 depends="xserver-abi-video-14_1"
 replaces="xf86-video-fbturbo>=0"
 
+if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+	makedepends+=" sunxi-mali-devel>=20140127_2"
+fi
+
 pre_configure() {
 	cp /usr/include/xorg/dri2.h src
 }

srcpkgs/xkeyboard-config/template

@@ -1,6 +1,6 @@
 # Template build file for 'xkeyboard-config'.
 pkgname=xkeyboard-config
-version=2.10.1
+version=2.11
 revision=1
 noarch="yes"
 build_style=gnu-configure
@@ -13,4 +13,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 license="MIT"
 distfiles="http://xorg.freedesktop.org/releases/individual/data/$pkgname/$pkgname-$version.tar.bz2"
-checksum=7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b
+checksum=e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76

srcpkgs/xonotic-data-low/template

@@ -1,7 +1,7 @@
 # Template file for 'xonotic-data-low'
 pkgname=xonotic-data-low
 version=0.7.0
-revision=1
+revision=2
 wrksrc="Xonotic"
 homepage="http://xonotic.org"
 license="GPL-2, GPL-3"
@@ -9,16 +9,10 @@ distfiles="http://dl.xonotic.org/xonotic-${version}-low.zip"
 makedepends="unzip"
 noarch="yes"
 replaces="xonotic-data>=0"
-provides="xonotic-data-${version}"
-short_desc="A free, fast-paced crossplatform FPS (LQ data files)"
+provides="xonotic-data-${version}_${revision}"
+short_desc="A free, fast-paced crossplatform FPS (Lower Quality data files)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=35a0e3c299ded3ee0e0b60cba94fed0ea844055972bb2e0a770497018a21711b
-long_desc="
- This package contains the lower quality data files.
-
- Uses JPEG texture compression instead of using DDS textures compiled with S3TC.
- This build has smaller file size and has better support for opensource/legacy
- drivers, but the textures take slightly longer while loading the game."
 
 do_install() {
 	vmkdir usr/share/xonotic

srcpkgs/xonotic/template

@@ -1,7 +1,7 @@
 # Template file for 'xonotic'
 pkgname=xonotic
 version=0.7.0
-revision=1
+revision=2
 wrksrc="Xonotic"
 homepage="http://xonotic.org"
 license="GPL-2, GPL-3"

srcpkgs/xtrans/template

@@ -1,6 +1,6 @@
 # Template build file for 'xtrans'.
 pkgname=xtrans
-version=1.3.2
+version=1.3.3
 revision=1
 noarch="yes"
 build_style=gnu-configure
@@ -10,4 +10,4 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
-checksum=94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87
+checksum=622db4adce224581a44fbe41321bbb0bdc0c78aec586ba83548f1f1c6e8a09bf