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

Conflicts:
	community/oss/PKGBUILD
	community/pdnsd/PKGBUILD
	community/subtle/PKGBUILD

7 files changed, 139 insertions, 4 deletions

diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 108c80d3e..d389f3b7c 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -13,12 +13,13 @@ url="http://www.mplayer2.org/"
 install=$pkgname.install
 depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
          'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
-         'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau'
+         'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'lirc-utils'
          'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
 if [ "$CARCH" != "mips64el" ]; then
-depends+=('lirc-utils')
+depends+=('libgl' 'libvdpau')
 fi
-makedepends=('mesa' 'unzip' 'yasm')
+makedepends=('mesa' 'unzip')
+[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
diff --git a/community/python2-nautilus/PKGBUILD b/community/python2-nautilus/PKGBUILD
new file mode 100644
index 000000000..4e79d732c
--- /dev/null
+++ b/community/python2-nautilus/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 72850 2012-06-24 00:37:15Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Giorgio Gilestro <giorgio@gilest.ro>
+
+pkgname=python2-nautilus
+_pkgname=nautilus-python
+pkgver=1.1
+pkgrel=3
+pkgdesc="Python bindings for the Nautilus Extension API"
+arch=('i686' 'x86_64')
+url="http://projects.gnome.org/nautilus-python/"
+license=('GPL')
+depends=('nautilus' 'python2-gobject')
+replaces=('python-nautilus')
+provides=('python-nautilus')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz)
+sha256sums=('7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/rblcheck/01-change-filename-tags-for-directories.patch b/community/rblcheck/01-change-filename-tags-for-directories.patch
new file mode 100644
index 000000000..0a5674c33
--- /dev/null
+++ b/community/rblcheck/01-change-filename-tags-for-directories.patch
@@ -0,0 +1,21 @@
+--- a/docs/rblcheck.sgml	(revision 71)
++++ b/docs/rblcheck.sgml	(revision 72)
+@@ -160,7 +160,7 @@
+ <Para>
+ When you are done, you can type <Application>make install</Application> to
+ install the software (by default, everything will be installed in
+-<Filename>/usr/local</Filename>.
++<Filename class="directory">/usr/local</Filename>.
+ </Para>
+ 
+ <Para>
+@@ -397,7 +397,8 @@
+ A recent addition to the rblcheck package is the <Application>rbl</Application>
+ shell script, which is a simple wrapper around rblcheck, with one special
+ feature: it will read a global <Filename>rblcheckrc</Filename> (usually
+-in <Filename>/etc</Filename> or <Filename>/usr/etc</Filename>), and then
++in <Filename class="directory">/etc</Filename> or
++<Filename class="directory">/usr/etc</Filename>), and then
+ a <Filename>.rblcheckrc</Filename> from the current user's home directory.
+ These files can contain any of the usual <Application>rblcheck</Application>
+ command-line arguments (see <XRef linkend="using_rblcheck">), but are most
diff --git a/community/rblcheck/02-fix-configure.patch b/community/rblcheck/02-fix-configure.patch
new file mode 100644
index 000000000..dbc16342c
--- /dev/null
+++ b/community/rblcheck/02-fix-configure.patch
@@ -0,0 +1,20 @@
+--- a/configure	2005-07-01 10:50:36.000000000 +0100
++++ b/configure	2005-07-01 10:57:05.000000000 +0100
+@@ -1529,13 +1529,12 @@
+ cat > conftest.$ac_ext <<EOF
+ #line 1531 "configure"
+ #include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char res_query();
++
++/* Include <resolv.h> to get macro definition for res_query */
++#include <resolv.h>
+ 
+ int main() {
+-res_query()
++res_query("",0,0,"",0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/community/rblcheck/03-custom-rbl.patch b/community/rblcheck/03-custom-rbl.patch
new file mode 100644
index 000000000..fe9672a9a
--- /dev/null
+++ b/community/rblcheck/03-custom-rbl.patch
@@ -0,0 +1,21 @@
+--- a/sites.h
++++ b/sites.h
+@@ -62,3 +62,18 @@
+ /* ORDB: Open Relay DataBase
+    http://www.ordb.org/ */
+ /* SITE("relays.ordb.org") */
++
++
++SITE("zen.spamhaus.org");
++SITE("sbl.spamhaus.org");
++SITE("xbl.spamhaus.org");
++SITE("pbl.spamhaus.org");
++SITE("bl.spamcop.net");
++SITE("psbl.surriel.com");
++SITE("dnsbl.njabl.org");
++SITE("dul.dnsbl.sorbs.net");
++SITE("all.spam-rbl.fr");
++SITE("spam.spam-rbl.fr");
++SITE("dsl.spam-rbl.fr");
++SITE("bogon.spam-rbl.fr");
++
diff --git a/community/rblcheck/PKGBUILD b/community/rblcheck/PKGBUILD
new file mode 100644
index 000000000..d879b6c23
--- /dev/null
+++ b/community/rblcheck/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 72842 2012-06-23 19:47:22Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=rblcheck
+pkgver=1.5
+pkgrel=1
+pkgdesc='Tool to Query RBL Servers'
+arch=('i686' 'x86_64')
+url='http://rblcheck.sourceforge.net/'
+license=('GPL2')
+depends=('glibc' 'bash')
+backup=('etc/rblcheckrc')
+source=("http://downloads.sourceforge.net/rblcheck/$pkgname-$pkgver.tar.gz"
+        '01-change-filename-tags-for-directories.patch'
+        '02-fix-configure.patch'
+        '03-custom-rbl.patch'
+)
+md5sums=('fb7ee9adc0e09eee9dda195f9b9e7ca4'
+         '9e8ed44f4bc6abf235a14065b6aa373c'
+         '2db00ffd71e17753e89c0968c76d5871'
+         'f9ff2de975584f71f7794550691a0272')
+
+build() {
+  cd $pkgname-$pkgver
+  for p in "$srcdir"/*.patch; do
+    msg2 "Apply patch ${p##*/}"
+    patch -p 1 -i "$p"
+  done
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 /dev/null "$pkgdir/etc/rblcheckrc"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index a39b7fdeb..3fb185aa1 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=subtle
 pkgver=0.11.3224
 pkgrel=1
 pkgdesc="Grid-based manual tiling window manager"
-arch=("i686" "x86_64" 'mips64el')
+arch=("i686" "x86_64" "mips64el")
 url="http://subtle.subforge.org"
 license=("GPL")
 depends=("ruby" "libxft" "libxpm" "libxrandr" "libxft" "libxpm" "libxinerama"