Merge branch 'master' of ssh://gparabola/srv/git/abslibre

14 files changed, 49 insertions, 61 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index ba4ff1d0c..0c90c3a5c 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -2,12 +2,13 @@
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryhaja@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=calibre
 pkgname=calibre-libre
 pkgver=0.9.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -36,6 +37,7 @@ build() {
 
   #rm -rf src/{cherrypy,pyPdf}
   rm -rf src/cherrypy
+  rm -rf resources/${pkgname}-portable.*
   sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
 
   # Fix for calibre-0.8.58
@@ -72,6 +74,7 @@ package() {
   sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
 
   install -d "${pkgdir}/usr/lib/python2.7/site-packages"
+  install -d "${pkgdir}/usr/share/zsh/site-functions"
   LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
     --staging-bindir="${pkgdir}/usr/bin" \
     --staging-libdir="${pkgdir}/usr/lib" \
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index efff37e2b..09e552a00 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176530 2013-01-31 14:43:11Z andrea $
+# $Id: PKGBUILD 179154 2013-03-04 11:09:37Z 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.0
+pkgver=4.10.1
 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')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('5b0127bd946286f52d98a1779eabf65e416a66c3'
+sha1sums=('1becdcaf0e41cb7da6c7f66562a0a2aad9fafb5a'
           '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 8e049cd0c..96f7af2c2 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.0
+pkgver=4.10.1
 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=('eff82d54383ece321dc93bdfb494c0a9abcbb998'
+sha1sums=('68d630a5f38a3bb3e629b8cfe4d800e6aef5e327'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 5db404e8a..18947854a 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 178874 2013-02-27 23:08:32Z andrea $
+# $Id: PKGBUILD 179135 2013-03-04 11:09:00Z 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.0
-pkgrel=4
+pkgver=4.10.1
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -24,7 +24,7 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'khtml-fsdg.diff')
-sha1sums=('093bfd214511bae7fda88242413c6ed4ff0b18f0'
+sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index cbd38ec0f..8fb964334 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176632 2013-01-31 14:46:22Z andrea $
+# $Id: PKGBUILD 179256 2013-03-04 11:13:30Z 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.0
+pkgver=4.10.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('974bd9aea71a583563667e7cdc4749fe9d5bd82e'
+sha1sums=('3d54276d1b3808896640d8a28db2c354ef268953'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index f72efd2cd..53c588336 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.0
+pkgver=4.10.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -30,16 +30,11 @@ license=('GPL' 'LGPL' 'FDL')
 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"
-        'boost152.patch')
-sha1sums=('6074fcea53b10c3660c5cc9a00b65e777840fdc4'
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
+sha1sums=('9d1102ec9ea7ee7b8ddc70011231f173ceb2e5c1'
           '652de82dcc1c45de3123898ba46e1962bb0ed6d4')
 
 build() {
-    cd ${_pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/boost152.patch
-    cd ../
-
 	mkdir build
 	cd build
 	cmake ../${_pkgbase}-${pkgver} \
diff --git a/libre/kdepim-libre/boost152.patch b/libre/kdepim-libre/boost152.patch
deleted file mode 100644
index c82b092f1..000000000
--- a/libre/kdepim-libre/boost152.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdepim-4.10.0/kleopatra/models/keylistmodel.cpp~	2013-01-31 09:40:34.270651208 +0000
-+++ kdepim-4.10.0/kleopatra/models/keylistmodel.cpp	2013-01-31 09:41:26.570259714 +0000
-@@ -60,9 +60,9 @@
- #ifdef _WIN32_WCE
- #define BOOST_ALL_NO_LIB
- #endif
--#include <boost/graph/adjacency_list.hpp>
- 
- #ifndef Q_MOC_RUN // QTBUG-22829
-+#include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topological_sort.hpp>
- #endif
- 
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 4b7f1ca34..73acbc578 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 178872 2013-02-27 22:38:42Z andrea $
+# $Id: PKGBUILD 179261 2013-03-04 11:13:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.0
-pkgrel=2
-pkgdesc='Archiving Tool'
+pkgver=4.10.1
+pkgrel=1
+pkgdesc='Archiving Tool (with unar support included instead of unrar)'
 url='http://kde.org/applications/utilities/ark/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeutils')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
-optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+optdepends=('p7zip' 'zip' 'unzip' 'unar')
 install=${_pkgname}.install
 provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('b4f4aaa7dc38ccd515066065ba2b9313d981cfc2'
+sha1sums=('cbb1a1fb9364f81d3653bbb570ab8907ba05aa95'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 898a24f12..95d0c374f 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8.1
+_kernver=3.8.2
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index b8da783ad..c177a1ad6 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.67
+_kernver=3.0.68
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=5
+pkgrel=6
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 2fa94e7dd..fc5cd17c9 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179096 2013-03-03 15:52:54Z andyrtr $
+# $Id: PKGBUILD 179286 2013-03-04 17:14:18Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=67
+_sublevel=68
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.66 # nearly always the same as pkgver
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '7756388fbd9608b61e33fb41773af010'
+         '571adcbf6f408967fe4df19c1c17b00b'
          '99f9c408b64393aceb2482c9a3e329ee'
          'fba95bf1857ce6bf863e13a1ab73f584'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 5fc657d19..283424020 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.67-1-LIBRE-LTS
+KERNEL_VERSION=3.0.68-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index 4d6611548..b5891747d 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.14.1
-pkgrel=3
+pkgver=6.15.0
+pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
   i686
@@ -43,8 +43,8 @@ source=(
   "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2"
 )
 
-md5sums=(
-  16814530ba9ce1f2968bb8c8c785651b
+sha512sums=(
+  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
 )
 
 build() {
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 89c07a433..0baad307c 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: AlexanderR <rvacheva at nxt dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.14.1
+pkgver=6.15.0
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
 arch=('any')
@@ -20,12 +21,14 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-md5sums=('16814530ba9ce1f2968bb8c8c785651b'
-         'a9beb35fa6c6d8af7ba5d2a764c33158'
-         'd206d24b78e207a2c3b603fef14ac47f'
-         '8b9922e26e567248a2a5adc1d0cdfdd4'
-         '0476b16220e6faeb031e1dbfe45249b4'
-         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
+sha512sums=(
+  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
+  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
+  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
+  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
+  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
+)
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -33,7 +36,7 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm common/DejaVuSans.ttf common/DejaVuSans.txt
+  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
 }
 
 package(){
@@ -47,7 +50,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher renpy common renpy.py  template the_question tutorial "$pkgdir/usr/share/$pkgname"
+  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
   cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
   install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
   install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"