Thu Mar 20 04:00:11 UTC 2014

9 files changed, 98 insertions, 144 deletions

diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index e50f59444..220034c7e 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205566 2014-02-07 20:38:36Z eric $
+# $Id: PKGBUILD 208208 2014-03-19 01:47:32Z eric $
 # Maintainer: 
 
 pkgname=i8kutils
-pkgver=1.40
-pkgrel=4
+pkgver=1.41
+pkgrel=1
 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/i8kutils"
@@ -11,30 +11,32 @@ license=('GPL')
 depends=('bash' 'acpi')
 optdepends=('tk: for i8kmon deamon')
 backup=('etc/i8kutils/i8kmon.conf')
-source=(http://ftp.de.debian.org/debian/pool/main/i/${pkgname}/${pkgname}_${pkgver}.tar.gz
-        i8kmon.service i8kutils-probe.diff)
-sha1sums=('584edfbd90aa167885520b84848381585d9212fb'
-          '5c20f5241de7e60b46117269f4e867b08734cdc8'
-          'ab9058f92adb3e8b9306568005d5751908fb1765')
+DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 --insecure -o %o %u')
+source=(https://launchpad.net/i8kutils/trunk/${pkgver}/+download/i8kutils_${pkgver}.tar.gz{,.asc}
+        i8kmon.service)
+sha1sums=('7baf9ed1b27f4bcab7a9a5c7c037d36c769945cc'
+          'SKIP'
+          '5c20f5241de7e60b46117269f4e867b08734cdc8')
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -p0 -i "$srcdir"/i8kutils-probe.diff
-
+  cd $pkgname
   # conform to Arch Linux guidelines
   sed -i 's|/etc/i8kmon|/etc/i8kutils/i8kmon.conf|g' i8kmon.1
   sed -i 's|/etc/i8kmon.conf|/etc/i8kutils/i8kmon.conf|g' i8kmon
+  make clean
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   install -d "$pkgdir"/usr/{bin,share/man/man1}
-  make DESTDIR="$pkgdir" install install-man
+  install -D -m644 i8kctl.1 i8kmon.1 "$pkgdir/usr/share/man/man1"
+  install -D -m755 i8kctl i8kfan i8kmon "$pkgdir/usr/bin"
+
   install -D -m644 i8kmon.conf "$pkgdir/etc/i8kutils/i8kmon.conf"
   install -D -m644 ../i8kmon.service "$pkgdir/usr/lib/systemd/system/i8kmon.service"
 }
diff --git a/extra/i8kutils/i8kutils-probe.diff b/extra/i8kutils/i8kutils-probe.diff
deleted file mode 100644
index 60485d737..000000000
--- a/extra/i8kutils/i8kutils-probe.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-=== modified file 'i8kmon'
---- i8kmon	2013-11-23 19:41:17 +0000
-+++ i8kmon	2013-11-23 20:30:47 +0000
-@@ -27,6 +27,7 @@
-     sysconfig	/etc/i8kmon.conf
-     userconfig	~/.i8kmon
-     i8kfan	/usr/bin/i8kfan
-+    acpi    "acpi"
-     geometry	{}
-     use_conf    1
-     auto	1
-@@ -202,22 +202,15 @@
- 
-     set status(acpi_timer) [expr 60 / $config(timeout)]
- 
--    set cmd "acpi -a"; set acpi_ac [eval exec $cmd]
--    set cmd2 "acpitool -a"; set acpi_ac2 [eval exec $cmd2]
--    set ret [string first "on-line" $acpi_ac]
--	set ret2 [string first "online" $acpi_ac2]
--    if {$ret >= 0 | $ret2 >= 0} {
-+    set acpi_ac [exec {*}$config(acpi)]
-+    if {[string match *on-line* $acpi_ac] || [string match *online* $acpi_ac]} {
-         set status(ac) 1
-     } else {
-         set status(ac) 0
-     }
- 
-     if {$config(verbose) > 0} {
--        if {$ret >= 0} {
--            puts "[clock seconds] acpi: $acpi_ac"
--        } elseif {$ret2 >= 0} {
--            puts "[clock seconds] acpi: $acpi_ac2"
--        }
-+        puts "[clock seconds] acpi: $acpi_ac"
-     }
- 
-     return 0
-@@ -495,8 +487,8 @@
-     -a|--auto               control automatically the fans
-    -na|--noauto	            don\x27t control automatically the fans
-     -d|--daemon             run in daemon mode without user interface
--   -nd|--nodaemon           don\x27 run as daemon, open the user interface
--   -nc|--nouserconfig       don't use \$HOME/.i8kmon
-+   -nd|--nodaemon           don\x27t run as daemon, open the user interface
-+   -nc|--nouserconfig       don\x27t use \$HOME/.i8kmon
-     -v|--verbose            report status on stdout
-     -g|--geometry <geom>    set applet geometry
-     -t|--timeout <secs>     set poll timeout
-@@ -556,7 +548,7 @@
-     }
- 
-     if {$config(verbose) > 0} {
--	set copyright "Copyright (C) 2013 i8kutils <https://launchpad.net/i8kutils>"
-+	set copyright "Copyright (C) 2013 Vitor Augusto <vitorafsr@gmail.com>"
- 	puts "i8kmon $PROG_VERSION - $copyright"
- 	parray config
- 	parray status
-@@ -596,8 +588,25 @@
-     set status(rightspeed) "0 $rspeed1 $rspeed2 $rspeed3"
- }
- 
-+# probe external tools
-+proc probe_tools {} {
-+
-+    # The possibility of choosing 'acpi' or 'acpitool' is for compatibility
-+    # between different architectures: amd64, i386, kFreeBSD
-+    # This code below is strictly related on package dependency stated at
-+    # keyword 'Depends:' on file 'debian/control'
-+    if {![catch {exec acpi}]} {
-+        set config(acpi) "acpi"
-+    } elseif {[catch {exec acpitool}]} {
-+        set config(acpi) "acpitool"
-+    } else {
-+        puts stderr "Package dependency problem: neither 'acpi' nor 'acpitool' package is installed"
-+    }
-+}
-+
- proc main {} {
-     probe_fan_speed
-+    probe_tools
-     read_config
-     parse_options
-     make_ui
-
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 37a3709c7..c8db32d83 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 206898 2014-03-05 17:54:13Z andyrtr $
+# $Id: PKGBUILD 208226 2014-03-19 20:32:56Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libburn
-pkgver=1.3.6
+pkgver=1.3.6.pl01
 pkgrel=1
 pkgdesc="Library for reading, mastering and writing optical discs"
 arch=('i686' 'x86_64')
@@ -12,17 +12,17 @@ license=('GPL')
 depends=('glibc')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
 options=('!emptydirs')
-md5sums=('ed7b9bbf873fc754b1a75df1b2cc1023'
+md5sums=('ebfecd07b09f0e6a06c97bcdaa3f8fa3'
          'SKIP')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/.pl01/}
   ./configure --prefix=/usr --disable-static
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/.pl01/}
   make DESTDIR=${pkgdir} install
 }
 
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 4ed6c4cea..293ff4816 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 206903 2014-03-05 18:01:14Z andyrtr $
+# $Id: PKGBUILD 208228 2014-03-19 20:36:58Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gour <Gour <gour@mail.inet.hr>
 
 pkgname=libisoburn
-pkgver=1.3.6
+pkgver=1.3.6.pl01
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia-project.org"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('libburn>=1.3.6' 'libisofs>=1.3.6' 'readline')
+depends=('libburn>=1.3.6.pl01' 'libisofs>=1.3.6' 'readline')
 optdepends=('tk:      for xorriso-tcltk frontend'
             'bwidget: for xorriso-tcltk frontend')
 provides=('xorriso' 'xorriso-tcltk')
 install=${pkgname}.install
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('1f7bea50c44ba69acb5710f14f561f5d'
+md5sums=('51f010e022b54e38a5f0c194b78c5b3a'
          'SKIP')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/.pl01/}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver/.pl01/}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index e25f0ea94..e4997d025 100644
--- a/extra/liquidwar/PKGBUILD
+++ b/extra/liquidwar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $
-# Maintainer: Jeff Mickey <jeff@archlinux.org>
+# $Id: PKGBUILD 208212 2014-03-19 03:53:19Z eric $
+# Maintainer:
 
 pkgname=liquidwar
 pkgver=5.6.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A unique multiplayer wargame"
 arch=('i686' 'x86_64')
 url="http://www.ufoot.org/liquidwar/"
@@ -12,21 +12,28 @@ depends=('allegro4')
 makedepends=('python2')
 install=liquidwar.install
 source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz
-        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch)
+        http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig
+	liquidwar-5.6.4-ovflfix.patch liquidwar-5.6.4-underlink.patch)
 sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6'
-          'a262967d60e0f04ac5b99693144ef6b0038bb6c4'
-          'e2102792c54a01b7cd14adb6d72404044175ec7e')
+          'SKIP'
+          'e2102792c54a01b7cd14adb6d72404044175ec7e'
+          '442097d99402890ed27ea1de6b7ae984baa2676a')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
   patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
+  patch -p0 -i "$srcdir/liquidwar-5.6.4-underlink.patch"
   sed -i 's/python/python2/' doc/Makefile.in
+}
+
+build() {
+  cd $pkgname-$pkgver
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
-  LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
+  PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
   make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink
 }
diff --git a/extra/liquidwar/liquidwar-5.6.4-underlink.patch b/extra/liquidwar/liquidwar-5.6.4-underlink.patch
new file mode 100644
index 000000000..2bc53e0ca
--- /dev/null
+++ b/extra/liquidwar/liquidwar-5.6.4-underlink.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
++++ src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
+@@ -223,7 +223,7 @@
+     EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
+ else
+     LINK_OPTIONS = 
+-    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
++    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
+ endif
+ 
+ CONFIG_OPTIONS = \
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index 0e308434b..f1591afff 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 169030 2012-10-17 10:21:00Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 208210 2014-03-19 02:32:28Z eric $
+# Maintainer:
 
 pkgbase=python-pysqlite
 pkgname=python2-pysqlite
 pkgver=2.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 license=('custom')
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
+url="https://pypi.python.org/pypi/pysqlite"
 depends=('python2' 'sqlite')
 conflicts=('python-pysqlite<=2.6.3-2')
 replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
+source=(https://pypi.python.org/packages/source/p/pysqlite/pysqlite-${pkgver}.tar.gz
         setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
+md5sums=('7ff1cedee74646b50117acff87aa1cfa'
          '86dd356c65afd14a22f2f8f64a26441e')
 
-check() {
-    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
-    python2 -c "from pysqlite2 import test; test.test()"
+prepare() {
+  cp "${srcdir}/setup.cfg" pysqlite-${pkgver}
 }
 
 build() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	cp "${srcdir}/setup.cfg" .
-	python2 setup.py build
+  cd pysqlite-${pkgver}
+  python2 setup.py build
+}
+
+check() {
+  cd pysqlite-${pkgver}/build/lib.*/
+  python2 -c "from pysqlite2 import test; test.test()"
 }
 
 package_python2-pysqlite() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm -r "${pkgdir}/usr/pysqlite2-doc"
+  cd pysqlite-${pkgver}
+  python2 setup.py install --root="${pkgdir}"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -r "${pkgdir}/usr/pysqlite2-doc"
 }
diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD
index e63309034..7678cf079 100644
--- a/extra/xine-ui/PKGBUILD
+++ b/extra/xine-ui/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 184454 2013-05-06 19:40:24Z foutrelis $
+# $Id: PKGBUILD 208230 2014-03-19 21:26:01Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-ui
-pkgver=0.99.7
-pkgrel=2
+pkgver=0.99.8
+pkgrel=1
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libpng' 'libxft' 'xdg-utils' 'shared-mime-info' 
-         'hicolor-icon-theme' 'desktop-file-utils' 'lirc-utils')
+depends=('xine-lib' 'curl' 'libxft' 'libxxf86vm' 'lirc-utils' 'xdg-utils'
+         'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
 options=('!strip')
 install=xine-ui.install
-source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('ca82e09cf8245d038813bc4dbd8384ba79cbf197')
+source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz xine-ui-readline.patch)
+sha1sums=('ffe8e6507a95f92f1e29aa4e3751f4b505e8da1a'
+          'e325c322a365a57ddbd62256a540202d092d4d1e')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/xine-ui-readline.patch"
+}
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xine-ui/xine-ui-readline.patch b/extra/xine-ui/xine-ui-readline.patch
new file mode 100644
index 000000000..bb680193e
--- /dev/null
+++ b/extra/xine-ui/xine-ui-readline.patch
@@ -0,0 +1,11 @@
+--- xine-ui-0.99.8.orig/src/xitk/network.c
++++ xine-ui-0.99.8/src/xitk/network.c
+@@ -1255,7 +1255,7 @@ int main(int argc, char **argv) {
+   rl_readline_name = PROGNAME;
+   rl_set_prompt(session.prompt);
+   rl_initialize();
+-  rl_attempted_completion_function = (CPPFunction *)completion_function;
++  rl_attempted_completion_function = completion_function;
+   
+   signal(SIGPIPE, SIG_IGN);
+