[arch-commits] Commit in garcon/trunk (PKGBUILD)

2012-02-13 Thread Evangelos Foutras
Date: Monday, February 13, 2012 @ 03:07:58
  Author: foutrelis
Revision: 150128

upgpkg: garcon 0.1.10-1

New upstream release.

Modified:
  garcon/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 07:58:15 UTC (rev 150127)
+++ PKGBUILD2012-02-13 08:07:58 UTC (rev 150128)
@@ -3,7 +3,7 @@
 # Contributor: Xavier Devlamynck magicrhe...@ouranos.be
 
 pkgname=garcon
-pkgver=0.1.9
+pkgver=0.1.10
 pkgrel=1
 pkgdesc=Implementation of the freedesktop.org menu specification
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 replaces=('libxfce4menu')
 options=('!libtool' '!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5')
+sha256sums=('c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316')
 
 build() {
   cd $srcdir/garcon-$pkgver



[arch-commits] Commit in garcon/repos (4 files)

2012-02-13 Thread Evangelos Foutras
Date: Monday, February 13, 2012 @ 03:08:25
  Author: foutrelis
Revision: 150129

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  garcon/repos/extra-i686/PKGBUILD
(from rev 150128, garcon/trunk/PKGBUILD)
  garcon/repos/extra-x86_64/PKGBUILD
(from rev 150128, garcon/trunk/PKGBUILD)
Deleted:
  garcon/repos/extra-i686/PKGBUILD
  garcon/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   74 
 extra-x86_64/PKGBUILD |   74 
 2 files changed, 74 insertions(+), 74 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 08:07:58 UTC (rev 150128)
+++ extra-i686/PKGBUILD 2012-02-13 08:08:25 UTC (rev 150129)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras evange...@foutrelis.com
-# Contributor: Xavier Devlamynck magicrhe...@ouranos.be
-
-pkgname=garcon
-pkgver=0.1.9
-pkgrel=1
-pkgdesc=Implementation of the freedesktop.org menu specification
-arch=('i686' 'x86_64')
-url=http://wiki.xfce.org/dev/garcon;
-license=('LGPL')
-groups=('xfce4')
-depends=('glib2' 'libxfce4util')
-makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
-replaces=('libxfce4menu')
-options=('!libtool' '!makeflags')
-source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5')
-
-build() {
-  cd $srcdir/garcon-$pkgver
-
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---libexecdir=/usr/lib \
---localstatedir=/var \
---disable-static \
---disable-debug
-  make
-}
-
-package() {
-  cd $srcdir/garcon-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: garcon/repos/extra-i686/PKGBUILD (from rev 150128, 
garcon/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 08:08:25 UTC (rev 150129)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Evangelos Foutras evange...@foutrelis.com
+# Contributor: Xavier Devlamynck magicrhe...@ouranos.be
+
+pkgname=garcon
+pkgver=0.1.10
+pkgrel=1
+pkgdesc=Implementation of the freedesktop.org menu specification
+arch=('i686' 'x86_64')
+url=http://wiki.xfce.org/dev/garcon;
+license=('LGPL')
+groups=('xfce4')
+depends=('glib2' 'libxfce4util')
+makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
+replaces=('libxfce4menu')
+options=('!libtool' '!makeflags')
+source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
+sha256sums=('c2497a2991101fc1e621dc712ef72aba7c238f6e5f5a1733c9572f9b23761316')
+
+build() {
+  cd $srcdir/garcon-$pkgver
+
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--libexecdir=/usr/lib \
+--localstatedir=/var \
+--disable-static \
+--disable-debug
+  make
+}
+
+package() {
+  cd $srcdir/garcon-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-13 08:07:58 UTC (rev 150128)
+++ extra-x86_64/PKGBUILD   2012-02-13 08:08:25 UTC (rev 150129)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras evange...@foutrelis.com
-# Contributor: Xavier Devlamynck magicrhe...@ouranos.be
-
-pkgname=garcon
-pkgver=0.1.9
-pkgrel=1
-pkgdesc=Implementation of the freedesktop.org menu specification
-arch=('i686' 'x86_64')
-url=http://wiki.xfce.org/dev/garcon;
-license=('LGPL')
-groups=('xfce4')
-depends=('glib2' 'libxfce4util')
-makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
-replaces=('libxfce4menu')
-options=('!libtool' '!makeflags')
-source=(http://archive.xfce.org/src/xfce/garcon/0.1/garcon-$pkgver.tar.bz2)
-sha256sums=('485e23c8ec1af0d3af423aa244e05467dd2f96afbb66efc70ca7689222cf31d5')
-
-build() {
-  cd $srcdir/garcon-$pkgver
-
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---libexecdir=/usr/lib \
---localstatedir=/var \
---disable-static \
---disable-debug
-  make
-}
-
-package() {
-  cd $srcdir/garcon-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: garcon/repos/extra-x86_64/PKGBUILD (from rev 150128, 
garcon/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-13 08:08:25 UTC (rev 150129)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Evangelos Foutras evange...@foutrelis.com
+# Contributor: Xavier Devlamynck magicrhe...@ouranos.be
+
+pkgname=garcon
+pkgver=0.1.10
+pkgrel=1
+pkgdesc=Implementation of the freedesktop.org menu specification
+arch=('i686' 'x86_64')
+url=http://wiki.xfce.org/dev/garcon;
+license=('LGPL')
+groups=('xfce4')
+depends=('glib2' 'libxfce4util')
+makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')

[arch-commits] Commit in xfce4-session/trunk (PKGBUILD)

2012-02-13 Thread Evangelos Foutras
Date: Monday, February 13, 2012 @ 03:12:10
  Author: foutrelis
Revision: 150130

upgpkg: xfce4-session 4.8.3-1

New upstream release.

Modified:
  xfce4-session/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 08:08:25 UTC (rev 150129)
+++ PKGBUILD2012-02-13 08:12:10 UTC (rev 150130)
@@ -3,8 +3,8 @@
 # Contributor: tobias tobias funnychar archlinux.org
 
 pkgname=xfce4-session
-pkgver=4.8.2
-pkgrel=2
+pkgver=4.8.3
+pkgrel=1
 pkgdesc=A session manager for Xfce
 arch=('i686' 'x86_64')
 url=http://www.xfce.org/;
@@ -20,7 +20,7 @@
 options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
+sha256sums=('f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338')
 
 build() {
   cd $srcdir/$pkgname-$pkgver



[arch-commits] Commit in xfce4-session/repos (8 files)

2012-02-13 Thread Evangelos Foutras
Date: Monday, February 13, 2012 @ 03:12:40
  Author: foutrelis
Revision: 150131

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xfce4-session/repos/extra-i686/PKGBUILD
(from rev 150130, xfce4-session/trunk/PKGBUILD)
  xfce4-session/repos/extra-i686/xfce4-session.install
(from rev 150130, xfce4-session/trunk/xfce4-session.install)
  xfce4-session/repos/extra-x86_64/PKGBUILD
(from rev 150130, xfce4-session/trunk/PKGBUILD)
  xfce4-session/repos/extra-x86_64/xfce4-session.install
(from rev 150130, xfce4-session/trunk/xfce4-session.install)
Deleted:
  xfce4-session/repos/extra-i686/PKGBUILD
  xfce4-session/repos/extra-i686/xfce4-session.install
  xfce4-session/repos/extra-x86_64/PKGBUILD
  xfce4-session/repos/extra-x86_64/xfce4-session.install

+
 extra-i686/PKGBUILD|  100 +--
 extra-i686/xfce4-session.install   |   26 -
 extra-x86_64/PKGBUILD  |  100 +--
 extra-x86_64/xfce4-session.install |   26 -
 4 files changed, 126 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 08:12:10 UTC (rev 150130)
+++ extra-i686/PKGBUILD 2012-02-13 08:12:40 UTC (rev 150131)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras evange...@foutrelis.com
-# Contributor: tobias tobias funnychar archlinux.org
-
-pkgname=xfce4-session
-pkgver=4.8.2
-pkgrel=2
-pkgdesc=A session manager for Xfce
-arch=('i686' 'x86_64')
-url=http://www.xfce.org/;
-license=('GPL2')
-groups=('xfce4')
-# keep xorg-server-utils for https://bugs.archlinux.org/task/21096
-# upower and consolekit for reboot/shutdown/hibernate/suspend
-depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm'
- 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme')
-makedepends=('intltool')
-optdepends=('fortune-mod: for xfce4-tips')
-replaces=('xfce4-toys')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
-sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---libexecdir=/usr/lib/xfce4 \
---localstatedir=/var \
---disable-static \
---disable-hal \
---enable-gnome \
---enable-libgnome-keyring \
---enable-session-screenshots \
---enable-upower \
---enable-consolekit \
---enable-polkit \
---enable-panel-plugin \
---disable-debug
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: xfce4-session/repos/extra-i686/PKGBUILD (from rev 150130, 
xfce4-session/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 08:12:40 UTC (rev 150131)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Evangelos Foutras evange...@foutrelis.com
+# Contributor: tobias tobias funnychar archlinux.org
+
+pkgname=xfce4-session
+pkgver=4.8.3
+pkgrel=1
+pkgdesc=A session manager for Xfce
+arch=('i686' 'x86_64')
+url=http://www.xfce.org/;
+license=('GPL2')
+groups=('xfce4')
+# keep xorg-server-utils for https://bugs.archlinux.org/task/21096
+# upower and consolekit for reboot/shutdown/hibernate/suspend
+depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm'
+ 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('fortune-mod: for xfce4-tips')
+replaces=('xfce4-toys')
+options=('!libtool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('f0801b8c0ffa7e5d41b29b8df281ac127adf467bf50e8ded8aebe5a02bd99338')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--libexecdir=/usr/lib/xfce4 \
+--localstatedir=/var \
+--disable-static \
+--disable-hal \
+--enable-gnome \
+--enable-libgnome-keyring \
+--enable-session-screenshots \
+--enable-upower \
+--enable-consolekit \
+--enable-polkit \
+--enable-panel-plugin \
+--disable-debug
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/xfce4-session.install
===
--- extra-i686/xfce4-session.install2012-02-13 08:12:10 UTC (rev 150130)
+++ extra-i686/xfce4-session.install2012-02-13 08:12:40 UTC (rev 150131)
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: 

[arch-commits] Commit in xfce4-mpc-plugin/trunk (PKGBUILD)

2012-02-13 Thread Eric Bélanger
Date: Monday, February 13, 2012 @ 05:08:48
  Author: eric
Revision: 150132

upgpkg: xfce4-mpc-plugin 0.4.0-1

Upstream update, Remove libxfcegui4 depends, Fix license

Modified:
  xfce4-mpc-plugin/trunk/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 08:12:40 UTC (rev 150131)
+++ PKGBUILD2012-02-13 10:08:48 UTC (rev 150132)
@@ -4,21 +4,21 @@
 # Contributor: Tobias Kieslich tobias (at) archlinux.org
 
 pkgname=xfce4-mpc-plugin
-pkgver=0.3.6
-pkgrel=2
-pkgdesc=plugin to control the music player daemon from the xfce4-panel
-arch=(i686 x86_64)
-license=('GPL2')
+pkgver=0.4.0
+pkgrel=1
+pkgdesc=A plugin to control the music player daemon from the xfce4-panel
+arch=('i686' 'x86_64')
+license=('BSD')
 url=http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin;
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libmpd=0.16.1')
+depends=('xfce4-panel' 'libmpd=0.16.1')
 makedepends=('intltool')
-options=(!libtool)
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a632885d803dcebd82bbb91ed3c7')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ae9b285e24385e27cfd797ab605a1b7f')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
@@ -29,6 +29,7 @@
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }



[arch-commits] Commit in xfce4-mpc-plugin/repos (4 files)

2012-02-13 Thread Eric Bélanger
Date: Monday, February 13, 2012 @ 05:09:13
  Author: eric
Revision: 150133

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  xfce4-mpc-plugin/repos/extra-i686/PKGBUILD
(from rev 150132, xfce4-mpc-plugin/trunk/PKGBUILD)
  xfce4-mpc-plugin/repos/extra-x86_64/PKGBUILD
(from rev 150132, xfce4-mpc-plugin/trunk/PKGBUILD)
Deleted:
  xfce4-mpc-plugin/repos/extra-i686/PKGBUILD
  xfce4-mpc-plugin/repos/extra-x86_64/PKGBUILD

---+
 extra-i686/PKGBUILD   |   69 
 extra-x86_64/PKGBUILD |   69 
 2 files changed, 70 insertions(+), 68 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 10:08:48 UTC (rev 150132)
+++ extra-i686/PKGBUILD 2012-02-13 10:09:13 UTC (rev 150133)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Contributor: aurelien aurel...@archlinux.org
-# Contributor: Tobias Kieslich tobias (at) archlinux.org
-
-pkgname=xfce4-mpc-plugin
-pkgver=0.3.6
-pkgrel=2
-pkgdesc=plugin to control the music player daemon from the xfce4-panel
-arch=(i686 x86_64)
-license=('GPL2')
-url=http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin;
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libmpd=0.16.1')
-makedepends=('intltool')
-options=(!libtool)
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a632885d803dcebd82bbb91ed3c7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-   --localstatedir=/var \
-   --disable-static \
-   --disable-debug
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: xfce4-mpc-plugin/repos/extra-i686/PKGBUILD (from rev 150132, 
xfce4-mpc-plugin/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 10:09:13 UTC (rev 150133)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: aurelien aurel...@archlinux.org
+# Contributor: Tobias Kieslich tobias (at) archlinux.org
+
+pkgname=xfce4-mpc-plugin
+pkgver=0.4.0
+pkgrel=1
+pkgdesc=A plugin to control the music player daemon from the xfce4-panel
+arch=('i686' 'x86_64')
+license=('BSD')
+url=http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin;
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libmpd=0.16.1')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('ae9b285e24385e27cfd797ab605a1b7f')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+   --sysconfdir=/etc \
+   --libexecdir=/usr/lib \
+   --localstatedir=/var \
+   --disable-static \
+   --disable-debug
+  make
+}
+
+package(){
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-13 10:08:48 UTC (rev 150132)
+++ extra-x86_64/PKGBUILD   2012-02-13 10:09:13 UTC (rev 150133)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Contributor: aurelien aurel...@archlinux.org
-# Contributor: Tobias Kieslich tobias (at) archlinux.org
-
-pkgname=xfce4-mpc-plugin
-pkgver=0.3.6
-pkgrel=2
-pkgdesc=plugin to control the music player daemon from the xfce4-panel
-arch=(i686 x86_64)
-license=('GPL2')
-url=http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin;
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libmpd=0.16.1')
-makedepends=('intltool')
-options=(!libtool)
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a632885d803dcebd82bbb91ed3c7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-   --localstatedir=/var \
-   --disable-static \
-   --disable-debug
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: xfce4-mpc-plugin/repos/extra-x86_64/PKGBUILD (from rev 150132, 
xfce4-mpc-plugin/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-13 10:09:13 UTC (rev 150133)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: aurelien aurel...@archlinux.org
+# Contributor: Tobias Kieslich tobias (at) 

[arch-commits] Commit in brltty/repos (14 files)

2012-02-13 Thread Ionut Biru
Date: Monday, February 13, 2012 @ 06:01:23
  Author: ibiru
Revision: 150135

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  brltty/repos/extra-i686/PKGBUILD
(from rev 150134, brltty/trunk/PKGBUILD)
  brltty/repos/extra-i686/brltty
(from rev 150134, brltty/trunk/brltty)
  brltty/repos/extra-i686/brltty.conf
(from rev 150134, brltty/trunk/brltty.conf)
  brltty/repos/extra-x86_64/PKGBUILD
(from rev 150134, brltty/trunk/PKGBUILD)
  brltty/repos/extra-x86_64/brltty
(from rev 150134, brltty/trunk/brltty)
  brltty/repos/extra-x86_64/brltty.conf
(from rev 150134, brltty/trunk/brltty.conf)
Deleted:
  brltty/repos/extra-i686/PKGBUILD
  brltty/repos/extra-i686/brltty
  brltty/repos/extra-i686/brltty-4.2-S_ISCHR.patch
  brltty/repos/extra-i686/brltty.conf
  brltty/repos/extra-x86_64/PKGBUILD
  brltty/repos/extra-x86_64/brltty
  brltty/repos/extra-x86_64/brltty-4.2-S_ISCHR.patch
  brltty/repos/extra-x86_64/brltty.conf

---+
 extra-i686/PKGBUILD   |   95 ++
 extra-i686/brltty |  136 
 extra-i686/brltty-4.2-S_ISCHR.patch   |   11 --
 extra-i686/brltty.conf|4 
 extra-x86_64/PKGBUILD |   95 ++
 extra-x86_64/brltty   |  136 
 extra-x86_64/brltty-4.2-S_ISCHR.patch |   11 --
 extra-x86_64/brltty.conf  |4 
 8 files changed, 232 insertions(+), 260 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 11:00:14 UTC (rev 150134)
+++ extra-i686/PKGBUILD 2012-02-13 11:01:23 UTC (rev 150135)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: Giovanni Scafora giova...@archlinux.org
-
-pkgname=brltty
-pkgver=4.3
-pkgrel=1
-pkgdesc=Braille display driver for Linux/Unix
-arch=('i686' 'x86_64')
-url=http://mielke.cc/brltty;
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst')
-makedepends=('pyrex' 'bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
-source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz
-'brltty'
-'brltty.conf')
-#'brltty-4.2-S_ISCHR.patch'
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
- '831ebaf0c56091702929c68805d20c4f'
- 'a8ab8b3dd059e96e1734bc9cdcf844fc')
-# '5954b289efaf2ff17676d06de9a88854'
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  CFLAGS+=${CFLAGS} -D_GNU_SOURCE \
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---localstatedir=/var \
---enable-gpm \
---disable-java-bindings \
---disable-caml-bindings \
-PYTHON=/usr/bin/python2
-
-#  patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make INSTALL_ROOT=${pkgdir} install
-  install -D -m755 ${srcdir}/brltty ${pkgdir}/etc/rc.d/brltty
-  install -D -m644 ${srcdir}/brltty.conf ${pkgdir}/etc/conf.d/brltty.conf
-  install -D -m644 Documents/brltty.conf ${pkgdir}/etc/brltty.conf
-}

Copied: brltty/repos/extra-i686/PKGBUILD (from rev 150134, 
brltty/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 11:01:23 UTC (rev 150135)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+
+pkgname=brltty
+pkgver=4.3
+pkgrel=3
+pkgdesc=Braille display driver for Linux/Unix
+arch=('i686' 'x86_64')
+url=http://mielke.cc/brltty;
+license=('GPL' 'LGPL')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 
'pyrex')
+makedepends=('bluez')
+optdepends=('bluez: bluetooth support')
+backup=(etc/brltty.conf etc/conf.d/brltty.conf)
+options=('!makeflags' '!emptydirs')
+source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
+'brltty'
+'brltty.conf')
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
+ '831ebaf0c56091702929c68805d20c4f'
+ 'a8ab8b3dd059e96e1734bc9cdcf844fc')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--localstatedir=/var \
+--with-screen-driver=a2 \
+--enable-gpm \
+--disable-java-bindings \
+--disable-caml-bindings \
+PYTHON=/usr/bin/python2
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make INSTALL_ROOT=$pkgdir install
+  install -D -m755 $srcdir/brltty $pkgdir/etc/rc.d/brltty
+  install -D -m644 $srcdir/brltty.conf $pkgdir/etc/conf.d/brltty.conf
+  install -D -m644 Documents/brltty.conf $pkgdir/etc/brltty.conf
+}

Deleted: 

[arch-commits] Commit in qscintilla/trunk (PKGBUILD)

2012-02-13 Thread Eric Bélanger
Date: Monday, February 13, 2012 @ 06:40:26
  Author: eric
Revision: 150136

upgpkg: qscintilla 2.6.1-1

Upstream update

Modified:
  qscintilla/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 11:01:23 UTC (rev 150135)
+++ PKGBUILD2012-02-13 11:40:26 UTC (rev 150136)
@@ -5,18 +5,17 @@
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.6
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
 makedepends=('python2-pyqt' 'chrpath')
 
source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;
 'configure.py-objdir-support.diff')
-md5sums=('0605a8006ea752ec2d1d7fc4791d1c75'
+md5sums=('39a1d0567a20b416177eb1a8afe225a7'
  '8cf9c06252e2f11ab00e62848e322fd3')
 
-
 build() {
 cd ${srcdir}/QScintilla-gpl-${pkgver} 
 patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff



[arch-commits] Commit in qscintilla/repos (8 files)

2012-02-13 Thread Eric Bélanger
Date: Monday, February 13, 2012 @ 06:40:55
  Author: eric
Revision: 150137

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qscintilla/repos/extra-i686/PKGBUILD
(from rev 150136, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
(from rev 150136, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/extra-x86_64/PKGBUILD
(from rev 150136, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
(from rev 150136, qscintilla/trunk/configure.py-objdir-support.diff)
Deleted:
  qscintilla/repos/extra-i686/PKGBUILD
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
  qscintilla/repos/extra-x86_64/PKGBUILD
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff

---+
 extra-i686/PKGBUILD   |  137 +++-
 extra-i686/configure.py-objdir-support.diff   |   78 ++---
 extra-x86_64/PKGBUILD |  137 +++-
 extra-x86_64/configure.py-objdir-support.diff |   78 ++---
 4 files changed, 214 insertions(+), 216 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 11:40:26 UTC (rev 150136)
+++ extra-i686/PKGBUILD 2012-02-13 11:40:55 UTC (rev 150137)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade d...@aur.archlinux.org
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.6
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
-makedepends=('python2-pyqt' 'chrpath')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;
-'configure.py-objdir-support.diff')
-md5sums=('0605a8006ea752ec2d1d7fc4791d1c75'
- '8cf9c06252e2f11ab00e62848e322fd3')
-
-
-build() {
-cd ${srcdir}/QScintilla-gpl-${pkgver} 
-patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
-
-cd Qt4
-qmake qscintilla.pro
-make
-
-cd ../designer-Qt4
-qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
-make
-
-cd ../
-cp -rf Python Python2
-cd Python
-python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
-make
-
-cd ../Python2
-python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
-make
-}
-
-package_qscintilla() {
-pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class
-depends=('qt')
-
-cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4
-make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-
-cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
-make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-}
-
-package_python-qscintilla() {
-pkgdesc=Python 3 bindings for QScintilla2
-depends=('pyqt' 'qscintilla')
-
-cd ${srcdir}/QScintilla-gpl-${pkgver}/Python
-install -Dm755 Qsci.so \
-  ${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so
-}
-
-package_python2-qscintilla() {
-pkgdesc=Python 2 bindings for QScintilla2
-depends=('python-qscintilla' 'python2-pyqt')
-
-cd ${srcdir}/QScintilla-gpl-${pkgver}/Python2
-make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-}

Copied: qscintilla/repos/extra-i686/PKGBUILD (from rev 150136, 
qscintilla/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 11:40:55 UTC (rev 150137)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade d...@aur.archlinux.org
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
+pkgver=2.6.1
+pkgrel=1
+license=('GPL')
+arch=('i686' 'x86_64')
+url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
+makedepends=('python2-pyqt' 'chrpath')
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;
+'configure.py-objdir-support.diff')
+md5sums=('39a1d0567a20b416177eb1a8afe225a7'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+cd ${srcdir}/QScintilla-gpl-${pkgver} 
+patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
+
+cd Qt4
+qmake qscintilla.pro
+make
+
+cd ../designer-Qt4
+qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+make
+}
+
+package_qscintilla() {
+pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class
+depends=('qt')
+
+cd 

[arch-commits] Commit in dovecot/trunk (PKGBUILD)

2012-02-13 Thread andyrtr
Date: Monday, February 13, 2012 @ 07:12:24
  Author: andyrtr
Revision: 150138

upgpkg: dovecot 2.0.18-1

upstream update 2.0.18

Modified:
  dovecot/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 11:40:55 UTC (rev 150137)
+++ PKGBUILD2012-02-13 12:12:24 UTC (rev 150138)
@@ -5,7 +5,7 @@
 # Contributor: GARETTE Emmanuel gnunux at laposte dot net
 
 pkgname=dovecot
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc=An IMAP and POP3 server written with security primarily in mind
 arch=('i686' 'x86_64')
@@ -24,8 +24,9 @@

etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
-source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('41c10dffa56e228b9176833db2efaac5'
+source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz{,.sig} 
dovecot.sh)
+md5sums=('4fdee96b390a287d75b51ffcf6abe30f'
+ 'c317125fd613a6ed207fbaf7d7543163'
  '587159e84e2da6f83d70b3c706ba87cc')
 
 build() {



[arch-commits] Commit in dovecot/repos (12 files)

2012-02-13 Thread andyrtr
Date: Monday, February 13, 2012 @ 07:13:16
  Author: andyrtr
Revision: 150139

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  dovecot/repos/extra-i686/PKGBUILD
(from rev 150138, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-i686/dovecot.install
(from rev 150138, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-i686/dovecot.sh
(from rev 150138, dovecot/trunk/dovecot.sh)
  dovecot/repos/extra-x86_64/PKGBUILD
(from rev 150138, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-x86_64/dovecot.install
(from rev 150138, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-x86_64/dovecot.sh
(from rev 150138, dovecot/trunk/dovecot.sh)
Deleted:
  dovecot/repos/extra-i686/PKGBUILD
  dovecot/repos/extra-i686/dovecot.install
  dovecot/repos/extra-i686/dovecot.sh
  dovecot/repos/extra-x86_64/PKGBUILD
  dovecot/repos/extra-x86_64/dovecot.install
  dovecot/repos/extra-x86_64/dovecot.sh

--+
 extra-i686/PKGBUILD  |  139 -
 extra-i686/dovecot.install   |  116 +-
 extra-i686/dovecot.sh|  138 
 extra-x86_64/PKGBUILD|  139 -
 extra-x86_64/dovecot.install |  116 +-
 extra-x86_64/dovecot.sh  |  138 
 6 files changed, 394 insertions(+), 392 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 12:12:24 UTC (rev 150138)
+++ extra-i686/PKGBUILD 2012-02-13 12:13:16 UTC (rev 150139)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Contributor: Paul Mattal p...@mattal.com
-# Contributor: Federico Quagliata (quaqo) qu...@despammed.com
-# Contributor: GARETTE Emmanuel gnunux at laposte dot net
-
-pkgname=dovecot
-pkgver=2.0.17
-pkgrel=1
-pkgdesc=An IMAP and POP3 server written with security primarily in mind
-arch=('i686' 'x86_64')
-url=http://dovecot.org/;
-license=(LGPL)
-depends=('krb5' 'openssl' 'sqlite3=3.7.5' 'libmysqlclient=5.5.10'
-'postgresql-libs=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam=1.1.1' 'libcap=2.19' 'libldap=2.4.22')
-optdepends=('libldap: ldap plugin')
-provides=('imap-server' 'pop3-server')
-options=('!libtool')
-backup=(etc/dovecot/dovecot.conf
-   
etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf
-   etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf
-   etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf
-   
etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
-   etc/ssl/dovecot-openssl.cnf)
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('41c10dffa56e228b9176833db2efaac5'
- '587159e84e2da6f83d70b3c706ba87cc')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-   --libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-   --disable-static \
-   --with-nss \
-   --with-pam \
-   --with-mysql \
-   --with-pgsql \
-   --with-sqlite \
-   --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-   --with-gssapi \
-   --with-ldap=plugin \
-   --with-zlib --with-bzlib \
-   --with-libcap \
-   --with-solr \
-   --with-docs
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
-  # install example conf files and ssl.conf
-  install -d -m755 ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf 
${pkgdir}/etc/dovecot/conf.d
-  install -m 644 
${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext 
${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf 
${pkgdir}/etc/dovecot/
-  install -d -m755 ${pkgdir}/etc/ssl
-  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf 
${pkgdir}/etc/ssl/
-
-  rm ${pkgdir}/etc/dovecot/README
-}

Copied: dovecot/repos/extra-i686/PKGBUILD (from rev 150138, 
dovecot/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 12:13:16 UTC (rev 150139)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Contributor: Paul Mattal p...@mattal.com
+# Contributor: Federico Quagliata (quaqo) qu...@despammed.com
+# Contributor: GARETTE Emmanuel gnunux at laposte dot net
+
+pkgname=dovecot
+pkgver=2.0.18
+pkgrel=1
+pkgdesc=An IMAP and POP3 server written with security 

[arch-commits] Commit in glproto/repos (staging-any testing-any testing-any/PKGBUILD)

2012-02-13 Thread andyrtr
Date: Monday, February 13, 2012 @ 07:56:32
  Author: andyrtr
Revision: 150140

db-move: moved glproto from [staging] to [testing] (any)

Added:
  glproto/repos/testing-any/
  glproto/repos/testing-any/PKGBUILD
(from rev 150139, glproto/repos/staging-any/PKGBUILD)
Deleted:
  glproto/repos/staging-any/

--+
 PKGBUILD |   26 ++
 1 file changed, 26 insertions(+)

Copied: glproto/repos/testing-any/PKGBUILD (from rev 150139, 
glproto/repos/staging-any/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2012-02-13 12:56:32 UTC (rev 150140)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Jan de Groot j...@archlinux.org
+# Contributor: Alexander Baldeck alexan...@archlinux.org
+
+pkgname=glproto
+pkgver=1.4.15
+pkgrel=1
+pkgdesc=X11 OpenGL extension wire protocol
+arch=(any)
+url=http://xorg.freedesktop.org/;
+license=('custom')
+source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4cee35232f1926312b29d59a94da1c526b01e5c3')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/
+}



[arch-commits] Commit in xf86-video-savage/trunk (PKGBUILD)

2012-02-13 Thread andyrtr
Date: Monday, February 13, 2012 @ 08:07:00
  Author: andyrtr
Revision: 150141

prepare update, use recent git state

Modified:
  xf86-video-savage/trunk/PKGBUILD

--+
 PKGBUILD |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 12:56:32 UTC (rev 150140)
+++ PKGBUILD2012-02-13 13:07:00 UTC (rev 150141)
@@ -3,7 +3,8 @@
 
 pkgname=xf86-video-savage
 pkgver=2.3.3
-pkgrel=2
+pkgrel=3
+_gitver=c4022796ec69bb3223d435d8442f9168aebe9c3d
 pkgdesc=X.org savage video driver
 arch=(i686 x86_64)
 url=http://xorg.freedesktop.org/;
@@ -13,17 +14,21 @@
 conflicts=('xorg-server1.11.99.903')
 options=(!libtool !makeflags)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2')
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+
http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/snapshot/xf86-video-savage-${_gitver}.tar.gz)
+md5sums=('d97a57dfd3d0570e4ec3c7ee0e5eea24')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr #--enable-dri
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
+  autoreconf -fi
+  ./configure --prefix=/usr --disable-dri
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  #cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}*
   make DESTDIR=${pkgdir} install
 
   install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname}



[arch-commits] Commit in octave/trunk (PKGBUILD)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 09:10:32
  Author: ronald
Revision: 150142

upgpkg: octave 3.6.0-1

update to 3.6.0

Modified:
  octave/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 13:07:00 UTC (rev 150141)
+++ PKGBUILD2012-02-13 14:10:32 UTC (rev 150142)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune cyberd...@gmail.com
 
 pkgname=octave
-pkgver=3.4.3
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc=A high-level language, primarily intended for numerical computations.
 arch=('i686' 'x86_64')
 url=http://www.octave.org;
@@ -19,7 +19,7 @@
 source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
 options=('!emptydirs')
 install=octave.install
-sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
+sha1sums=('62116e090d257a601e9d605f969dd87b7de1ffce')

 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in octave/repos (20 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 09:12:46
  Author: ronald
Revision: 150143

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  octave/repos/extra-i686/PKGBUILD
(from rev 150142, octave/trunk/PKGBUILD)
  octave/repos/extra-i686/curlfix.patch
(from rev 150142, octave/trunk/curlfix.patch)
  octave/repos/extra-i686/imread.patch
(from rev 150142, octave/trunk/imread.patch)
  octave/repos/extra-i686/octave-3.4.0-gcc46.patch
(from rev 150142, octave/trunk/octave-3.4.0-gcc46.patch)
  octave/repos/extra-i686/octave.install
(from rev 150142, octave/trunk/octave.install)
  octave/repos/extra-x86_64/PKGBUILD
(from rev 150142, octave/trunk/PKGBUILD)
  octave/repos/extra-x86_64/curlfix.patch
(from rev 150142, octave/trunk/curlfix.patch)
  octave/repos/extra-x86_64/imread.patch
(from rev 150142, octave/trunk/imread.patch)
  octave/repos/extra-x86_64/octave-3.4.0-gcc46.patch
(from rev 150142, octave/trunk/octave-3.4.0-gcc46.patch)
  octave/repos/extra-x86_64/octave.install
(from rev 150142, octave/trunk/octave.install)
Deleted:
  octave/repos/extra-i686/PKGBUILD
  octave/repos/extra-i686/curlfix.patch
  octave/repos/extra-i686/imread.patch
  octave/repos/extra-i686/octave-3.4.0-gcc46.patch
  octave/repos/extra-i686/octave.install
  octave/repos/extra-x86_64/PKGBUILD
  octave/repos/extra-x86_64/curlfix.patch
  octave/repos/extra-x86_64/imread.patch
  octave/repos/extra-x86_64/octave-3.4.0-gcc46.patch
  octave/repos/extra-x86_64/octave.install

---+
 extra-i686/PKGBUILD   |   88 
 extra-i686/curlfix.patch  |   20 +++
 extra-i686/imread.patch   |   58 ++---
 extra-i686/octave-3.4.0-gcc46.patch   |   48 -
 extra-i686/octave.install |   36 ++---
 extra-x86_64/PKGBUILD |   88 
 extra-x86_64/curlfix.patch|   20 +++
 extra-x86_64/imread.patch |   58 ++---
 extra-x86_64/octave-3.4.0-gcc46.patch |   48 -
 extra-x86_64/octave.install   |   36 ++---
 10 files changed, 250 insertions(+), 250 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 14:10:32 UTC (rev 150142)
+++ extra-i686/PKGBUILD 2012-02-13 14:12:46 UTC (rev 150143)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor : shining shiningxc.at.gmail.com
-# Contributor : cyberdune cyberd...@gmail.com
-
-pkgname=octave
-pkgver=3.4.3
-pkgrel=2
-pkgdesc=A high-level language, primarily intended for numerical computations.
-arch=('i686' 'x86_64')
-url=http://www.octave.org;
-license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 
'fltk')
-optdepends=('texinfo: for help-support in octave'
-'gnuplot: alternative plotting'
-   'umfpack: LU decomposition of some large sparse matrices'
-   'fltk: alternative plotting')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2;)
-options=('!emptydirs')
-install=octave.install
-sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679')
-   
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS=-O -ffloat-store \
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static --with-quantum-depth=16
-
-  LANG=C make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo /usr/lib/${pkgname}-${pkgver}  
${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}

Copied: octave/repos/extra-i686/PKGBUILD (from rev 150142, 
octave/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 14:12:46 UTC (rev 150143)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor : shining shiningxc.at.gmail.com
+# Contributor : cyberdune cyberd...@gmail.com
+
+pkgname=octave
+pkgver=3.6.0
+pkgrel=1
+pkgdesc=A high-level language, primarily intended for numerical computations.
+arch=('i686' 'x86_64')
+url=http://www.octave.org;
+license=('GPL')
+depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 
'gcc-libs' 'qhull')
+makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 
'fltk')
+optdepends=('texinfo: for help-support in octave'
+'gnuplot: alternative plotting'
+   'umfpack: LU decomposition of some large sparse matrices'
+   'fltk: alternative plotting')

[arch-commits] Commit in (5 files)

2012-02-13 Thread Pierre Schmitz
Date: Monday, February 13, 2012 @ 09:25:35
  Author: pierre
Revision: 150144

initial commit of the keyring package

Added:
  archlinux-keyring/
  archlinux-keyring/repos/
  archlinux-keyring/trunk/
  archlinux-keyring/trunk/PKGBUILD
  archlinux-keyring/trunk/archlinux-keyring.install

---+
 PKGBUILD  |   19 +++
 archlinux-keyring.install |9 +
 2 files changed, 28 insertions(+)

Added: archlinux-keyring/trunk/PKGBUILD
===
--- archlinux-keyring/trunk/PKGBUILD(rev 0)
+++ archlinux-keyring/trunk/PKGBUILD2012-02-13 14:25:35 UTC (rev 150144)
@@ -0,0 +1,19 @@
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+
+pkgname=archlinux-keyring
+pkgver=20120213
+pkgrel=1
+pkgdesc='Arch Linux PGP keyring'
+arch=('any')
+url='https://projects.archlinux.org/archlinux-keyring.git/'
+license=('GPL')
+install=${pkgname}.install
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;
+
ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig;)
+md5sums=('0bce827a30ddbea42b38cc24d1691ac5'
+ '27275509ea3ff9d0c24e6b0ba47878a8')
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make PREFIX=/usr DESTDIR=${pkgdir} install
+}

Added: archlinux-keyring/trunk/archlinux-keyring.install
===
--- archlinux-keyring/trunk/archlinux-keyring.install   
(rev 0)
+++ archlinux-keyring/trunk/archlinux-keyring.install   2012-02-13 14:25:35 UTC 
(rev 150144)
@@ -0,0 +1,9 @@
+post_upgrade() {
+   pacman-key -a \
+   usr/share/archlinux-keyring/master/*.asc \
+   usr/share/archlinux-keyring/packager/*.asc /dev/null
+}
+
+post_install() {
+   post_upgrade
+}



[arch-commits] Commit in maxima/trunk (PKGBUILD)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 09:35:00
  Author: ronald
Revision: 150145

upgpkg: maxima 5.26.0-1

update to 5.26.0

Modified:
  maxima/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 14:25:35 UTC (rev 150144)
+++ PKGBUILD2012-02-13 14:35:00 UTC (rev 150145)
@@ -3,8 +3,8 @@
 # Contributor: Damir Perisa da...@archlinux.org
 
 pkgname=maxima
-pkgver=5.25.1
-pkgrel=3
+pkgver=5.26.0
+pkgrel=1
 pkgdesc=Maxima - a sophisticated computer algebra system
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,7 +17,7 @@
 options=('!makeflags' '!zipman') # don't zip info pages or they won't work 
inside maxima
 install=maxima.install
 
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz;
 $pkgname.desktop)
-sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b'
+sha1sums=('bc7448486478b217c333605c6d8f6c0bbdd3526c'
   '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
 
 build() {



[arch-commits] Commit in maxima/repos (12 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 09:36:40
  Author: ronald
Revision: 150146

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  maxima/repos/extra-i686/PKGBUILD
(from rev 150145, maxima/trunk/PKGBUILD)
  maxima/repos/extra-i686/maxima.desktop
(from rev 150145, maxima/trunk/maxima.desktop)
  maxima/repos/extra-i686/maxima.install
(from rev 150145, maxima/trunk/maxima.install)
  maxima/repos/extra-x86_64/PKGBUILD
(from rev 150145, maxima/trunk/PKGBUILD)
  maxima/repos/extra-x86_64/maxima.desktop
(from rev 150145, maxima/trunk/maxima.desktop)
  maxima/repos/extra-x86_64/maxima.install
(from rev 150145, maxima/trunk/maxima.install)
Deleted:
  maxima/repos/extra-i686/PKGBUILD
  maxima/repos/extra-i686/maxima.desktop
  maxima/repos/extra-i686/maxima.install
  maxima/repos/extra-x86_64/PKGBUILD
  maxima/repos/extra-x86_64/maxima.desktop
  maxima/repos/extra-x86_64/maxima.install

-+
 extra-i686/PKGBUILD |   92 +-
 extra-i686/maxima.desktop   |   22 +-
 extra-i686/maxima.install   |   36 
 extra-x86_64/PKGBUILD   |   92 +-
 extra-x86_64/maxima.desktop |   22 +-
 extra-x86_64/maxima.install |   36 
 6 files changed, 150 insertions(+), 150 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 14:35:00 UTC (rev 150145)
+++ extra-i686/PKGBUILD 2012-02-13 14:36:40 UTC (rev 150146)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor: Damir Perisa da...@archlinux.org
-
-pkgname=maxima
-pkgver=5.25.1
-pkgrel=3
-pkgdesc=Maxima - a sophisticated computer algebra system
-arch=('i686' 'x86_64')
-license=('GPL')
-url=http://maxima.sourceforge.net;
-depends=('sbcl=1.0.54' 'texinfo' 'sh')
-makedepends=('python2')
-optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via 
/usr/bin/rmaxima' 'tk: graphical xmaxima interface')
-# needs rebuild when bash changes version
-# needs a rebuild when sbcl changes version
-options=('!makeflags' '!zipman') # don't zip info pages or they won't work 
inside maxima
-install=maxima.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz;
 $pkgname.desktop)
-sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b'
-  '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # set correct python executable to create docs
-  sed -i s|${PYTHONBIN:-python}|python2| doc/info/extract_categories.sh
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
-   --libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-   ${pkgdir}/usr/share/applications/${pkgname}.desktop
-
-  # make sure, we have a nice icon for the desktop file at the right place ;)
-  install -d ${pkgdir}/usr/share/pixmaps/
-  ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
-   ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-}

Copied: maxima/repos/extra-i686/PKGBUILD (from rev 150145, 
maxima/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 14:36:40 UTC (rev 150146)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: Damir Perisa da...@archlinux.org
+
+pkgname=maxima
+pkgver=5.26.0
+pkgrel=1
+pkgdesc=Maxima - a sophisticated computer algebra system
+arch=('i686' 'x86_64')
+license=('GPL')
+url=http://maxima.sourceforge.net;
+depends=('sbcl=1.0.54' 'texinfo' 'sh')
+makedepends=('python2')
+optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via 
/usr/bin/rmaxima' 'tk: graphical xmaxima interface')
+# needs rebuild when bash changes version
+# needs a rebuild when sbcl changes version
+options=('!makeflags' '!zipman') # don't zip info pages or they won't work 
inside maxima
+install=maxima.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz;
 $pkgname.desktop)
+sha1sums=('bc7448486478b217c333605c6d8f6c0bbdd3526c'
+  '4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # set correct python executable to create docs
+  sed -i s|${PYTHONBIN:-python}|python2| doc/info/extract_categories.sh
+
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+   --libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # install some freedesktop.org compatibility
+  

[arch-commits] Commit in pacman/repos (11 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 09:49:34
  Author: dreisner
Revision: 150147

db-move: moved pacman from [testing] to [core] (i686)

Added:
  pacman/repos/core-i686/PKGBUILD
(from rev 150146, pacman/repos/testing-i686/PKGBUILD)
  pacman/repos/core-i686/makepkg.conf
(from rev 150146, pacman/repos/testing-i686/makepkg.conf)
  pacman/repos/core-i686/pacman.conf
(from rev 150146, pacman/repos/testing-i686/pacman.conf)
  pacman/repos/core-i686/pacman.conf.x86_64
(from rev 150146, pacman/repos/testing-i686/pacman.conf.x86_64)
  pacman/repos/core-i686/pacman.install
(from rev 150146, pacman/repos/testing-i686/pacman.install)
Deleted:
  pacman/repos/core-i686/PKGBUILD
  pacman/repos/core-i686/makepkg.conf
  pacman/repos/core-i686/pacman.conf
  pacman/repos/core-i686/pacman.conf.x86_64
  pacman/repos/core-i686/pacman.install
  pacman/repos/testing-i686/

+
 PKGBUILD   |  151 ---
 makepkg.conf   |  242 +--
 pacman.conf|  200 +-
 pacman.conf.x86_64 |  222 +++---
 pacman.install |  146 +++---
 5 files changed, 483 insertions(+), 478 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-02-13 14:36:40 UTC (rev 150146)
+++ core-i686/PKGBUILD  2012-02-13 14:49:34 UTC (rev 150147)
@@ -1,73 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-# Maintainer: Dave Reisner d...@archlinux.org
-
-pkgname=pacman
-pkgver=4.0.1
-pkgrel=4
-pkgdesc=A library-based package manager with dependency support
-arch=('i686' 'x86_64')
-url=http://www.archlinux.org/pacman/;
-license=('GPL')
-groups=('base')
-depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
- 'gpgme' 'pacman-mirrorlist')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-pacman.conf
-pacman.conf.x86_64
-makepkg.conf)
-md5sums=('76bd88eff8cd94bc9899faa091822dc1'
- '4605b3490d4fd1e5c6e20db17da9ded6'
- 'a0edf98ad1845a4c7d902a86638d5d2d'
- 'db051afbd12993b7743ccd4d58668499')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install Arch specific stuff
-  mkdir -p $pkgdir/etc
-  case $CARCH in
-i686)
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-  mycarch=i686
-  mychost=i686-pc-linux-gnu
-  myflags=-march=i686 
-  ;;
-x86_64)
-  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-  mycarch=x86_64
-  mychost=x86_64-unknown-linux-gnu
-  myflags=-march=x86-64 
-  ;;
-  esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  # set things correctly in the default conf file
-  sed -i $pkgdir/etc/makepkg.conf \
--e s|@CARCH[@]|$mycarch|g \
--e s|@CHOST[@]|$mychost|g \
--e s|@CARCHFLAGS[@]|$myflags|g
-
-  # install completion files
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
-}

Copied: pacman/repos/core-i686/PKGBUILD (from rev 150146, 
pacman/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-02-13 14:49:34 UTC (rev 150147)
@@ -0,0 +1,78 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.2
+pkgrel=1
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base')
+depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+ '575140dce3ea597d91b6d081aa3f6a00'
+ '4605b3490d4fd1e5c6e20db17da9ded6'
+ 'a0edf98ad1845a4c7d902a86638d5d2d'
+ 

[arch-commits] Commit in pacman/repos (11 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 09:49:35
  Author: dreisner
Revision: 150148

db-move: moved pacman from [testing] to [core] (x86_64)

Added:
  pacman/repos/core-x86_64/PKGBUILD
(from rev 150146, pacman/repos/testing-x86_64/PKGBUILD)
  pacman/repos/core-x86_64/makepkg.conf
(from rev 150146, pacman/repos/testing-x86_64/makepkg.conf)
  pacman/repos/core-x86_64/pacman.conf
(from rev 150146, pacman/repos/testing-x86_64/pacman.conf)
  pacman/repos/core-x86_64/pacman.conf.x86_64
(from rev 150146, pacman/repos/testing-x86_64/pacman.conf.x86_64)
  pacman/repos/core-x86_64/pacman.install
(from rev 150146, pacman/repos/testing-x86_64/pacman.install)
Deleted:
  pacman/repos/core-x86_64/PKGBUILD
  pacman/repos/core-x86_64/makepkg.conf
  pacman/repos/core-x86_64/pacman.conf
  pacman/repos/core-x86_64/pacman.conf.x86_64
  pacman/repos/core-x86_64/pacman.install
  pacman/repos/testing-x86_64/

+
 PKGBUILD   |  151 ---
 makepkg.conf   |  242 +--
 pacman.conf|  200 +-
 pacman.conf.x86_64 |  222 +++---
 pacman.install |  146 +++---
 5 files changed, 483 insertions(+), 478 deletions(-)

Deleted: core-x86_64/PKGBUILD
===
--- core-x86_64/PKGBUILD2012-02-13 14:49:34 UTC (rev 150147)
+++ core-x86_64/PKGBUILD2012-02-13 14:49:35 UTC (rev 150148)
@@ -1,73 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id$
-# Maintainer: Dan McGee d...@archlinux.org
-# Maintainer: Dave Reisner d...@archlinux.org
-
-pkgname=pacman
-pkgver=4.0.1
-pkgrel=4
-pkgdesc=A library-based package manager with dependency support
-arch=('i686' 'x86_64')
-url=http://www.archlinux.org/pacman/;
-license=('GPL')
-groups=('base')
-depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
- 'gpgme' 'pacman-mirrorlist')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
-pacman.conf
-pacman.conf.x86_64
-makepkg.conf)
-md5sums=('76bd88eff8cd94bc9899faa091822dc1'
- '4605b3490d4fd1e5c6e20db17da9ded6'
- 'a0edf98ad1845a4c7d902a86638d5d2d'
- 'db051afbd12993b7743ccd4d58668499')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install Arch specific stuff
-  mkdir -p $pkgdir/etc
-  case $CARCH in
-i686)
-  install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-  mycarch=i686
-  mychost=i686-pc-linux-gnu
-  myflags=-march=i686 
-  ;;
-x86_64)
-  install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-  mycarch=x86_64
-  mychost=x86_64-unknown-linux-gnu
-  myflags=-march=x86-64 
-  ;;
-  esac
-  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  # set things correctly in the default conf file
-  sed -i $pkgdir/etc/makepkg.conf \
--e s|@CARCH[@]|$mycarch|g \
--e s|@CHOST[@]|$mychost|g \
--e s|@CARCHFLAGS[@]|$myflags|g
-
-  # install completion files
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion 
$pkgdir/usr/share/zsh/site-functions/_pacman
-}

Copied: pacman/repos/core-x86_64/PKGBUILD (from rev 150146, 
pacman/repos/testing-x86_64/PKGBUILD)
===
--- core-x86_64/PKGBUILD(rev 0)
+++ core-x86_64/PKGBUILD2012-02-13 14:49:35 UTC (rev 150148)
@@ -0,0 +1,78 @@
+# vim: set ts=2 sw=2 et:
+# $Id$
+# Maintainer: Dan McGee d...@archlinux.org
+# Maintainer: Dave Reisner d...@archlinux.org
+
+pkgname=pacman
+pkgver=4.0.2
+pkgrel=1
+pkgdesc=A library-based package manager with dependency support
+arch=('i686' 'x86_64')
+url=http://www.archlinux.org/pacman/;
+license=('GPL')
+groups=('base')
+depends=('bash' 'glibc=2.15' 'libarchive=3.0.2' 'curl=7.19.4'
+ 'gpgme' 'pacman-mirrorlist')
+makedepends=('asciidoc')
+optdepends=('fakeroot: for makepkg usage as normal user')
+backup=(etc/pacman.conf etc/makepkg.conf)
+install=pacman.install
+options=(!libtool)
+source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+pacman.conf
+pacman.conf.x86_64
+makepkg.conf)
+md5sums=('289ba4a19a16393096e065cec1cb9b0a'
+ '575140dce3ea597d91b6d081aa3f6a00'
+ '4605b3490d4fd1e5c6e20db17da9ded6'
+ 

[arch-commits] Commit in basket/trunk (PKGBUILD basket.install)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:01:54
  Author: ronald
Revision: 150149

upgpkg: basket 1.81-3

sign package; add update-desktop-database to install file

Modified:
  basket/trunk/PKGBUILD
  basket/trunk/basket.install

+
 PKGBUILD   |   12 ++--
 basket.install |1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 14:49:35 UTC (rev 150148)
+++ PKGBUILD2012-02-13 15:01:54 UTC (rev 150149)
@@ -5,19 +5,19 @@
 
 pkgname=basket
 pkgver=1.81
-pkgrel=2
+pkgrel=3
 pkgdesc=All-purpose notes taker for KDE.
 arch=('i686' 'x86_64')
 url=http://basket.kde.org/;
-depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme')
+depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme' 
'kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=$pkgname.install
 license=('GPL')
 source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('cbb1bc5ca7c2ad1485c433c00a8f65a1')
+sha1sums=('209d92048523f341259d79510fa56977690e5dfc')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
   cmake ../${pkgbase}-${pkgver} \
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_SKIP_RPATH=ON \
@@ -27,6 +27,6 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$startdir/pkg install
+  cd $srcdir/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }

Modified: basket.install
===
--- basket.install  2012-02-13 14:49:35 UTC (rev 150148)
+++ basket.install  2012-02-13 15:01:54 UTC (rev 150149)
@@ -1,5 +1,6 @@
 post_install() {
 xdg-icon-resource forceupdate --theme hicolor  /dev/null
+   update-desktop-database -q
 }
 
 post_upgrade() {



[arch-commits] Commit in basket/repos (8 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:03:16
  Author: ronald
Revision: 150150

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  basket/repos/extra-i686/PKGBUILD
(from rev 150149, basket/trunk/PKGBUILD)
  basket/repos/extra-i686/basket.install
(from rev 150149, basket/trunk/basket.install)
  basket/repos/extra-x86_64/PKGBUILD
(from rev 150149, basket/trunk/PKGBUILD)
  basket/repos/extra-x86_64/basket.install
(from rev 150149, basket/trunk/basket.install)
Deleted:
  basket/repos/extra-i686/PKGBUILD
  basket/repos/extra-i686/basket.install
  basket/repos/extra-x86_64/PKGBUILD
  basket/repos/extra-x86_64/basket.install

-+
 extra-i686/PKGBUILD |   64 +-
 extra-i686/basket.install   |   25 
 extra-x86_64/PKGBUILD   |   64 +-
 extra-x86_64/basket.install |   25 
 4 files changed, 90 insertions(+), 88 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 15:01:54 UTC (rev 150149)
+++ extra-i686/PKGBUILD 2012-02-13 15:03:16 UTC (rev 150150)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor: James Rayner ja...@archlinux.org
-# Contributor: lucke lucke at o2 dot pl
-
-pkgname=basket
-pkgver=1.81
-pkgrel=2
-pkgdesc=All-purpose notes taker for KDE.
-arch=('i686' 'x86_64')
-url=http://basket.kde.org/;
-depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme')
-makedepends=('cmake' 'automoc4')
-install=$pkgname.install
-license=('GPL')
-source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('cbb1bc5ca7c2ad1485c433c00a8f65a1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  cmake ../${pkgbase}-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_SKIP_RPATH=ON \
--DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$startdir/pkg install
-}

Copied: basket/repos/extra-i686/PKGBUILD (from rev 150149, 
basket/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 15:03:16 UTC (rev 150150)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Ronald van Haren ronald.archlinux.org
+# Contributor: James Rayner ja...@archlinux.org
+# Contributor: lucke lucke at o2 dot pl
+
+pkgname=basket
+pkgver=1.81
+pkgrel=3
+pkgdesc=All-purpose notes taker for KDE.
+arch=('i686' 'x86_64')
+url=http://basket.kde.org/;
+depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme' 
'kdebase-runtime')
+makedepends=('cmake' 'automoc4')
+install=$pkgname.install
+license=('GPL')
+source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2)
+sha1sums=('209d92048523f341259d79510fa56977690e5dfc')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  cmake ../${pkgbase}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH=ON \
+-DCMAKE_INSTALL_PREFIX=/usr
+
+  make
+}
+
+package() {
+  cd $srcdir/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Deleted: extra-i686/basket.install
===
--- extra-i686/basket.install   2012-02-13 15:01:54 UTC (rev 150149)
+++ extra-i686/basket.install   2012-02-13 15:03:16 UTC (rev 150150)
@@ -1,12 +0,0 @@
-post_install() {
-xdg-icon-resource forceupdate --theme hicolor  /dev/null
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
-

Copied: basket/repos/extra-i686/basket.install (from rev 150149, 
basket/trunk/basket.install)
===
--- extra-i686/basket.install   (rev 0)
+++ extra-i686/basket.install   2012-02-13 15:03:16 UTC (rev 150150)
@@ -0,0 +1,13 @@
+post_install() {
+xdg-icon-resource forceupdate --theme hicolor  /dev/null
+   update-desktop-database -q
+}
+
+post_upgrade() {
+post_install
+}
+
+post_remove() {
+post_install
+}
+

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-13 15:01:54 UTC (rev 150149)
+++ extra-x86_64/PKGBUILD   2012-02-13 15:03:16 UTC (rev 150150)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren ronald.archlinux.org
-# Contributor: James Rayner ja...@archlinux.org
-# Contributor: lucke lucke at o2 dot pl
-
-pkgname=basket
-pkgver=1.81
-pkgrel=2
-pkgdesc=All-purpose notes taker for KDE.
-arch=('i686' 'x86_64')
-url=http://basket.kde.org/;
-depends=('kdelibs' 'gpgme' 'qimageblitz' 'hicolor-icon-theme')
-makedepends=('cmake' 'automoc4')
-install=$pkgname.install
-license=('GPL')
-source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('cbb1bc5ca7c2ad1485c433c00a8f65a1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  

[arch-commits] Commit in libnova/trunk (PKGBUILD)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:38:38
  Author: ronald
Revision: 150151

upgpkg: libnova 0.14.0-1

update to 0.14.0; cleanup PKGBUILD; sign package

Modified:
  libnova/trunk/PKGBUILD

--+
 PKGBUILD |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 15:03:16 UTC (rev 150150)
+++ PKGBUILD2012-02-13 15:38:38 UTC (rev 150151)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
 
 pkgname=libnova
-pkgver=0.13.0
+pkgver=0.14.0
 pkgrel=1
-pkgdesc=libnova is a general purpose, double precision, celestial mechanics, 
astrometry and astrodynamics library.
+pkgdesc=A general purpose, double precision, celestial mechanics, astrometry 
and astrodynamics library.
 url=http://libnova.sourceforge.net/;
 license=('GPL2')
 arch=('i686' 'x86_64')
@@ -12,11 +13,15 @@
 makedepends=('pkgconfig')
 
source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
 options=(!libtool)
+sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51')
 
 build() {
-cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
-make || return 1
-make DESTDIR=$pkgdir/ install
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr
+   make
 }
-md5sums=('32f67b1ae28372582da7fe4e6f554dcd')
+
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in libnova/repos (4 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:39:56
  Author: ronald
Revision: 150152

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  libnova/repos/staging-i686/
  libnova/repos/staging-i686/PKGBUILD
(from rev 150151, libnova/trunk/PKGBUILD)
  libnova/repos/staging-x86_64/
  libnova/repos/staging-x86_64/PKGBUILD
(from rev 150151, libnova/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   27 +++
 staging-x86_64/PKGBUILD |   27 +++
 2 files changed, 54 insertions(+)

Copied: libnova/repos/staging-i686/PKGBUILD (from rev 150151, 
libnova/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-13 15:39:56 UTC (rev 150152)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+
+pkgname=libnova
+pkgver=0.14.0
+pkgrel=1
+pkgdesc=A general purpose, double precision, celestial mechanics, astrometry 
and astrodynamics library.
+url=http://libnova.sourceforge.net/;
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
+options=(!libtool)
+sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr
+   make
+}
+
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}

Copied: libnova/repos/staging-x86_64/PKGBUILD (from rev 150151, 
libnova/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-13 15:39:56 UTC (rev 150152)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Ronald van Haren ron...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+
+pkgname=libnova
+pkgver=0.14.0
+pkgrel=1
+pkgdesc=A general purpose, double precision, celestial mechanics, astrometry 
and astrodynamics library.
+url=http://libnova.sourceforge.net/;
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
+options=(!libtool)
+sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr
+   make
+}
+
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in dhcpcd/repos (11 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:50:02
  Author: ronald
Revision: 150153

db-move: moved dhcpcd from [testing] to [core] (i686)

Added:
  dhcpcd/repos/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
(from rev 150152, 
dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch)
  dhcpcd/repos/core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
(from rev 150152, 
dhcpcd/repos/testing-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch)
  dhcpcd/repos/core-i686/PKGBUILD
(from rev 150152, dhcpcd/repos/testing-i686/PKGBUILD)
  dhcpcd/repos/core-i686/dhcpcd.conf.d
(from rev 150152, dhcpcd/repos/testing-i686/dhcpcd.conf.d)
  dhcpcd/repos/core-i686/remove_ifconfig.patch
(from rev 150152, dhcpcd/repos/testing-i686/remove_ifconfig.patch)
Deleted:
  dhcpcd/repos/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
  dhcpcd/repos/core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
  dhcpcd/repos/core-i686/PKGBUILD
  dhcpcd/repos/core-i686/dhcpcd.conf.d
  dhcpcd/repos/core-i686/remove_ifconfig.patch
  dhcpcd/repos/testing-i686/

---+
 0001-Set-hostname-via-proc-if-file-is-available.patch |   66 
 0001-set-MTU-via-sysfs-if-file-is-available.patch |  122 
 PKGBUILD  |  115 +++
 dhcpcd.conf.d |   12 -
 remove_ifconfig.patch |   40 ++---
 5 files changed, 178 insertions(+), 177 deletions(-)

Deleted: core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch
===
--- core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 
2012-02-13 15:39:56 UTC (rev 150152)
+++ core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 
2012-02-13 15:50:02 UTC (rev 150153)
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee d...@archlinux.org
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee d...@archlinux.org

- dhcpcd-hooks/30-hostname |6 +-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
 a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
-   if valid_domainname $1; then
--  hostname $1
-+  if [ -w /proc/sys/kernel/hostname ]; then
-+  echo $1  /proc/sys/kernel/hostname
-+  else
-+  hostname $1
-+  fi
-   else
-   syslog err Invalid hostname: $1
-   fi
--- 
-1.7.5.4
-

Copied: 
dhcpcd/repos/core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 
(from rev 150152, 
dhcpcd/repos/testing-i686/0001-Set-hostname-via-proc-if-file-is-available.patch)
===
--- core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 
(rev 0)
+++ core-i686/0001-Set-hostname-via-proc-if-file-is-available.patch 
2012-02-13 15:50:02 UTC (rev 150153)
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee d...@archlinux.org
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee d...@archlinux.org
+---
+ dhcpcd-hooks/30-hostname |6 +-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
 b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+   if valid_domainname $1; then
+-  hostname $1
++  if [ -w /proc/sys/kernel/hostname ]; then
++  echo $1  /proc/sys/kernel/hostname
++  else
++  hostname $1
++  fi
+   else
+   syslog err Invalid hostname: $1
+   fi
+-- 
+1.7.5.4
+

Deleted: core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch
===
--- core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2012-02-13 
15:39:56 UTC (rev 150152)
+++ core-i686/0001-set-MTU-via-sysfs-if-file-is-available.patch 2012-02-13 
15:50:02 UTC (rev 150153)
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
-From: Dave Reisner d...@falconindy.com

[arch-commits] Commit in dhcpcd/repos (11 files)

2012-02-13 Thread Ronald van Haren
Date: Monday, February 13, 2012 @ 10:50:03
  Author: ronald
Revision: 150154

db-move: moved dhcpcd from [testing] to [core] (x86_64)

Added:
  dhcpcd/repos/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
(from rev 150152, 
dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch)
  dhcpcd/repos/core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
(from rev 150152, 
dhcpcd/repos/testing-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch)
  dhcpcd/repos/core-x86_64/PKGBUILD
(from rev 150152, dhcpcd/repos/testing-x86_64/PKGBUILD)
  dhcpcd/repos/core-x86_64/dhcpcd.conf.d
(from rev 150152, dhcpcd/repos/testing-x86_64/dhcpcd.conf.d)
  dhcpcd/repos/core-x86_64/remove_ifconfig.patch
(from rev 150152, dhcpcd/repos/testing-x86_64/remove_ifconfig.patch)
Deleted:
  dhcpcd/repos/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
  dhcpcd/repos/core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
  dhcpcd/repos/core-x86_64/PKGBUILD
  dhcpcd/repos/core-x86_64/dhcpcd.conf.d
  dhcpcd/repos/core-x86_64/remove_ifconfig.patch
  dhcpcd/repos/testing-x86_64/

---+
 0001-Set-hostname-via-proc-if-file-is-available.patch |   66 
 0001-set-MTU-via-sysfs-if-file-is-available.patch |  122 
 PKGBUILD  |  115 +++
 dhcpcd.conf.d |   12 -
 remove_ifconfig.patch |   40 ++---
 5 files changed, 178 insertions(+), 177 deletions(-)

Deleted: core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch
===
--- core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch   
2012-02-13 15:50:02 UTC (rev 150153)
+++ core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch   
2012-02-13 15:50:03 UTC (rev 150154)
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee d...@archlinux.org
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee d...@archlinux.org

- dhcpcd-hooks/30-hostname |6 +-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
 a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
-   if valid_domainname $1; then
--  hostname $1
-+  if [ -w /proc/sys/kernel/hostname ]; then
-+  echo $1  /proc/sys/kernel/hostname
-+  else
-+  hostname $1
-+  fi
-   else
-   syslog err Invalid hostname: $1
-   fi
--- 
-1.7.5.4
-

Copied: 
dhcpcd/repos/core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch 
(from rev 150152, 
dhcpcd/repos/testing-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch)
===
--- core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch   
(rev 0)
+++ core-x86_64/0001-Set-hostname-via-proc-if-file-is-available.patch   
2012-02-13 15:50:03 UTC (rev 150154)
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee d...@archlinux.org
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee d...@archlinux.org
+---
+ dhcpcd-hooks/30-hostname |6 +-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
 b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+   if valid_domainname $1; then
+-  hostname $1
++  if [ -w /proc/sys/kernel/hostname ]; then
++  echo $1  /proc/sys/kernel/hostname
++  else
++  hostname $1
++  fi
+   else
+   syslog err Invalid hostname: $1
+   fi
+-- 
+1.7.5.4
+

Deleted: core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch
===
--- core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch   
2012-02-13 15:50:02 UTC (rev 150153)
+++ core-x86_64/0001-set-MTU-via-sysfs-if-file-is-available.patch   
2012-02-13 15:50:03 UTC (rev 150154)
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 

[arch-commits] Commit in sip/trunk (PKGBUILD)

2012-02-13 Thread Andrea Scarpino
Date: Monday, February 13, 2012 @ 12:14:55
  Author: andrea
Revision: 150155

upgpkg: sip 4.13.2-1

Upstream release

Modified:
  sip/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 15:50:03 UTC (rev 150154)
+++ PKGBUILD2012-02-13 17:14:55 UTC (rev 150155)
@@ -1,19 +1,18 @@
 # $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
+# Maintainer: Andrea Scarpino and...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 # Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.13.1
+pkgver=4.13.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://www.riverbankcomputing.com/software/sip/;
 license=('custom:sip')
 makedepends=('python' 'python2')
 
source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
-md5sums=('3f61fd39d5b0c8fa9e43b59af04de924')
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in sip/repos (4 files)

2012-02-13 Thread Andrea Scarpino
Date: Monday, February 13, 2012 @ 12:15:18
  Author: andrea
Revision: 150156

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  sip/repos/staging-i686/
  sip/repos/staging-i686/PKGBUILD
(from rev 150155, sip/trunk/PKGBUILD)
  sip/repos/staging-x86_64/
  sip/repos/staging-x86_64/PKGBUILD
(from rev 150155, sip/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   54 ++
 staging-x86_64/PKGBUILD |   54 ++
 2 files changed, 108 insertions(+)

Copied: sip/repos/staging-i686/PKGBUILD (from rev 150155, sip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-13 17:15:18 UTC (rev 150156)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.13.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://www.riverbankcomputing.com/software/sip/;
+license=('custom:sip')
+makedepends=('python' 'python2')
+source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
+
+build() {
+  cd ${srcdir}
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+  
+  ### Python2 version ###
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+}
+
+package_sip() {
+  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
+  depends=('python')
+  replaces=('python-sip')
+  provides=('python-sip')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python2-sip() {
+  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
+  depends=('sip' 'python2')
+
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # Provided by sip
+  rm ${pkgdir}/usr/bin/sip
+}

Copied: sip/repos/staging-x86_64/PKGBUILD (from rev 150155, sip/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-13 17:15:18 UTC (rev 150156)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.13.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://www.riverbankcomputing.com/software/sip/;
+license=('custom:sip')
+makedepends=('python' 'python2')
+source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
+
+build() {
+  cd ${srcdir}
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+  
+  ### Python2 version ###
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+}
+
+package_sip() {
+  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
+  depends=('python')
+  replaces=('python-sip')
+  provides=('python-sip')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python2-sip() {
+  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
+  depends=('sip' 'python2')
+
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # Provided by sip
+  rm ${pkgdir}/usr/bin/sip
+}



[arch-commits] Commit in kmod/trunk (2 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 13:05:11
  Author: dreisner
Revision: 150157

upgpkg: kmod 5-3

- Backport upstream patch to fix infinite loop in softdeps

Added:
  kmod/trunk/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
Modified:
  kmod/trunk/PKGBUILD

-+
 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch |   39 
++
 PKGBUILD|7 +
 2 files changed, 45 insertions(+), 1 deletion(-)

Added: 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
===
--- 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch 
(rev 0)
+++ 0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch 
2012-02-13 18:05:11 UTC (rev 150157)
@@ -0,0 +1,39 @@
+From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi lucas.demar...@profusion.mobi
+Date: Sat, 11 Feb 2012 19:45:29 -0200
+Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps
+
+If a softdep depends on a module in the dependency list of the module
+being inserted, we would enter and infinite loop.
+
+Move the mod-visited = true assignment to the proper place, hoping it
+didn't break other use cases. This is a bug that comes and goes every
+now and then. Since we have a testsuite now, a test for this should be
+written.
+---
+ libkmod/libkmod-module.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index b5eb7c9..835896f 100644
+--- a/libkmod/libkmod-module.c
 b/libkmod/libkmod-module.c
+@@ -1013,7 +1013,6 @@ static int __kmod_module_fill_softdep(struct kmod_module 
*mod,
+   goto fail;
+   }
+   *list = l;
+-  mod-visited = true;
+   mod-ignorecmd = (pre != NULL || post != NULL);
+ 
+   kmod_list_foreach(l, post) {
+@@ -1043,6 +1042,7 @@ static int __kmod_module_get_probe_list(struct 
kmod_module *mod,
+   mod-name);
+   return 0;
+   }
++  mod-visited = true;
+ 
+   dep = kmod_module_get_dependencies(mod);
+   kmod_list_foreach(l, dep) {
+-- 
+1.7.9
+

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 17:15:18 UTC (rev 150156)
+++ PKGBUILD2012-02-13 18:05:11 UTC (rev 150157)
@@ -3,7 +3,7 @@
 
 pkgname=kmod
 pkgver=5
-pkgrel=2
+pkgrel=3
 pkgdesc=Linux kernel module handling
 arch=('i686' 'x86_64')
 url=http://git.profusion.mobi/cgit.cgi/kmod.git;
@@ -15,9 +15,11 @@
 replaces=('module-init-tools')
 source=(http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz;
 '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
+'0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch'
 depmod-search.conf)
 md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
  '81545a1509b43008f85c03fb980f0e86'
+ '662a85dbe420f04c1ef24f9cd4e4c990'
  '4b8cbcbc54b9029c99fd730e257d4436')
 
 build() {
@@ -26,6 +28,9 @@
   # fix modprobe --show-depends failures on loaded modules
   patch -Np1 
$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
 
+  # fix infinite loop with softdeps
+  patch -Np1 
$srcdir/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
+
   ./configure \
 --sysconfdir=/etc \
 --with-rootprefix= \



[arch-commits] Commit in kmod/repos (10 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 13:05:27
  Author: dreisner
Revision: 150158

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kmod/repos/testing-i686/
  
kmod/repos/testing-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
(from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch)
  
kmod/repos/testing-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
(from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch)
  kmod/repos/testing-i686/PKGBUILD
(from rev 150157, kmod/trunk/PKGBUILD)
  kmod/repos/testing-i686/depmod-search.conf
(from rev 150157, kmod/trunk/depmod-search.conf)
  kmod/repos/testing-x86_64/
  
kmod/repos/testing-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
(from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch)
  
kmod/repos/testing-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
(from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch)
  kmod/repos/testing-x86_64/PKGBUILD
(from rev 150157, kmod/trunk/PKGBUILD)
  kmod/repos/testing-x86_64/depmod-search.conf
(from rev 150157, kmod/trunk/depmod-search.conf)

+
 testing-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch   
|   28 
 testing-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch   
|   39 ++
 testing-i686/PKGBUILD  
|   62 ++
 testing-i686/depmod-search.conf
|5 
 testing-x86_64/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch 
|   28 
 testing-x86_64/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch 
|   39 ++
 testing-x86_64/PKGBUILD
|   62 ++
 testing-x86_64/depmod-search.conf  
|5 
 8 files changed, 268 insertions(+)

Copied: 
kmod/repos/testing-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
 (from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch)
===
--- 
testing-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
(rev 0)
+++ 
testing-i686/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
2012-02-13 18:05:27 UTC (rev 150158)
@@ -0,0 +1,28 @@
+From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi lucas.demar...@profusion.mobi
+Date: Tue, 7 Feb 2012 09:48:59 -0200
+Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being
+ applied
+
+---
+ TODO |3 +++
+ libkmod/libkmod-module.c |3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 0af3e2e..b5eb7c9 100644
+--- a/libkmod/libkmod-module.c
 b/libkmod/libkmod-module.c
+@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct 
kmod_module *mod,
+   if (mod == NULL)
+   return -ENOENT;
+ 
+-  if (module_is_inkernel(mod)) {
++  if (!(flags  KMOD_PROBE_IGNORE_LOADED)
++   module_is_inkernel(mod)) {
+   if (flags  KMOD_PROBE_FAIL_ON_LOADED)
+   return -EEXIST;
+   else
+-- 
+1.7.9
+

Copied: 
kmod/repos/testing-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
 (from rev 150157, 
kmod/trunk/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch)
===
--- 
testing-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
(rev 0)
+++ 
testing-i686/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
2012-02-13 18:05:27 UTC (rev 150158)
@@ -0,0 +1,39 @@
+From 8cd0f9e4f9f5c093136a7a2c0c2998b9dd203161 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi lucas.demar...@profusion.mobi
+Date: Sat, 11 Feb 2012 19:45:29 -0200
+Subject: [PATCH] libkmod-module: probe: fix infinite loop with softdeps
+
+If a softdep depends on a module in the dependency list of the module
+being inserted, we would enter and infinite loop.
+
+Move the mod-visited = true assignment to the proper place, hoping it
+didn't break other use cases. This is a bug that comes and goes every
+now and then. Since we have a testsuite now, a test for this should be
+written.
+---
+ libkmod/libkmod-module.c |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 

[arch-commits] Commit in brltty/repos (14 files)

2012-02-13 Thread Ionut Biru
Date: Monday, February 13, 2012 @ 14:59:22
  Author: ibiru
Revision: 150160

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  brltty/repos/extra-i686/PKGBUILD
(from rev 150159, brltty/trunk/PKGBUILD)
  brltty/repos/extra-i686/brltty
(from rev 150159, brltty/trunk/brltty)
  brltty/repos/extra-i686/brltty.conf
(from rev 150159, brltty/trunk/brltty.conf)
  brltty/repos/extra-i686/brltty.install
(from rev 150159, brltty/trunk/brltty.install)
  brltty/repos/extra-x86_64/PKGBUILD
(from rev 150159, brltty/trunk/PKGBUILD)
  brltty/repos/extra-x86_64/brltty
(from rev 150159, brltty/trunk/brltty)
  brltty/repos/extra-x86_64/brltty.conf
(from rev 150159, brltty/trunk/brltty.conf)
  brltty/repos/extra-x86_64/brltty.install
(from rev 150159, brltty/trunk/brltty.install)
Deleted:
  brltty/repos/extra-i686/PKGBUILD
  brltty/repos/extra-i686/brltty
  brltty/repos/extra-i686/brltty.conf
  brltty/repos/extra-x86_64/PKGBUILD
  brltty/repos/extra-x86_64/brltty
  brltty/repos/extra-x86_64/brltty.conf

-+
 extra-i686/PKGBUILD |   93 ++--
 extra-i686/brltty   |  136 +-
 extra-i686/brltty.conf  |4 -
 extra-i686/brltty.install   |   20 ++
 extra-x86_64/PKGBUILD   |   93 ++--
 extra-x86_64/brltty |  136 +-
 extra-x86_64/brltty.conf|4 -
 extra-x86_64/brltty.install |   20 ++
 8 files changed, 274 insertions(+), 232 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-13 19:57:38 UTC (rev 150159)
+++ extra-i686/PKGBUILD 2012-02-13 19:59:22 UTC (rev 150160)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Jan de Groot j...@archlinux.org
-# Contributor: Giovanni Scafora giova...@archlinux.org
-
-pkgname=brltty
-pkgver=4.3
-pkgrel=3
-pkgdesc=Braille display driver for Linux/Unix
-arch=('i686' 'x86_64')
-url=http://mielke.cc/brltty;
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 
'pyrex')
-makedepends=('bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
-source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-'brltty'
-'brltty.conf')
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
- '831ebaf0c56091702929c68805d20c4f'
- 'a8ab8b3dd059e96e1734bc9cdcf844fc')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---localstatedir=/var \
---with-screen-driver=a2 \
---enable-gpm \
---disable-java-bindings \
---disable-caml-bindings \
-PYTHON=/usr/bin/python2
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALL_ROOT=$pkgdir install
-  install -D -m755 $srcdir/brltty $pkgdir/etc/rc.d/brltty
-  install -D -m644 $srcdir/brltty.conf $pkgdir/etc/conf.d/brltty.conf
-  install -D -m644 Documents/brltty.conf $pkgdir/etc/brltty.conf
-}

Copied: brltty/repos/extra-i686/PKGBUILD (from rev 150159, 
brltty/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-13 19:59:22 UTC (rev 150160)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:
+# Contributor: Jan de Groot j...@archlinux.org
+# Contributor: Giovanni Scafora giova...@archlinux.org
+
+pkgname=brltty
+pkgver=4.3
+pkgrel=4
+pkgdesc=Braille display driver for Linux/Unix
+arch=('i686' 'x86_64')
+url=http://mielke.cc/brltty;
+license=('GPL' 'LGPL')
+depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 
'pyrex')
+makedepends=('bluez')
+optdepends=('bluez: bluetooth support')
+backup=(etc/brltty.conf etc/conf.d/brltty.conf)
+options=('!makeflags' '!emptydirs')
+install=brltty.install
+source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
+'brltty'
+'brltty.conf')
+md5sums=('5ada573f88df32b6150db3b9a620e20b'
+ '831ebaf0c56091702929c68805d20c4f'
+ 'a8ab8b3dd059e96e1734bc9cdcf844fc')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--localstatedir=/var \
+--with-screen-driver=a2 \
+--enable-gpm \
+--disable-java-bindings \
+--disable-caml-bindings \
+PYTHON=/usr/bin/python2
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make INSTALL_ROOT=$pkgdir install
+  install -D -m755 $srcdir/brltty $pkgdir/etc/rc.d/brltty
+  install -D -m644 $srcdir/brltty.conf $pkgdir/etc/conf.d/brltty.conf
+  install -D -m644 Documents/brltty.conf $pkgdir/etc/brltty.conf
+}

Deleted: extra-i686/brltty
===
--- extra-i686/brltty   

[arch-commits] Commit in ca-certificates/trunk (PKGBUILD)

2012-02-13 Thread Pierre Schmitz
Date: Monday, February 13, 2012 @ 16:02:55
  Author: pierre
Revision: 150161

upgpkg: ca-certificates 20120212-1

upstream update

Modified:
  ca-certificates/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 19:59:22 UTC (rev 150160)
+++ PKGBUILD2012-02-13 21:02:55 UTC (rev 150161)
@@ -2,7 +2,7 @@
 # Maintainer: Pierre Schmitz pie...@archlinux.de
 
 pkgname=ca-certificates
-pkgver=20111211
+pkgver=20120212
 pkgrel=1
 pkgdesc='Common CA certificates'
 arch=('any')
@@ -13,7 +13,7 @@
 makedepends=('python2')
 install='ca-certificates.install'
 backup=('etc/ca-certificates.conf')
-sha256sums=('6f0633136d17ffef3ed0adfb171a00136a320f0fd79c9c75733ac02662a754a7')
+sha256sums=('95f3eac93dad4433b5731bc9e106a26e2ccf210acace1927e597477b24187dce')
 
 build() {
cd ${srcdir}/${pkgname}-${pkgver}



[arch-commits] Commit in ca-certificates/repos (3 files)

2012-02-13 Thread Pierre Schmitz
Date: Monday, February 13, 2012 @ 16:03:16
  Author: pierre
Revision: 150162

archrelease: copy trunk to testing-any

Added:
  ca-certificates/repos/testing-any/
  ca-certificates/repos/testing-any/PKGBUILD
(from rev 150161, ca-certificates/trunk/PKGBUILD)
  ca-certificates/repos/testing-any/ca-certificates.install
(from rev 150161, ca-certificates/trunk/ca-certificates.install)

-+
 PKGBUILD|   38 ++
 ca-certificates.install |   26 ++
 2 files changed, 64 insertions(+)

Copied: ca-certificates/repos/testing-any/PKGBUILD (from rev 150161, 
ca-certificates/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2012-02-13 21:03:16 UTC (rev 150162)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Pierre Schmitz pie...@archlinux.de
+
+pkgname=ca-certificates
+pkgver=20120212
+pkgrel=1
+pkgdesc='Common CA certificates'
+arch=('any')
+url='http://packages.qa.debian.org/c/ca-certificates.html'
+license=('MPL' 'GPL')
+source=(http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz;)
+depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
+makedepends=('python2')
+install='ca-certificates.install'
+backup=('etc/ca-certificates.conf')
+sha256sums=('95f3eac93dad4433b5731bc9e106a26e2ccf210acace1927e597477b24187dce')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
+   sed 's|python|python2|g' -i mozilla/Makefile
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   install -d -m755 
${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
+   make install DESTDIR=${pkgdir}
+   install -D -m644 sbin/update-ca-certificates.8 
${pkgdir}/usr/share/man/man8/update-ca-certificates.8
+
+   (
+   echo # Automatically generated by ${pkgname}-${pkgver}-${pkgrel}
+   echo # see update-ca-certificates man page
+   echo # 
+   cd ${pkgdir}/usr/share/ca-certificates
+   find . -name '*.crt' | sort | cut -b3-
+   )  ${pkgdir}/etc/ca-certificates.conf
+}

Copied: ca-certificates/repos/testing-any/ca-certificates.install (from rev 
150161, ca-certificates/trunk/ca-certificates.install)
===
--- testing-any/ca-certificates.install (rev 0)
+++ testing-any/ca-certificates.install 2012-02-13 21:03:16 UTC (rev 150162)
@@ -0,0 +1,26 @@
+export LC_ALL=C
+
+post_install() {
+   usr/sbin/update-ca-certificates --fresh /dev/null 21
+}
+
+post_upgrade() {
+   if [ $(vercmp $2 20110421-1) -lt 0 ]; then
+   echo 'Updating certificates. This might take a while...'
+   fi
+   usr/sbin/update-ca-certificates --fresh /dev/null 21
+}
+
+pre_remove() {
+   # clean up certificates
+   local _backup=$(mktemp)
+   mv etc/ca-certificates.conf ${_backup}
+   echo  etc/ca-certificates.conf
+   usr/sbin/update-ca-certificates --fresh /dev/null 21
+   mv ${_backup} etc/ca-certificates.conf
+}
+
+post_remove() {
+   # remove the cert file if it is empty
+   [[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f 
etc/ssl/certs/ca-certificates.crt
+}



[arch-commits] Commit in shadow/trunk (3 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 16:55:51
  Author: dreisner
Revision: 150163

upgpkg: shadow 4.1.5-1

- remove CVE patch
- refactor remaining patches
- add source gpg .sig
- build static libmisc (avoids build breakage)
- assorted PKGBUILD cleanup

Modified:
  shadow/trunk/PKGBUILD
  shadow/trunk/shadow-strncpy-usage.patch
Deleted:
  shadow/trunk/shadow_CVE-2011-0721.patch

+
 PKGBUILD   |   74 +++
 shadow-strncpy-usage.patch |   36 +---
 shadow_CVE-2011-0721.patch |   57 -
 3 files changed, 57 insertions(+), 110 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 21:03:16 UTC (rev 150162)
+++ PKGBUILD2012-02-13 21:55:51 UTC (rev 150163)
@@ -3,8 +3,8 @@
 # Maintainer: Aaron Griffin aa...@archlinux.org
 
 pkgname=shadow
-pkgver=4.1.4.3
-pkgrel=5
+pkgver=4.1.5
+pkgrel=1
 pkgdesc=Password and account management tool suite with support for shadow 
files and PAM
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -17,15 +17,25 @@
 etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
 etc/default/useradd)
 options=('!libtool')
-install=shadow.install
-#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2
-# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied
-source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
-adduser chgpasswd chpasswd defaults.pam login login.defs newusers
-passwd shadow.cron.daily useradd.defaults LICENSE
-xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch
+install='shadow.install'
+source=(http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2{,.sig}
+LICENSE
+adduser
+chgpasswd
+chpasswd
+defaults.pam
+login
+login.defs
+newusers
+passwd
+shadow.cron.daily
+useradd.defaults
+xstrdup.patch
+shadow-strncpy-usage.patch
 shadow-add-missing-include.patch)
-sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
+sha1sums=('3ab1ae0e30af36d04445314fcb5a079bdf05de41'
+  '0a31aafceb948a91fe7370a6378cafd6fd883145'
+  '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
   '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
   '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
   '12427b1ca92a9b85ca8202239f0d9f50198b818f'
@@ -36,42 +46,40 @@
   '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
   '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
   '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-  '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
   '6010fffeed1fc6673ad9875492e1193b1a847b53'
-  '6bfe6528391eb38d338beacedd620407877b637d'
-  '9db9e62ad173f31e1039121c0124cf60826ffd7e'
+  '21e12966a6befb25ec123b403cd9b5c492fe5b16'
   '0697a21f7519de30821da7772677035652df4ad2')
 
 build() {
-  cd $srcdir/$pkgname-4.1.4.2+svn3283
+  cd $pkgname-$pkgver
 
-  # fix linking issues with binutils 2.22
+  # avoid transitive linking issues with binutils 2.22
   sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
 
-  # Ugh, force this to build shared libraries, for god's sake
-  sed -i s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g lib/Makefile.am
-  libtoolize
-  autoreconf
-  export LDFLAGS=$LDFLAGS -lcrypt
+  # link to glibc's crypt(3)
+  LDFLAGS+= -lcrypt
 
-  patch -p1 -i $srcdir/xstrdup.patch
-  patch -p1 -i $srcdir/shadow_CVE-2011-0721.patch
-  patch -p1 -i $srcdir/shadow-strncpy-usage.patch
-  patch -p1 -i $srcdir/shadow-add-missing-include.patch
+  patch -Np1 $srcdir/xstrdup.patch
+  patch -Np1 $srcdir/shadow-strncpy-usage.patch
+  patch -Np1 $srcdir/shadow-add-missing-include.patch
 
   # supress etc/pam.d/*, we provide our own
   sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
 
   ./configure \
---prefix=/usr --libdir=/lib \
---mandir=/usr/share/man --sysconfdir=/etc \
---enable-shared --disable-static \
---with-libpam --without-selinux
+--prefix=/usr \
+--libdir=/lib \
+--mandir=/usr/share/man \
+--sysconfdir=/etc \
+--with-libpam \
+--without-selinux
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-4.1.4.2+svn3283
+  cd $pkgname-$pkgver
+
   make DESTDIR=$pkgdir install
 
   # license
@@ -90,11 +98,9 @@
   install -Dm644 $srcdir/login.defs $pkgdir/etc/login.defs
 
   # PAM config - custom
-  install -Dm644 $srcdir/login $pkgdir/etc/pam.d/login
-  install -Dm644 $srcdir/passwd $pkgdir/etc/pam.d/passwd
-  install -Dm644 $srcdir/chgpasswd $pkgdir/etc/pam.d/chgpasswd
-  install -Dm644 $srcdir/chpasswd $pkgdir/etc/pam.d/chpasswd
-  install -Dm644 $srcdir/newusers $pkgdir/etc/pam.d/newusers
+  install -dm644 $pkgdir/etc/pam.d
+  install -t $pkgdir/etc/pam.d -m644 
$srcdir/{login,passwd,chgpasswd,chpasswd,newusers}
+
   # PAM config - from 

[arch-commits] Commit in shadow/repos (34 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 16:56:35
  Author: dreisner
Revision: 150164

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  shadow/repos/testing-i686/
  shadow/repos/testing-i686/LICENSE
(from rev 150163, shadow/trunk/LICENSE)
  shadow/repos/testing-i686/PKGBUILD
(from rev 150163, shadow/trunk/PKGBUILD)
  shadow/repos/testing-i686/adduser
(from rev 150163, shadow/trunk/adduser)
  shadow/repos/testing-i686/chgpasswd
(from rev 150163, shadow/trunk/chgpasswd)
  shadow/repos/testing-i686/chpasswd
(from rev 150163, shadow/trunk/chpasswd)
  shadow/repos/testing-i686/defaults.pam
(from rev 150163, shadow/trunk/defaults.pam)
  shadow/repos/testing-i686/login
(from rev 150163, shadow/trunk/login)
  shadow/repos/testing-i686/login.defs
(from rev 150163, shadow/trunk/login.defs)
  shadow/repos/testing-i686/newusers
(from rev 150163, shadow/trunk/newusers)
  shadow/repos/testing-i686/passwd
(from rev 150163, shadow/trunk/passwd)
  shadow/repos/testing-i686/shadow-add-missing-include.patch
(from rev 150163, shadow/trunk/shadow-add-missing-include.patch)
  shadow/repos/testing-i686/shadow-strncpy-usage.patch
(from rev 150163, shadow/trunk/shadow-strncpy-usage.patch)
  shadow/repos/testing-i686/shadow.cron.daily
(from rev 150163, shadow/trunk/shadow.cron.daily)
  shadow/repos/testing-i686/shadow.install
(from rev 150163, shadow/trunk/shadow.install)
  shadow/repos/testing-i686/useradd.defaults
(from rev 150163, shadow/trunk/useradd.defaults)
  shadow/repos/testing-i686/xstrdup.patch
(from rev 150163, shadow/trunk/xstrdup.patch)
  shadow/repos/testing-x86_64/
  shadow/repos/testing-x86_64/LICENSE
(from rev 150163, shadow/trunk/LICENSE)
  shadow/repos/testing-x86_64/PKGBUILD
(from rev 150163, shadow/trunk/PKGBUILD)
  shadow/repos/testing-x86_64/adduser
(from rev 150163, shadow/trunk/adduser)
  shadow/repos/testing-x86_64/chgpasswd
(from rev 150163, shadow/trunk/chgpasswd)
  shadow/repos/testing-x86_64/chpasswd
(from rev 150163, shadow/trunk/chpasswd)
  shadow/repos/testing-x86_64/defaults.pam
(from rev 150163, shadow/trunk/defaults.pam)
  shadow/repos/testing-x86_64/login
(from rev 150163, shadow/trunk/login)
  shadow/repos/testing-x86_64/login.defs
(from rev 150163, shadow/trunk/login.defs)
  shadow/repos/testing-x86_64/newusers
(from rev 150163, shadow/trunk/newusers)
  shadow/repos/testing-x86_64/passwd
(from rev 150163, shadow/trunk/passwd)
  shadow/repos/testing-x86_64/shadow-add-missing-include.patch
(from rev 150163, shadow/trunk/shadow-add-missing-include.patch)
  shadow/repos/testing-x86_64/shadow-strncpy-usage.patch
(from rev 150163, shadow/trunk/shadow-strncpy-usage.patch)
  shadow/repos/testing-x86_64/shadow.cron.daily
(from rev 150163, shadow/trunk/shadow.cron.daily)
  shadow/repos/testing-x86_64/shadow.install
(from rev 150163, shadow/trunk/shadow.install)
  shadow/repos/testing-x86_64/useradd.defaults
(from rev 150163, shadow/trunk/useradd.defaults)
  shadow/repos/testing-x86_64/xstrdup.patch
(from rev 150163, shadow/trunk/xstrdup.patch)

-+
 testing-i686/LICENSE|   31 +
 testing-i686/PKGBUILD   |  116 ++
 testing-i686/adduser|  399 ++
 testing-i686/chgpasswd  |4 
 testing-i686/chpasswd   |6 
 testing-i686/defaults.pam   |6 
 testing-i686/login  |   21 +
 testing-i686/login.defs |  197 ++
 testing-i686/newusers   |6 
 testing-i686/passwd |4 
 testing-i686/shadow-add-missing-include.patch   |   11 
 testing-i686/shadow-strncpy-usage.patch |   25 +
 testing-i686/shadow.cron.daily  |6 
 testing-i686/shadow.install |9 
 testing-i686/useradd.defaults   |9 
 testing-i686/xstrdup.patch  |9 
 testing-x86_64/LICENSE  |   31 +
 testing-x86_64/PKGBUILD |  116 ++
 testing-x86_64/adduser  |  399 ++
 testing-x86_64/chgpasswd|4 
 testing-x86_64/chpasswd |6 
 testing-x86_64/defaults.pam |6 
 testing-x86_64/login|   21 +
 testing-x86_64/login.defs   |  197 ++
 testing-x86_64/newusers |6 
 testing-x86_64/passwd   |4 
 testing-x86_64/shadow-add-missing-include.patch |   11 
 testing-x86_64/shadow-strncpy-usage.patch   |   25 +
 testing-x86_64/shadow.cron.daily|6 
 testing-x86_64/shadow.install   |9 
 

[arch-commits] Commit in shadow/trunk (PKGBUILD)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 20:55:11
  Author: dreisner
Revision: 150165

upgpkg: shadow 4.1.5-2

- fix wrong permissions on /etc/pam.d

Modified:
  shadow/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-13 21:56:35 UTC (rev 150164)
+++ PKGBUILD2012-02-14 01:55:11 UTC (rev 150165)
@@ -4,7 +4,7 @@
 
 pkgname=shadow
 pkgver=4.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc=Password and account management tool suite with support for shadow 
files and PAM
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -98,7 +98,7 @@
   install -Dm644 $srcdir/login.defs $pkgdir/etc/login.defs
 
   # PAM config - custom
-  install -dm644 $pkgdir/etc/pam.d
+  install -dm755 $pkgdir/etc/pam.d
   install -t $pkgdir/etc/pam.d -m644 
$srcdir/{login,passwd,chgpasswd,chpasswd,newusers}
 
   # PAM config - from tarball



[arch-commits] Commit in shadow/repos (64 files)

2012-02-13 Thread Dave Reisner
Date: Monday, February 13, 2012 @ 20:55:53
  Author: dreisner
Revision: 150166

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  shadow/repos/testing-i686/LICENSE
(from rev 150165, shadow/trunk/LICENSE)
  shadow/repos/testing-i686/PKGBUILD
(from rev 150165, shadow/trunk/PKGBUILD)
  shadow/repos/testing-i686/adduser
(from rev 150165, shadow/trunk/adduser)
  shadow/repos/testing-i686/chgpasswd
(from rev 150165, shadow/trunk/chgpasswd)
  shadow/repos/testing-i686/chpasswd
(from rev 150165, shadow/trunk/chpasswd)
  shadow/repos/testing-i686/defaults.pam
(from rev 150165, shadow/trunk/defaults.pam)
  shadow/repos/testing-i686/login
(from rev 150165, shadow/trunk/login)
  shadow/repos/testing-i686/login.defs
(from rev 150165, shadow/trunk/login.defs)
  shadow/repos/testing-i686/newusers
(from rev 150165, shadow/trunk/newusers)
  shadow/repos/testing-i686/passwd
(from rev 150165, shadow/trunk/passwd)
  shadow/repos/testing-i686/shadow-add-missing-include.patch
(from rev 150165, shadow/trunk/shadow-add-missing-include.patch)
  shadow/repos/testing-i686/shadow-strncpy-usage.patch
(from rev 150165, shadow/trunk/shadow-strncpy-usage.patch)
  shadow/repos/testing-i686/shadow.cron.daily
(from rev 150165, shadow/trunk/shadow.cron.daily)
  shadow/repos/testing-i686/shadow.install
(from rev 150165, shadow/trunk/shadow.install)
  shadow/repos/testing-i686/useradd.defaults
(from rev 150165, shadow/trunk/useradd.defaults)
  shadow/repos/testing-i686/xstrdup.patch
(from rev 150165, shadow/trunk/xstrdup.patch)
  shadow/repos/testing-x86_64/LICENSE
(from rev 150165, shadow/trunk/LICENSE)
  shadow/repos/testing-x86_64/PKGBUILD
(from rev 150165, shadow/trunk/PKGBUILD)
  shadow/repos/testing-x86_64/adduser
(from rev 150165, shadow/trunk/adduser)
  shadow/repos/testing-x86_64/chgpasswd
(from rev 150165, shadow/trunk/chgpasswd)
  shadow/repos/testing-x86_64/chpasswd
(from rev 150165, shadow/trunk/chpasswd)
  shadow/repos/testing-x86_64/defaults.pam
(from rev 150165, shadow/trunk/defaults.pam)
  shadow/repos/testing-x86_64/login
(from rev 150165, shadow/trunk/login)
  shadow/repos/testing-x86_64/login.defs
(from rev 150165, shadow/trunk/login.defs)
  shadow/repos/testing-x86_64/newusers
(from rev 150165, shadow/trunk/newusers)
  shadow/repos/testing-x86_64/passwd
(from rev 150165, shadow/trunk/passwd)
  shadow/repos/testing-x86_64/shadow-add-missing-include.patch
(from rev 150165, shadow/trunk/shadow-add-missing-include.patch)
  shadow/repos/testing-x86_64/shadow-strncpy-usage.patch
(from rev 150165, shadow/trunk/shadow-strncpy-usage.patch)
  shadow/repos/testing-x86_64/shadow.cron.daily
(from rev 150165, shadow/trunk/shadow.cron.daily)
  shadow/repos/testing-x86_64/shadow.install
(from rev 150165, shadow/trunk/shadow.install)
  shadow/repos/testing-x86_64/useradd.defaults
(from rev 150165, shadow/trunk/useradd.defaults)
  shadow/repos/testing-x86_64/xstrdup.patch
(from rev 150165, shadow/trunk/xstrdup.patch)
Deleted:
  shadow/repos/testing-i686/LICENSE
  shadow/repos/testing-i686/PKGBUILD
  shadow/repos/testing-i686/adduser
  shadow/repos/testing-i686/chgpasswd
  shadow/repos/testing-i686/chpasswd
  shadow/repos/testing-i686/defaults.pam
  shadow/repos/testing-i686/login
  shadow/repos/testing-i686/login.defs
  shadow/repos/testing-i686/newusers
  shadow/repos/testing-i686/passwd
  shadow/repos/testing-i686/shadow-add-missing-include.patch
  shadow/repos/testing-i686/shadow-strncpy-usage.patch
  shadow/repos/testing-i686/shadow.cron.daily
  shadow/repos/testing-i686/shadow.install
  shadow/repos/testing-i686/useradd.defaults
  shadow/repos/testing-i686/xstrdup.patch
  shadow/repos/testing-x86_64/LICENSE
  shadow/repos/testing-x86_64/PKGBUILD
  shadow/repos/testing-x86_64/adduser
  shadow/repos/testing-x86_64/chgpasswd
  shadow/repos/testing-x86_64/chpasswd
  shadow/repos/testing-x86_64/defaults.pam
  shadow/repos/testing-x86_64/login
  shadow/repos/testing-x86_64/login.defs
  shadow/repos/testing-x86_64/newusers
  shadow/repos/testing-x86_64/passwd
  shadow/repos/testing-x86_64/shadow-add-missing-include.patch
  shadow/repos/testing-x86_64/shadow-strncpy-usage.patch
  shadow/repos/testing-x86_64/shadow.cron.daily
  shadow/repos/testing-x86_64/shadow.install
  shadow/repos/testing-x86_64/useradd.defaults
  shadow/repos/testing-x86_64/xstrdup.patch

-+
 testing-i686/LICENSE|   62 -
 testing-i686/PKGBUILD   |  232 +++---
 testing-i686/adduser|  798 +++---
 testing-i686/chgpasswd  |8 
 testing-i686/chpasswd   |   12 
 testing-i686/defaults.pam   |   12 
 testing-i686/login  |   42 -
 testing-i686/login.defs |  394 +-
 

[arch-commits] Commit in glibc/trunk (4 files)

2012-02-13 Thread Allan McRae
Date: Tuesday, February 14, 2012 @ 01:41:58
  Author: allan
Revision: 150167

upgpkg: glibc 2.15-6

disable AVX strcasecmp due to Xen issue, add ARENA_TEST fix, add fix for nscd 
caching transient negative results

Added:
  glibc/trunk/glibc-2.15-arena.patch
  glibc/trunk/glibc-2.15-negative-result-cache.patch
  glibc/trunk/glibc-2.15-strcasecmp-disable-avx.patch
Modified:
  glibc/trunk/PKGBUILD

-+
 PKGBUILD|   25 -
 glibc-2.15-arena.patch  |   29 ++
 glibc-2.15-negative-result-cache.patch  |  138 ++
 glibc-2.15-strcasecmp-disable-avx.patch |   48 ++
 4 files changed, 237 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-14 01:55:53 UTC (rev 150166)
+++ PKGBUILD2012-02-14 06:41:58 UTC (rev 150167)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=5
+pkgrel=6
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -35,8 +35,11 @@
 glibc-2.15-scanf.patch
 glibc-2.15-ifunc.patch
 glibc-2.15-avx.patch
+glibc-2.15-strcasecmp-disable-avx.patch
 glibc-2.15-gb18030.patch
 glibc-2.15-revert-netlink-cache.patch
+glibc-2.15-arena.patch
+glibc-2.15-negative-result-cache.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -55,8 +58,11 @@
  '39353f53168f4a7509ba5fe0d9f218b8'
  '136eb969f5d6bb6f5155f72a1a7cf23e'
  '41ae047ac88e8f6f547c70b0a0bc3b72'
+ 'fccb89f6628f59752278e125c35941f8'
  'c4cd34f20ccd37817f6c1374bd4ee68e'
  '6771b0b2bb8aa3870a259fd2f46c424f'
+ 'a9ffadcfd2d357f91fee0b861fd4a7c6'
+ '2c46b8e294de24c531f2253ff69aeef3'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -80,8 +86,9 @@
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
   patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
 
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # Undefine __i686 for gcc = 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires 
additional backporting...
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
@@ -115,6 +122,8 @@
 
   # revert commit c5a0802a - causes various hangs
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+  # Note: fedora may have actual fix (not submitted upstream yet...)
+  # 
http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
   # fix realloc usage in vfscanf
@@ -129,6 +138,8 @@
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
   patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  # and fix strcasecmp
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
@@ -137,10 +148,18 @@
   patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential fix in 
comment)
   # reverts commit 3a2c0242 and other necessary following changes...
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
+  # handle ARENA_TEST correctly
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
+  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+
+  # Do not cache negative results in nscd if these are transient
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
+  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Added: glibc-2.15-arena.patch
===
--- glibc-2.15-arena.patch  (rev 0)
+++ glibc-2.15-arena.patch  2012-02-14 06:41:58 UTC (rev 150167)
@@ -0,0 +1,29 @@
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d3cf4b9..b1c9469 100644
+--- a/malloc/arena.c
 b/malloc/arena.c
+@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
+   {
+ if (mp_.arena_max != 0)
+   narenas_limit = mp_.arena_max;
+-else
++else if (narenas  mp_.arena_test)
+   {
+ int n  = __get_nprocs ();
+ 
+@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
+   }
+ repeat:;
+   size_t n = narenas;
+-  if (__builtin_expect (n = mp_.arena_test || n  narenas_limit, 0))
++  /* NB: the following depends on the fact that (size_t)0 - 1 is a
++   very large number and that the underflow is 

[arch-commits] Commit in glibc/repos (50 files)

2012-02-13 Thread Allan McRae
Date: Tuesday, February 14, 2012 @ 01:50:20
  Author: allan
Revision: 150168

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  glibc/repos/testing-i686/
  glibc/repos/testing-i686/PKGBUILD
(from rev 150167, glibc/trunk/PKGBUILD)
  glibc/repos/testing-i686/glibc-2.10-bz4781.patch
(from rev 150167, glibc/trunk/glibc-2.10-bz4781.patch)
  glibc/repos/testing-i686/glibc-2.10-dont-build-timezone.patch
(from rev 150167, glibc/trunk/glibc-2.10-dont-build-timezone.patch)
  
glibc/repos/testing-i686/glibc-2.12.2-ignore-origin-of-privileged-program.patch
(from rev 150167, 
glibc/trunk/glibc-2.12.2-ignore-origin-of-privileged-program.patch)
  glibc/repos/testing-i686/glibc-2.14-libdl-crash.patch
(from rev 150167, glibc/trunk/glibc-2.14-libdl-crash.patch)
  glibc/repos/testing-i686/glibc-2.14-reexport-rpc-interface.patch
(from rev 150167, glibc/trunk/glibc-2.14-reexport-rpc-interface.patch)
  glibc/repos/testing-i686/glibc-2.14-reinstall-nis-rpc-headers.patch
(from rev 150167, glibc/trunk/glibc-2.14-reinstall-nis-rpc-headers.patch)
  glibc/repos/testing-i686/glibc-2.14-revert-4768ae77.patch
(from rev 150167, glibc/trunk/glibc-2.14-revert-4768ae77.patch)
  glibc/repos/testing-i686/glibc-2.15-arena.patch
(from rev 150167, glibc/trunk/glibc-2.15-arena.patch)
  glibc/repos/testing-i686/glibc-2.15-avx.patch
(from rev 150167, glibc/trunk/glibc-2.15-avx.patch)
  glibc/repos/testing-i686/glibc-2.15-gb18030.patch
(from rev 150167, glibc/trunk/glibc-2.15-gb18030.patch)
  glibc/repos/testing-i686/glibc-2.15-ifunc.patch
(from rev 150167, glibc/trunk/glibc-2.15-ifunc.patch)
  glibc/repos/testing-i686/glibc-2.15-lddebug-scopes.patch
(from rev 150167, glibc/trunk/glibc-2.15-lddebug-scopes.patch)
  glibc/repos/testing-i686/glibc-2.15-negative-result-cache.patch
(from rev 150167, glibc/trunk/glibc-2.15-negative-result-cache.patch)
  glibc/repos/testing-i686/glibc-2.15-regex.patch
(from rev 150167, glibc/trunk/glibc-2.15-regex.patch)
  glibc/repos/testing-i686/glibc-2.15-revert-c5a0802a.patch
(from rev 150167, glibc/trunk/glibc-2.15-revert-c5a0802a.patch)
  glibc/repos/testing-i686/glibc-2.15-revert-netlink-cache.patch
(from rev 150167, glibc/trunk/glibc-2.15-revert-netlink-cache.patch)
  glibc/repos/testing-i686/glibc-2.15-scanf.patch
(from rev 150167, glibc/trunk/glibc-2.15-scanf.patch)
  glibc/repos/testing-i686/glibc-2.15-strcasecmp-disable-avx.patch
(from rev 150167, glibc/trunk/glibc-2.15-strcasecmp-disable-avx.patch)
  glibc/repos/testing-i686/glibc-__i686.patch
(from rev 150167, glibc/trunk/glibc-__i686.patch)
  glibc/repos/testing-i686/glibc.install
(from rev 150167, glibc/trunk/glibc.install)
  glibc/repos/testing-i686/locale-gen
(from rev 150167, glibc/trunk/locale-gen)
  glibc/repos/testing-i686/locale.gen.txt
(from rev 150167, glibc/trunk/locale.gen.txt)
  glibc/repos/testing-i686/nscd
(from rev 150167, glibc/trunk/nscd)
  glibc/repos/testing-x86_64/
  glibc/repos/testing-x86_64/PKGBUILD
(from rev 150167, glibc/trunk/PKGBUILD)
  glibc/repos/testing-x86_64/glibc-2.10-bz4781.patch
(from rev 150167, glibc/trunk/glibc-2.10-bz4781.patch)
  glibc/repos/testing-x86_64/glibc-2.10-dont-build-timezone.patch
(from rev 150167, glibc/trunk/glibc-2.10-dont-build-timezone.patch)
  
glibc/repos/testing-x86_64/glibc-2.12.2-ignore-origin-of-privileged-program.patch
(from rev 150167, 
glibc/trunk/glibc-2.12.2-ignore-origin-of-privileged-program.patch)
  glibc/repos/testing-x86_64/glibc-2.14-libdl-crash.patch
(from rev 150167, glibc/trunk/glibc-2.14-libdl-crash.patch)
  glibc/repos/testing-x86_64/glibc-2.14-reexport-rpc-interface.patch
(from rev 150167, glibc/trunk/glibc-2.14-reexport-rpc-interface.patch)
  glibc/repos/testing-x86_64/glibc-2.14-reinstall-nis-rpc-headers.patch
(from rev 150167, glibc/trunk/glibc-2.14-reinstall-nis-rpc-headers.patch)
  glibc/repos/testing-x86_64/glibc-2.14-revert-4768ae77.patch
(from rev 150167, glibc/trunk/glibc-2.14-revert-4768ae77.patch)
  glibc/repos/testing-x86_64/glibc-2.15-arena.patch
(from rev 150167, glibc/trunk/glibc-2.15-arena.patch)
  glibc/repos/testing-x86_64/glibc-2.15-avx.patch
(from rev 150167, glibc/trunk/glibc-2.15-avx.patch)
  glibc/repos/testing-x86_64/glibc-2.15-gb18030.patch
(from rev 150167, glibc/trunk/glibc-2.15-gb18030.patch)
  glibc/repos/testing-x86_64/glibc-2.15-ifunc.patch
(from rev 150167, glibc/trunk/glibc-2.15-ifunc.patch)
  glibc/repos/testing-x86_64/glibc-2.15-lddebug-scopes.patch
(from rev 150167, glibc/trunk/glibc-2.15-lddebug-scopes.patch)
  glibc/repos/testing-x86_64/glibc-2.15-negative-result-cache.patch
(from rev 150167, glibc/trunk/glibc-2.15-negative-result-cache.patch)
  glibc/repos/testing-x86_64/glibc-2.15-regex.patch
(from rev 150167, glibc/trunk/glibc-2.15-regex.patch)
  glibc/repos/testing-x86_64/glibc-2.15-revert-c5a0802a.patch
(from rev 150167, 

[arch-commits] Commit in pyqt/trunk (3 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:26:17
  Author: andrea
Revision: 150169

upgpkg: pyqt 4.9.1-1

Upstream release

Added:
  pyqt/trunk/fix-qthelp-build.patch
Modified:
  pyqt/trunk/PKGBUILD
Deleted:
  pyqt/trunk/fix-qthelp-build.patch

+
 PKGBUILD   |   18 +-
 fix-qthelp-build.patch |   22 +++---
 2 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-14 06:50:20 UTC (rev 150168)
+++ PKGBUILD2012-02-14 07:26:17 UTC (rev 150169)
@@ -1,13 +1,12 @@
 # $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
+# Maintainer: Andrea Scarpino and...@archlinux.org
 # Contributor: Douglas Soares de Andrade doug...@archlinux.org
 # Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
+pkgver=4.9.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://riverbankcomputing.co.uk/software/pyqt/intro;
 license=('GPL')
@@ -15,14 +14,15 @@
  'python-opengl' 'qt-assistant-compat' 'qtwebkit')
 
source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
 'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
- '356a453331a33c507b1baba4a9771764')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
 
 build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
   cd ${srcdir}
-
-  patch -p0 -i ${srcdir}/fix-qthelp-build.patch
-
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}

Deleted: fix-qthelp-build.patch
===
--- fix-qthelp-build.patch  2012-02-14 06:50:20 UTC (rev 150168)
+++ fix-qthelp-build.patch  2012-02-14 07:26:17 UTC (rev 150169)
@@ -1,11 +0,0 @@
 PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100
-+++ PyQt-x11-gpl-4.9/configure.py  2011-12-23 14:52:38.384984221 +0100
-@@ -1264,7 +1264,7 @@
- opengl = (mname == QtOpenGL)
- 
- qt = [mname]
--if mname in (QtOpenGL, QtWebKit):
-+if mname in (QtHelp, QtOpenGL, QtWebKit):
- qt.append(QtCore)
- 
- makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,

Added: fix-qthelp-build.patch
===
--- fix-qthelp-build.patch  (rev 0)
+++ fix-qthelp-build.patch  2012-02-14 07:26:17 UTC (rev 150169)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~   2012-02-13 20:16:11.418786488 +
 PyQt-x11-gpl-4.9.1/configure.py2012-02-13 20:16:50.561809527 +
+@@ -1261,7 +1261,7 @@
+ opengl = (mname == QtOpenGL)
+ 
+ qt = [mname]
+-if mname in (QtOpenGL, QtWebKit):
++if mname in (QtHelp, QtOpenGL, QtWebKit):
+ qt.append(QtCore)
+ 
+ makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,



[arch-commits] Commit in pyqt/repos (6 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:26:39
  Author: andrea
Revision: 150170

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  pyqt/repos/staging-i686/
  pyqt/repos/staging-i686/PKGBUILD
(from rev 150169, pyqt/trunk/PKGBUILD)
  pyqt/repos/staging-i686/fix-qthelp-build.patch
(from rev 150169, pyqt/trunk/fix-qthelp-build.patch)
  pyqt/repos/staging-x86_64/
  pyqt/repos/staging-x86_64/PKGBUILD
(from rev 150169, pyqt/trunk/PKGBUILD)
  pyqt/repos/staging-x86_64/fix-qthelp-build.patch
(from rev 150169, pyqt/trunk/fix-qthelp-build.patch)

---+
 staging-i686/PKGBUILD |   84 
 staging-i686/fix-qthelp-build.patch   |   11 
 staging-x86_64/PKGBUILD   |   84 
 staging-x86_64/fix-qthelp-build.patch |   11 
 4 files changed, 190 insertions(+)

Copied: pyqt/repos/staging-i686/PKGBUILD (from rev 150169, pyqt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-14 07:26:39 UTC (rev 150170)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  python configure.py \
+--confirm-license \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
+  python2 configure.py \
+--confirm-license \
+-v /usr/share/sip \
+--qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt(){
+  pkgdesc=A set of Python 3.x bindings for the Qt toolkit
+  depends=('qtwebkit' 'python-sip')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python-qt')
+  provides=('python-qt')
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}
+
+package_python2-pyqt(){
+  pkgdesc=A set of Python 2.x bindings for the Qt toolkit
+  depends=('pyqt' 'python2-sip' 'dbus-python')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+  'qscintilla: QScintilla API'
+  'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('python2-qt')
+  provides=('python2-qt')
+  options=('!emptydirs')
+
+  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+
+  # Provided by pyqt
+  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
+  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
+}

Copied: pyqt/repos/staging-i686/fix-qthelp-build.patch (from rev 150169, 
pyqt/trunk/fix-qthelp-build.patch)
===
--- staging-i686/fix-qthelp-build.patch (rev 0)
+++ staging-i686/fix-qthelp-build.patch 2012-02-14 07:26:39 UTC (rev 150170)
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~   2012-02-13 20:16:11.418786488 +
 PyQt-x11-gpl-4.9.1/configure.py2012-02-13 20:16:50.561809527 +
+@@ -1261,7 +1261,7 @@
+ opengl = (mname == QtOpenGL)
+ 
+ qt = [mname]
+-if mname in (QtOpenGL, QtWebKit):
++if mname in (QtHelp, QtOpenGL, QtWebKit):
+ qt.append(QtCore)
+ 
+ makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,

Copied: pyqt/repos/staging-x86_64/PKGBUILD (from rev 150169, 
pyqt/trunk/PKGBUILD)

[arch-commits] Commit in kdebindings-python/trunk (PKGBUILD)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:51:22
  Author: andrea
Revision: 150171

upgpkg: kdebindings-python 4.8.0-2

PyQt rebuild

Modified:
  kdebindings-python/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-14 07:26:39 UTC (rev 150170)
+++ PKGBUILD2012-02-14 07:51:22 UTC (rev 150171)
@@ -3,7 +3,7 @@
 
 pkgname=kdebindings-python
 pkgver=4.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc=KDE bindings for Python
 url=http://kde.org/;
 arch=('i686' 'x86_64')



[arch-commits] Commit in kdebindings-python/repos (4 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:51:48
  Author: andrea
Revision: 150172

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  kdebindings-python/repos/staging-i686/
  kdebindings-python/repos/staging-i686/PKGBUILD
(from rev 150171, kdebindings-python/trunk/PKGBUILD)
  kdebindings-python/repos/staging-x86_64/
  kdebindings-python/repos/staging-x86_64/PKGBUILD
(from rev 150171, kdebindings-python/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   34 ++
 staging-x86_64/PKGBUILD |   34 ++
 2 files changed, 68 insertions(+)

Copied: kdebindings-python/repos/staging-i686/PKGBUILD (from rev 150171, 
kdebindings-python/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-02-14 07:51:48 UTC (rev 150172)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdebindings-python
+pkgver=4.8.0
+pkgrel=2
+pkgdesc=KDE bindings for Python
+url=http://kde.org/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost')
+source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
+sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+
+  # Use the python2 executable
+  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
+}

Copied: kdebindings-python/repos/staging-x86_64/PKGBUILD (from rev 150171, 
kdebindings-python/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-02-14 07:51:48 UTC (rev 150172)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdebindings-python
+pkgver=4.8.0
+pkgrel=2
+pkgdesc=KDE bindings for Python
+url=http://kde.org/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost')
+source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
+sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+
+  # Use the python2 executable
+  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
+}



[arch-commits] Commit in sip/repos (3 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:34
  Author: andrea
Revision: 150173

db-move: moved sip from [staging] to [extra] (i686)

Added:
  sip/repos/extra-i686/PKGBUILD
(from rev 150172, sip/repos/staging-i686/PKGBUILD)
Deleted:
  sip/repos/extra-i686/PKGBUILD
  sip/repos/staging-i686/

--+
 PKGBUILD |  109 ++---
 1 file changed, 54 insertions(+), 55 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-14 07:51:48 UTC (rev 150172)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:34 UTC (rev 150173)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
-
-pkgbase=sip
-pkgname=('sip' 'python2-sip')
-pkgver=4.13.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://www.riverbankcomputing.com/software/sip/;
-license=('custom:sip')
-makedepends=('python' 'python2')
-source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
-md5sums=('3f61fd39d5b0c8fa9e43b59af04de924')
-
-build() {
-  cd ${srcdir}
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
-  make
-  
-  ### Python2 version ###
-  cd ${srcdir}/python2-${pkgbase}-${pkgver}
-  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
-  make
-}
-
-package_sip() {
-  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
-  depends=('python')
-  replaces=('python-sip')
-  provides=('python-sip')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-sip() {
-  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
-  depends=('sip' 'python2')
-
-  cd ${srcdir}/python2-${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Provided by sip
-  rm ${pkgdir}/usr/bin/sip
-}

Copied: sip/repos/extra-i686/PKGBUILD (from rev 150172, 
sip/repos/staging-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:34 UTC (rev 150173)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.13.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://www.riverbankcomputing.com/software/sip/;
+license=('custom:sip')
+makedepends=('python' 'python2')
+source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
+
+build() {
+  cd ${srcdir}
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+  
+  ### Python2 version ###
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+}
+
+package_sip() {
+  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
+  depends=('python')
+  replaces=('python-sip')
+  provides=('python-sip')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python2-sip() {
+  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
+  depends=('sip' 'python2')
+
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # Provided by sip
+  rm ${pkgdir}/usr/bin/sip
+}



[arch-commits] Commit in sip/repos (3 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:34
  Author: andrea
Revision: 150174

db-move: moved sip from [staging] to [extra] (x86_64)

Added:
  sip/repos/extra-x86_64/PKGBUILD
(from rev 150172, sip/repos/staging-x86_64/PKGBUILD)
Deleted:
  sip/repos/extra-x86_64/PKGBUILD
  sip/repos/staging-x86_64/

--+
 PKGBUILD |  109 ++---
 1 file changed, 54 insertions(+), 55 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-14 07:57:34 UTC (rev 150173)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:34 UTC (rev 150174)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
-
-pkgbase=sip
-pkgname=('sip' 'python2-sip')
-pkgver=4.13.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url=http://www.riverbankcomputing.com/software/sip/;
-license=('custom:sip')
-makedepends=('python' 'python2')
-source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
-md5sums=('3f61fd39d5b0c8fa9e43b59af04de924')
-
-build() {
-  cd ${srcdir}
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
-  make
-  
-  ### Python2 version ###
-  cd ${srcdir}/python2-${pkgbase}-${pkgver}
-  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
-  make
-}
-
-package_sip() {
-  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
-  depends=('python')
-  replaces=('python-sip')
-  provides=('python-sip')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-sip() {
-  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
-  depends=('sip' 'python2')
-
-  cd ${srcdir}/python2-${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Provided by sip
-  rm ${pkgdir}/usr/bin/sip
-}

Copied: sip/repos/extra-x86_64/PKGBUILD (from rev 150172, 
sip/repos/staging-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:34 UTC (rev 150174)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com, Ben b...@benmazer.net
+
+pkgbase=sip
+pkgname=('sip' 'python2-sip')
+pkgver=4.13.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://www.riverbankcomputing.com/software/sip/;
+license=('custom:sip')
+makedepends=('python' 'python2')
+source=(http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz;)
+md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84')
+
+build() {
+  cd ${srcdir}
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  python configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+  
+  ### Python2 version ###
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  python2 configure.py CFLAGS=${CFLAGS} LFLAGS=${LDFLAGS}
+  make
+}
+
+package_sip() {
+  pkgdesc=A tool that makes it easy to create Python bindings for C and C++ 
libraries
+  depends=('python')
+  replaces=('python-sip')
+  provides=('python-sip')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+package_python2-sip() {
+  pkgdesc=A tool that makes it easy to create Python2 bindings for C and C++ 
libraries
+  depends=('sip' 'python2')
+
+  cd ${srcdir}/python2-${pkgbase}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+
+  # Provided by sip
+  rm ${pkgdir}/usr/bin/sip
+}



[arch-commits] Commit in pyqt/repos (5 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:37
  Author: andrea
Revision: 150176

db-move: moved pyqt from [staging] to [extra] (x86_64)

Added:
  pyqt/repos/extra-x86_64/PKGBUILD
(from rev 150172, pyqt/repos/staging-x86_64/PKGBUILD)
  pyqt/repos/extra-x86_64/fix-qthelp-build.patch
(from rev 150172, pyqt/repos/staging-x86_64/fix-qthelp-build.patch)
Deleted:
  pyqt/repos/extra-x86_64/PKGBUILD
  pyqt/repos/extra-x86_64/fix-qthelp-build.patch
  pyqt/repos/staging-x86_64/

+
 PKGBUILD   |  168 +++
 fix-qthelp-build.patch |   22 +++---
 2 files changed, 95 insertions(+), 95 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-14 07:57:36 UTC (rev 150175)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:37 UTC (rev 150176)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://riverbankcomputing.co.uk/software/pyqt/intro;
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
- '356a453331a33c507b1baba4a9771764')
-
-build() {
-  cd ${srcdir}
-
-  patch -p0 -i ${srcdir}/fix-qthelp-build.patch
-
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  python configure.py \
---confirm-license \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
---confirm-license \
--v /usr/share/sip \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt(){
-  pkgdesc=A set of Python 3.x bindings for the Qt toolkit
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
-  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-}
-
-package_python2-pyqt(){
-  pkgdesc=A set of Python 2.x bindings for the Qt toolkit
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
-  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/extra-x86_64/PKGBUILD (from rev 150172, 
pyqt/repos/staging-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:37 UTC (rev 150176)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd 

[arch-commits] Commit in kdebindings-python/repos (3 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:39
  Author: andrea
Revision: 150177

db-move: moved kdebindings-python from [staging] to [extra] (i686)

Added:
  kdebindings-python/repos/extra-i686/PKGBUILD
(from rev 150172, kdebindings-python/repos/staging-i686/PKGBUILD)
Deleted:
  kdebindings-python/repos/extra-i686/PKGBUILD
  kdebindings-python/repos/staging-i686/

--+
 PKGBUILD |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-14 07:57:37 UTC (rev 150176)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:39 UTC (rev 150177)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=kdebindings-python
-pkgver=4.8.0
-pkgrel=1
-pkgdesc=KDE bindings for Python
-url=http://kde.org/;
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
-sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-
-  # Use the python2 executable
-  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-i686/PKGBUILD (from rev 150172, 
kdebindings-python/repos/staging-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:39 UTC (rev 150177)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdebindings-python
+pkgver=4.8.0
+pkgrel=2
+pkgdesc=KDE bindings for Python
+url=http://kde.org/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost')
+source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
+sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+
+  # Use the python2 executable
+  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
+}



[arch-commits] Commit in pyqt/repos (5 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:36
  Author: andrea
Revision: 150175

db-move: moved pyqt from [staging] to [extra] (i686)

Added:
  pyqt/repos/extra-i686/PKGBUILD
(from rev 150172, pyqt/repos/staging-i686/PKGBUILD)
  pyqt/repos/extra-i686/fix-qthelp-build.patch
(from rev 150172, pyqt/repos/staging-i686/fix-qthelp-build.patch)
Deleted:
  pyqt/repos/extra-i686/PKGBUILD
  pyqt/repos/extra-i686/fix-qthelp-build.patch
  pyqt/repos/staging-i686/

+
 PKGBUILD   |  168 +++
 fix-qthelp-build.patch |   22 +++---
 2 files changed, 95 insertions(+), 95 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-02-14 07:57:34 UTC (rev 150174)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:36 UTC (rev 150175)
@@ -1,84 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino and...@archlinux.org
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url=http://riverbankcomputing.co.uk/software/pyqt/intro;
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
-'fix-qthelp-build.patch')
-md5sums=('61619500d09d87b6c2a25bd3ea994504'
- '356a453331a33c507b1baba4a9771764')
-
-build() {
-  cd ${srcdir}
-
-  patch -p0 -i ${srcdir}/fix-qthelp-build.patch
-
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  python configure.py \
---confirm-license \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
---confirm-license \
--v /usr/share/sip \
---qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 
's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt(){
-  pkgdesc=A set of Python 3.x bindings for the Qt toolkit
-  depends=('qtwebkit' 'python-sip')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python-qt')
-  provides=('python-qt')
-
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
-  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-}
-
-package_python2-pyqt(){
-  pkgdesc=A set of Python 2.x bindings for the Qt toolkit
-  depends=('pyqt' 'python2-sip' 'dbus-python')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'python-opengl: enable OpenGL 3D graphics in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  replaces=('python2-qt')
-  provides=('python2-qt')
-  options=('!emptydirs')
-
-  cd ${srcdir}/Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
-  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-
-  # Provided by pyqt
-  rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
-  rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/extra-i686/PKGBUILD (from rev 150172, 
pyqt/repos/staging-i686/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-14 07:57:36 UTC (rev 150175)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Contributor: riai r...@bigfoot.com Ben b...@benmazer.net
+
+pkgbase=pyqt
+pkgname=('pyqt' 'python2-pyqt')
+pkgver=4.9.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url=http://riverbankcomputing.co.uk/software/pyqt/intro;
+license=('GPL')
+makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
+ 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+source=(http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz;
+'fix-qthelp-build.patch')
+md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
+ '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i ${srcdir}/fix-qthelp-build.patch
+
+  cd ${srcdir}
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  python configure.py \
+

[arch-commits] Commit in kdebindings-python/repos (3 files)

2012-02-13 Thread Andrea Scarpino
Date: Tuesday, February 14, 2012 @ 02:57:40
  Author: andrea
Revision: 150178

db-move: moved kdebindings-python from [staging] to [extra] (x86_64)

Added:
  kdebindings-python/repos/extra-x86_64/PKGBUILD
(from rev 150172, kdebindings-python/repos/staging-x86_64/PKGBUILD)
Deleted:
  kdebindings-python/repos/extra-x86_64/PKGBUILD
  kdebindings-python/repos/staging-x86_64/

--+
 PKGBUILD |   68 ++---
 1 file changed, 34 insertions(+), 34 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-02-14 07:57:39 UTC (rev 150177)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:40 UTC (rev 150178)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
-
-pkgname=kdebindings-python
-pkgver=4.8.0
-pkgrel=1
-pkgdesc=KDE bindings for Python
-url=http://kde.org/;
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'boost')
-source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
-sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
--DCMAKE_BUILD_TYPE=Release \
--DCMAKE_INSTALL_PREFIX=/usr \
--DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-
-  # Use the python2 executable
-  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
-}

Copied: kdebindings-python/repos/extra-x86_64/PKGBUILD (from rev 150172, 
kdebindings-python/repos/staging-x86_64/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-02-14 07:57:40 UTC (rev 150178)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=kdebindings-python
+pkgver=4.8.0
+pkgrel=2
+pkgdesc=KDE bindings for Python
+url=http://kde.org/;
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+makedepends=('cmake' 'automoc4' 'boost')
+source=(http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2;)
+sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+
+  # Use the python2 executable
+  find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env 
python|#!/usr/bin/env python2|'
+}