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

Conflicts:
	community/fcitx-chewing/PKGBUILD
	community/fcitx-cloudpinyin/PKGBUILD
	community/fcitx-rime/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lxpanel/PKGBUILD
	community/pdns/PKGBUILD
	core/bash/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	extra/json-c/PKGBUILD
	extra/liblouis/PKGBUILD
	extra/live-media/PKGBUILD
	extra/samba/PKGBUILD
	extra/transmission/PKGBUILD
	social/opentracker/PKGBUILD

5 files changed, 22 insertions, 9 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 694358a07..91f4c8ea6 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,8 +6,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.15
-pkgrel=2
+pkgver=0.9.16
+pkgrel=1
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -27,7 +27,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('2e87ac93bb2006e40001a4028945cee2'
+md5sums=('ee66d836fad40a184792cee3c5c6755b'
          '42c07b43d575b5e7e7524bd7b9528f0e'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 695686722..8b0d1f23d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -9,7 +9,7 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 1588b5319..90c8ea6aa 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -9,7 +9,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=4
+pkgrel=5
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -18,7 +18,7 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
@@ -98,7 +98,7 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -121,6 +121,7 @@ package_cpupower-libre() {
   replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
+  install=cpupower.install
 
   pushd linux-$pkgver/tools/power/cpupower
   make \
diff --git a/libre/linux-libre-tools/cpupower.install b/libre/linux-libre-tools/cpupower.install
new file mode 100644
index 000000000..10e07ae52
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 3.7-4)" -le 0 ]; then
+    cat << EOF
+===> cpupower startup config file moved to /etc/default/cpupower
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 9117277a7..6563cff19 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -15,7 +15,7 @@ source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
-md5sums=('83cc258f57e6e9501246270bf776849e')
+md5sums=('0ee6833595a007a60ca36eca98ae9781')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -24,4 +24,3 @@ build() {
   mkdir -p $pkgdir/etc/pacman.d
   install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
 }
-