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

Conflicts:
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	libre/cdfs-libre/PKGBUILD
	libre/vhba-module-libre/PKGBUILD

10 files changed, 25 insertions, 24 deletions

diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index e36241067..45f2d1121 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,8 +6,8 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=34
-pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
+pkgrel=34.1
+pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files. (adapted to linux-libre kernel)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
 license=('GPL')
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index c420c2070..0f7128226 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -8,8 +8,8 @@ pkgname=linux-libre-api-headers
 _basekernel=3.6
 _sublevel=3
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
-pkgdesc="Kernel libre headers sanitized for use in userspace"
+pkgrel=1.1
+pkgdesc="Kernel headers sanitized for use in userspace (built from linux-libre source)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
 license=('GPL2')
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 52fcbd887..e6461610b 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
+_pkgname=linux-firmware
 pkgname=linux-libre-firmware
 pkgver=3.7
-pkgrel=1
-pkgdesc='Free firmware files for Linux-libre'
+pkgrel=2
+pkgdesc='Free firmware files for Linux (built from linux-libre source)'
 arch=('any')
 url='http://linux-libre.fsfla.org/'
 license=('GPL2')
@@ -43,7 +44,7 @@ package() {
   
   make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
 
-  # move WHENCE file to linux-libre-firmware license folder
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+  # move WHENCE file to linux-firmware license folder
+  install -d -m755 $pkgdir/usr/share/licenses/$_pkgname
+  mv firmware/WHENCE $pkgdir/usr/share/licenses/$_pkgname
 }
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index e6cc4238c..92f3778ca 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=linux-libre-manpages
 pkgver=3.1
-pkgrel=1.2
-pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel"
+pkgrel=1.3
+pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel"
 arch=('any')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index c525abb93..2609ad281 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -91,7 +91,7 @@ build() {
 }
 
 package_libtraceevent-libre() {
-  pkgdesc='Linux-libre kernel trace event library'
+  pkgdesc='Linux kernel trace event library (built from linux-libre source)'
   depends=('glibc')
   replaces=('libtraceevent')
   conflicts=('libtraceevent')
@@ -103,7 +103,7 @@ package_libtraceevent-libre() {
 }
 
 package_perf-libre() {
-  pkgdesc='Linux-libre kernel performance auditing tool'
+  pkgdesc='Linux kernel performance auditing tool (built from linux-libre source)'
   depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
   replaces=('perf')  
   conflicts=('perf')
@@ -121,7 +121,7 @@ package_perf-libre() {
 }
 
 package_cpupower-libre() {
-  pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
+  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor (built from linux-libre source)'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
   replaces=('cpupower' 'cpufrequtils')
@@ -143,7 +143,7 @@ package_cpupower-libre() {
 }
 
 package_x86_energy_perf_policy-libre() {
-  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS (built from linux-libre source)'
   depends=('glibc')
   replaces=('x86_energy_perf_policy')
   conflicts=('x86_energy_perf_policy')
@@ -155,7 +155,7 @@ package_x86_energy_perf_policy-libre() {
 }
 
 package_usbip-libre() {
-  pkgdesc='An USB device sharing system over IP network'
+  pkgdesc='An USB device sharing system over IP network (built from linux-libre source)'
   depends=('glib2' 'sysfsutils')
   options=('!libtool')
   replaces=('usbip')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 711d8efb5..29a814519 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -393,7 +393,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
   provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
   conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
   replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index c8cd92d40..d6bf55f57 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=35
+pkgrel=35.1
 epoch=1
 _extramodules=extramodules-3.7-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
@@ -55,7 +55,7 @@ build() {
 }
 
 package_lirc-libre() {
-  pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
+  pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (adapted to linux-libre kernel) "
   depends=('lirc-utils-libre' 'linux-libre>=3.7' 'linux-libre<3.8')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
@@ -72,7 +72,7 @@ package_lirc-libre() {
 }
 
 package_lirc-utils-libre() {
-  pkgdesc="Linux-libre Infrared Remote Control utils"
+  pkgdesc="Linux Infrared Remote Control utils (adapted to linux-libre kernel)"
   depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
   optdepends=('python2: pronto2lirc utility')
   options=('strip' '!libtool')
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 01502f813..d3228b177 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -13,7 +13,7 @@ _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
 pkgrel=9.3
-pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality"
+pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre-lts kernel)"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 37a7c1ad9..11b515683 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,8 +11,8 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=12
-pkgdesc="Modules for ThinkPad's SMAPI functionality"
+pkgrel=12.1
+pkgdesc="Modules for ThinkPad's SMAPI functionality (adapted to linux-libre kernel)"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index af7f7156e..6467942a6 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.7-LIBRE
 pkgrel=15
-pkgdesc="Kernel libre module that emulates SCSI devices"
+pkgdesc="Kernel module that emulates SCSI devices (adapted to linux-libre kernel)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')