Wed Oct 12 23:14:40 UTC 2011

15 files changed, 430 insertions, 96 deletions

diff --git a/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD
index 880a5bdac..a15f0e3e1 100644
--- a/community/catdvi/PKGBUILD
+++ b/community/catdvi/PKGBUILD
@@ -1,26 +1,37 @@
-# Contributor: Xilon <xilonmu@gmail.com>
+# $Id: PKGBUILD 56716 2011-10-11 07:11:55Z andrea $
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Xilon <xilonmu@gmail.com>
+
 pkgname=catdvi
 pkgver=0.14
-pkgrel=3
+pkgrel=4
 pkgdesc="A DVI to plain text translator"
 arch=('i686' 'x86_64')
 url="http://catdvi.sourceforge.net"
 license=('GPL')
 depends=('glibc' 'texlive-core')
-maedepends=('texlive-fontsextra')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b18eac65baf522c1e37bb3dc37ab42c3')
+makedepends=('texlive-fontsextra')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'texlive2008.patch')
+md5sums=('b18eac65baf522c1e37bb3dc37ab42c3'
+         '509f61a30d3758e5d102c124bc5fa9a0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
+  patch -p1 -i "${srcdir}"/texlive2008.patch
+  autoconf
+
+  ./configure --prefix=/usr --mandir=/usr/share/man
 
-  install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1 || return 1
-  sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk || return 1
-  sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk || return 1
+  install -d $pkgdir/usr/bin $pkgdir/usr/share/man/man1
+  sed -i "s#\(bindir = \)\(.*\)#\1$pkgdir\2#" config.mk
+  sed -i "s#\(mandir = \)\(.*\)#\1$pkgdir\2#" config.mk
 
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/catdvi/texlive2008.patch b/community/catdvi/texlive2008.patch
new file mode 100644
index 000000000..20ee9732e
--- /dev/null
+++ b/community/catdvi/texlive2008.patch
@@ -0,0 +1,58 @@
+--- catdvi-0.14-orig/config.mk.in
++++ catdvi-0.14/config.mk.in
+@@ -23,6 +23,7 @@
+ 
+ CFG_HAS_GETOPT_LONG = @CFG_HAS_GETOPT_LONG@
+ CFG_HAS_KPATHSEA = @CFG_HAS_KPATHSEA@
++CFG_HAS_KPATHSEA_VERSION_H = @CFG_HAS_KPATHSEA_VERSION_H@
+ CFG_KPATHSEA_HAS_GETOPT_LONG = @CFG_KPATHSEA_HAS_GETOPT_LONG@
+ CFG_SHOW_PSE2UNIC_WARNINGS = @CFG_SHOW_PSETOUNIC_WARNINGS@
+ 
+--- catdvi-0.14-orig/configure.in
++++ catdvi-0.14/configure.in
+@@ -48,6 +48,9 @@
+     AC_MSG_ERROR([*** kpathsea library (required) not found; try to use the --with-kpathsea-prefix option ***])
+ fi
+ 
++AC_CHECK_HEADERS([kpathsea/version.h], CFG_HAS_KPATHSEA_VERSION_H=yes, CFG_HAS_KPATHSEA_VERSION_H=no)
++AC_SUBST(CFG_HAS_KPATHSEA_VERSION_H)
++
+ dnl It seem libkpathsea provides a getopt_long() implementation
+ dnl if and only if the C library does not.
+ dnl
+--- catdvi-0.14-orig/GNUmakefile
++++ catdvi-0.14/GNUmakefile
+@@ -36,6 +36,10 @@
+ endif
+ endif
+ 
++ifeq ($(CFG_HAS_KPATHSEA_VERSION_H),yes)
++CPPFLAGS += -DCFG_HAS_KPATHSEA_VERSION_H
++endif
++
+ ifeq ($(CFG_HAS_KPATHSEA),yes)
+ FINDTFM = kpathsea.o
+ LDLIBS = -lkpathsea
+--- catdvi-0.14-orig/kpathsea.c
++++ catdvi-0.14/kpathsea.c
+@@ -21,6 +21,12 @@
+ #include "findtfm.h"
+ #include "version.h"
+ 
++#ifdef CFG_HAS_KPATHSEA_VERSION_H
++#include <kpathsea/version.h>
++#else 
++extern char * kpathsea_version_string;
++#endif
++
+ void setup_findtfm(char const * progname)
+ {
+         kpse_set_program_name(progname, PACKAGE);
+@@ -36,7 +42,6 @@
+ 
+ void version_findtfm(void)
+ {
+-        extern char * kpathsea_version_string;
+         puts(kpathsea_version_string);
+ }
+ 
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index a172483e4..351fda367 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 48668 2011-06-04 07:12:24Z bluewind $
+# $Id: PKGBUILD 56750 2011-10-11 20:34:16Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.5
+pkgver=3.6
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=(qt lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2)
-md5sums=('0bb8cef23209bb6f31a581cb6e7bff77')
+md5sums=('b23093dba7c44a7628ee5c97e68c9941')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 1a3cbedb3..28e2ea582 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -1,34 +1,45 @@
-# $Id: PKGBUILD 56582 2011-10-09 02:28:04Z tdziedzic $
+# $Id: PKGBUILD 56757 2011-10-11 21:02:19Z arodseth $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Gergely Imreh <imrehgATgmailDOTcom>
-# Originally contributed by champus, madeye, Ranguvar and ninja_pt
-
+# Contributor: champus
+# Contributor: madeye
+# Contributor: Ranguvar
+# Contributor: ninja_pt
 pkgname=hwinfo
-pkgver=18.5
-_pkgver=$pkgver-2.7
-pkgrel=1
-pkgdesc='The hardware detection tool from openSUSE'
-arch=('i686' 'x86_64')
+pkgver=19.0
+pkgrel=2
+pkgdesc='Hardware detection tool from openSUSE'
+arch=('x86_64' 'i686')
 url='http://www.opensuse.org/'
 license=('GPL2')
 depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$_pkgver.src.rpm"
-        'kbd.patch')
-md5sums=('17c2a703643d1f007859c5e743589bb8'
+source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.1.src.rpm"
+        'custom_ioctl.patch')
+md5sums=('751238feaa13449324593ee5e145cd56'
          '1500ecfa26f6aaf4d7967eea74e86e5d')
 
 build() {
   cd "${srcdir}"
-  rpmextract.sh "${pkgname}-${_pkgver}.src.rpm"
-  tar -xjf $pkgname-$pkgver.tar.bz2
-  cd "${srcdir}/${pkgname}-${pkgver}"
 
-# Apply patch for custom ioctl
-  patch -p 0 < ../kbd.patch
+  msg2 "Extracting source rpm..."
+  rpmextract.sh "${pkgname}-${pkgver}-1.1.src.rpm"
+  tar jxf ${pkgname}-${pkgver}.tar.bz2
+  cd "${pkgname}-${pkgver}"
+  msg2 "Patching..."
+  patch -p0 < ../custom_ioctl.patch
+  msg2 "Compiling..."
+  make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib
+}
 
-  make -j1 LIBDIR=/usr/lib
-  make LIBDIR=/usr/lib DESTDIR=$pkgdir install
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  msg2 "Packaging files..."
+  make LIBDIR=/usr/lib DESTDIR=${pkgdir} install
+  msg2 "Cleaning up..."
+  rmdir "${pkgdir}/sbin"
 }
-md5sums=('7d862ddd407200e40d1e0954e09cd566'
-         '1500ecfa26f6aaf4d7967eea74e86e5d')
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/hwinfo/custom_ioctl.patch b/community/hwinfo/custom_ioctl.patch
new file mode 100644
index 000000000..b9dd67161
--- /dev/null
+++ b/community/hwinfo/custom_ioctl.patch
@@ -0,0 +1,16 @@
+--- src/hd/kbd.c.old	2010-03-15 23:37:52.000000000 +0800
++++ src/hd/kbd.c	2010-03-22 10:50:58.000000000 +0800
+@@ -146,11 +146,13 @@
+   }
+ 
+   if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
++    /* Removing since TIOCGDEV is not supported by the mainline kernel
+     if(ioctl(fd, TIOCGDEV, &u) != -1) {
+       tty_major = (u >> 8) & 0xfff;
+       tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00);
+       ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor);
+     }
++    */
+ 
+     if (0)
+ 	    ;
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index d159c3c01..22f3a5697 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 33413 2010-11-24 16:03:47Z spupykin $
+# $Id: PKGBUILD 56740 2011-10-11 17:41:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -6,19 +6,19 @@
 
 pkgname=madman
 pkgver=0.94beta1.20060611
-pkgrel=1
+pkgrel=3
 pkgdesc="I-tunes like music player"
 arch=('i686' 'x86_64')
 url="http://madman.sourceforge.net/"
 license=('GPL')
-depends=('qt3' 'xmms' 'libid3tag' 'gtk')
-makedepends=('python')
-source=(http://arch.pp.ru/~sergej/dl/madman_$pkgver.orig.tar.gz
-	http://arch.pp.ru/~sergej/dl/madman_$pkgver-2.diff.gz
-	madman.desktop
-	madman_logo.png
-	madman_logo_mini.png
-	madman_logo_large.png
+depends=('qt3' 'xmms' 'gtk' 'taglib')
+makedepends=('python2' 'scons')
+source=(ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver.orig.tar.gz
+	ftp://ftp.archlinux.org/other/community/madman/madman_$pkgver-2.diff.gz
+	ftp://ftp.archlinux.org/other/community/madman/madman.desktop
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo.png
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo_mini.png
+	ftp://ftp.archlinux.org/other/community/madman/madman_logo_large.png
 	fake-g++.sh)
 md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          '26de942ae2465fb805748d3bea9a8a17'
@@ -26,7 +26,7 @@ md5sums=('36e7a4619ebe83ed939c7ae09c16d535'
          'd4546f77857a6ccdabb2036eb6a0da07'
          '2d54bb8eceed283edc88a3e4553d2483'
          '3c2da1b1800fb372e225ae38fa1398e8'
-         '6882bb5e67e6dea45e2f770d899514c5')
+         '685a6fb13c861b82950dd6a77fd02120')
 
 build() {
   . /etc/profile.d/qt3.sh
@@ -41,19 +41,15 @@ build() {
 	,build/release/designer/tsonglistview.h \
 	,build/release/designer/tsetlistview.h
   sed -i '26,1i#include <memory>' utility/base.h
+  sed -i 's|python|python2|' designer/make_imagedata httpd/make_webdata doc/update_format_tag
   cp $srcdir/fake-g++.sh ./g++
   export PATH=.:$PATH
 
-  scons || return 1
-  scons prefix=$pkgdir/usr install || return 1
+  scons
+  scons install_to=$pkgdir/usr prefix=/usr install
 
-  rm $pkgdir/usr/bin/.sconsign
-  rm $pkgdir/usr/lib/madman/plugins/.sconsign
-  mkdir -p $pkgdir/usr/share/{applications,icons}
-  mkdir -p $pkgdir/usr/share/icons/{mini,large}
-
-  cp $srcdir/madman_logo.png $pkgdir/usr/share/icons
-  cp $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini
-  cp $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large
-  cp $srcdir/madman.desktop $pkgdir/usr/share/applications
+  install -Dm644 $srcdir/madman_logo.png $pkgdir/usr/share/icons/madman_logo.png
+  install -Dm644 $srcdir/madman_logo_mini.png $pkgdir/usr/share/icons/mini/madman_logo_mini.png
+  install -Dm644 $srcdir/madman_logo_large.png $pkgdir/usr/share/icons/large/madman_logo_large.png
+  install -Dm644 $srcdir/madman.desktop $pkgdir/usr/share/applications/madman.desktop
 }
diff --git a/community/madman/fake-g++.sh b/community/madman/fake-g++.sh
index 17da66d5a..af424f5ca 100755
--- a/community/madman/fake-g++.sh
+++ b/community/madman/fake-g++.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -x
 
 Q=`echo "$*" | sed 's|- p t h r e a d|-pthread|'`
-
 echo "$Q" | grep 'lmp4ff' && Q="$Q /usr/lib/libmp4ff.a"
-
-exec /bin/g++ $Q
+exec /usr/bin/g++ $Q
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 235eb1b0c..ab516ed39 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,31 +1,24 @@
-# $Id: PKGBUILD 51657 2011-07-12 14:22:18Z spupykin $
+# $Id: PKGBUILD 56720 2011-10-11 09:17:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=myodbc
-pkgver=5.1.8
-pkgrel=2
+pkgver=5.1.9
+pkgrel=1
 pkgdesc="ODBC driver/connector for MySQL"
 arch=(i686 x86_64)
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmysqlclient')
 license=('GPL')
+options=('libtool')
 source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz"
-	myodbc-64bit.patch
-	myodbc-add-mysys.patch
-	myodbc-my-free.patch
-	myodbc-shutdown.patch)
-md5sums=('c64d8cec9de453bdf48fcb168643b943'
-         '142a985fa0d3273df04399148ef27533'
-         '8d019f9b6a10a6a56d835e7e4e22d215'
-         '2d1636160af606323014b112c9481cf2'
-         'ec43ad7b5c887a7de4b6024899ff886c')
+	myconf.h.in)
+md5sums=('80f146bd384a9011d968aa67df27e68e'
+         '6c99c83e309b18d15ef0f07f0b461241')
 
 build() {
   cd $srcdir/mysql-connector-odbc-${pkgver}
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-64bit.patch
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-add-mysys.patch
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-my-free.patch
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/myodbc-shutdown.patch
+  cp $srcdir/myconf.h.in driver/myconf.h.in
+  [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; }
   [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
 	./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
 		--with-mysql-path=/usr --without-x --disable-gui --disable-test
diff --git a/community/myodbc/myconf.h.in b/community/myodbc/myconf.h.in
new file mode 100644
index 000000000..2a04eebba
--- /dev/null
+++ b/community/myodbc/myconf.h.in
@@ -0,0 +1,165 @@
+/* driver/myconf.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <iodbcinst.h> header file. */
+#undef HAVE_IODBCINST_H
+
+/* Define to 1 if you have the <isqlext.h> header file. */
+#undef HAVE_ISQLEXT_H
+
+/* Define to 1 if you have the <isqltypes.h> header file. */
+#undef HAVE_ISQLTYPES_H
+
+/* Define to 1 if you have the <isql.h> header file. */
+#undef HAVE_ISQL_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <odbcinst.h> header file. */
+#undef HAVE_ODBCINST_H
+
+/* Define to 1 if you have the <sqlext.h> header file. */
+#undef HAVE_SQLEXT_H
+
+/* Define if SQLGetPrivateProfileString is defined */
+#undef HAVE_SQLGETPRIVATEPROFILESTRING
+
+/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */
+#undef HAVE_SQLGETPRIVATEPROFILESTRINGW
+
+/* Define to 1 if you have the <sqltypes.h> header file. */
+#undef HAVE_SQLTYPES_H
+
+/* Define to 1 if you have the <sql.h> header file. */
+#undef HAVE_SQL_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strndup' function. */
+#undef HAVE_STRNDUP
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define if SQLCHAR is undefined */
+#undef SQLCHAR
+
+/* Define if SQLHDBC is undefined */
+#undef SQLHDBC
+
+/* Define if SQLHENV is undefined */
+#undef SQLHENV
+
+/* Define if SQLHSTMT is undefined */
+#undef SQLHSTMT
+
+/* Define if SQLHWND is undefined */
+#undef SQLHWND
+
+/* Define if SQLINTEGER is undefined */
+#undef SQLINTEGER
+
+/* Define if SQLPOINTER is undefined */
+#undef SQLPOINTER
+
+/* Define if SQLRETURN is undefined */
+#undef SQLRETURN
+
+/* Define if SQLSMALLINT is undefined */
+#undef SQLSMALLINT
+
+/* Define if SQLUINTEGER is undefined */
+#undef SQLUINTEGER
+
+/* Define if SQLUSMALLINT is undefined */
+#undef SQLUSMALLINT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define path to system ODBC.INI file */
+#undef SYSTEM_ODBC_INI
+
+/* Define if compiler defines C99 __func__ macro */
+#undef USE_C99_FUNC_MACRO
+
+/* Define if compiler defines __FUNCTION__ */
+#undef USE_GNU_FUNC_MACRO
+
+/* use iODBC */
+#undef USE_IODBC
+
+/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */
+#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR
+
+/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */
+#undef USE_SQLCOLATTRIBUTE_SQLPOINTER
+
+/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER
+   */
+#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR
+
+/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */
+#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR
+
+/* use unixODBC */
+#undef USE_UNIXODBC
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
+/* Define if we are using unix build environment */
+#undef _UNIX_
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 69553b7f0..f1e2428da 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 52474 2011-07-25 20:35:38Z jelle $
+# $Id: PKGBUILD 56752 2011-10-11 20:37:22Z lcarlier $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
-pkgver=0.7.3
-pkgrel=5
+pkgver=0.7.4
+pkgrel=2
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64')
 url="http://pingus.seul.org"
 license=('GPL')
-depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs>=1.46')
-makedepends=('scons' 'boost>=1.46')
+depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.47')
+makedepends=('scons' 'boost>=1.47' 'mesa')
 source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop)
-md5sums=('7d1a0b0d658cc46dd09d6274f39acc7d'
-         'b94efaa6e2de959de7fdb50cfc7dbdea')
-sha1sums=('ca7fe5cea65fb3392d1e81056a879831925502f2'
-          'f35649f3b0b2bfcb01ce75085cf719dcaa609a54')
+md5sums=('82742bc9906cad98338cfd3ea700b396'
+         '9eec34047bdcff49e08f41e81764e20c')
+sha1sums=('e61e5ffefcecebed83286c25b3626f70ed75d2a5'
+          '579a1144f161ce89e6e024cea37210149b89c0c0')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -25,7 +25,10 @@ build() {
 package() {
   cd ${pkgname}-${pkgver}
 
-  ./install.sh "${pkgdir}/usr"
+  # fix launcher
+  sed -i 's/echo/echo -e/g' ./Makefile
+
+  make install DESTDIR="${pkgdir}" PREFIX="/usr"
 
   install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
 }
diff --git a/community/pingus/pingus.desktop b/community/pingus/pingus.desktop
index 158eaa820..276db36a4 100644
--- a/community/pingus/pingus.desktop
+++ b/community/pingus/pingus.desktop
@@ -6,4 +6,4 @@ Exec=pingus
 Terminal=false
 Type=Application
 Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/data/images/core/editor/actions.png
+Icon=/usr/share/pingus/images/core/editor/actions.png
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 0acbbbc57..04cdef219 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54383 2011-08-17 20:41:29Z schiv $
+# $Id: PKGBUILD 56764 2011-10-11 21:59:15Z ebelanger $
 # Maintainer:
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
 
 pkgname=skrooge
-pkgver=0.9.1
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('kdebase-runtime' 'libofx' 'qca-ossl')
 makedepends=('cmake' 'automoc4' 'docbook-xsl')
 install=$pkgname.install
 source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('2fa984e250359fd6008d2c601f1209ec')
+md5sums=('900da5dd41b940272941ee71e78cf8b4')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/skrooge/skrooge.install b/community/skrooge/skrooge.install
index 7edfb0647..5cfbe649e 100644
--- a/community/skrooge/skrooge.install
+++ b/community/skrooge/skrooge.install
@@ -1,5 +1,7 @@
 post_install() {
 	update-mime-database usr/share/mime &> /dev/null
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
 	kbuildsycoca4 &> /dev/null
 }
 
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index f2523ff6a..8fe770e58 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 55861 2011-09-23 23:07:50Z dreisner $
+# $Id: PKGBUILD 56766 2011-10-12 01:06:12Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
-pkgver=36
+pkgver=37
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
@@ -30,9 +30,11 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
         etc/systemd/systemd-logind.conf)
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "os-release")
-md5sums=('e1213338efb697abc8215d9a66a7f082'
-         '752636def0db3c03f121f8b4f44a63cd')
+        "os-release"
+        systemctl-completion.patch)
+md5sums=('1435f23be79c8c38d1121c6b150510f3'
+         '752636def0db3c03f121f8b4f44a63cd'
+         '8acca6b7be4bfebe4174d89e4625b0ee')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -42,6 +44,9 @@ build() {
   sed -i -e '/^Environ.*LANG/s/^/#/' \
          -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
 
+  # fix bash completion
+  patch -Np1 < "$srcdir"/systemctl-completion.patch
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --libexecdir=/usr/lib/systemd \
@@ -49,8 +54,7 @@ build() {
               --localstatedir=/var \
               --with-rootdir= \
               --with-rootlibdir=/lib \
-              --disable-audit \
-              --disable-tcpwrap
+              --disable-audit
 
   make
 
diff --git a/community/systemd/systemctl-completion.patch b/community/systemd/systemctl-completion.patch
new file mode 100644
index 000000000..afa1ae73f
--- /dev/null
+++ b/community/systemd/systemctl-completion.patch
@@ -0,0 +1,77 @@
+From 255e63837bc985ce6f3c3b5ce5d2856e2240138b Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Tue, 11 Oct 2011 20:53:05 -0400
+Subject: [PATCH] systemctl-completion: always invoke with --no-legend
+
+In the case of completion for the 'restart' verb, passing the invalid
+unit name (the colums header) causes completion to cease functioning
+entirely, with the error:
+
+  Failed to issue method call: Unit name UNIT is not valid.
+
+This adds a small wrapper function for systemctl which can have common
+options added to it.
+
+---
+ src/systemctl-bash-completion.sh |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh
+index 6369a6c..6ebb792 100644
+--- a/src/systemctl-bash-completion.sh
++++ b/src/systemctl-bash-completion.sh
+@@ -15,6 +15,10 @@
+ # You should have received a copy of the GNU General Public License
+ # along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ 
++__systemctl() {
++        systemctl --no-legend "$@"
++}
++
+ __contains_word () {
+         local word=$1; shift
+         for w in $*; do [[ $w = $word ]] && return 0; done
+@@ -24,7 +28,7 @@ __contains_word () {
+ __filter_units_by_property () {
+         local property=$1 value=$2 ; shift ; shift
+         local -a units=( $* )
+-        local -a props=( $(systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
++        local -a props=( $(__systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
+         for ((i=0; $i < ${#units[*]}; i++)); do
+                 if [[ "${props[i]}" = "$property=$value" ]]; then
+                         echo "${units[i]}"
+@@ -32,10 +36,10 @@ __filter_units_by_property () {
+         done
+ }
+ 
+-__get_all_units      () { systemctl list-units --full --all | awk '                 {print $1}' ; }
+-__get_active_units   () { systemctl list-units --full       | awk '                 {print $1}' ; }
+-__get_inactive_units () { systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; }
+-__get_failed_units   () { systemctl list-units --full       | awk '$3 == "failed"   {print $1}' ; }
++__get_all_units      () { __systemctl list-units --full --all | awk '                 {print $1}' ; }
++__get_active_units   () { __systemctl list-units --full       | awk '                 {print $1}' ; }
++__get_inactive_units () { __systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; }
++__get_failed_units   () { __systemctl list-units --full       | awk '$3 == "failed"   {print $1}' ; }
+ 
+ _systemctl () {
+         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+@@ -134,13 +138,13 @@ _systemctl () {
+                 comps=''
+ 
+         elif __contains_word "$verb" ${VERBS[JOBS]}; then
+-                comps=$( systemctl list-jobs | awk '{print $1}' )
++                comps=$( __systemctl list-jobs | awk '{print $1}' )
+ 
+         elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
+-                comps=$( systemctl list-units --type snapshot --full --all | awk '{print $1}' )
++                comps=$( __systemctl list-units --type snapshot --full --all | awk '{print $1}' )
+ 
+         elif __contains_word "$verb" ${VERBS[ENVS]}; then
+-                comps=$( systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
++                comps=$( __systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
+                 compopt -o nospace
+         fi
+ 
+-- 
+1.7.7
+