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

Conflicts:
	libre/file-roller-libre/PKGBUILD

16 files changed, 234 insertions, 29 deletions

diff --git a/libre/debhelper/PKGBUILD b/libre/debhelper/PKGBUILD
new file mode 100644
index 000000000..60ff8f267
--- /dev/null
+++ b/libre/debhelper/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer (AUR): Antoine Lubineau <antoine@lubignon.info>
+# Contributor (AUR): Andrei "Garoth" Thorp <garoth@gmail.com>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+
+_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
+debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
+
+pkgname=debhelper
+pkgver=9.20120322
+pkgrel=1
+pkgdesc="A collection of programs that can be used in a debian/rules file to automate common tasks"
+arch=('any')
+url="http://packages.debian.org/${pkgname}"
+license='GPL3'
+depends=('binutils' 'dpkg' 'file' 'html2text' 'man-db' 'perl')
+makedepends=('po4a')
+source=(`debfile ${pkgname}`/${pkgname}_$pkgver.tar.gz)
+
+build() {
+  cd "$srcdir/$pkgname"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+  make DESTDIR="$pkgdir" install
+}
+
+md5sums=('9ea56782e6396a59ec49f45f9c4a603f')
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
new file mode 100644
index 000000000..175b80610
--- /dev/null
+++ b/libre/dpkg/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer (AUR): Jochen Schalanda <jochen+aur@schalanda.name>
+# Contributor (AUR): Thomas Dziedzic <gostrc@gmail>
+# Contributor (AUR): Chris Giles <Chris.G.27@gmail.com>
+# Contributor (AUR): seblu <seblu+arch@seblu.net>
+# Contributor (AUR): squiddo <squiddo@intheocean.net>
+# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+
+_debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid
+debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; }
+
+# TODO: split into (dpkg dpkg-devtools dselect dpkg-perl)
+pkgname=dpkg
+pkgver=1.16.2
+pkgrel=1
+pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'."
+arch=('i686' 'x86_64')
+url="http://packages.debian.org/${pkgname}"
+license=('GPL2')
+depends=('bzip2' 'perl-timedate')
+makedepends=('gcc' 'make' 'patch')
+optdepends=('fakeroot')
+replaces=(dpkg-ubuntu)
+conflits=(dpkg-ubuntu)
+source=(`debfile ${pkgname}`/${pkgname}_${pkgver}.tar.bz2
+        dpkg-rsyncable.patch dpkg-arch.patch)
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -p1 -i "${srcdir}/dpkg-rsyncable.patch"
+  patch -p1 -i "${srcdir}/dpkg-arch.patch" # Architecture detection
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --without-start-stop-daemon
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # Variables
+  install -d "${pkgdir}/var/${pkgname}/updates/"
+  touch "${pkgdir}/var/lib/${pkgname}/{status,available}"
+}
+
+md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8'
+         'bc36609f6191c5b509fae58c21966c95'
+         '24ab12e79989a2e7f31653fb1dd3cdf9')
diff --git a/libre/dpkg/dpkg-arch.patch b/libre/dpkg/dpkg-arch.patch
new file mode 100644
index 000000000..66e7a2ef2
--- /dev/null
+++ b/libre/dpkg/dpkg-arch.patch
@@ -0,0 +1,17 @@
+diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm dpkg-1.16.2/scripts/Dpkg/Arch.pm
+--- dpkg-1.16.2.orig/scripts/Dpkg/Arch.pm	2012-03-19 02:40:08.000000000 -0400
++++ dpkg-1.16.2/scripts/Dpkg/Arch.pm	2012-04-02 16:14:55.000000000 -0400
+@@ -49,12 +49,7 @@
+     {
+ 	return $build_arch if defined $build_arch;
+ 
+-	# Note: We *always* require an installed dpkg when inferring the
+-	# build architecture. The bootstrapping case is handled by
+-	# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
+-	# variables when they are not requested.
+-
+-	my $build_arch = `dpkg --print-architecture`;
++	my $build_arch = `uname -m`;
+ 	syserr("dpkg --print-architecture failed") if $? >> 8;
+ 
+ 	chomp $build_arch;
diff --git a/libre/dpkg/dpkg-rsyncable.patch b/libre/dpkg/dpkg-rsyncable.patch
new file mode 100644
index 000000000..e7e58dfdf
--- /dev/null
+++ b/libre/dpkg/dpkg-rsyncable.patch
@@ -0,0 +1,12 @@
+diff -ru dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm dpkg-1.16.2/scripts/Dpkg/Compression.pm
+--- dpkg-1.16.2.orig/scripts/Dpkg/Compression.pm	2012-03-19 02:40:08.000000000 -0400
++++ dpkg-1.16.2/scripts/Dpkg/Compression.pm	2012-04-02 16:26:27.000000000 -0400
+@@ -52,7 +52,7 @@
+ my $COMP = {
+     "gzip" => {
+ 	"file_ext" => "gz",
+-	"comp_prog" => [ "gzip", "--no-name", "--rsyncable" ],
++	"comp_prog" => [ "gzip", "--no-name"],
+ 	"decomp_prog" => [ "gunzip" ],
+ 	"default_level" => 9,
+     },
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index df1b50e84..024594330 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -24,7 +24,7 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
 sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc')
 
 build() {
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 71e834c3d..c27cf61f9 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=gstreamer0.10-bad-libre
 pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
 pkgver=0.10.23
-pkgrel=1
+pkgrel=1.2
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg')
@@ -43,7 +43,7 @@ package_gstreamer0.10-bad-libre-plugins() {
   depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg')
   groups=('gstreamer0.10-plugins')
   install=gstreamer0.10-bad-plugins.install
-  provides=("gstreamer0.10-bad-plugins-libre=$pkgver")
+  provides=("gstreamer0.10-bad-plugins=$pkgver")
   conflicts=('gstreamer0.10-bad-plugins')
   replaces=('gstreamer0.10-bad-plugins')
 
diff --git a/libre/hardinfo/.directory b/libre/hardinfo/.directory
new file mode 100644
index 000000000..725259ee6
--- /dev/null
+++ b/libre/hardinfo/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,57,42
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 869d2f52a..47f4c1330 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=hardinfo
 pkgver=0.5.1
-pkgrel=2.1
+pkgrel=4
 pkgdesc="A system information and benchmark tool."
 arch=('i686' 'x86_64')
 url="http://hardinfo.berlios.de/wiki/index.php/Main_Page"
 license=('GPL2')
-depends=('gtk2' 'libsoup' 'gnutls')
+depends=('gtk2' 'libsoup')
 options=('!emptydirs')
 source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \
         fixsensors.patch hardinfo.distro)
@@ -21,18 +21,18 @@ sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../fixsensors.patch 
-  sed -i 's|/usr/lib64|/usr/lib|' configure 
-  ./configure --prefix=/usr 
-  sed -i 's|lib64|lib|' binreloc.c 
-  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h 
-  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h 
+  patch -p1 < ../fixsensors.patch
+  sed -i 's|/usr/lib64|/usr/lib|' configure
+  ./configure --prefix=/usr
+  sed -i 's|lib64|lib|' binreloc.c
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h
+  sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h
   sed -i 's|{ DB_PREFIX "debian_version",	"deb"  },|{ DB_PREFIX "hardinfo.distro",       "parabola"  },{ DB_PREFIX "debian_version",	"deb"  },|' computer.h 
-  make 
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install 
-  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" 
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro"
 }
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
new file mode 100644
index 000000000..c813946c7
--- /dev/null
+++ b/libre/luxrays-libre/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+_pkgname=luxrays
+pkgname=luxrays-libre
+pkgver=0.8
+_pkgver=ed424ec77571
+pkgrel=7
+epoch=0
+pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('freeimage' 'freeglut' 'glew')
+makedepends=('cmake' 'boost')
+replaces=('luxrays')
+conflicts=('luxrays')
+provides=("luxrays=$pkgver")
+source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
+md5sums=('2ac9c588675c5971c57f473ef10ac67d')
+
+build() {
+  cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+  # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail'
+  sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLUXRAYS_DISABLE_OPENCL=ON \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir/luxrender-$_pkgname-$_pkgver"
+
+  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
+  install -m755 bin/* "$pkgdir"/usr/bin
+  install -m644 lib/* "$pkgdir"/usr/lib
+  cp -a include/luxrays "$pkgdir"/usr/include
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
new file mode 100644
index 000000000..38021313d
--- /dev/null
+++ b/libre/luxrender-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Initial contributor: flixie <69one@gmx.net>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+pkgname=luxrender-libre
+pkgver=0.8
+_pkgver=45d3e13eb94c
+pkgrel=13
+pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)"
+arch=('i686' 'x86_64')
+url="http://www.luxrender.net/"
+license=('GPL')
+depends=('boost-libs' 'freeimage' 'openexr')
+optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
+            'python: Python interface (pylux)')
+makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python')
+replaces=('luxrender')
+conflicts=('luxrender')
+provides=("luxrender=$pkgver")
+source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2)
+md5sums=('0f2d856385db72131f51e44a7ee527fa')
+
+build() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+
+  sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt
+
+  export CXXFLAGS="$CXXFLAGS -lpthread"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLUXRAYS_DISABLE_OPENCL=ON \
+    -DPYTHON_CUSTOM=ON \
+    -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \
+    .
+  make
+}
+
+package() {
+  cd "$srcdir"/luxrender-lux-$_pkgver
+  make DESTDIR="$pkgdir" install
+
+  # fix library path on x86_64
+  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+
+  #install pylux
+  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/psutils-libre/.directory b/libre/psutils-libre/.directory
new file mode 100644
index 000000000..60ed4bded
--- /dev/null
+++ b/libre/psutils-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,4,11,16,24,1
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 4cb5ac014..25e88f492 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -4,6 +4,7 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: xihh <hahj87@gmail.com>
 
+_pkgname=psutils
 pkgname=psutils-libre
 pkgver=1.17
 pkgrel=3
@@ -11,18 +12,18 @@ arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A set of postscript utilities"
 url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
 license=('custom')
-depends=('glibc' 'ghostscript-libre')
+depends=('glibc' 'gnu-ghostscript')
 provides=('psutils-lprng' 'psutils')
 replaces=('psutils-lprng' 'psutils')
 conflicts=('psutils-lprng' 'psutils')
 options=('!makeflags')
-source=(http://www.connochaetos.org/misc/${pkgname}-${pkgver}.tar.gz
+source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz"
         'psutils-1.17.diff')
-md5sums=('5553b70be2484cef7a76d741a26f24d5'
+md5sums=('b161522f3bd1507655326afa7db4a0ad'
          '2b49e9e796000b42f42804d4b50a2be1')
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${_pkgname}"
   patch -Np1 -i "${srcdir}/psutils-1.17.diff"
   make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
     INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
@@ -32,12 +33,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${_pkgname}"
   install -d -m755 "${pkgdir}/usr/include"
   install -d -m755 "${pkgdir}/usr/share/man"
   make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
     INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
     MANDIR="${pkgdir}/usr/share/man/man1" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${_pkgname}"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/"
 }
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 001873ad3..87d775d4e 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 121261 2011-04-29 22:06:13Z andyrtr $
+# $Id: PKGBUILD 154769 2012-03-30 16:45:24Z pierre $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=4
+pkgrel=5
 pkgdesc="GTK+ frontend to various command line archivers"
 arch=('i686' 'x86_64')
 url="http://xarchiver.sourceforge.net"
@@ -21,10 +21,11 @@ optdepends=('tar: TAR support'
             'bzip2: BZIP2 support'
             'zip: ZIP support'
             'unzip: ZIP support'
+            'ununrar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
             'lha: LHA support'
-            'lzma-utils: LZMA support'
+            'xz: LZMA support'
             'lzop: LZOP support')
 options=('!libtool')
 install=xarchiver.install
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
index ad5b51b59..f7ff098c0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-fix_7z_support.patch
@@ -108,4 +108,3 @@ diff -Nur xarchiver-0.5.2.orig/src/7zip.c xarchiver-0.5.2/src/7zip.c
  	entry = xa_set_archive_entries_for_each_row (archive,filename,item);
  	g_free(filename);
  }
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
index bd6df9731..d962a44af 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-rpm2cpio.patch
@@ -82,4 +82,3 @@ diff -up ./src/rpm.c.rpm2cpio ./src/rpm.c
  	list = NULL;
  	list = g_slist_append(list,command);
  	result = xa_run_command (archive,list);
-
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
index ab907419d..e29d40c41 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-open-with.patch
@@ -13,4 +13,3 @@ diff -pur xarchiver-0.5.2/src/open-with-dlg.c xarchiver-0.5.2.new/src/open-with-
  	gtk_tree_model_get(model,&iter,2,&exec,-1);
  	
  	gtk_entry_set_text(GTK_ENTRY(data->custom_command_entry),exec);
-