Mon Jul 8 01:44:07 PDT 2013

6 files changed, 134 insertions, 75 deletions

diff --git a/libre/ath9k-htc-firmware-git/LICENSE b/libre/ath9k-htc-firmware-git/LICENSE
new file mode 100644
index 000000000..7668bcb97
--- /dev/null
+++ b/libre/ath9k-htc-firmware-git/LICENSE
@@ -0,0 +1,33 @@
+Copyright (c) 2013 Qualcomm Atheros, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted (subject to the limitations in the
+disclaimer below) provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Qualcomm Atheros nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libre/ath9k-htc-firmware-git/PKGBUILD b/libre/ath9k-htc-firmware-git/PKGBUILD
new file mode 100644
index 000000000..2f52f38fa
--- /dev/null
+++ b/libre/ath9k-htc-firmware-git/PKGBUILD
@@ -0,0 +1,77 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=ath9k-htc-firmware-git
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=1
+pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
+arch=('any')
+url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
+license=('BSD')
+makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
+conflicts=('ath9k-htc-firmware')
+provides=('ath9k-htc-firmware')
+source=("git://github.com/qca/open-ath9k-htc-firmware"
+        'LICENSE')
+md5sums=('SKIP'
+         '5163b2711bc481c77045850610b7dd31')
+
+prepare() {
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+  mkdir -p build/{k2,magpie}
+
+}
+
+build() {
+
+  cd $srcdir/open-ath9k-htc-firmware
+
+  export CTARGET="xtensa-unknown-elf"
+  export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
+  export CXXFLAGS="${CFLAGS}"
+
+  cat > target_firmware/build/toolchain.cmake <<EOF
+INCLUDE(CMakeForceCompiler)
+
+SET(CMAKE_SYSTEM_PROCESSOR xtensa)
+SET(COMPILER_PREFIX "xtensa-unknown-elf")
+SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
+
+CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
+EOF
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
+  cd -
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie
+
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
+  cd -
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+
+  make -C build/k2
+  make -C build/magpie
+
+}
+
+package() {
+
+  # create firmware folder to put the free firmware files there
+  install -d -m755 $pkgdir/usr/lib/firmware
+
+  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+
+  # move firmware files to firmware folder
+  cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
+
+  # create license folder to put the license file there
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+
+  # put LICENSE to license folder
+  install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
+  
+}
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index d323ef8d2..6aec27967 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -2,107 +2,57 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ath9k-htc-firmware
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=2
+pkgver=1.3.2
+pkgrel=3
 pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
 arch=('any')
 url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
 license=('BSD')
-makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
-source=("git://github.com/qca/open-ath9k-htc-firmware"
+makedepends=('cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
+source=("https://github.com/qca/open-ath9k-htc-firmware/archive/$pkgver.tar.gz"
         'LICENSE')
-md5sums=('SKIP'
+md5sums=('73c66751151dd47535cb4142477da480'
          '5163b2711bc481c77045850610b7dd31')
 
 prepare() {
 
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
   mkdir -p build/{k2,magpie}
 
 }
 
 build() {
 
-  cd $srcdir/open-ath9k-htc-firmware
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver
 
-  export CBUILD=$CHOST
-  export CHOST="xtensa-unknown-elf"
   export CTARGET="xtensa-unknown-elf"
   export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
   export CXXFLAGS="${CFLAGS}"
 
-  export CC=/usr/bin/xtensa-unknown-elf-gcc
-  export CPP=/usr/bin/xtensa-unknown-elf-cpp
-  export AR=/usr/bin/xtensa-unknown-elf-ar
-  export AS=/usr/bin/xtensa-unknown-elf-as
-  export LD=/usr/bin/xtensa-unknown-elf-ld
-  export NM=/usr/bin/xtensa-unknown-elf-nm
-  export OBJCOPY=/usr/bin/xtensa-unknown-elf-objcopy
-  export OBJDUMP=/usr/bin/xtensa-unknown-elf-objdump
-  export RANLIB=/usr/bin/xtensa-unknown-elf-ranlib
-  export STRIP=/usr/bin/xtensa-unknown-elf-strip
-
   cat > target_firmware/build/toolchain.cmake <<EOF
 INCLUDE(CMakeForceCompiler)
 
-SET(CMAKE_CROSSCOMPILING)
-SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_PROCESSOR xtensa)
-SET(CMAKE_HOST_SYSTEM_PROCESSOR xtensa)
 SET(COMPILER_PREFIX "xtensa-unknown-elf")
-SET(GNU_HOST "xtensa-unknown-elf")
 SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
-SET(CMAKE_C_COMPILER /usr/bin/xtensa-unknown-elf-gcc)
-SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
-SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
 
 CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
 EOF
 
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/k2
 
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
   cd -
 
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/magpie
 
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
+  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
   cd -
 
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-
-  sed -i 's|/usr/bin/gcc|/usr/bin/xtensa-unknown-elf-gcc|g;
-          s|/usr/bin/cpp|/usr/bin/xtensa-unknown-elf-cpp|g;
-          s|/usr/bin/ar|/usr/bin/xtensa-unknown-elf-ar|g;
-          s|/usr/bin/as|/usr/bin/xtensa-unknown-elf-as|g;
-          s|/usr/bin/ld|/usr/bin/xtensa-unknown-elf-ld|g;
-          s|/usr/bin/nm|/usr/bin/xtensa-unknown-elf-nm|g;
-          s|/usr/bin/objcopy|/usr/bin/xtensa-unknown-elf-objcopy|g;
-          s|/usr/bin/objdump|/usr/bin/xtensa-unknown-elf-objdump|g;
-          s|/usr/bin/ranlib|/usr/bin/xtensa-unknown-elf-ranlib|g;
-          s|/usr/bin/strip|/usr/bin/xtensa-unknown-elf-strip|g;
-          s|/usr/local|/usr|g;
-         ' $(grep -rlI /usr/bin/gcc) \
-           $(grep -rlI /usr/bin/cpp) \
-           $(grep -rlI /usr/bin/ld) \
-           $(grep -rlI /usr/bin/ar) \
-           $(grep -rlI /usr/bin/as) \
-           $(grep -rlI /usr/bin/nm) \
-           $(grep -rlI /usr/bin/objcopy) \
-           $(grep -rlI /usr/bin/objdump) \
-           $(grep -rlI /usr/bin/ranlib) \
-           $(grep -rlI /usr/bin/strip) \
-           $(grep -rlI /usr/local)
-
-  make \
-    CC="${CC}" CPP="${CPP}" AR="${AR}" AS="${AS}" LD="${LD}" NM="${NM}" \
-    OBJCOPY="${OBJCOPY}" OBJDUMP="${OBJDUMP}" RANLIB="${RANLIB}" STRIP="${STRIP}" \
-    -C build/k2
-  make \
-    CC="${CC}" CPP="${CPP}" AR="${AR}" AS="${AS}" LD="${LD}" NM="${NM}" \
-    OBJCOPY="${OBJCOPY}" OBJDUMP="${OBJDUMP}" RANLIB="${RANLIB}" STRIP="${STRIP}" \
-    -C build/magpie
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
+
+  make -C build/k2
+  make -C build/magpie
 
 }
 
@@ -111,7 +61,7 @@ package() {
   # create firmware folder to put the free firmware files there
   install -d -m755 $pkgdir/usr/lib/firmware
 
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
+  cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
 
   # move firmware files to firmware folder
   cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 339969ba1..7991897ce 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93260 2013-06-30 12:27:03Z jelle $
+# $Id: PKGBUILD 93610 2013-07-07 09:52:43Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.37
+pkgver=0.9.38
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,10 +30,9 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('76db2eb11fe51d85ae9121203defb677'
+md5sums=('7dac0c5896d3affb87667fe5dbdf9019'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
-
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 80b154dff..562692e48 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130627
-_libretools_commit=08375ed421d18b48388169c7fc7cf4ca076577ba
+pkgver=20130706
+_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b
 _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
 
 _packages_url=https://projects.parabolagnulinux.org/packages
@@ -74,5 +74,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('acbdcd22c1b922f943651dbf7c320bbd'
+md5sums=('f30fbc4011acdd9065310f8295267bdd'
          'b28b1492fda205be7c577fc03cbc3399')
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index f8ce261db..695ea966e 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=linux-libre-manpages
 pkgver=3.9
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel"
+pkgrel=1.1
+pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel"
 arch=('any')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')