Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el

Conflicts:
	community/almanah/PKGBUILD
	community/audit/PKGBUILD
	community/bird/PKGBUILD
	community/blobby2/PKGBUILD
	community/blueman/PKGBUILD
	community/bomberclone/PKGBUILD
	community/botan/PKGBUILD
	community/cantata/PKGBUILD
	community/cinnamon-desktop/PKGBUILD
	community/cinnamon-settings-daemon/PKGBUILD
	community/cinnamon/PKGBUILD
	community/clearsilver/PKGBUILD
	community/clinica/PKGBUILD
	community/confuse/PKGBUILD
	community/deadbeef/PKGBUILD
	community/dvdrtools/PKGBUILD
	community/etl/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/flashrom/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gcolor2/PKGBUILD
	community/geary/PKGBUILD
	community/glob2/PKGBUILD
	community/gnash/PKGBUILD
	community/gnome-commander/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gnuchess/PKGBUILD
	community/haskell-bytestring-show/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-vector/PKGBUILD
	community/hedgewars/PKGBUILD
	community/hitori/PKGBUILD
	community/inputattach/PKGBUILD
	community/jack2/PKGBUILD
	community/kid3/PKGBUILD
	community/lcdproc/PKGBUILD
	community/libcec/PKGBUILD
	community/libvirt/PKGBUILD
	community/libwww/PKGBUILD
	community/lightdm/PKGBUILD
	community/lincity-ng/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linuxtv-dvb-apps/PKGBUILD
	community/lockdev/PKGBUILD
	community/log4cpp/PKGBUILD
	community/love/PKGBUILD
	community/luajit/PKGBUILD
	community/lxc/PKGBUILD
	community/metamail/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mingw32-pthreads/PKGBUILD
	community/mongodb/PKGBUILD
	community/nemo/PKGBUILD
	community/par2cmdline/PKGBUILD
	community/pdfedit/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pidgin-talkfilters/PKGBUILD
	community/pokerth/PKGBUILD
	community/setconf/PKGBUILD
	community/stfl/PKGBUILD
	community/talkfilters/PKGBUILD
	community/tre/PKGBUILD
	community/ubuntuone-client-gnome/PKGBUILD
	community/ubuntuone-client/PKGBUILD
	community/vor/PKGBUILD
	community/warmux/PKGBUILD
	community/wdm/PKGBUILD
	community/xbmc-pvr-addons/PKGBUILD
	core/gcc/PKGBUILD
	core/lvm2/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aubio/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bluez4/PKGBUILD
	extra/boost/PKGBUILD
	extra/calligra/PKGBUILD
	extra/caribou/PKGBUILD
	extra/chemtool/PKGBUILD
	extra/cinepaint/PKGBUILD
	extra/conky/PKGBUILD
	extra/cups/PKGBUILD
	extra/enlightenment16/PKGBUILD
	extra/exo/PKGBUILD
	extra/fakechroot/PKGBUILD
	extra/farstream-0.1/PKGBUILD
	extra/ffmpeg-compat/PKGBUILD
	extra/fltk/PKGBUILD
	extra/git/PKGBUILD
	extra/gpart/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ffmpeg/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-vnc/PKGBUILD
	extra/haveged/PKGBUILD
	extra/icewm/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kactivities/PKGBUILD
	extra/kdeaccessibility-jovie/PKGBUILD
	extra/kdeaccessibility-kaccessible/PKGBUILD
	extra/kdeaccessibility-kmag/PKGBUILD
	extra/kdeaccessibility-kmousetool/PKGBUILD
	extra/kdeaccessibility-kmouth/PKGBUILD
	extra/kdeadmin-kcron/PKGBUILD
	extra/kdeadmin-ksystemlog/PKGBUILD
	extra/kdeadmin-kuser/PKGBUILD
	extra/kdeartwork/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-workspace/PKGBUILD
	extra/kdebase/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdeedu-analitza/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-pairs/PKGBUILD
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdegames-bomber/PKGBUILD
	extra/kdegames-bovo/PKGBUILD
	extra/kdegames-granatier/PKGBUILD
	extra/kdegames-kapman/PKGBUILD
	extra/kdegames-katomic/PKGBUILD
	extra/kdegames-kblackbox/PKGBUILD
	extra/kdegames-kblocks/PKGBUILD
	extra/kdegames-kbounce/PKGBUILD
	extra/kdegames-kbreakout/PKGBUILD
	extra/kdegames-kdiamond/PKGBUILD
	extra/kdegames-kfourinline/PKGBUILD
	extra/kdegames-kgoldrunner/PKGBUILD
	extra/kdegames-kigo/PKGBUILD
	extra/kdegames-killbots/PKGBUILD
	extra/kdegames-kiriki/PKGBUILD
	extra/kdegames-kjumpingcube/PKGBUILD
	extra/kdegames-klickety/PKGBUILD
	extra/kdegames-klines/PKGBUILD
	extra/kdegames-kmahjongg/PKGBUILD
	extra/kdegames-kmines/PKGBUILD
	extra/kdegames-knavalbattle/PKGBUILD
	extra/kdegames-knetwalk/PKGBUILD
	extra/kdegames-kolf/PKGBUILD
	extra/kdegames-kollision/PKGBUILD
	extra/kdegames-konquest/PKGBUILD
	extra/kdegames-kpatience/PKGBUILD
	extra/kdegames-kreversi/PKGBUILD
	extra/kdegames-kshisen/PKGBUILD
	extra/kdegames-ksirk/PKGBUILD
	extra/kdegames-ksnakeduel/PKGBUILD
	extra/kdegames-kspaceduel/PKGBUILD
	extra/kdegames-ksquares/PKGBUILD
	extra/kdegames-ksudoku/PKGBUILD
	extra/kdegames-ktuberling/PKGBUILD
	extra/kdegames-kubrick/PKGBUILD
	extra/kdegames-lskat/PKGBUILD
	extra/kdegames-palapeli/PKGBUILD
	extra/kdegames-picmi/PKGBUILD
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-mobipocket/PKGBUILD
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdemultimedia-audiocd-kio/PKGBUILD
	extra/kdemultimedia-dragonplayer/PKGBUILD
	extra/kdemultimedia-ffmpegthumbs/PKGBUILD
	extra/kdemultimedia-juk/PKGBUILD
	extra/kdemultimedia-kmix/PKGBUILD
	extra/kdemultimedia-kscd/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdenetwork-filesharing/PKGBUILD
	extra/kdenetwork-kdnssd/PKGBUILD
	extra/kdenetwork-kget/PKGBUILD
	extra/kdenetwork-kppp/PKGBUILD
	extra/kdenetwork-krdc/PKGBUILD
	extra/kdenetwork-krfb/PKGBUILD
	extra/kdenetwork-strigi-analyzers/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdepimlibs/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-cervisia/PKGBUILD
	extra/kdesdk-dev-scripts/PKGBUILD
	extra/kdesdk-dev-utils/PKGBUILD
	extra/kdesdk-dolphin-plugins/PKGBUILD
	extra/kdesdk-kapptemplate/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kcachegrind/PKGBUILD
	extra/kdesdk-kioslaves/PKGBUILD
	extra/kdesdk-kompare/PKGBUILD
	extra/kdesdk-lokalize/PKGBUILD
	extra/kdesdk-okteta/PKGBUILD
	extra/kdesdk-poxml/PKGBUILD
	extra/kdesdk-strigi-analyzers/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdesdk-umbrello/PKGBUILD
	extra/kdetoys-amor/PKGBUILD
	extra/kdetoys-kteatime/PKGBUILD
	extra/kdetoys-ktux/PKGBUILD
	extra/kdeutils-filelight/PKGBUILD
	extra/kdeutils-kcalc/PKGBUILD
	extra/kdeutils-kcharselect/PKGBUILD
	extra/kdeutils-kdf/PKGBUILD
	extra/kdeutils-kfloppy/PKGBUILD
	extra/kdeutils-kgpg/PKGBUILD
	extra/kdeutils-kremotecontrol/PKGBUILD
	extra/kdeutils-ktimer/PKGBUILD
	extra/kdeutils-kwallet/PKGBUILD
	extra/kdeutils-print-manager/PKGBUILD
	extra/kdeutils-superkaramba/PKGBUILD
	extra/kdeutils-sweeper/PKGBUILD
	extra/kdewebdev/PKGBUILD
	extra/kino/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libiec61883/PKGBUILD
	extra/libkcddb/PKGBUILD
	extra/libkcompactdisc/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdeedu/PKGBUILD
	extra/libkdegames/PKGBUILD
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkmahjongg/PKGBUILD
	extra/libksane/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmp4v2/PKGBUILD
	extra/libnet/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libsidplay/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/libxmi/PKGBUILD
	extra/lua51/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/nepomuk-core/PKGBUILD
	extra/nepomuk-widgets/PKGBUILD
	extra/obexd/PKGBUILD
	extra/opencv/PKGBUILD
	extra/perl-dbd-mysql/PKGBUILD
	extra/phonon-gstreamer/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pycrypto/PKGBUILD
	extra/python/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/rcs/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/rtmpdump/PKGBUILD
	extra/ruby/PKGBUILD
	extra/signon/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wcslib/PKGBUILD
	extra/windowmaker/PKGBUILD
	extra/x264/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xmlto/PKGBUILD
	libre/angband-libre/PKGBUILD
	libre/hplip-libre/PKGBUILD
	libre/kdebase-konqueror-libre/PKGBUILD
	libre/kdebase-runtime-libre/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	libre/kdepim-libre/PKGBUILD
	libre/kdeutils-ark-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/xbmc-libre/PKGBUILD
	nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
	nonprism/kdepim-runtime-nonprism/PKGBUILD
	pcr/libquvi-scripts-current/PKGBUILD

1 files changed, 6 insertions, 6 deletions

diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index d811d7f49..458eb992a 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195489 2013-10-01 11:32:32Z tomegun $
+# $Id: PKGBUILD 202441 2013-12-21 23:13:17Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
-pkgver=0.20rc1.3
+pkgver=3.12
 pkgrel=1
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64 mips64el)
@@ -14,11 +14,14 @@ replaces=('btrfs-progs-unstable')
 conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
-source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
 install=btrfs-progs.install
 options=(!staticlibs)
+md5sums=('SKIP'
+         '7241ba3a4286d08da0d50b7176941112'
+         'b09688a915a0ec8f40e2f5aacbabc9ad')
 
 build() {
    cd $pkgname
@@ -42,6 +45,3 @@ package() {
    install -Dm644 "$srcdir/initcpio-hook-btrfs" \
      "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
-md5sums=('SKIP'
-         '7241ba3a4286d08da0d50b7176941112'
-         'b09688a915a0ec8f40e2f5aacbabc9ad')