Merge branch 'master' of git+ssh://parabola-git/abslibre-mips64el

6 files changed, 190 insertions, 5 deletions

diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
index 6fd9c4c96..d278860cb 100644
--- a/testing/kmod/PKGBUILD
+++ b/testing/kmod/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 146216 2012-01-06 04:24:28Z dreisner $
+# $Id: PKGBUILD 146226 2012-01-06 11:00:10Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=3
-pkgrel=3
+pkgrel=4
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url="http://git.profusion.mobi/cgit.cgi/kmod.git"
@@ -26,6 +26,7 @@ build() {
   patch -Np1 <"$srcdir/return-non-zero-on-fail.patch"
 
   ./configure \
+    --sysconfdir=/etc \
     --with-rootprefix= \
     --with-rootlibdir=/lib \
     --with-zlib
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
index 6bcc909f1..c5988c0fb 100644
--- a/testing/lirc/PKGBUILD
+++ b/testing/lirc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 146184 2012-01-05 13:52:33Z tpowa $
+# $Id: PKGBUILD 146228 2012-01-06 12:04:39Z ibiru $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgbase=lirc
 pkgname=('lirc' 'lirc-utils')
 pkgver=0.9.0
-pkgrel=9
+pkgrel=10
 epoch=1
 _extramodules=extramodules-3.2-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
@@ -61,7 +61,7 @@ build() {
 
 package_lirc() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
-  depends=('lirc-utils' 'linux>=3.1' 'linux<3.2')
+  depends=('lirc-utils' 'linux>=3.2' 'linux<3.3')
   replaces=('lirc+pctv')
   install=lirc.install
 
diff --git a/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch b/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
new file mode 100644
index 000000000..993650b2c
--- /dev/null
+++ b/testing/util-linux/0001-findmnt-support-alternative-location-of-fstab.patch
@@ -0,0 +1,77 @@
+From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Sun, 11 Dec 2011 13:58:05 -0500
+Subject: [PATCH] findmnt: support alternative location of fstab
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/findmnt.8 |    6 ++++--
+ misc-utils/findmnt.c |    9 +++++----
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
+index 24e3a52..7f3dc6c 100644
+--- a/misc-utils/findmnt.8
++++ b/misc-utils/findmnt.8
+@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default.
+ .SH OPTIONS
+ .IP "\fB\-h, \-\-help\fP"
+ Print help and exit.
+-.IP "\fB\-s, \-\-fstab\fP"
++.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
+ Search in
+ .IR /etc/fstab
+ and
+ .IR /etc/fstab.d .
+-The output is in the list format (see --list).
++The output is in the list format (see --list). Optionally, search the file
++specified by
++.IR fstab .
+ .IP "\fB\-m, \-\-mtab\fP"
+ Search in
+ .IR /etc/mtab .
+diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
+index 4577dc6..5502a87 100644
+--- a/misc-utils/findmnt.c
++++ b/misc-utils/findmnt.c
+@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
+ 
+ 	fprintf(out, _(
+ 	"\nOptions:\n"
+-	" -s, --fstab            search in static table of filesystems\n"
++	" -s, --fstab[=<fstab>]  search in static table of filesystems\n"
+ 	" -m, --mtab             search in table of mounted filesystems\n"
+ 	" -k, --kernel           search in kernel table of mounted\n"
+         "                          filesystems (default)\n\n"));
+@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
+ 	    { "direction",    1, 0, 'd' },
+ 	    { "evaluate",     0, 0, 'e' },
+ 	    { "first-only",   0, 0, 'f' },
+-	    { "fstab",        0, 0, 's' },
++	    { "fstab",        2, 0, 's' },
+ 	    { "help",         0, 0, 'h' },
+ 	    { "invert",       0, 0, 'i' },
+ 	    { "kernel",       0, 0, 'k' },
+@@ -872,7 +872,8 @@ int main(int argc, char *argv[])
+ 	tt_flags |= TT_FL_TREE;
+ 
+ 	while ((c = getopt_long(argc, argv,
+-				"acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) {
++				"acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
++				longopts, NULL)) != -1) {
+ 		switch(c) {
+ 		case 'a':
+ 			tt_flags |= TT_FL_ASCII;
+@@ -938,7 +939,7 @@ int main(int argc, char *argv[])
+ 		case 's':		/* fstab */
+ 			if (tabfile)
+ 				errx_mutually_exclusive("--{fstab,mtab,kernel}");
+-			tabfile = _PATH_MNTTAB;
++			tabfile = optarg ? optarg : _PATH_MNTTAB;
+ 			tt_flags &= ~TT_FL_TREE;
+ 			break;
+ 		case 'k':		/* kernel (mountinfo) */
+-- 
+1.7.8.1
+
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
new file mode 100644
index 000000000..f014cd857
--- /dev/null
+++ b/testing/util-linux/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 146238 2012-01-06 20:01:52Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=util-linux
+pkgver=2.20.1
+pkgrel=2
+pkgdesc="Miscellaneous system utilities for Linux"
+url="http://userweb.kernel.org/~kzak/util-linux-ng/"
+arch=('i686' 'x86_64')
+groups=('base')
+depends=('filesystem')
+replaces=('linux32' 'util-linux-ng')
+conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
+provides=('linux32' "util-linux-ng=${pkgver}")
+license=('GPL2')
+options=('!libtool')
+#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2
+	0001-findmnt-support-alternative-location-of-fstab.patch)
+optdepends=('perl: for chkdupexe support')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # hardware clock
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  # backport patch needed for usr support in initramfs
+  patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch
+
+  ./configure --enable-arch\
+              --enable-write\
+              --enable-raw\
+              --disable-wall\
+              --enable-partx\
+              --enable-libmount-mount
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm755 "${pkgdir}/var/lib/hwclock"
+
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('079b37517fd4e002a2e6e992e8b4e361'
+         '823e2d87885b81f245b8c368e28f8cab')
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
new file mode 100644
index 000000000..e4677e072
--- /dev/null
+++ b/testing/xf86-video-nouveau/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 146234 2012-01-06 15:24:05Z ibiru $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: buddabrod <buddabrod@gmail.com>
+
+pkgname=xf86-video-nouveau
+_gitdate=20120106
+pkgver=0.0.16_git${_gitdate} # see configure.ac
+pkgrel=1
+pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
+arch=('i686' 'x86_64')
+url="http://nouveau.freedesktop.org/wiki/"
+license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
+depends=('libdrm' 'udev')
+optdepends=('nouveau-dri:	experimental gallium3d features')
+makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
+conflicts=('xorg-server<1.11.0')
+options=('!libtool')
+install=$pkgname.install
+source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
+md5sums=('4b0ee8643b3322ff3a0c5d70262a54af')
+
+# source PKGBUILD && mksource
+mksource() {
+	mkdir /tmp/$pkgname-${_gitdate}
+	pushd /tmp/$pkgname-${_gitdate}
+	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
+	cd xf86-video-nouveau
+	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
+	popd
+}
+
+build() {
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
+  ./autogen.sh --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/xf86-video-nouveau-${_gitdate}
+  make DESTDIR=$pkgdir install
+}
diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install
new file mode 100644
index 000000000..027154ff3
--- /dev/null
+++ b/testing/xf86-video-nouveau/xf86-video-nouveau.install
@@ -0,0 +1,16 @@
+post_install () {
+   cat << _EOF
+  ==> make sure you use KernelModeSetting (KMS)
+  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
+_EOF
+}
+
+post_upgrade() {
+  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
+    cat << _EOF
+  ==> ATTENTION: Usermode support has been dropped
+  ==> make sure you use KernelModeSetting (KMS)
+  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
+_EOF
+ fi
+}