merging brances...

6 files changed, 37 insertions, 96 deletions

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/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 5d7534534..806194577 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,28 +12,30 @@ pkgname=(dpkg-devtools perl-dpkg)
 pkgdesc="Debian Package manager and utilities"
 license=('GPL2')
 
-pkgver=1.16.9
+pkgver=1.16.10
 url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
+_debrepo=http://ftp.debian.org/debian/pool/main
+
+pkgrel=1.3
 
-pkgrel=1.2
-debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'xz' 'zlib' 'ncurses')
 checkdepends=('perl-test-pod')
 makedepends=('perl-io-string' 'perl-timedate')
-source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
-        dpkg-gzip-rsyncable.patch dpkg-gpg2.patch)
+
+_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+        dpkg-gzip-rsyncable.patch)
 
 ######################################################################
 
 # This is really gross.
 # It uses the debian control files to help us split the package.
 # Shame on the dpkg developers for not putting that logic into the build system.
-_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg"
+_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
 _debhelper_install() {
   local debname=$1
-  cd "$_destdir"
+  cd "$srcdir/$_destdir"
 
   # main files
   sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
@@ -80,11 +82,10 @@ build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
-  patch -Np1 -i "${srcdir}/dpkg-gpg2.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
   make
-  make DESTDIR="$_destdir" install
+  make DESTDIR="$srcdir/$_destdir" install
 }
 
 check() {
@@ -125,3 +126,5 @@ package_perl-dpkg() {
 md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
          '5ab63758999e9bb10f84bce79a0307b2'
          '74b7ce3045690a8fc290104f10cf8d42')
+md5sums=('a20a06a5272717274a8b009368f237da'
+         '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
deleted file mode 100644
index 28671c484..000000000
--- a/libre/dpkg/dpkg-gpg2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig	2013-01-09 01:28:47.000000000 -0500
-+++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm	2013-01-09 01:30:51.000000000 -0500
-@@ -344,7 +344,7 @@
-     my $dsc = $self->get_filename();
-     my @exec;
-     if (find_command('gpgv')) {
--        push @exec, "gpgv";
-+        push @exec, "gpgv", "--verify";
-     } elsif (find_command('gpg')) {
-         push @exec, "gpg", "--no-default-keyring", "-q", "--verify";
-     }
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')