Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

10 files changed, 39 insertions, 55 deletions

diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 1a0e3ddd0..3f83618e0 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 7db206be9..2d5f48040 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index d5a72e95c..f1264b0c7 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.10.4
+pkgver=4.10.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d'
+sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 4b6f40af9..224d304e1 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.4
+pkgver=4.10.5
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1'
+sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index ea698dfd7..8cdf5228e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.10.4
+pkgver=4.10.5
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
         'khtml-fsdg.diff')
-sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237'
+sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 89ed6edf3..890c2ef66 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.4
-pkgrel=2
+pkgver=4.10.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a'
+sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 prepare() {
@@ -56,6 +56,6 @@ package_kdenetwork-kopete-libre() {
 	install='kdenetwork-kopete.install'
 	cd $srcdir/build/kopete
 	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
+	cd $srcdir/build/kopete/doc
 	make DESTDIR=$pkgdir install
 }
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 007ed7f74..3f9b3ce28 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.4
+pkgver=4.10.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets')
              source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3')
+sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 6b7a264ae..5efee348d 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.4
+pkgver=4.10.5
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7'
+sha1sums=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 4b46592d0..eb82af49b 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,14 +2,15 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=linux-libre-firmware
-pkgver=3.9
-pkgrel=2
+_pkgver=3.9
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
+pkgrel=1
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
 url=('http://linux-libre.fsfla.org/'
      'http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
 license=('GPL2' 'BSD')
-makedepends=('git' 'wget')
+makedepends=('git' 'xtensa-unknown-elf-gcc')
 provides=('linux-firmware'
           'kernel26-firmware=2.6.34.99')
 conflicts=('linux-firmware'
@@ -37,41 +38,24 @@ replaces=('linux-firmware'
           'rt2870usb-fw'
           'rt2x00-rt61-fw'
           'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz"
         "git://github.com/qca/open-ath9k-htc-firmware")
 md5sums=('120df29f88622dabf7015a22c7cc8e25'
          'SKIP')
 
-prepare() {
-
-  cd $srcdir/open-ath9k-htc-firmware
-
-  # disable build error
-  sed -i 's|GMP,|GMP,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|;
-          s|MPFR,|MPFR,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|;
-          s|MPC,|MPC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|;
-          s|BINUTILS,|BINUTILS,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|;
-          s|GCC,|GCC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|;
-         ' Makefile
-
-  # prepare toolchain to compile ath9k-htc firmware
-  make toolchain
-
-}
-
 build() {
 
   cd $srcdir/open-ath9k-htc-firmware
 
   # create firmware folder to put the free firmware files there
-  mkdir -p $pkgdir/usr/lib/firmware
+  install -d -m755 $pkgdir/usr/lib/firmware
 
   # compile ath9k-htc-firmware
   make -C target_firmware
 
   mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware
 
-  cd $srcdir/linux-$pkgver
+  cd $srcdir/linux-$_pkgver
 
   # compile free firmware files of linux-libre source code  
   make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
@@ -80,6 +64,7 @@ build() {
 
 package() {
 
+  # create licenses folder to put the licenses files there
   install -d -m755 $pkgdir/usr/share/licenses/$pkgname
 
   # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder
@@ -87,7 +72,7 @@ package() {
   mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware
   
   # move WHENCE file to linux-firmware license folder
-  cd $srcdir/linux-$pkgver
+  cd $srcdir/linux-$_pkgver
   mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
 
 }
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index d2c38b7d6..af130b5c0 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -8,11 +8,10 @@ arch=('any')
 url='https://projects.parabolagnulinux.org/hackers.git/'
 license=('GPL')
 install="${pkgname}.install"
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig})
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${pkgname}-"*
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
 md5sums=('007c35459478f86484f66323bf90b1e0'