adding: yate and pysfml2-git

53 files changed, 1397 insertions, 496 deletions

diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index 99ddd75ba..73968cd4b 100644
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-spacenav-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/gis/libfreexl/PKGBUILD b/gis/libfreexl/PKGBUILD
new file mode 100644
index 000000000..533071120
--- /dev/null
+++ b/gis/libfreexl/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Bruno Gola <brunogola at gmail dot com>
+pkgname=libfreexl
+pkgver=1.0.0b
+pkgrel=1
+pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
+arch=('i686' 'x86_64')
+url="https://www.gaia-gis.it/fossil/freexl/index"
+license=('MPL')
+source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.0b.tar.gz")
+md5sums=('e2e1c59eb2883d825782dfe8fe244207')
+
+build() {
+    cd "$srcdir/freexl-$pkgver"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "$srcdir/freexl-$pkgver"
+    make DESTDIR="$pkgdir/" install
+}
diff --git a/gis/libspatialite/PKGBUILD b/gis/libspatialite/PKGBUILD
new file mode 100644
index 000000000..13e2b8335
--- /dev/null
+++ b/gis/libspatialite/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Brian Galey <bkgaley at gmail dot com>
+# Contributor: Pietro Zambelli <peter.zamb at gmail dot com>
+pkgname=libspatialite
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="SQLite extension to support spatial data types and operations"
+arch=('i686' 'x86_64')
+url="https://www.gaia-gis.it/fossil/libspatialite/index"
+license=('MPL')
+depends=('geos' 'proj' 'sqlite3' 'libfreexl')
+options=('!libtool')
+source=("http://www.gaia-gis.it/gaia-sins/libspatialite-3.0.1.tar.gz")
+md5sums=('450d1a0d9da1bd9f770b7db3f2509f69')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir/" install
+}
diff --git a/gis/qgis/PKGBUILD b/gis/qgis/PKGBUILD
index 7c348fd1e..cb06ed0a6 100644
--- a/gis/qgis/PKGBUILD
+++ b/gis/qgis/PKGBUILD
@@ -5,53 +5,47 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=1.7.4
-pkgrel=4
+pkgver=1.8.0
+pkgrel=2
 pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 # update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview
-depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib' 'xerces-c' 'cfitsio' 'qwt5' 'gdal' 'flex' 'bison')
-makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip' 'txt2tags')
+depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib'  'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex')
+makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip')
 optdepends=('postgis: postgis support and SPIT plugin'
             'fcgi: qgis mapserver'
             'python2-sip: python-support'
             'grass: grass plugin'
-            'gsl: georeferencer  ')
+            'gsl: georeferencer')
 options=('!makeflags')
 source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2"
-        'qgis.desktop'
-        'qgis_1.7.4_gcc4.7.patch')
+        'qgis.desktop')
+
+md5sums=('1d60520f81d7763c026d0af887ac9a05'
+         '8ab66039f2aba519b92f52272ec3c13e')
 
-md5sums=('ad6e2bd8c5eb0c486939c420af5d8c44'
-         '8ab66039f2aba519b92f52272ec3c13e'
-         '0a978eac520b3df8736603074b1072b0')
-         
 build() {
   # Fix insecure RPATH is weird, but just works ;)
   # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in
   #cd qgis-${pkgver}
-  
-  #apply patch to be able to build qgis with GCC 4.7
-  patch -p0 < ${srcdir}/qgis_1.7.4_gcc4.7.patch
 
   rm -rf build
   mkdir build
   cd build
 
   cmake ../qgis-${pkgver} \
+    -DENABLE_TESTS=OFF \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DGRASS_PREFIX=/opt/grass \
     -DQGIS_MANUAL_SUBDIR=share/man \
-    -DQWT_INCLUDE_DIR=/usr/include/qwt5 \
-    -DQWT_LIBRARY=/usr/lib/libqwt5.so \
     -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	-DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
-	-DPYTHON_INCLUDE_PATH=/usr/include/python2.7/ 
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python2.7/
 
   make
 }
diff --git a/gis/qwt5/PKGBUILD b/gis/qwt5/PKGBUILD
deleted file mode 100644
index f998a0765..000000000
--- a/gis/qwt5/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer:  Eugen Zagorodniy <e dot zagorodniy at gmail dot com>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=qwt5
-pkgver=5.2.2
-pkgrel=1
-pkgdesc="Qt Widgets for Technical Applications (version 5.X)"
-arch=('i686' 'x86_64')
-url="http://qwt.sourceforge.net/"
-depends=('qt>=4.5.1')
-options=('!makeflags')
-license=("custom:$pkgname")
-provides=('qwt')
-source=("http://downloads.sourceforge.net/sourceforge/qwt/qwt-$pkgver.tar.bz2" \
-        "qwtconfig-archlinux.pri")
-md5sums=('70d77e4008a6cc86763737f0f24726ca'
-         '15db52c3312b5f8f7cbbdabc4831591b')
-build() {
-  cd ${srcdir}/qwt-${pkgver}
-
-  # copy our config file to the right place
-  install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \
-	${srcdir}/qwt-${pkgver}/qwtconfig.pri
-
-  # build qwt:
-  qmake qwt.pro
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/qwt-${pkgver}
-
-  make INSTALL_ROOT=${pkgdir} QTDIR=/usr install
-
-  # rename conlicting symlink
-  mv ${pkgdir}/usr/lib/libqwt.so ${pkgdir}/usr/lib/libqwt5.so
-
-  # move html docs to propee place and move man pages to avoid conflict
-  # with qwt from [extra]
-  install -d ${pkgdir}/usr/share/doc/${pkgname}
-  mv ${pkgdir}/usr/share/html ${pkgdir}/usr/share/doc/${pkgname}/
-  mv ${pkgdir}/usr/share/man ${pkgdir}/usr/share/doc/${pkgname}/
-
-  # install licence
-  install -Dm644 ${srcdir}/qwt-${pkgver}/COPYING \
-	${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
diff --git a/gis/qwt5/qwtconfig-archlinux.pri b/gis/qwt5/qwtconfig-archlinux.pri
deleted file mode 100644
index 045e53275..000000000
--- a/gis/qwt5/qwtconfig-archlinux.pri
+++ /dev/null
@@ -1,85 +0,0 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include/qwt5
-doc.path       = $$INSTALLBASE/share
-
-######################################################################
-# qmake internal options
-######################################################################
-
-CONFIG           += qt     # Also for Qtopia Core!
-CONFIG           += warn_on
-CONFIG           += thread
-
-######################################################################
-# release/debug mode
-# The designer plugin is always built in release mode.
-# If want to change this, you have to edit designer/designer.pro.
-######################################################################
-
-CONFIG           += release     # release/debug
-
-######################################################################
-# Build the static/shared libraries.
-# If QwtDll is enabled, a shared library is built, otherwise
-# it will be a static library.
-######################################################################
-
-CONFIG           += QwtDll
-
-######################################################################
-# QwtPlot enables all classes, that are needed to use the QwtPlot
-# widget.
-######################################################################
-
-CONFIG       += QwtPlot
-
-######################################################################
-# QwtWidgets enables all classes, that are needed to use the all other
-# widgets (sliders, dials, ...), beside QwtPlot.
-######################################################################
-
-CONFIG     += QwtWidgets
-
-######################################################################
-# If you want to display svg images on the plot canvas, enable the
-# line below. Note that Qwt needs the svg+xml, when enabling
-# QwtSVGItem.
-######################################################################
-
-CONFIG     += QwtSVGItem
-
-######################################################################
-# If you have a commercial license you can use the MathML renderer
-# of the Qt solutions package to enable MathML support in Qwt.
-# So if you want this, copy qtmmlwidget.h + qtmmlwidget.cpp to
-# textengines/mathml and enable the line below.
-######################################################################
-
-#CONFIG     += QwtMathML
-
-######################################################################
-# If you want to build the Qwt designer plugin,
-# enable the line below.
-# Otherwise you have to build it from the designer directory.
-######################################################################
-
-CONFIG     += QwtDesigner
-
-######################################################################
-# If you want to auto build the examples, enable the line below
-# Otherwise you have to build them from the examples directory.
-######################################################################
-
-#CONFIG     += QwtExamples
diff --git a/gis/spatialindex/PKGBUILD b/gis/spatialindex/PKGBUILD
new file mode 100644
index 000000000..e0787808e
--- /dev/null
+++ b/gis/spatialindex/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Lantald  <lantald at Gmx dot com>
+pkgname=spatialindex
+pkgver=1.7.1
+pkgrel=1
+pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries."
+arch=('i686' 'x86_64')
+url="http://libspatialindex.github.com/"
+license=('(L)GPL')
+depends=(gcc-libs)
+provides=(spatialindex)
+conflicts=(libspatialindex-git)
+source=(http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz)
+md5sums=('8599243d5d8204f0f8d92cd55ab120f5')
+
+build() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2788e21d9..6e3228359 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -4,8 +4,7 @@
 _pkgname=blender
 pkgname=blender-libre
 pkgver=2.63a
-pkgrel=4
-epoch=4
+pkgrel=5
 pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 7bfca020f..d146e02dd 100644
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.5
+_debver=2.7.6
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,9 +22,9 @@ pkgbase=iceape-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.5
+_pkgver=2.7.6
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('any')
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('03a75ce1325fc748d0943cd39659e8ca'
-         '9fc2070dc6db8d94f322cb5e27523ea4'
-         '6cb55fe51fca1de674ca32b10edc7c8b'
-         '138121b288c269aa418ca0c33eb65326'
-         '8fd47eed7c79fe29c74a81d9b4a4864a'
-         '71f6007df53b17361965f38c01869738'
-         'f253842c0a377e86c6c62f7db27db32d'
-         'b93caebe5ceb08d2cde78fe40fff3c0c'
-         'a36d0776b736609b1e72b8530cc9e755'
-         '9acd2d8e4fd39700aa99a21681403a72'
-         '60703c83180e8bb3abdcfbf26bf1289d'
-         'dc708663d015830fb11e800f48d7492c'
-         '313e6a88a602e09b5f08d6ff8ccdc89a'
-         '31debae1dca6035695805d0de55c71f3'
-         '1f927d23eb1db49db3ffe2d3ee5e3da5'
-         '4b5e52235ce8a52d1144d5f6e45a069c'
-         '81d1a28544f9a6e92eafc48e57a45a35'
-         'bb32f5938b885d2de225e4d8e2471d28'
-         '69d447db48244cc1546d0ce3447e8ab8'
-         '16d36a140dfbd9a001b28f4fcbc81df8'
-         '211bb03760a2eacf685f27f03e71da4d'
-         '83225015ad8f023ff0d9f9643c295e4c'
-         '67d3ec1632a4ed2aaf8e7a5df0284b1e')
+md5sums=('ee7f337bb32aee98a9f2be1936843106'
+         '10102b3e8f81dbd91dacddb892ba68b9'
+         'fef4de4746cc36bcf911fb0f7a7b2338'
+         'd31e21bb4917155e159941400b86b9a8'
+         '76e7c36cc0fd7e200c8b0d220d05f084'
+         '804fbc692db4523e31fbe337c37cd958'
+         '7bd3d6b9d4bdfcd5c53002ed695c3be9'
+         'b875123775d4aa52b747e9ef897cee4c'
+         'a5ecf997b5afa853fd46840f1e9cc01e'
+         '352872240f6e1812fb27599f2d43ed5e'
+         '7f680543cca22102660e39d775ea4f1f'
+         '19c47a8901163e23fc937b2076812147'
+         '7c1b1105b5a70008c12b3a5195c5a789'
+         '3306f9408c61f622a185fd9e218199ef'
+         '88f466e2bd3ec4236f76d92b22cc5e12'
+         '8c655118c3cfc0063581f11f11f23817'
+         '0d481cfdd69a591881e358f6a4d45e3e'
+         '457aea13f02af3aa2bc690ab438e1f37'
+         '9b72f83a7e1142ab8839fd2350437dfc'
+         '7e640437184ff9874d50bba9ddd8b800'
+         '2f00074f37b3785df5781a750e4a8293'
+         '9b4295c47829adcc3832d2b9524c6a95'
+         '1dea8892db29f13a37acdb02ba635f80')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index ca386c03a..20aa8b8e7 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=iceape
-_debver=2.7.5
+_debver=2.7.6
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}-2.0-lang.patch
         clrf.patch
         libre.patch)
-md5sums=('7a6e671485a75cd9495f346e0f8e4dcb'
-         '174e572e9d7b1b62a8e437f70fe771ba'
+md5sums=('7177342dcd4d445b166c36935c1d4ca5'
+         '5adb3b2c718311e664d8541bb4a16304'
          '60ba9e8f2fafd20e41268af534a55ea7'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index cc509fdd3..a209713b3 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,39 +1,30 @@
-# $Id: PKGBUILD 160065 2012-05-29 18:46:25Z tomegun $
+# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.07.14
+pkgver=2012.07.29
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
-            'dhcpcd: DHCP network configuration'
-            'net-tools: legacy network support'
-            'wireless_tools: Wireless networking')
+optdepends=('dhcpcd: DHCP network configuration'
+            'bridge-utils: Legacy network bridging support'
+            'net-tools: Legacy network support'
+            'wireless_tools: Legacy wireless networking')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        0001-remove-run-nologin-before-leaving-rc.multi.patch
-        'wireless.conf.d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-#  patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
-}
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('15e2f373be03b25b0033fd4fb4820d30'
-         'ba32b9d723c20b38487669fb3c00d3d5'
-         '027576534885b8d5dded9be546057b12')
+md5sums=('0fc663f1ad8e7512f5907d498e09be21'
+         '372f08fcb40e31c0e88a9715354e3b19')
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 550ad4b3f..bed0b129a 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160829 2012-06-06 16:14:38Z andrea $
+# $Id: PKGBUILD 164089 2012-07-26 16:54:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.8.4
+pkgver=4.9.0
 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=('a1d6951b27c868c738a36dbd21702b658f3d6245'
+sha1sums=('f5c358e3c7902b15328908a9966f98774827988e'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 25084c92c..27fb5d504 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,35 +1,33 @@
-# $Id: PKGBUILD 162798 2012-06-30 15:30:51Z andrea $
+# $Id: PKGBUILD 164789 2012-08-05 12:10:43Z 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.8.4
+pkgver=4.9.0
 pkgrel=4
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
+url='https://projects.kde.org/projects/kde/kdelibs'
 license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
         'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit'
-        'media-player-info')
+        'media-player-info' 'libxtst')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 provides=("kdelibs=$pkgver")
-replaces=('kdelibs-experimental' 'kdelibs')
+replaces=('kdelibs')
 conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
-        'fix-application-crashes.patch'
         'khtml-fsdg.diff')
-sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
+sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
-          'c271c712bf202f517015b597d61cfe1aed0db82b'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -40,9 +38,7 @@ build() {
 
        # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
        patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
-
-       # KDEBUG 301453
-       patch -p1 -i "${srcdir}"/fix-application-crashes.patch
+       
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch
deleted file mode 100644
index 8ac385483..000000000
--- a/libre/kdelibs-libre/fix-application-crashes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Vishesh Handa <me@vhanda.in>
-Date: Wed, 13 Jun 2012 21:26:31 +0000
-Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d
----
-Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
-
-This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
-
-This is done so that 4.8.x works with Soprano 2.7.6
----
-
-
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -94,7 +94,7 @@ public:
- 
-         // we may get disconnected from the server but we don't want to try
-         // to connect every time the model is requested
--        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-+        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
-             delete localSocketModel;
-             localSocketModel = 0;
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-
-From: Vishesh Handa <me@vhanda.in>
-Date: Wed, 13 Jun 2012 21:25:32 +0000
-Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us."
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=76e0376d7582cfe5b898c56bf3779ca2279dace8
----
-Revert "Disconnect before re-connecting. Soprano does not do that for us."
-
-This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
-
-This is being done so that KDE 4.8.x works with Soprano 2.7.6
----
-
-
---- a/nepomuk/core/nepomukmainmodel.cpp
-+++ b/nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
-         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
-             delete localSocketModel;
-             localSocketModel = 0;
--            localSocketClient.disconnect();
-             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
-             kDebug() << "Connecting to local socket" << socketName;
-             if ( localSocketClient.connect( socketName ) ) {
-
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index b221fbca7..1244e21bb 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 160882 2012-06-06 16:17:23Z andrea $
+# $Id: PKGBUILD 164151 2012-07-26 16:58:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
-    'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
-    'libktorrent' 'libmms' 'mediastreamer')
-    source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458')
+	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
+    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
+    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d')
 
 build() {
     cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 5558e73f4..7d80e341e 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160887 2012-06-06 16:17:38Z andrea $
+# $Id: PKGBUILD 164156 2012-07-26 16:58:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.8.4
+pkgver=4.9.0
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -14,12 +14,12 @@ groups=('kde' 'kdeutils')
 depends=('kdebase-runtime' 'kdebase-lib' 'libarchive' 'qjson')
 makedepends=('cmake' 'automoc4')
 optdepends=('p7zip' 'zip' 'unzip' 'ununrar')
+install=${_pkgname}.install
 provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
-install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('1d0d311beb8beeee7f33a58baef7f95192eb69ac')
+sha1sums=('60c535370da1edf03481fdc1ef3f04f9269d54e2')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 35529f458..706b2d0d7 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
 # $Id: PKGBUILD 161863 2012-06-15 23:14:52Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.6
+pkgver=1.8.7
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-sha1sums=('c469d87da4b0512270376aa360c7a955d02153c3'
+sha1sums=('3cdadae3b3bcec2da048257b72a5d7c11a9621f1'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index d2a5610df..93ee3ad0a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=38
+_sublevel=39
 pkgver=${_basekernel}.${_sublevel}
-_lxopkgver=${_basekernel}.37 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '8a2416fd6ac323184ab563958a6eb560'
-         '9cfcf3807201ce44aa720571232a10ce'
-         '8bb5c5aa217202c3ac3798ba7798e07d'
+         '9259948f76db87052be56da4c525d07a'
+         '5e3362ef81c99563852f1b7a8c5b5837'
+         '3d078c10d51f9c2f4d0ec6be531caf1d'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         'f0c4e2fa00e3f9fd9d666742c32beefb')
+         'eea9aa0065f636fc924a23b3ffd24343')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 83bab0f8c..240eccfbf 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 3.0.29-1 Kernel Configuration
+# Linux/i386 3.0.39-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -192,9 +192,10 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -992,7 +993,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
@@ -1104,6 +1107,7 @@ CONFIG_XPS=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5343,6 +5347,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5386,6 +5391,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5417,6 +5423,7 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index fa7be5e5b..86b096eaf 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 3.0.26-1 Kernel Configuration
+# Linux/x86_64 3.0.39-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -193,9 +193,10 @@ CONFIG_TRACEPOINTS=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -960,7 +961,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
@@ -1070,10 +1073,9 @@ CONFIG_BPF_JIT=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
 
 #
 # Packet Radio protocols
@@ -1093,6 +1095,8 @@ CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BAYCOM_PAR=m
 CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
 
 #
 # IrDA protocols
@@ -5083,6 +5087,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5126,6 +5131,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5157,6 +5163,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 226061525..6f7899fe6 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.38-1-LIBRE-LTS
+KERNEL_VERSION=3.0.39-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/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b552dcca5..0ef52901a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -16,7 +16,7 @@ _basekernel=3.5
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
 _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch'
+        'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         'a89ff57fd3ce5833d51f7cdef17a9a3c'
-         '978a58bebbdfe04d6e91523e09da5ad5'
+         '7f0b7950bc9d2a20cdb6b850e6e4eb5a'
+         'a796ea383eb136cb38fab0a52b6d2f52'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '263725f20c0b9eb9c353040792d644e5'
+         '2afcc001cc178be72e3a19d95f4bd5eb'
          'a9338d11a2b23fe0cd43cc4fee5aed42')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -60,21 +60,16 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
-
 
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix avmfritz capi20 functionallity
+  # https://bugzilla.kernel.org/show_bug.cgi?id=45271
+  patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
new file mode 100644
index 000000000..f8bb193c6
--- /dev/null
+++ b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch
@@ -0,0 +1,48 @@
+From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001
+From: Karsten Keil <keil@b1-systems.de>
+Date: Sat, 28 Jul 2012 20:10:04 +0200
+Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection
+
+The test for the fillempty condition was wrong in one place.
+Changed the variable to the right boolean type.
+
+Signed-off-by: Karsten Keil <keil@b1-systems.de>
+---
+ drivers/isdn/hardware/mISDN/avmfritz.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
+index c08fc60..fa6ca47 100644
+--- a/drivers/isdn/hardware/mISDN/avmfritz.c
++++ b/drivers/isdn/hardware/mISDN/avmfritz.c
+@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch)
+ {
+ 	struct fritzcard *fc = bch->hw;
+ 	struct hdlc_hw *hdlc;
+-	int count, fs, cnt = 0, idx, fillempty = 0;
++	int count, fs, cnt = 0, idx;
++	bool fillempty = false;
+ 	u8 *p;
+ 	u32 *ptr, val, addr;
+ 
+@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch)
+ 			return;
+ 		count = fs;
+ 		p = bch->fill;
+-		fillempty = 1;
++		fillempty = true;
+ 	} else {
+ 		count = bch->tx_skb->len - bch->tx_idx;
+ 		if (count <= 0)
+@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch)
+ 			hdlc->ctrl.sr.cmd |= HDLC_CMD_XME;
+ 	}
+ 	ptr = (u32 *)p;
+-	if (fillempty) {
++	if (!fillempty) {
+ 		pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count,
+ 			 bch->tx_idx, bch->tx_skb->len);
+ 		bch->tx_idx += count;
+-- 
+1.7.7
+
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 114841394..a66ebeaa7 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.5.0-1 Kernel Configuration
+# Linux/i386 3.5.0-2 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -204,9 +204,11 @@ CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -1071,7 +1073,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
@@ -1191,6 +1195,7 @@ CONFIG_BQL=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5624,6 +5629,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5664,8 +5670,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5697,6 +5704,7 @@ CONFIG_DEBUG_RODATA=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index fcc8b37dd..350a2b905 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.5.0-1 Kernel Configuration
+# Linux/x86_64 3.5.0-2 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -206,9 +206,11 @@ CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
-# CONFIG_KPROBES is not set
+CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_KRETPROBES=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
@@ -1036,7 +1038,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 # DCCP Kernel Hacking
 #
 # CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
 CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
@@ -1153,6 +1157,7 @@ CONFIG_BPF_JIT=y
 # Network testing
 #
 CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_HAMRADIO=y
 
@@ -5393,6 +5398,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -5433,8 +5439,9 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
@@ -5466,6 +5473,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_UDELAY=2
diff --git a/libre/linux-libre/i915-fix-ghost-tv-output.patch b/libre/linux-libre/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 87de3c8d5..5f1005477 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.5.0-1-LIBRE
+KERNEL_VERSION=3.5.0-2-LIBRE
 
 # 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/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 4442712f0..4b3384c25 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=24
+pkgrel=25
 epoch=1
 _extramodules=extramodules-3.5-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
new file mode 100644
index 000000000..d9934e179
--- /dev/null
+++ b/libre/luxblend25/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+pkgname=luxblend25
+pkgver=1.0rc3
+_pkgver=2d621c653196
+_blender=2.63
+pkgrel=1
+pkgdesc="A LuxRender exporter for Blender-libre"
+arch=('any')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('blender' 'luxrender')
+replaces=('luxblend25')
+conflicts=('luxblend25')
+provides=("luxblend25=$pkgver")
+source=(https://bitbucket.org/luxrender/luxblend25/get/$_pkgver.tar.bz2)
+md5sums=('c5719c2a0e8567cd9f0aef429a2996f0')
+
+package() {
+  install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  cp -a "$srcdir"/luxrender-luxblend25-$_pkgver/src/luxrender \
+    "$pkgdir"/usr/share/blender/$_blender/scripts/addons
+  # change the search path in exporter so it finds pylux in its new location
+  sed -i 's|from.*import pylux|import pylux|' "$pkgdir/usr/share/blender/$_blender/scripts/addons/luxrender/outputs/pure_api.py"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c8ea75082..279e6622e 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-pkgver=1.0rc2
-_pkgver=8707be9e6dc9
-pkgrel=2
+pkgver=1.0rc3
+_pkgver=eb749c000ffc
+pkgrel=1
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ replaces=('luxrays')
 conflicts=('luxrays')
 provides=("luxrays=$pkgver")
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('b4f31563a8235a2791ab9df58be43adb')
+md5sums=('f5f4b53df22a1c7ad301c78d046edd7d')
 
 build() {
   cd "$srcdir/luxrender-$_pkgname-$_pkgver"
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 122a87207..be6fd88e8 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 pkgname=luxrender-libre
-pkgver=1.0rc2
-_pkgver=008805644181
-pkgrel=3
+pkgver=1.0rc3
+_pkgver=9ed6b94cef05
+pkgrel=1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
@@ -20,7 +20,7 @@ conflicts=('luxrender')
 provides=("luxrender=$pkgver")
 source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \
         boost_1.50_fix.diff)
-md5sums=('1922ccce6f70e7d707b340e2415875cd'
+md5sums=('54ff625a7833541c3cff5f0a77a93863'
          '8c7774bb0c97aadd77d9e665d8fa4aab')
 
 build() {
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index 9c29caf0b..a921253da 100644
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -6,7 +6,7 @@ replaces=('archlinux-themes-slim')
 conflicts=('archlinux-themes-slim')
 pkgname=parabola-themes-slim
 pkgver=1.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="a theme parabolero to the Slim login manager"
 arch=('any')
 url="https://parabolagnulinux.org/"
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index b3cabb285..3de090703 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts')
 pkgver=4.1.18
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -48,12 +48,12 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          'f7d275fc52e5f3cfafd85646c2914063')
 
 _extramodules=extramodules-3.0-LIBRE-LTS
-_kernver=3.0.38-1-LIBRE-LTS
-
-export KERN_DIR=/usr/lib/modules/${_kernver}/build/
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
 
 build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    export KERN_DIR=/usr/lib/modules/${_kernver}/build/
+    export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
     cd "$srcdir/VirtualBox-${pkgver}"
 
     patch -Np1 -i "$srcdir/libre.patch"
@@ -107,7 +107,7 @@ package_virtualbox-libre-parabola-modules-lts(){
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
     replaces=('virtualbox-archlinux-modules-lts')
     conflicts=('virtualbox-archlinux-modules-lts')
-    provides=("virtualbox-archlinux-modules=$pkgver" "virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-libre-parabola-modules=$pkgver" )
+    provides=("virtualbox-archlinux-modules-lts=$pkgver" "virtualbox-archlinux-modules=$pkgver")
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
@@ -131,7 +131,7 @@ package_virtualbox-libre-modules-lts(){
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
     replaces=('virtualbox-modules-lts')
     conflicts=('virtualbox-modules-lts')
-    provides=("virtualbox-modules=$pkgver" "virtualbox-modules-lts=$pkgver")
+    provides=("virtualbox-modules-lts=$pkgver" "virtualbox-modules=$pkgver")
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index ef63d7ff0..d1b6f5fae 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
 pkgver=4.1.18
-pkgrel=5.1
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -47,12 +47,16 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          'f7d275fc52e5f3cfafd85646c2914063')
 
 _extramodules=extramodules-3.5-LIBRE
-_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
 
-export KERN_DIR=/usr/lib/modules/${_kernver}/build
-export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
+
 
 build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)"
+
+    export KERN_DIR=/usr/lib/modules/${_kernver}/build
+    export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
     cd "$srcdir/VirtualBox-${pkgver}"
 
     patch -Np1 -i "$srcdir/libre.patch"
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 84761ac24..c3aa1a69c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-source'
          'virtualbox-libre-parabola-source')
 pkgver=4.1.18
-pkgrel=4.1
+pkgrel=4.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -158,9 +158,9 @@ package_virtualbox-libre() {
 package_virtualbox-libre-source() {
     pkgdesc="VirtualBox kernel modules source"
     depends=(dkms gcc make)
-    replaces=('virtualbox-source' 'virtualbox-libre-modules')
+    replaces=('virtualbox-source')
     conflicts=('virtualbox-source')
-    provides=("virtualbox-source=$pkgver" "virtualbox-libre-modules=$pkgver")
+    provides=("virtualbox-source=$pkgver" "virtualbox-modules=$pkgver")
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-source.install
@@ -195,8 +195,8 @@ package_virtualbox-libre-sdk() {
 package_virtualbox-libre-parabola-additions(){
     pkgdesc="Additions only for Parabola guests (userspace tools)"
     depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
-    conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
+    replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
+    conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
     provides=("virtualbox-archlinux-additions=${pkgver}")
     backup=('etc/conf.d/vboxservice')
     install=virtualbox-libre-parabola-additions.install
@@ -234,9 +234,9 @@ package_virtualbox-libre-parabola-additions(){
 package_virtualbox-libre-parabola-source() {
     pkgdesc='VirtualBox Additions kernel modules source'
     depends=(dkms gcc make)
-    replaces=('virtualbox-archlinux-source' 'virtualbox-libre-parabola-modules')
+    replaces=('virtualbox-archlinux-source')
     conflicts=('virtualbox-archlinux-source')
-    provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}" "virtualbox-libre-parabola-modules=${pkgver}")
+    provides=("virtualbox-archlinux-source=${pkgver}" "virtualbox-archlinux-modules=${pkgver}")
     optdepends=('linux-libre-headers'
                 'linux-libre-lts-headers')
     install=virtualbox-libre-parabola-source.install
@@ -249,7 +249,7 @@ package_virtualbox-libre-parabola-source() {
 
 md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
-         '755ab0dd9bcacf2c00d2275b1ca69547'
+         '2d599c6cf8bbbf183a7c07a9bcb926c7'
          'a1ff1d1b4423556887e48a32978226a6'
          '4ff559f2bea335d59c4012048983ca91'
          '97e193f050574dd272a38e5ee5ebe62b'
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 682175798..c2c673386 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -9,9 +9,9 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "as root. If it is available in your distribution, you should install the "
 -  "DKMS package first. This package keeps track of Linux kernel changes and "
 -  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-source and"
-+  "execute /usr/bin/vboxbuild ."
++  "  <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
++  "as root. If you don't use our stock kernel, install virtualbox-libre-source and "
++  "execute dkms install vboxhost/4.1.18 ."
    );
  
  QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -25,7 +25,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
 -  "may correct this. Make sure that you do not mix the "
 -  "OSE version and the PUEL version of VirtualBox."
 +  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
++  "  <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
    );
 
  QString g_QStrHintOtherNoDriver = QApplication::tr(
@@ -37,11 +37,11 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
  WARNING: The vboxdrv kernel module is not loaded. Either there is no module
           available for the current kernel (`uname -r`) or it failed to
 -         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-modules or
++         load. Please reinstall the kernel module virtualbox-libre-modules or
 +         if you don't use our stock kernel compile the modules with
  
 -           sudo /etc/init.d/vboxdrv setup
-+           sudo /usr/bin/vboxbuild
++           sudo dkms install vboxhost/4.1.18
  
           You will not be able to start VMs until this problem is fixed.
  EOF
diff --git a/~lukeshu/codeanalyst/PKGBUILD b/~lukeshu/codeanalyst/PKGBUILD
new file mode 100644
index 000000000..5cbab45dc
--- /dev/null
+++ b/~lukeshu/codeanalyst/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
+
+# A note about the oprofile fork:
+# The docs claim that the fork is just for adding support for
+# processors that aren't upstream yet (at the time, they are now that
+# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
+#  * AMD also added a bunch of CodeAnalyst-specific code. Also some of
+#    the external.
+#  * Several external variables/types have different names; the API is
+#    incompatible.
+#  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
+
+pkgbase=CodeAnalyst
+pkgname=codeanalyst
+pkgver=3.3.18.0361
+_pkgver="${pkgver//./_}"
+pkgrel=4.1
+pkgdesc="AMD performance profiler. Includes a fork of oprofile."
+url="http://developer.amd.com/tools/${pkgbase}/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc' 'sudo' 'qt>=4.1' 'oprofile' 'libdwarf')
+makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
+provides=('oprofile=0.9.6cvs')
+conflicts=('oprofile')
+options=('!strip')
+install=codeanalyst.install
+source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
+	'gcc47.patch'
+	'skipSetup.patch'
+        'codeanalyst.sudo'
+        'codeanalyst.desktop'
+	'codeanalyst.svg')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  patch -Np1 -i "${srcdir}/gcc47.patch"
+  patch -Np1 -i "${srcdir}/skipSetup.patch"
+  rm -rf src/dwarf-* # easiest way to ensure using the system install
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+    --with-libdwarf-includes=/usr/include/libdwarf \
+    --with-libdwarf-libraries=/usr/lib
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
+
+  find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
+
+  cd "${srcdir}"
+  install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
+  install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
+  install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
+}
+
+md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
+         '063d0fc9680641a92ce5e310ffe1c9c0'
+         'ce549e59c4a5916fd19e8d085e863627'
+         '3cc8f64fe84c5a886d0172ee8d99f690'
+         '3a18d3f7fb01f199a8ed5ae2908c18e4'
+         '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/codeanalyst/codeanalyst.desktop b/~lukeshu/codeanalyst/codeanalyst.desktop
new file mode 100644
index 000000000..56d54f884
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=AMD CodeAnalyst
+Comment=AMD profiler and performance analyzer
+Exec=/usr/bin/CodeAnalyst
+Icon=codeanalyst
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Development;
diff --git a/~lukeshu/codeanalyst/codeanalyst.install b/~lukeshu/codeanalyst/codeanalyst.install
new file mode 100755
index 000000000..8edb4adc2
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.install
@@ -0,0 +1,32 @@
+post_install() {
+  getent group amdca &>/dev/null || /usr/bin/groupadd amdca &>/dev/null
+  echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
+  echo "     ie: gpasswd -a USERNAME amdca"
+
+  chown root:amdca /usr/bin/calog_report
+  chown root:amdca /usr/bin/capackage.sh
+  chown root:amdca /usr/bin/careport.sh
+  chown root:amdca /usr/bin/cgreport
+  chown root:amdca /usr/bin/CodeAnalyst
+  chown root:amdca /usr/bin/opannotate
+  chown root:amdca /usr/bin/oparchive
+  chown root:amdca /usr/bin/opcontrol
+  chown root:amdca /usr/bin/opgprof
+  chown root:amdca /usr/bin/ophelp
+  chown root:amdca /usr/bin/opimport
+  chown root:amdca /usr/bin/opjitconv
+  chown root:amdca /usr/bin/opreport
+  chown root:amdca /usr/bin/oprofiled
+  chown root:amdca /usr/sbin/ca_oprofile_controller
+  #chown root:amdca /usr/sbin/ca_user_manager
+
+  update-desktop-database -q
+}
+
+post_remove() {
+  if getent group amdca &>/dev/null; then
+    groupdel amdca
+  fi
+
+  update-desktop-database -q
+}
diff --git a/~lukeshu/codeanalyst/codeanalyst.sudo b/~lukeshu/codeanalyst/codeanalyst.sudo
new file mode 100644
index 000000000..1c3173bdb
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.sudo
@@ -0,0 +1 @@
+%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/codeanalyst/codeanalyst.svg b/~lukeshu/codeanalyst/codeanalyst.svg
new file mode 100644
index 000000000..8febf725b
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   width="286.95001"
+   height="286.95001"
+   viewBox="0 0 286.95063 286.95"
+   overflow="visible"
+   enable-background="new 0 0 1368.987 286.954"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="AMD_Logo.svg"
+   style="overflow:visible"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1028"
+   id="namedview13"
+   showgrid="false"
+   inkscape:zoom="2.11"
+   inkscape:cx="163.32315"
+   inkscape:cy="145.21584"
+   inkscape:window-x="-4"
+   inkscape:window-y="-3"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<polyline
+   points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
+   id="polyline3"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+<polyline
+   points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
+   id="polyline5"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+
+
+
+</svg>
\ No newline at end of file
diff --git a/~lukeshu/codeanalyst/gcc47.patch b/~lukeshu/codeanalyst/gcc47.patch
new file mode 100644
index 000000000..dfec4a0c4
--- /dev/null
+++ b/~lukeshu/codeanalyst/gcc47.patch
@@ -0,0 +1,72 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am	2012-04-22 17:55:01.227439003 -0300
+***************
+*** 25,31 ****
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+--- 25,31 ----
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp	2012-04-22 17:38:14.884058192 -0300
+***************
+*** 17,22 ****
+--- 17,23 ----
+  */
+  
+  #include <qtooltip.h>
++ #include <unistd.h>
+  
+  #include "MonitorDockView.h"
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp	2012-04-22 17:34:45.670714989 -0300
+***************
+*** 21,26 ****
+--- 21,27 ----
+  #include <sys/types.h>
+  #include <sys/stat.h>
+  #include <fcntl.h>
++ #include <unistd.h>
+  
+  #include "dwarfengine.h"
+  #define DWARF_DEBUG		0
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-22 17:32:30.780708624 -0300
+***************
+*** 29,34 ****
+--- 29,35 ----
+  #include <sys/stat.h>
+  #include <fcntl.h>
+  #include <time.h>
++ #include <unistd.h>
+  
+  // CodeAnalyst headers
+  #include "CaProfileWriter.h"
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp	2012-04-22 17:26:58.424026278 -0300
+***************
+*** 13,18 ****
+--- 13,19 ----
+  #include <sys/ipc.h>
+  #include <sys/sem.h>
+  #include <sys/stat.h>
++ #include <unistd.h>
+  
+  #include "slock.h"
+  #include "smm.h"
diff --git a/~lukeshu/codeanalyst/skipSetup.patch b/~lukeshu/codeanalyst/skipSetup.patch
new file mode 100644
index 000000000..fdc9bf42f
--- /dev/null
+++ b/~lukeshu/codeanalyst/skipSetup.patch
@@ -0,0 +1,68 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am	2012-04-22 20:44:07.437917684 -0300
+***************
+*** 8,19 ****
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! install-exec-hook:
+! 	@if test -e "scripts/Setup.sh"; then \
+! 		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! 	fi
+  
+! uninstall-hook:
+! 	@if test -e "scripts/Uninstall.sh"; then \
+! 		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! 	fi
+--- 8,19 ----
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! #install-exec-hook:
+! #	@if test -e "scripts/Setup.sh"; then \
+! #		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! #	fi
+  
+! #uninstall-hook:
+! #	@if test -e "scripts/Uninstall.sh"; then \
+! #		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! #	fi
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am	2012-04-22 20:47:21.604593511 -0300
+***************
+*** 15,20 ****
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! install-exec-hook:
+! 	@/sbin/ldconfig
+  
+--- 15,20 ----
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! #install-exec-hook:
+! #	@/sbin/ldconfig
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am	2012-04-22 20:44:57.674586720 -0300
+***************
+*** 8,21 ****
+  install-exec-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 		/sbin/ldconfig ;\
+  	fi
+  
+  uninstall-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+  			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 			/sbin/ldconfig ; \
+  		fi ; \
+  	fi
+  
+--- 8,19 ----
diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/~lukeshu/emacs-lucid/PKGBUILD
new file mode 100644
index 000000000..af8e755c4
--- /dev/null
+++ b/~lukeshu/emacs-lucid/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 161437 2012-06-11 15:10:57Z juergen $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
+_pkgname=emacs
+pkgname=emacs-lucid
+pkgver=24.1
+pkgrel=2
+pkgdesc="emacs, with the lucid toolkit rather than GTK2"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk-update-icon-cache' 'libxaw' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+install=emacs.install
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig} gnulib.patch)
+
+build() {
+  cd "$srcdir"/$_pkgname-$pkgver
+
+  # This is from Gentoo, to deal with a newer version of gnulib
+  patch -p1 -i "$srcdir/gnulib.patch"
+  # This is to deal with a newer version of autoconf
+  autoreconf -i -I m4
+
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=lucid --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # fix all the 777 perms on directories
+  find "$pkgdir"/usr/share/emacs -type d -exec chmod 755 {} \;
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}
+md5sums=('8ba0932c498bc8fb10d7ddba52227e5b'
+         'c303d5c0bd0f7ea28acd14c9738faff4'
+         'f9192850960902d90504150f08be4a81')
diff --git a/~lukeshu/emacs24/emacs.install b/~lukeshu/emacs-lucid/emacs.install
index d84f1de14..d84f1de14 100644
--- a/~lukeshu/emacs24/emacs.install
+++ b/~lukeshu/emacs-lucid/emacs.install
diff --git a/~lukeshu/emacs-lucid/gnulib.patch b/~lukeshu/emacs-lucid/gnulib.patch
new file mode 100644
index 000000000..2fd685c80
--- /dev/null
+++ b/~lukeshu/emacs-lucid/gnulib.patch
@@ -0,0 +1,105 @@
+Fix compilation with glibc-2.16.
+https://bugs.gentoo.org/424755
+
+Patch backported from gnulib upstream:
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH 1/1] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- emacs-24.1-orig/lib/gnulib.mk
++++ emacs-24.1/lib/gnulib.mk
+@@ -599,7 +624,6 @@
+ 	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
+ 	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
+ 	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
+-	      -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
+ 	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
+ 	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+ 	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
+--- emacs-24.1-orig/lib/stdio.in.h
++++ emacs-24.1/lib/stdio.in.h
+@@ -699,22 +699,11 @@
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+@@ -1054,9 +1043,9 @@
+ # endif
+ #endif
+ 
+-/* Some people would argue that sprintf should be handled like gets
+-   (for example, OpenBSD issues a link warning for both functions),
+-   since both can cause security holes due to buffer overruns.
++/* Some people would argue that all sprintf uses should be warned about
++   (for example, OpenBSD issues a link warning for it),
++   since it can cause security holes due to buffer overruns.
+    However, we believe that sprintf can be used safely, and is more
+    efficient than snprintf in those safe cases; and as proof of our
+    belief, we use sprintf in several gnulib modules.  So this header
+--- emacs-24.1-orig/m4/stdio_h.m4
++++ emacs-24.1/m4/stdio_h.m4
+@@ -1,4 +1,4 @@
+-# stdio_h.m4 serial 40
++# stdio_h.m4 serial 41
+ dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -18,7 +18,6 @@
+   GNULIB_GETC=1
+   GNULIB_GETCHAR=1
+   GNULIB_FGETS=1
+-  GNULIB_GETS=1
+   GNULIB_FREAD=1
+   dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
+   dnl "expected source file, required through AC_LIBSOURCES, not found". It is
+@@ -72,10 +71,10 @@
+ 
+   dnl Check for declarations of anything we want to poison if the
+   dnl corresponding gnulib module is not in use, and which is not
+-  dnl guaranteed by C89.
++  dnl guaranteed by both C89 and C11.
+   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+-    ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen renameat
+-    snprintf tmpfile vdprintf vsnprintf])
++    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
++    renameat snprintf tmpfile vdprintf vsnprintf])
+ ])
+ 
+ AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
+@@ -113,7 +112,6 @@
+   GNULIB_GETCHAR=0;              AC_SUBST([GNULIB_GETCHAR])
+   GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
+   GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
+-  GNULIB_GETS=0;                 AC_SUBST([GNULIB_GETS])
+   GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
+   GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
+   GNULIB_PCLOSE=0;               AC_SUBST([GNULIB_PCLOSE])
diff --git a/~lukeshu/emacs24/PKGBUILD b/~lukeshu/emacs24/PKGBUILD
deleted file mode 100644
index f9eb76d64..000000000
--- a/~lukeshu/emacs24/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-pkgname=emacs24-bzr
-_majorver=24.0.92
-pkgver=106756
-pkgrel=1
-pkgdesc="The extensible, customizable, self-documenting real-time display editor"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/emacs/emacs.html"
-license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
-makedepends=('bzr')
-install=emacs.install
-source=(emacs.desktop)
-md5sums=()
-
-_bzrtrunk=bzr://bzr.savannah.gnu.org/emacs/trunk
-_bzrmod=$pkgname
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Bazaar server...."
-
-  if [[ -d "$_bzrmod" ]]; then
-    cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -v -r "$pkgver" 2>&1
-    msg "The local files are updated."
-  else
-    bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -v -r "$pkgver" 2>&1
-  fi
-
-  msg "Bazaar checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_bzrmod-$_majorver"
-  cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-$_majorver"
-
-  cd "$srcdir"/$pkgname-$_majorver
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk --with-xft
-  make
-}
-
-package() {
-  provides=("emacs=${_majorver}a")
-
-  cd "$srcdir"/$pkgname-$_majorver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags,ctags.emacs}.1.gz
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-
-  # fix  FS#9253
-  mkdir -p "$pkgdir"/usr/share/pixmaps
-  ln -s  $pkgdir../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
-
-  # This is done down here to help future-proof the above
-  rm "$pkgdir"/usr/bin/emacs
-  mv "$pkgdir"/usr/share/man/man1/emacs{,-$_majorver}.1.gz
-  for prog in ctags.emacs ebrowse emacsclient etags grep-changelog rcs-checkin; do
-    mv "$pkgdir"/usr/bin/$prog{,-$_majorver}
-    mv "$pkgdir"/usr/share/man/man1/$prog{,-24}.1.gz
-  done
-  mv "$pkgdir"/usr/share/applications/emacs{,24}.desktop
-  mv "$pkgdir"/usr/share/emacs/site-lisp/subdirs{,.emacs24}.el
-  rm "$pkgdir"/usr/share/info/dir
-  for file in "$pkgdir"/usr/share/pixmaps/emacs-icon.png `find "$pkgdir"/usr/share/{icons,info} -type f`; do
-    mv "$file" "`echo "$file"|sed 's/\..*/-24&/'`"
-  done
-  ln -s "$_majorver" "$pkgdir"/usr/share/emacs/24
-  rm "$pkgdir"/var/games/emacs/*
-}
-
-md5sums=('bc513345deb65f0e910f43c1a74072de')
diff --git a/~lukeshu/emacs24/emacs.desktop b/~lukeshu/emacs24/emacs.desktop
deleted file mode 100644
index 1b18fd46c..000000000
--- a/~lukeshu/emacs24/emacs.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Emacs Text Editor
-Name[de]=Emacs Texteditor
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs24 %f
-Icon=emacs-icon
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-StartupWMClass=Emacs
diff --git a/~lukeshu/libdwarf/PKGBUILD b/~lukeshu/libdwarf/PKGBUILD
new file mode 100644
index 000000000..591b92633
--- /dev/null
+++ b/~lukeshu/libdwarf/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Marti Raudsepp <marti@juffo.org>
+
+pkgname=libdwarf
+pkgver=20111214
+pkgrel=1
+pkgdesc="Static library for handling DWARF Debugging Information Format"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+url="http://reality.sgiweb.org/davea/dwarf.html"
+depends=('elfutils' 'gcc-libs')
+makedepends=('libelf')
+source=(http://reality.sgiweb.org/davea/$pkgname-$pkgver.tar.gz)
+
+build() {
+  cd $srcdir/dwarf-$pkgver/libdwarf
+  ./configure
+  make
+
+  # dwarfdump
+  cd $srcdir/dwarf-$pkgver/dwarfdump2
+  ./configure --prefix=/usr CFLAGS=-I../libdwarf CXXFLAGS=-I../libdwarf LDFLAGS=-L../libdwarf
+  # disable parallelization; -j5 build fails ~20% of the time on my machine
+  make -j1
+}
+
+package() {
+  cd $srcdir/dwarf-$pkgver/libdwarf
+
+  install -d $pkgdir/usr/lib
+  install -m 644 libdwarf.a $pkgdir/usr/lib
+
+  install -d $pkgdir/usr/include/libdwarf
+  install dwarf.h libdwarf.h $pkgdir/usr/include/libdwarf
+
+  install -dm 755 $pkgdir/usr/share/doc/$pkgname
+  install README NEWS *.pdf $pkgdir/usr/share/doc/$pkgname
+
+  # dwarfdump
+  cd $srcdir/dwarf-$pkgver/dwarfdump2
+  install -Dm755 dwarfdump $pkgdir/usr/bin/dwarfdump
+  install -Dm644 dwarfdump.1 $pkgdir/usr/share/man/man1/dwarfdump.1
+  install -Dm644 dwarfdump.conf $pkgdir/usr/lib/dwarfdump.conf
+}
+md5sums=('573b49b94e38a0e65ff337768f003d33')
diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD
index 799ab47c2..62b12072a 100644
--- a/~mtjm/cups-usblp/PKGBUILD
+++ b/~mtjm/cups-usblp/PKGBUILD
@@ -1,21 +1,18 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
+# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgname="cups"
 pkgname="cups-usblp"
-pkgver=1.5.3
-pkgrel=2
+pkgver=1.5.4
+pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package with usblp backend"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
+             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
 optdepends=('php: for included phpcups.so module'
-            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
-	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'xdg-utils: xdg .desktop file support')
 provides=("cups=${pkgver}")
 conflicts=("cups" "cups-libre")
@@ -38,17 +35,19 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
+        cups-systemd-socket.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
-         '8ec0d9d4b6fe3a8902042ed2432fb8b4'
-         'c80bd1ff8d342cdf379ce5f445b9e944'
+md5sums=('de3006e5cf1ee78a9c6145ce62c4e982'
+         '12c8af5bcd3b8f84240280b3dfaf9e89'
+         'cdc1322c8014297ae349e2db78a03c5a'
          '1a5112f63958643f2888abc9418dbcac'
          'c37d1bf1bb76acc3fe93362c80d91b7c'
          '5d302860559960042f3b47a91b97c5fe'
          '9b8467a1e51d360096b70e2c3c081e6c'
          '3733c23e77eb503bd94cc368e02830dc'
          'c9159ba1233902ba6ddbbe6885a46b72'
+         '4505b8b2c57a7c28ea79e08388bbbbb9'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -63,6 +62,9 @@ build() {
   patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch
   patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch
 
+  # add systemd socket support - Fedora patch, also used in Gentoo
+  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
+  
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
 
@@ -76,6 +78,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --libdir=/usr/lib \
+     --with-systemdsystemunitdir=/usr/lib/systemd/system \
      --with-logdir=/var/log/cups \
      --with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon \
@@ -120,14 +123,10 @@ package() {
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc
   
-  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
-  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
   # install ssl directory where to store the certs, solves some samba issues
   install -dm700 -g lp ${pkgdir}/etc/cups/ssl
   # remove directory from package, we create it in cups rc.d file
   rm -rf ${pkgdir}/var/run
-#  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
 
   # install some more configuration files that will get filled by cupsd
   touch ${pkgdir}/etc/cups/printers.conf
@@ -143,4 +142,13 @@ package() {
   
   # remove client.conf man page
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+  
+  # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions
+  rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
+  rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+  rm -v ${pkgdir}/usr/share/cups/banners/*
+  rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs}
+  rm -v ${pkgdir}/usr/share/cups/fonts/*
+  # comment out all conversion rules which use any of the removed filters
+  perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs
 }
diff --git a/~mtjm/cups-usblp/cups-avahi-1-config.patch b/~mtjm/cups-usblp/cups-avahi-1-config.patch
index 516e01fa9..304cd2607 100644
--- a/~mtjm/cups-usblp/cups-avahi-1-config.patch
+++ b/~mtjm/cups-usblp/cups-avahi-1-config.patch
@@ -39,4 +39,4 @@ diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/confi
 +
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
+ 		case "$uname" in
\ No newline at end of file
diff --git a/~mtjm/cups-usblp/cups-avahi-2-backend.patch b/~mtjm/cups-usblp/cups-avahi-2-backend.patch
index 9fa367729..00e12a0a3 100644
--- a/~mtjm/cups-usblp/cups-avahi-2-backend.patch
+++ b/~mtjm/cups-usblp/cups-avahi-2-backend.patch
@@ -1115,4 +1115,4 @@ diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-sup
 +
  
  /*
-  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
+  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file
diff --git a/~mtjm/cups-usblp/cups-systemd-socket.patch b/~mtjm/cups-usblp/cups-systemd-socket.patch
new file mode 100644
index 000000000..09d17d415
--- /dev/null
+++ b/~mtjm/cups-usblp/cups-systemd-socket.patch
@@ -0,0 +1,527 @@
+diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in
+--- cups-1.5.2/config.h.in.systemd-socket	2012-03-16 14:50:57.089449755 +0000
++++ cups-1.5.2/config.h.in	2012-03-16 14:50:57.146449787 +0000
+@@ -503,6 +503,13 @@
+ 
+ 
+ /*
++ * Do we have systemd support?
++ */
++
++#undef HAVE_SYSTEMD
++
++
++/*
+  * Various scripting languages...
+  */
+ 
+diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/config-scripts/cups-systemd.m4
+--- cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket	2012-03-16 14:50:57.146449787 +0000
++++ cups-1.5.2/config-scripts/cups-systemd.m4	2012-03-16 14:50:57.146449787 +0000
+@@ -0,0 +1,36 @@
++dnl
++dnl "$Id$"
++dnl
++dnl   systemd stuff for CUPS.
++
++dnl Find whether systemd is available
++
++SDLIBS=""
++AC_ARG_WITH([systemdsystemunitdir],
++        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++        AC_MSG_CHECKING(for libsystemd-daemon)
++        if $PKGCONFIG --exists libsystemd-daemon; then
++		AC_MSG_RESULT(yes)
++        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
++        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
++		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++		AC_DEFINE(HAVE_SYSTEMD)
++	else
++		AC_MSG_RESULT(no)
++	fi
++fi
++
++if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
++        SYSTEMD_UNITS="cups.service cups.socket cups.path"
++else
++        SYSTEMD_UNITS=""
++fi
++
++AC_SUBST(SYSTEMD_UNITS)
++AC_SUBST(SDLIBS)
++
++dnl
++dnl "$Id$"
++dnl
+diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in
+--- cups-1.5.2/configure.in.systemd-socket	2011-08-31 02:36:33.000000000 +0100
++++ cups-1.5.2/configure.in	2012-03-16 14:50:57.146449787 +0000
+@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
+ sinclude(config-scripts/cups-largefile.m4)
+ sinclude(config-scripts/cups-dnssd.m4)
+ sinclude(config-scripts/cups-launchd.m4)
++sinclude(config-scripts/cups-systemd.m4)
+ sinclude(config-scripts/cups-defaults.m4)
+ sinclude(config-scripts/cups-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
+@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
+ 	  conf/snmp.conf
+ 	  cups-config
+ 	  data/testprint
++          data/cups.service
++          data/cups.socket
++          data/cups.path
+ 	  desktop/cups.desktop
+ 	  doc/help/ref-cupsd-conf.html
+ 	  doc/help/standard.html
+diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c
+--- cups-1.5.2/cups/usersys.c.systemd-socket	2012-03-16 14:50:57.054449734 +0000
++++ cups-1.5.2/cups/usersys.c	2012-03-16 14:50:57.148449788 +0000
+@@ -778,7 +778,7 @@ cups_read_client_conf(
+     struct stat	sockinfo;		/* Domain socket information */
+ 
+     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
+-	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
++	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
+       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
+     else
+ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
+diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.in
+--- cups-1.5.2/data/cups.path.in.systemd-socket	2012-03-16 14:50:57.148449788 +0000
++++ cups-1.5.2/data/cups.path.in	2012-03-16 14:50:57.148449788 +0000
+@@ -0,0 +1,8 @@
++[Unit]
++Description=CUPS Printer Service Spool
++
++[Path]
++PathExistsGlob=@CUPS_REQUESTS@/d*
++
++[Install]
++WantedBy=multi-user.target
+diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.service.in
+--- cups-1.5.2/data/cups.service.in.systemd-socket	2012-03-16 14:50:57.149449788 +0000
++++ cups-1.5.2/data/cups.service.in	2012-03-16 14:50:57.149449788 +0000
+@@ -0,0 +1,10 @@
++[Unit]
++Description=CUPS Printing Service
++
++[Service]
++ExecStart=@sbindir@/cupsd -f
++PrivateTmp=true
++
++[Install]
++Also=cups.socket cups.path
++WantedBy=printer.target
+diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in
+--- cups-1.5.2/data/cups.socket.in.systemd-socket	2012-03-16 14:50:57.150449788 +0000
++++ cups-1.5.2/data/cups.socket.in	2012-03-16 14:50:57.150449788 +0000
+@@ -0,0 +1,11 @@
++[Unit]
++Description=CUPS Printing Service Sockets
++
++[Socket]
++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=631
++ListenDatagram=0.0.0.0:631
++BindIPv6Only=ipv6-only
++
++[Install]
++WantedBy=sockets.target
+diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile
+--- cups-1.5.2/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
++++ cups-1.5.2/data/Makefile	2012-03-16 14:50:57.151449789 +0000
+@@ -112,6 +112,12 @@ install-data:
+ 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
++	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
++		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
++		for file in $(SYSTEMD_UNITS); do \
++			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
++		done; \
++	fi
+ 
+ 
+ #
+@@ -159,6 +165,9 @@ uninstall:
+ 	-$(RMDIR) $(DATADIR)/charsets
+ 	-$(RMDIR) $(DATADIR)/banners
+ 	-$(RMDIR) $(DATADIR)
++	for file in $(SYSTEMD_UNITS); do \
++		$(RM) $(SYSTEMDUNITDIR)/$$file; \
++	done
+ 
+ 
+ #
+diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in
+--- cups-1.5.2/Makedefs.in.systemd-socket	2012-03-16 14:50:57.081449751 +0000
++++ cups-1.5.2/Makedefs.in	2012-03-16 14:50:57.152449790 +0000
+@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+ CXXLIBS		=	@CXXLIBS@
+ DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
+ DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
++SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
+ DNSSD_BACKEND	=	@DNSSD_BACKEND@
+ DSOFLAGS	=	-L../cups @DSOFLAGS@
+ DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
+@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
+ IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+ LAUNCHDLIBS	=	@LAUNCHDLIBS@
++SDLIBS		=	@SDLIBS@
+ LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
+ 			-L../scheduler @LDARCHFLAGS@ \
+ 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
+ 
+ DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+ DBUSDIR		=	@DBUSDIR@
++SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
+ 
+ 
+ #
+diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/client.h
+--- cups-1.5.2/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
++++ cups-1.5.2/scheduler/client.h	2012-03-16 14:50:57.153449791 +0000
+@@ -75,6 +75,9 @@ typedef struct
+   int			fd;		/* File descriptor for this server */
+   http_addr_t		address;	/* Bind address of socket */
+   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
++#ifdef HAVE_SYSTEMD
++  int			is_systemd;	/* Is this a systemd socket? */
++#endif /* HAVE_SYSTEMD */
+ } cupsd_listener_t;
+ 
+ 
+diff -up cups-1.5.2/scheduler/dirsvc.c.systemd-socket cups-1.5.2/scheduler/dirsvc.c
+--- cups-1.5.2/scheduler/dirsvc.c.systemd-socket	2012-03-16 14:50:57.112449768 +0000
++++ cups-1.5.2/scheduler/dirsvc.c	2012-03-16 14:50:57.155449792 +0000
+@@ -1512,7 +1512,7 @@ cupsdStartBrowsing(void)
+       }
+     }
+ 
+-    if (BrowseSocket >= 0)
++    if (BrowseSocket >= 0 && !BrowseSocketIsSystemd)
+     {
+      /*
+       * Bind the socket to browse port...
+@@ -1556,13 +1556,17 @@ cupsdStartBrowsing(void)
+ 	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
+ 			strerror(errno));
+ 
++	if (!BrowseSocketIsSystemd)
++	{
+ #ifdef WIN32
+-	closesocket(BrowseSocket);
++	  closesocket(BrowseSocket);
+ #else
+-	close(BrowseSocket);
++	  close(BrowseSocket);
+ #endif /* WIN32 */
+ 
+-	BrowseSocket = -1;
++	  BrowseSocket = -1;
++	}
++
+ 	BrowseLocalProtocols &= ~BROWSE_CUPS;
+ 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
+ 
+@@ -1885,15 +1889,22 @@ cupsdStopBrowsing(void)
+   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) &&
+       BrowseSocket >= 0)
+   {
+-   /*
+-    * Close the socket and remove it from the input selection set.
+-    */
++    if (!BrowseSocketIsSystemd)
++    {
++     /*
++      * Close the socket.
++      */
+ 
+ #ifdef WIN32
+-    closesocket(BrowseSocket);
++      closesocket(BrowseSocket);
+ #else
+-    close(BrowseSocket);
++      close(BrowseSocket);
+ #endif /* WIN32 */
++    }
++
++   /*
++    * Remove it from the input selection set.
++    */
+ 
+     cupsdRemoveSelect(BrowseSocket);
+     BrowseSocket = -1;
+@@ -5693,11 +5704,14 @@ update_cups_browse(void)
+                       strerror(errno));
+       cupsdLogMessage(CUPSD_LOG_ERROR, "CUPS browsing turned off.");
+ 
++      if (!BrowseSocketIsSystemd)
++      {
+ #ifdef WIN32
+-      closesocket(BrowseSocket);
++	closesocket(BrowseSocket);
+ #else
+-      close(BrowseSocket);
++	close(BrowseSocket);
+ #endif /* WIN32 */
++      }
+ 
+       cupsdRemoveSelect(BrowseSocket);
+       BrowseSocket = -1;
+diff -up cups-1.5.2/scheduler/dirsvc.h.systemd-socket cups-1.5.2/scheduler/dirsvc.h
+--- cups-1.5.2/scheduler/dirsvc.h.systemd-socket	2012-03-16 14:50:57.113449769 +0000
++++ cups-1.5.2/scheduler/dirsvc.h	2012-03-16 14:50:57.157449792 +0000
+@@ -100,6 +100,8 @@ VAR int			Browsing	VALUE(TRUE),
+ 					/* Short names for remote printers? */
+ 			BrowseSocket	VALUE(-1),
+ 					/* Socket for browsing */
++			BrowseSocketIsSystemd	VALUE(0),
++					/* BrowseSocket is systemd-provided? */
+ 			BrowsePort	VALUE(IPP_PORT),
+ 					/* Port number for broadcasts */
+ 			BrowseInterval	VALUE(DEFAULT_INTERVAL),
+diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/listen.c
+--- cups-1.5.2/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
++++ cups-1.5.2/scheduler/listen.c	2012-03-16 14:50:57.158449792 +0000
+@@ -401,7 +401,11 @@ cupsdStopListening(void)
+        lis;
+        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+   {
+-    if (lis->fd != -1)
++    if (lis->fd != -1
++#ifdef HAVE_SYSTEMD
++        && !lis->is_systemd
++#endif /* HAVE_SYSTEMD */
++        )
+     {
+ #ifdef WIN32
+       closesocket(lis->fd);
+diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
+--- cups-1.5.2/scheduler/main.c.systemd-socket	2012-03-16 14:50:57.121449773 +0000
++++ cups-1.5.2/scheduler/main.c	2012-03-16 14:51:55.409483636 +0000
+@@ -26,6 +26,8 @@
+  *   launchd_checkin()     - Check-in with launchd and collect the listening
+  *                           fds.
+  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
++ *   systemd_checkin()     - Check-in with systemd and collect the
++ *                           listening fds.
+  *   parent_handler()      - Catch USR1/CHLD signals...
+  *   process_children()    - Process all dead children...
+  *   select_timeout()      - Calculate the select timeout value.
+@@ -62,6 +64,10 @@
+ #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif /* HAVE_SYSTEMD */
++
+ #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+ #  include <malloc.h>
+ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+@@ -78,6 +84,9 @@
+ static void		launchd_checkin(void);
+ static void		launchd_checkout(void);
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++static void		systemd_checkin(void);
++#endif /* HAVE_SYSTEMD */
+ static void		parent_handler(int sig);
+ static void		process_children(void);
+ static void		sigchld_handler(int sig);
+@@ -537,6 +546,13 @@ main(int  argc,				/* I - Number of comm
+   }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++ /*
++  * If we were started by systemd get the listen sockets file descriptors...
++  */
++  systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+  /*
+   * Startup the server...
+   */
+@@ -759,6 +775,15 @@ main(int  argc,				/* I - Number of comm
+ 	}
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++       /*
++	* If we were started by systemd get the listen sockets file
++	* descriptors...
++        */
++
++        systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+        /*
+         * Startup the server...
+         */
+@@ -1584,6 +1609,139 @@ launchd_checkout(void)
+ }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++static void
++systemd_checkin(void)
++{
++  int n, fd;
++
++  n = sd_listen_fds(0);
++  if (n < 0)
++  {
++    cupsdLogMessage(CUPSD_LOG_ERROR,
++           "systemd_checkin: Failed to acquire sockets from systemd - %s",
++           strerror(-n));
++    exit(EXIT_FAILURE);
++    return;
++  }
++
++  if (n == 0)
++    return;
++
++  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
++  {
++    http_addr_t addr;
++    socklen_t addrlen = sizeof (addr);
++    int r;
++    cupsd_listener_t *lis;
++    char s[256];
++
++    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
++    if (r < 0)
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to verify socket type - %s",
++             strerror(-r));
++      continue;
++    }
++
++    if (!r)
++    {
++      if (Browsing &&
++	  ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS))
++      {
++	r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, 0);
++	if (r < 0)
++	{
++	  cupsdLogMessage(CUPSD_LOG_ERROR,
++			  "systemd_checkin: Unable to verify socket type - %s",
++			  strerror(-r));
++	  continue;
++	}
++
++	if (r)
++	{
++	 /*
++	  * This is the browse socket.
++	  */
++
++	  char addrstr[256];
++	  if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
++	  {
++	    cupsdLogMessage(CUPSD_LOG_ERROR,
++			    "systemd_checkin: Unable to get local address - %s",
++			    strerror(errno));
++	    continue;
++	  }
++
++	  httpAddrString (&addr, addrstr, sizeof (addrstr));
++	  BrowseSocket = fd;
++	  BrowseSocketIsSystemd = 1;
++	  cupsdLogMessage(CUPSD_LOG_DEBUG,
++			  "systemd_checkin: Matched browse (port %d) with fd %d:%s...",
++			  BrowsePort, fd, addrstr);
++	  continue;
++	}
++
++      }
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Socket not of the right type");
++      continue;
++    }
++
++    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to get local address - %s",
++             strerror(errno));
++      continue;
++    }
++
++   /*
++    * Try to match the systemd socket address to one of the listeners...
++    */
++
++    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
++       lis;
++       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
++      if (httpAddrEqual(&lis->address, &addr))
++	break;
++
++    if (lis)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Matched existing listener %s with fd %d...",
++                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
++    }
++    else
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Adding new listener %s with fd %d...",
++                      httpAddrString(&addr, s, sizeof(s)), fd);
++
++      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR,
++                        "systemd_checkin: Unable to allocate listener - "
++                        "%s.", strerror(errno));
++        exit(EXIT_FAILURE);
++      }
++
++      cupsArrayAdd(Listeners, lis);
++
++      memcpy(&lis->address, &addr, sizeof(lis->address));
++    }
++
++    lis->fd = fd;
++    lis->is_systemd = 1;
++
++#  ifdef HAVE_SSL
++    if (_httpAddrPort(&(lis->address)) == 443)
++      lis->encryption = HTTP_ENCRYPT_ALWAYS;
++#  endif /* HAVE_SSL */
++  }
++}
++#endif /* HAVE_SYSTEMD */
+ 
+ /*
+  * 'parent_handler()' - Catch USR1/CHLD signals...
+diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makefile
+--- cups-1.5.2/scheduler/Makefile.systemd-socket	2012-03-16 14:50:57.130449778 +0000
++++ cups-1.5.2/scheduler/Makefile	2012-03-16 14:50:57.160449794 +0000
+@@ -382,7 +382,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
+ 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
+-		$(LIBGSSAPI) $(LIBWRAP)
++		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
+ 
+ cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+ 	echo Linking $@...
+@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+ 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+-		$(LIBWRAP)
++		$(LIBWRAP) $(SDLIBS)
+ 
+ 
+ #