Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/go/PKGBUILD
	core/openssl/PKGBUILD
	extra/libsigsegv/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	staging/boost/PKGBUILD
	staging/kactivities/PKGBUILD
	staging/kdeaccessibility-jovie/PKGBUILD
	staging/kdeaccessibility-kaccessible/PKGBUILD
	staging/kdeaccessibility-kmag/PKGBUILD
	staging/kdeaccessibility-kmousetool/PKGBUILD
	staging/kdeaccessibility-kmouth/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-konsole/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase-workspace/kde-np.pam
	staging/kdebase-workspace/kde.pam
	staging/kdebase/PKGBUILD
	staging/kdebindings-kimono/PKGBUILD
	staging/kdebindings-korundum/PKGBUILD
	staging/kdebindings-kross/PKGBUILD
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/kdebindings-qtruby/PKGBUILD
	staging/kdebindings-qyoto/PKGBUILD
	staging/kdebindings-smokegen/PKGBUILD
	staging/kdebindings-smokekde/PKGBUILD
	staging/kdebindings-smokeqt/PKGBUILD
	staging/kdeedu-analitza/PKGBUILD
	staging/kdeedu-blinken/PKGBUILD
	staging/kdeedu-cantor/PKGBUILD
	staging/kdeedu-kalgebra/PKGBUILD
	staging/kdeedu-kalzium/PKGBUILD
	staging/kdeedu-kanagram/PKGBUILD
	staging/kdeedu-kbruch/PKGBUILD
	staging/kdeedu-kgeography/PKGBUILD
	staging/kdeedu-khangman/PKGBUILD
	staging/kdeedu-kig/PKGBUILD
	staging/kdeedu-kiten/PKGBUILD
	staging/kdeedu-klettres/PKGBUILD
	staging/kdeedu-kmplot/PKGBUILD
	staging/kdeedu-kstars/PKGBUILD
	staging/kdeedu-ktouch/PKGBUILD
	staging/kdeedu-kturtle/PKGBUILD
	staging/kdeedu-kwordquiz/PKGBUILD
	staging/kdeedu-marble/PKGBUILD
	staging/kdeedu-parley/PKGBUILD
	staging/kdeedu-rocs/PKGBUILD
	staging/kdeedu-step/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/kdegraphics-kamera/PKGBUILD
	staging/kdegraphics-kcolorchooser/PKGBUILD
	staging/kdegraphics-kgamma/PKGBUILD
	staging/kdegraphics-kolourpaint/PKGBUILD
	staging/kdegraphics-kruler/PKGBUILD
	staging/kdegraphics-ksaneplugin/PKGBUILD
	staging/kdegraphics-ksnapshot/PKGBUILD
	staging/kdegraphics-mobipocket/PKGBUILD
	staging/kdegraphics-okular/PKGBUILD
	staging/kdegraphics-strigi-analyzer/PKGBUILD
	staging/kdegraphics-svgpart/PKGBUILD
	staging/kdegraphics-thumbnailers/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepim-runtime/PKGBUILD
	staging/kdepim/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdesdk-kate/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils-filelight/PKGBUILD
	staging/kdeutils-kcalc/PKGBUILD
	staging/kdeutils-kcharselect/PKGBUILD
	staging/kdeutils-kdf/PKGBUILD
	staging/kdeutils-kfloppy/PKGBUILD
	staging/kdeutils-kgpg/PKGBUILD
	staging/kdeutils-kremotecontrol/PKGBUILD
	staging/kdeutils-ksecrets/PKGBUILD
	staging/kdeutils-ktimer/PKGBUILD
	staging/kdeutils-kwallet/PKGBUILD
	staging/kdeutils-superkaramba/PKGBUILD
	staging/kdeutils-sweeper/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/libkdcraw/PKGBUILD
	staging/libkdeedu/PKGBUILD
	staging/libkexiv2/PKGBUILD
	staging/libkipi/PKGBUILD
	staging/libksane/PKGBUILD
	testing/e2fsprogs/PKGBUILD
	testing/iptables/PKGBUILD
	testing/ruby/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xorg-server/autoconfig-nvidia.patch
	testing/xorg-server/autoconfig-sis.patch

1 files changed, 8 insertions, 6 deletions

diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 35d08d4f9..8b1f78842 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -5,17 +5,17 @@
 # Contributor: coolkehon <coolkehon@gmail.com>
 
 pkgname=task
-pkgver=1.9.4
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A command-line todo list manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://taskwarrior.org/projects/show/taskwarrior/"
-license=('GPL')
+license=('MIT')
 depends=()
 makedepends=('cmake')
-optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon')
+optdepends=('bash-completion: for bash completion', 'python: for python export addon', 'ruby: for ruby export addon', 'perl: for perl export addon', 'lua: for luaexport addon')
 source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz)
-sha1sums=('b9bae255f4fa03970eced3ac0876935271d1d7a1')
+sha256sums=('78971e366c2395de1cc4b0c4fc41dd950c309d3bc2f6e9594b4c5821ad6775bd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,7 +28,7 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/etc/bash_completion.d/task_completion.sh"
+  install -Dm644 "$pkgdir/usr/share/doc/task/scripts/bash/task_completion.sh" "$pkgdir/usr/share/bash_completion/completions/task_completion.sh"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/fish/task.fish" "$pkgdir/usr/share/fish/completions/task.fish"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/zsh/_task" "$pkgdir/usr/share/zsh/site-functions/_task"
 
@@ -36,4 +36,6 @@ package() {
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskdata.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskdata.vim"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskedit.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskedit.vim"
   install -Dm644 "$pkgdir/usr/share/doc/task/scripts/vim/syntax/taskrc.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/taskrc.vim"
+
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/task/LICENSE"
 }