Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

1 files changed, 5 insertions, 15 deletions

diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index 8dc78efd1..a708fc92c 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,30 +1,19 @@
-# $Id: PKGBUILD 192163 2013-08-06 15:03:05Z tpowa $
+# $Id: PKGBUILD 194438 2013-09-16 12:13:08Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libusbx
-pkgver=1.0.16
-pkgrel=2
+pkgver=1.0.17
+pkgrel=1
 depends=('glibc' 'systemd')
 pkgdesc="Library that provides generic access to USB device"
 arch=(i686 x86_64 mips64el)
 url="http://libusbx.org"
 license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-        0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
-        0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 options=(!libtool)
 replaces=('libusb1' 'libusb')
 provides=("libusb=$pkgver")
 conflicts=("libusb")
-md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e'
-         'dad04322621fe7cabd2fe631c6d9929f'
-         '259238c92c92f8b3df5dcad0db8aaf2f')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix #36418
-  patch -Np1 -i ../0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
-  patch -Np1 -i ../0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
-}
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --disable-static
@@ -40,3 +29,4 @@ package () {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('99467ca2cb81c19c4a172de9f30e7576')