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

Conflicts:
	community/bird/PKGBUILD
	community/gmic/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/cpupower.systemd
	community/linux-tools/usbipd.service
	community/macchanger/PKGBUILD
	community/ndisc6/PKGBUILD
	community/nemiver/PKGBUILD
	core/gpgme/PKGBUILD
	extra/amarok/PKGBUILD
	extra/java-commons-daemon/PKGBUILD
	extra/libao/PKGBUILD
	extra/liblastfm/PKGBUILD

7 files changed, 51 insertions, 30 deletions

diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 335d35218..1aef0dc2e 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.7.1
-_kernrel=2
+_kernver=3.7.4
+_kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_pkgver=2012-12-19-u
-pkgver=20121219
+_pkgver=2013-01-23-1-u
+pkgver=20130123
 pkgrel=1
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@ install=linux-libre-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/19/compat-drivers-$_pkgver.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2013/01/23/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('60756fde830487042a525ff17ccfe7ab')
+md5sums=('4ba03ce3edf5a3fd2b79496284172d73')
 
 
 build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 767609934..5bea880cd 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.57
+_kernver=3.0.60
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-12-04-1-u
 pkgver=20121204
-pkgrel=1
+pkgrel=2
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -16,9 +16,9 @@ install=linux-libre-lts-kmod-alx.install
 replaces=('alx' 'alx-driver' 'dkms-alx')
 provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.bz2)
+source=(http://www.kernel.org/pub/linux/kernel/projects/backports/2012/12/04/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('bc46200e288acb862149a2af11f4b293')
+md5sums=('0759f5668d20f420d6d9dc6d854a2ceb')
 
 
 build() {
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index af26e178d..1588b5319 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-tools
@@ -9,7 +9,7 @@ _basekernel=3.7
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=3.1
+pkgrel=4
 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')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
@@ -26,21 +26,15 @@ makedepends+=('glib2' 'sysfsutils')
 groups=("$pkgbase")
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
-        'cpupower.conf'
-        'cpupower.rc'
+        'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.conf'
-        'usbipd.rc'
         'usbipd.service')
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '56883c159381ba89e50ab8ea65efec77'
-         '5fc1fcda4cef93f16e752b1931db23e3'
-         'c0d17b5295fe964623c772a2dd981771'
+         '7e0710c2f31c1eb1e1417a7972e676b1'
          '2450e8ff41b30eb58d43b5fffbfde1f4'
-         'e8fac9c45a628015644b4150b139278a'
-         '8a3831d962ff6a9968c0c20fd601cdec'
-         'ba7c1c513314dd21fb2334fb8417738f')
+         'a8fb0c6159bee1b9e345a87cabb3ba27')
 
 build() {
   # apply stable patching set
@@ -122,7 +116,7 @@ package_perf-libre() {
 
 package_cpupower-libre() {
   pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
-  backup=('etc/conf.d/cpupower')
+  backup=('etc/default/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
@@ -136,8 +130,7 @@ package_cpupower-libre() {
     install install-man
   popd
   # install startup scripts
-  install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -Dm 644 cpupower.default "$pkgdir/etc/default/cpupower"
   install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
   install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
@@ -168,9 +161,7 @@ package_usbip-libre() {
   # module loading
   install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
   printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  # install daemon scripts
-  install -Dm 755 usbipd.rc "$pkgdir/etc/rc.d/usbipd"
-  install -Dm 644 usbipd.conf "$pkgdir/etc/conf.d/usbipd"
+  # systemd
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
diff --git a/libre/linux-libre-tools/cpupower.default b/libre/linux-libre-tools/cpupower.default
new file mode 100644
index 000000000..b5c522ea1
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.default
@@ -0,0 +1,29 @@
+# Define CPUs governor
+# valid governors: ondemand, performance, powersave, conservative, userspace.
+#governor='ondemand'
+
+# Limit frequency range
+# Valid suffixes: Hz, kHz (default), MHz, GHz, THz
+#min_freq="2.25GHz"
+#max_freq="3GHz"
+
+# Specific frequency to be set.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
+#freq=
+
+# Utilizes cores in one processor package/socket first before processes are 
+# scheduled to other processor packages/sockets.
+# See man (1) CPUPOWER-SET for additional details.
+#mc_scheduler=
+
+# Utilizes thread siblings of one processor core first before processes are
+# scheduled to other cores. See man (1) CPUPOWER-SET for additional details.
+#smp_scheduler=
+
+#  Sets a register on supported Intel processore which allows software to convey
+# its policy for the relative importance of performance versus energy savings to
+# the  processor. See man (1) CPUPOWER-SET for additional details.
+#perf_bias=
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
index f45b02bc8..51c645415 100644
--- a/libre/linux-libre-tools/cpupower.systemd
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /etc/conf.d/cpupower
+. /etc/default/cpupower
 
 declare -i fail=0
 
diff --git a/libre/linux-libre-tools/usbipd.service b/libre/linux-libre-tools/usbipd.service
index ac2f5f7c1..1f3da08db 100644
--- a/libre/linux-libre-tools/usbipd.service
+++ b/libre/linux-libre-tools/usbipd.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=USB/IP server
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/usbipd
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 1833f020e..b19bb5ba7 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.6
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')