Fri Nov 11 23:15:00 UTC 2011

8 files changed, 119 insertions, 49 deletions

diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD
index 7fc0ac9d3..6302b6098 100644
--- a/community/acpitool/PKGBUILD
+++ b/community/acpitool/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $
+# $Id: PKGBUILD 58302 2011-11-10 17:58:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 # Contributor: Milosz Piglas <archeofuture@gmail.com>
 
 pkgname=acpitool
 pkgver=0.5.1
-pkgrel=3
+pkgrel=5
 pkgdesc="ACPI client - replacement for apm tool"
 url="http://sourceforge.net/projects/acpitool/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gcc-libs')
 source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
-	linux-3.0.patch)
+	linux-3.0.patch
+	sysfs-battery.patch)
 md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
-         'eb149edb32be6cdf20a7d16beb3e9f70')
+         'eb149edb32be6cdf20a7d16beb3e9f70'
+         '969fc4929cc215756db27168646c2b7a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/linux-3.0.patch
+  patch -p1 <$srcdir/sysfs-battery.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/acpitool/sysfs-battery.patch b/community/acpitool/sysfs-battery.patch
new file mode 100644
index 000000000..4f6898a78
--- /dev/null
+++ b/community/acpitool/sysfs-battery.patch
@@ -0,0 +1,52 @@
+diff -wbBur acpitool-0.5.1/src/acpitool.h acpitool-0.5.1.my/src/acpitool.h
+--- acpitool-0.5.1/src/acpitool.h	2008-10-16 19:38:12.000000000 +0400
++++ acpitool-0.5.1.my/src/acpitool.h	2011-11-10 21:55:23.000000000 +0400
+@@ -29,11 +29,11 @@
+ 
+ struct Battery_Info {
+     int  Battery_Present;
+-    char Charging_State[12];
+-    char Remaining_Cap[10];
+-    char Design_Cap[10];
+-    char LastFull_Cap[10];
+-    char Present_Rate[10];
++    char Charging_State[13];
++    char Remaining_Cap[13];
++    char Design_Cap[13];
++    char LastFull_Cap[13];
++    char Present_Rate[13];
+     char Technology[13];
+     char Model[13];
+     char Serial[13];
+diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp
+--- acpitool-0.5.1/src/battery.cpp	2009-08-13 23:42:43.000000000 +0400
++++ acpitool-0.5.1.my/src/battery.cpp	2011-11-10 21:48:22.000000000 +0400
+@@ -614,7 +614,7 @@
+     	}
+     	
+     	memset(str, '\0', 100);
+-	for(int t=0; t<5; t++)
++	for(int t=0; t<1; t++)
+ 	    fgets(str, 100, power_fp);            /* skip first 5 lines */
+     	
+     	/* get battery status (full, charging, ...) */
+@@ -664,8 +664,8 @@
+     	
+     	
+ 
+-	fgets(str, 100, power_fp);    	/* skip 1 line */	
+-
++	fgets(str, 100, power_fp);    	/* cycle count - skip 1 line */	
++	fgets(str, 100, power_fp);    	/* voltage_min - skip 1 line */	
+ 
+ 	/* get voltage_now */    
+ 	memset(str, '\0', 100);
+@@ -756,7 +756,7 @@
+     	else
+     	    strncpy(batt_info->Model, "unknown", 7);
+ 
+-	fgets(str, 100, power_fp);   
++	fgets(str, 100, power_fp);   /* manufacturer - skip 1 line */
+ 	
+ 	/* get serial */    
+ 	memset(str, '\0', 100);
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index 38164439b..b812f13dc 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=ginac
-pkgver=1.6.1
-pkgrel=2
-pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.'
+pkgver=1.6.2
+pkgrel=1
+pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.'
 arch=('i686' 'x86_64')
 url='http://www.ginac.de'
 license=('GPL')
@@ -12,7 +12,7 @@ depends=('cln')
 makedepends=('transfig' 'doxygen' 'texlive-bin')
 options=('!libtool')
 source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2")
-md5sums=('d383f3ee50f88ffa1b3966fdb11d0f12')
+md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9')
 
 build() {
   cd ginac-${pkgver}
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 459f288bd..401074d56 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,37 +1,44 @@
+# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=tar
 pkgname=haskell-tar
 pkgver=0.3.1.0
-pkgrel=4.2
+pkgrel=5
 pkgdesc="Reading, writing and manipulating \".tar\" archive files."
 url="http://hackage.haskell.org/package/tar"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 depends=('ghc=7.0.3-2' sh)
 options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
+install=haskell-tar.install
 md5sums=('10b54856495f9ef0a42aa270085c7d5e')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd "$srcdir/tar-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
+    --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register   --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$srcdir/tar-$pkgver"
+
+  install -Dm 744 register.sh \
+	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m 744 unregister.sh \
+	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" \
+	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
+# vim:set ts=2 sw=2 et:
diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install
index e8c2f6293..7e0383621 100644
--- a/community/haskell-tar/haskell-tar.install
+++ b/community/haskell-tar/haskell-tar.install
@@ -1,18 +1,24 @@
 HS_DIR=usr/share/haskell/haskell-tar
+
 post_install() {
   ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+	post_remove
 }
+
 pre_upgrade() {
   ${HS_DIR}/unregister.sh
 }
+
 post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+	post_install
 }
+
 pre_remove() {
-  ${HS_DIR}/unregister.sh
+	pre_upgrade
 }
+
 post_remove() {
   (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/raw-thumbnailer/PKGBUILD b/community/raw-thumbnailer/PKGBUILD
index e6d85babd..09aba9d1b 100644
--- a/community/raw-thumbnailer/PKGBUILD
+++ b/community/raw-thumbnailer/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 22594 2010-07-23 08:17:42Z lcarlier $
-# Maintainer: pressh <pressh at gmail dot com>
+# $Id: PKGBUILD 58310 2011-11-10 20:50:33Z rvanharen $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: boromil@gmail.com
 
 pkgname=raw-thumbnailer
-pkgver=0.2
-pkgrel=2
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="A lightweight and fast raw image thumbnailer that can be used by file managers."
 url="http://code.google.com/p/raw-thumbnailer/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('libopenraw')
 source=(http://raw-thumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('f107575aa32a0d53802cf5beead18bf8')
+sha1sums=('f34012062c0b1eaa10525722c36bd027b11ade2e')
 
 build() {
 	cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index bc08d2ef9..78b42754c 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=simple-scan
-pkgver=3.2.0
+pkgver=3.2.1
 pkgrel=1
 pkgdesc='Simple scanning utility'
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme')
 makedepends=('gnome-doc-utils' 'intltool')
 install=simple-scan.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac')
+sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index e0b22e2e4..51267430a 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 54970 2011-08-29 09:48:35Z spupykin $
+# $Id: PKGBUILD 58295 2011-11-10 13:02:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zerial <fernando@zerial.org>
 
 pkgname=unrealircd
-pkgver=3.2.8.1
-pkgrel=8
+pkgver=3.2.9
+pkgrel=1
 pkgdesc="Open Source IRC Server"
 arch=('i686' 'x86_64')
 url="http://unrealircd.com"
 license=('GPL2')
-depends=(openssl curl)
-conflicts=(ircd)
-provides=(ircd)
+depends=('openssl' 'curl')
+makedepends=('c-ares')
+conflicts=('ircd')
+provides=('ircd')
 backup=(etc/unrealircd/unrealircd.conf)
 source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
 	unrealircd.rc
 	arch-fixes.patch)
-md5sums=('7b741e94e867c0a7370553fd01506c66'
+md5sums=('bde023695347969f545ce5f2a9ac9aed'
          '0d728240132a97a2cef61be9558750b1'
          '77807313c4578f2c30286b9f9e3fb21c')
 
@@ -37,7 +38,8 @@ build() {
       --enable-dynamic-linking \
       --enable-ziplinks \
       --enable-ssl \
-      --enable-libcurl=/usr
+      --enable-libcurl=/usr \
+      --with-system-cares
 
   make
   make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install