Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/sed/PKGBUILD
	extra/tcl/PKGBUILD
	extra/transmission/PKGBUILD

9 files changed, 38 insertions, 42 deletions

diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index a5dbb427c..448840e00 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 165316 2012-08-15 13:47:42Z dan $
+# $Id: PKGBUILD 173919 2012-12-28 04:42:22Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.2
+pkgver=1.8.3
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
-makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
+makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript'
+             'texlive-latexextra' 'graphviz')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('6fa7baf995fa3f71cfc09e264ba88a83')
-sha1sums=('7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a')
+md5sums=('7004085a39217b4848e26ee726b3c9a7')
+sha1sums=('3719f062bf88a3793dc94711d159205b8bb6fd19')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index f5d868ff6..62ae913bb 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 173786 2012-12-22 22:26:11Z foutrelis $
+# $Id: PKGBUILD 173898 2012-12-27 13:10:52Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
 pkgname=exo
-pkgver=0.10.1
-pkgrel=2
+pkgver=0.10.2
+pkgrel=1
 pkgdesc="Extensions to Xfce by os-cillation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2' 'LGPL')
 groups=('xfce4')
 depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
-makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth' 'xfce4-dev-tools')
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
 optdepends=('perl-uri: for mail-compose helper script')
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
-        drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch)
-sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896'
-            '9983b3206391f0e86816d70ded4fc5ddd48ac27dd29b266d4ba4a930ca663626')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix launching of .desktop files (https://bugs.archlinux.org/task/33125)
-  patch -Np1 -i "$srcdir/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch"
-  NOCONFIGURE=1 xdt-autogen
-
   # Python 2 fix
   export PYTHON=python2
 
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 188069d38..6727b9a08 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173146 2012-12-11 15:31:20Z dan $
+# $Id: PKGBUILD 173917 2012-12-28 04:30:01Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.0.2
+pkgver=1.8.0.3
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -109,8 +109,8 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('1aca109d4a719fe5bc43d25927fbc7d9'
-         'ab83283a5b3c73ab711a9f02896ca12e'
+md5sums=('6a32290550c9e8aa55aeb6e8db9c183f'
+         '962ba4fb286372386c83c3712d1fd59a'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78'
          '042524f942785772d7bd52a1f02fe5ae'
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 353d07263..46c0ab6d5 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 172810 2012-12-06 08:19:33Z andrea $
+# $Id: PKGBUILD 173893 2012-12-27 10:15:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-workspace'
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index 5ef75191f..5eee90c6b 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 167263 2012-09-29 13:32:07Z ibiru $
+# $Id: PKGBUILD 173913 2012-12-28 02:38:34Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.8.1
+pkgver=0.8.3
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('qt' 'mplayer')
 install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('39556a6113afcd9ceee071a8f85477dc')
+md5sums=('48755bffdff3878df32d8c047d7a3d52')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 5b3c76238..e760e3735 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD 173849 2012-12-25 00:34:44Z foutrelis $
+# $Id: PKGBUILD 173902 2012-12-27 19:20:12Z andyrtr $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
 pkgver=8.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
+# tcl E: Dependency zlib detected and not included (libraries ['usr/lib/libz.so.1'] needed in files ['usr/lib/libtcl8.6.so'])
+# depends=('zlib')  ???
 md5sums=('573aa5fe678e9185ef2b3c56b24658d3')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
   
+  # maybe drop sqlite build at all? isn't this the same we already have in sqlite and sqlite-tcl pkg?
+  # rm -rf ${srcdir}/tcl${pkgver}/pkgs/sqlite3*
+  
   [[ $CARCH == "x86_64" ]] && BIT="--enable-64bit"
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads $BIT
   
@@ -38,4 +43,7 @@ package()
 
   # remove buildroot traces
   sed -i "s#${srcdir}#/usr/src#" ${pkgdir}/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh
+  
+  # fix a fileconflitct - FS#33201
+  rm ${pkgdir}/usr/share/man/mann/sqlite3.n
 }
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 77840cd1b..de4a198f9 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173051 2012-12-09 18:17:19Z foutrelis $
+# $Id: PKGBUILD 173900 2012-12-27 13:11:31Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Modern file manager for Xfce"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
-sha256sums=('a81021af558802b8c2c6cd7db47cca262477c4f3d2b6d8cfa8dbba88568048f1')
+sha256sums=('7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85')
 
 build() {
   cd "$srcdir/Thunar-$pkgver"
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index 64f106019..b39b80d0b 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170069 2012-10-31 13:47:37Z ibiru $
+# $Id: PKGBUILD 173915 2012-12-28 03:11:25Z foutrelis $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.73
-pkgrel=2
+pkgver=2.75
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
@@ -39,7 +39,6 @@ package_transmission-cli() {
   install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
   install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
   install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service"
-  ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service"
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
 }
 
@@ -71,7 +70,7 @@ package_transmission-qt() {
   install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
   install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
 }
-md5sums=('fae00b13a7b18f9dc16edef020edea85'
+md5sums=('26b92e56e1574bb10443eccbf17443a7'
          '7d6186ee2a852ae3d44980f05063e194'
          'db72b02fee139e8ab416324e6c044d76'
          '5c289c8901221a94be74665368ab5c2c'
diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install
index 94a829f5c..b0832042c 100644
--- a/extra/transmission/transmission-cli.install
+++ b/extra/transmission/transmission-cli.install
@@ -1,10 +1,4 @@
 post_install() {
-  cat << _EOF
-
-  If you want to run the Transmission daemon at boot do:
-  systemctl enable transmissiond
-_EOF
-
 post_upgrade
 passwd -l transmission &>/dev/null
 }