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

7 files changed, 117 insertions, 32 deletions

diff --git a/testing/fontforge/PKGBUILD b/testing/fontforge/PKGBUILD
index 91f7527d4..c5326fdd6 100644
--- a/testing/fontforge/PKGBUILD
+++ b/testing/fontforge/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 145014 2011-12-14 10:50:55Z bisson $
+# $Id: PKGBUILD 145120 2011-12-17 08:00:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fontforge
 pkgver=20111214
-pkgrel=1
+pkgrel=2
 pkgdesc='Outline and bitmap font editor'
 arch=('i686' 'x86_64')
 url='http://fontforge.sourceforge.net/'
 license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2')
+depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
 options=('!libtool' '!makeflags')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD
index 91583d99a..3212d196e 100644
--- a/testing/libdrm/PKGBUILD
+++ b/testing/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 144601 2011-12-07 17:32:22Z andyrtr $
+# $Id: PKGBUILD 145126 2011-12-17 09:08:44Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.28
+pkgver=2.4.29
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -14,23 +14,18 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
         COPYING
-	git_fixes.diff 
-	#missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538
-	rbo.h list.h)
-md5sums=('6488f64119c6439fa4038e9cd7b30b67'
+	git_fixes.diff)
+md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953'
          'c722c8406507b7e3a8da7a3030d1d9cf'
          'ba65e71c481b94ef0fb6c23c7f21ffa1'
-         '671b87f9670e709e54a19cd292c6330d'
-         '073846ea43fb4d6130062c1897d92e40'
-         'ce867d3331862c2b87d1a37461b42dbe')
+         'aebd5336568090b8ec084fabcfb08071')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
 
-  # add a missing file in the release tarball
+  # git fixes - currently none
   patch -Np1 -i ${srcdir}/git_fixes.diff
-  cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/
   
   #libtoolize --force
   autoreconf --force --install
diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff
index 5ebcb606a..dc80155f2 100644
--- a/testing/libdrm/git_fixes.diff
+++ b/testing/libdrm/git_fixes.diff
@@ -1,19 +1,13 @@
-From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 05 Dec 2011 21:24:48 +0000
-Subject: test/radeon: add missing files for dist
-
----
-diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am
-index 021ca72..1775669 100644
---- a/tests/radeon/Makefile.am
-+++ b/tests/radeon/Makefile.am
-@@ -9,4 +9,6 @@ noinst_PROGRAMS = \
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 19441f3..eb9dd32 100644
+--- a/intel/intel_bufmgr_gem.c
++++ b/intel/intel_bufmgr_gem.c
+@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
+ 				      bufmgr_gem->vma_cache.next,
+ 				      vma_list);
+ 		assert(bo_gem->map_count == 0);
+-		DRMLISTDEL(&bo_gem->vma_list);
++		DRMLISTDELINIT(&bo_gem->vma_list);
  
- radeon_ttm_SOURCES = \
- 	rbo.c \
-+	rbo.h \
-+	list.h \
- 	radeon_ttm.c
---
-cgit v0.9.0.2-2-gbebe
+ 		if (bo_gem->mem_virtual) {
+ 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/testing/libspiro/PKGBUILD b/testing/libspiro/PKGBUILD
new file mode 100644
index 000000000..b3fef038a
--- /dev/null
+++ b/testing/libspiro/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 145118 2011-12-17 08:00:09Z bisson $
+# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libspiro
+pkgver=20071029
+pkgrel=2
+pkgdesc='Simplifies the drawing of beautiful curves'
+url='http://libspiro.sourceforge.net/'
+license=('GPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
+sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
new file mode 100644
index 000000000..51022ac0f
--- /dev/null
+++ b/testing/nilfs-utils/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 145060 2011-12-15 22:33:56Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> 
+pkgname=nilfs-utils
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
+arch=('i686' 'x86_64')
+url="http://www.nilfs.org/"
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux-ng')
+options=(!libtool)
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('738f7bee062051c14dcff444bb17ada7')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --libdir=/lib
+  make
+}
+
+package() {
+   cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+}
diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD
new file mode 100644
index 000000000..84d918a8c
--- /dev/null
+++ b/testing/twisted/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 145058 2011-12-15 22:26:04Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
+
+pkgname=twisted
+pkgver=11.1.0
+pkgrel=1
+pkgdesc="Asynchronous networking framework written in Python."
+arch=('i686' 'x86_64')
+url="http://twistedmatrix.com/"
+license=('MIT')
+depends=('python2' 'pycrypto' 'zope-interface')
+optdepends=('python2-pyopenssl'
+            'python-soappy:for twisted.web.soap')
+install=twisted.install
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
+md5sums=('972f3497e6e19318c741bf2900ffe31c')
+
+build() {
+    cd "$srcdir/Twisted-$pkgver"
+    python2 setup.py build
+}
+
+package() {
+    cd "$srcdir/Twisted-$pkgver"
+    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+}
diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install
new file mode 100644
index 000000000..8e93ffd3c
--- /dev/null
+++ b/testing/twisted/twisted.install
@@ -0,0 +1,11 @@
+post_install() {
+  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+}