date:20121015

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

2012-10-15 Thread Eric Bélanger

Date: Tuesday, October 16, 2012 @ 02:31:40
  Author: eric
Revision: 168806

Change source url (close FS#30661)

Modified:
  imagemagick/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 04:32:11 UTC (rev 168805)
+++ PKGBUILD2012-10-16 06:31:40 UTC (rev 168806)
@@ -10,7 +10,7 @@
 license=('custom')
 makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
  'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz
 \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz
 \
 perlmagick.rpath.patch)
 sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c'
   '23405f80904b1de94ebd7bd6fe2a332471b8c283')

[arch-commits] Commit in python-numpy/repos (7 files)

2012-10-15 Thread Allan McRae

Date: Tuesday, October 16, 2012 @ 00:32:11
  Author: allan
Revision: 168805

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

Added:
  python-numpy/repos/staging-i686/PKGBUILD
(from rev 168804, python-numpy/trunk/PKGBUILD)
  python-numpy/repos/staging-i686/numpy-1.6.2-python-3.3-build-fix.patch
(from rev 168804, python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch)
  python-numpy/repos/staging-x86_64/
  python-numpy/repos/staging-x86_64/PKGBUILD
(from rev 168804, python-numpy/trunk/PKGBUILD)
  python-numpy/repos/staging-x86_64/numpy-1.6.2-python-3.3-build-fix.patch
(from rev 168804, python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch)
Deleted:
  python-numpy/repos/staging-i686/PKGBUILD
  python-numpy/repos/staging-i686/numpy-1.6.2-python-3.3-build-fix.patch

---+
 staging-i686/PKGBUILD |  128 ++--
 staging-i686/numpy-1.6.2-python-3.3-build-fix.patch   |  160 
 staging-x86_64/PKGBUILD   |   64 ++
 staging-x86_64/numpy-1.6.2-python-3.3-build-fix.patch |   80 
 4 files changed, 288 insertions(+), 144 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-10-16 04:25:31 UTC (rev 168804)
+++ staging-i686/PKGBUILD   2012-10-16 04:32:11 UTC (rev 168805)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: Angel 'angvp' Velasquez  
-
-pkgbase=python-numpy
-pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Scientific tools for Python"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://numpy.scipy.org/";
-makedepends=('lapack' 'python' 'python2' 'python-distribute' 
'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
-numpy-1.6.2-python-3.3-build-fix.patch)
-md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba'
- 'e0fdbcfc9f6193b6762383b4693e749e')
-
-build() {
-  cd "${srcdir}"
-  cp -a numpy-${pkgver} numpy-py2-${pkgver}
-
-  export Atlas=None
-  export LDFLAGS="$LDFLAGS -shared"
-
-  echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 build
-
-  echo "Building Python3"
-  cd "${srcdir}/numpy-${pkgver}"
-  patch -Np1 -i $srcdir/numpy-1.6.2-python-3.3-build-fix.patch
-  python setup.py config_fc --fcompiler=gnu95 build
-}
-
-package_python2-numpy() {
-  depends=('lapack' 'python2')
-  optdepends=('python-nose: testsuite')
-
-  cd "${srcdir}/numpy-py2-${pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr 
--root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
- $(find ${pkgdir} -name '*.py')
-}
-
-package_python-numpy() {
-  depends=('lapack' 'python')
-  provides=("python3-numpy=${pkgver}")
-  replaces=('python3-numpy')
-  conflicts=('python3-numpy')
-
-  cd "${srcdir}/numpy-${pkgver}"
-  python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr 
--root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
-}

Copied: python-numpy/repos/staging-i686/PKGBUILD (from rev 168804, 
python-numpy/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 04:32:11 UTC (rev 168805)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: Angel 'angvp' Velasquez  
+
+pkgbase=python-numpy
+pkgname=('python2-numpy' 'python-numpy')
+pkgver=1.6.2
+pkgrel=2
+pkgdesc="Scientific tools for Python"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://numpy.scipy.org/";
+makedepends=('lapack' 'python' 'python2' 'python-distribute' 
'python2-distribute' 'gcc-fortran' 'python-nose')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
+numpy-1.6.2-python-3.3-build-fix.patch)
+md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba'
+ 'e0fdbcfc9f6193b6762383b4693e749e')
+
+build() {
+  cd "${srcdir}"
+  cp -a numpy-${pkgver} numpy-py2-${pkgver}
+
+  export Atlas=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  echo "Building Python2"
+  cd "${srcdir}/numpy-py2-${pkgver}"
+  python2 setup.py config_fc --fcompiler=gnu95 build
+
+  echo "Building Python3"
+  cd "${srcdir}/numpy-${pkgver}"
+  patch -Np1 -i $srcdir/numpy-1.6.2-python-3.3-build-fix.patch
+  python s

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

2012-10-15 Thread Allan McRae

Date: Tuesday, October 16, 2012 @ 00:25:31
  Author: allan
Revision: 168804

archrelease: copy trunk to staging-i686

Added:
  python-numpy/repos/staging-i686/
  python-numpy/repos/staging-i686/PKGBUILD
(from rev 168803, python-numpy/trunk/PKGBUILD)
  python-numpy/repos/staging-i686/numpy-1.6.2-python-3.3-build-fix.patch
(from rev 168803, python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch)

+
 PKGBUILD   |   64 
 numpy-1.6.2-python-3.3-build-fix.patch |   80 +++
 2 files changed, 144 insertions(+)

Copied: python-numpy/repos/staging-i686/PKGBUILD (from rev 168803, 
python-numpy/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 04:25:31 UTC (rev 168804)
@@ -0,0 +1,64 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: Angel 'angvp' Velasquez  
+
+pkgbase=python-numpy
+pkgname=('python2-numpy' 'python-numpy')
+pkgver=1.6.2
+pkgrel=2
+pkgdesc="Scientific tools for Python"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://numpy.scipy.org/";
+makedepends=('lapack' 'python' 'python2' 'python-distribute' 
'python2-distribute' 'gcc-fortran' 'python-nose')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
+numpy-1.6.2-python-3.3-build-fix.patch)
+md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba'
+ 'e0fdbcfc9f6193b6762383b4693e749e')
+
+build() {
+  cd "${srcdir}"
+  cp -a numpy-${pkgver} numpy-py2-${pkgver}
+
+  export Atlas=None
+  export LDFLAGS="$LDFLAGS -shared"
+
+  echo "Building Python2"
+  cd "${srcdir}/numpy-py2-${pkgver}"
+  python2 setup.py config_fc --fcompiler=gnu95 build
+
+  echo "Building Python3"
+  cd "${srcdir}/numpy-${pkgver}"
+  patch -Np1 -i $srcdir/numpy-1.6.2-python-3.3-build-fix.patch
+  python setup.py config_fc --fcompiler=gnu95 build
+}
+
+package_python2-numpy() {
+  depends=('lapack' 'python2')
+  optdepends=('python-nose: testsuite')
+
+  cd "${srcdir}/numpy-py2-${pkgver}"
+  python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr 
--root="${pkgdir}" --optimize=1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
+  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
+
+  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+ $(find ${pkgdir} -name '*.py')
+}
+
+package_python-numpy() {
+  depends=('lapack' 'python')
+  provides=("python3-numpy=${pkgver}")
+  replaces=('python3-numpy')
+  conflicts=('python3-numpy')
+
+  cd "${srcdir}/numpy-${pkgver}"
+  python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr 
--root="${pkgdir}" --optimize=1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
+  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
+}

Copied: python-numpy/repos/staging-i686/numpy-1.6.2-python-3.3-build-fix.patch 
(from rev 168803, python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch)
===
--- staging-i686/numpy-1.6.2-python-3.3-build-fix.patch 
(rev 0)
+++ staging-i686/numpy-1.6.2-python-3.3-build-fix.patch 2012-10-16 04:25:31 UTC 
(rev 168804)
@@ -0,0 +1,80 @@
+diff --git a/numpy/core/src/multiarray/scalarapi.c 
b/numpy/core/src/multiarray/scalarapi.c
+index 00c71f9..0afdc17 100644
+--- a/numpy/core/src/multiarray/scalarapi.c
 b/numpy/core/src/multiarray/scalarapi.c
+@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject 
*base)
+ itemsize = (((itemsize - 1) >> 2) + 1) << 2;
+ }
+ }
++#if PY_VERSION_HEX >= 0x0303
++if (type_num == NPY_UNICODE) {
++PyObject *u, *args;
++char *buffer;
++if (swap) {
++buffer = malloc(itemsize);
++if (buffer == NULL) {
++PyErr_NoMemory();
++return NULL;
++}
++memcpy(buffer, data, itemsize);
++byte_swap_vector(buffer, itemsize >> 2, 4);
++} else {
++buffer = data;
++}
++u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
++itemsize >> 2);
++if (swap) {
++free(buffer);
++}
++if (u == NULL) {
++return NULL;
++}
++args = Py_BuildValue("(O)", u);
++if (args == NULL) {
++Py_DECREF(u);
++return NULL;
++}
++obj = type->tp_new(type, args, NULL);
++Py_DECREF(u);
++Py_DECREF(args);
++return obj;
++}
++#endif
+ if (type->tp_itemsize != 0) {
+ /* String type */
+ obj = type

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

2012-10-15 Thread Allan McRae

Date: Tuesday, October 16, 2012 @ 00:25:02
  Author: allan
Revision: 168803

upgpkg: python-numpy 1.6.2-2

python-3.3 rebuild

Added:
  python-numpy/trunk/numpy-1.6.2-python-3.3-build-fix.patch
Modified:
  python-numpy/trunk/PKGBUILD

+
 PKGBUILD   |9 ++-
 numpy-1.6.2-python-3.3-build-fix.patch |   80 +++
 2 files changed, 86 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 03:14:27 UTC (rev 168802)
+++ PKGBUILD2012-10-16 04:25:02 UTC (rev 168803)
@@ -6,14 +6,16 @@
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://numpy.scipy.org/";
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 
'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz
+numpy-1.6.2-python-3.3-build-fix.patch)
+md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba'
+ 'e0fdbcfc9f6193b6762383b4693e749e')
 
 build() {
   cd "${srcdir}"
@@ -28,6 +30,7 @@
 
   echo "Building Python3"
   cd "${srcdir}/numpy-${pkgver}"
+  patch -Np1 -i $srcdir/numpy-1.6.2-python-3.3-build-fix.patch
   python setup.py config_fc --fcompiler=gnu95 build
 }
 

Added: numpy-1.6.2-python-3.3-build-fix.patch
===
--- numpy-1.6.2-python-3.3-build-fix.patch  (rev 0)
+++ numpy-1.6.2-python-3.3-build-fix.patch  2012-10-16 04:25:02 UTC (rev 
168803)
@@ -0,0 +1,80 @@
+diff --git a/numpy/core/src/multiarray/scalarapi.c 
b/numpy/core/src/multiarray/scalarapi.c
+index 00c71f9..0afdc17 100644
+--- a/numpy/core/src/multiarray/scalarapi.c
 b/numpy/core/src/multiarray/scalarapi.c
+@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject 
*base)
+ itemsize = (((itemsize - 1) >> 2) + 1) << 2;
+ }
+ }
++#if PY_VERSION_HEX >= 0x0303
++if (type_num == NPY_UNICODE) {
++PyObject *u, *args;
++char *buffer;
++if (swap) {
++buffer = malloc(itemsize);
++if (buffer == NULL) {
++PyErr_NoMemory();
++return NULL;
++}
++memcpy(buffer, data, itemsize);
++byte_swap_vector(buffer, itemsize >> 2, 4);
++} else {
++buffer = data;
++}
++u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
++itemsize >> 2);
++if (swap) {
++free(buffer);
++}
++if (u == NULL) {
++return NULL;
++}
++args = Py_BuildValue("(O)", u);
++if (args == NULL) {
++Py_DECREF(u);
++return NULL;
++}
++obj = type->tp_new(type, args, NULL);
++Py_DECREF(u);
++Py_DECREF(args);
++return obj;
++}
++#endif
+ if (type->tp_itemsize != 0) {
+ /* String type */
+ obj = type->tp_alloc(type, itemsize);
+@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject 
*base)
+ memcpy(destptr, data, itemsize);
+ return obj;
+ }
++#if PY_VERSION_HEX < 0x0303
+ else if (type_num == PyArray_UNICODE) {
+ /* tp_alloc inherited from Python PyBaseObject_Type */
+ PyUnicodeObject *uni = (PyUnicodeObject*)obj;
+@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject 
*base)
+ #endif
+ return obj;
+ }
++#endif // PY_VERSION_HEX < 0x0303
+ else {
+ PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
+ vobj->base = NULL;
+diff --git a/numpy/core/src/multiarray/scalartypes.c.src 
b/numpy/core/src/multiarray/scalartypes.c.src
+index e547071..12745d7 100644
+--- a/numpy/core/src/multiarray/scalartypes.c.src
 b/numpy/core/src/multiarray/scalartypes.c.src
+@@ -2592,7 +2592,11 @@ finish:
+ *((npy_@name@ *)dest) = *((npy_@name@ *)src);
+ #elif @default@ == 1 /* unicode and strings */
+ if (itemsize == 0) { /* unicode */
++#if PY_VERSION_HEX >= 0x0303
++itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
++#else
+ itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
++#endif
+ }
+ memcpy(dest, src, itemsize);
+ /* @default@ == 2 won't get here */
+-- 
+1.7.12.3
+

[arch-commits] Commit in ftgl (3 files)

2012-10-15 Thread Jan Steffens

Date: Monday, October 15, 2012 @ 23:14:27
  Author: heftig
Revision: 168802

Fix building with glut installed. Just don't build the demo programs.

Modified:
  ftgl/repos/extra-i686/PKGBUILD
  ftgl/repos/extra-x86_64/PKGBUILD
  ftgl/trunk/PKGBUILD

-+
 repos/extra-i686/PKGBUILD   |1 +
 repos/extra-x86_64/PKGBUILD |1 +
 trunk/PKGBUILD  |1 +
 3 files changed, 3 insertions(+)

Modified: repos/extra-i686/PKGBUILD
===
--- repos/extra-i686/PKGBUILD   2012-10-16 01:54:36 UTC (rev 168801)
+++ repos/extra-i686/PKGBUILD   2012-10-16 03:14:27 UTC (rev 168802)
@@ -19,6 +19,7 @@
 
 build() {
   cd "$srcdir/$pkgname-${_pkgver/-/~}"
+  sed -i '/^SUBDIRS =/s/demo//' Makefile.in
   ./configure --prefix=/usr --with-pic --disable-static
   make
 }

Modified: repos/extra-x86_64/PKGBUILD
===
--- repos/extra-x86_64/PKGBUILD 2012-10-16 01:54:36 UTC (rev 168801)
+++ repos/extra-x86_64/PKGBUILD 2012-10-16 03:14:27 UTC (rev 168802)
@@ -19,6 +19,7 @@
 
 build() {
   cd "$srcdir/$pkgname-${_pkgver/-/~}"
+  sed -i '/^SUBDIRS =/s/demo//' Makefile.in
   ./configure --prefix=/usr --with-pic --disable-static
   make
 }

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2012-10-16 01:54:36 UTC (rev 168801)
+++ trunk/PKGBUILD  2012-10-16 03:14:27 UTC (rev 168802)
@@ -19,6 +19,7 @@
 
 build() {
   cd "$srcdir/$pkgname-${_pkgver/-/~}"
+  sed -i '/^SUBDIRS =/s/demo//' Makefile.in
   ./configure --prefix=/usr --with-pic --disable-static
   make
 }

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

2012-10-15 Thread Thomas Dziedzic

Date: Monday, October 15, 2012 @ 21:54:36
  Author: tdziedzic
Revision: 168801

cleanup md5sums

Modified:
  ruby/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 01:40:22 UTC (rev 168800)
+++ PKGBUILD2012-10-16 01:54:36 UTC (rev 168801)
@@ -13,7 +13,7 @@
 options=('!emptydirs' '!makeflags')
 
source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2";
 'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
+md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
  '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
@@ -65,5 +65,3 @@
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
 }
-md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
- '6fb8e7a09955e0f64be3158fb4a27e7a')

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:40:22
  Author: eric
Revision: 168800

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

Added:
  miro/repos/staging-i686/
  miro/repos/staging-i686/PKGBUILD
(from rev 168799, miro/trunk/PKGBUILD)
  miro/repos/staging-i686/ffmpeg.patch
(from rev 168799, miro/trunk/ffmpeg.patch)
  miro/repos/staging-i686/miro.install
(from rev 168799, miro/trunk/miro.install)
  miro/repos/staging-x86_64/
  miro/repos/staging-x86_64/PKGBUILD
(from rev 168799, miro/trunk/PKGBUILD)
  miro/repos/staging-x86_64/ffmpeg.patch
(from rev 168799, miro/trunk/ffmpeg.patch)
  miro/repos/staging-x86_64/miro.install
(from rev 168799, miro/trunk/miro.install)

-+
 staging-i686/PKGBUILD   |   49 
 staging-i686/ffmpeg.patch   |   63 ++
 staging-i686/miro.install   |   17 +++
 staging-x86_64/PKGBUILD |   49 
 staging-x86_64/ffmpeg.patch |   63 ++
 staging-x86_64/miro.install |   17 +++
 6 files changed, 258 insertions(+)

Copied: miro/repos/staging-i686/PKGBUILD (from rev 168799, miro/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 01:40:22 UTC (rev 168800)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+
+pkgname=miro
+pkgver=5.0.4
+pkgrel=2
+pkgdesc="The free and open source internet TV platform"
+arch=('i686' 'x86_64')
+url="http://www.getmiro.com";
+license=('GPL2')
+depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+ 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
+ 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
'python2-pycurl' 
+ 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
+makedepends=('pkg-config' 'boost')
+install=miro.install
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz";
+'ffmpeg.patch')
+sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
+  'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cd linux
+  patch -p2 -i "${srcdir}"/ffmpeg.patch
+
+  python2 setup.py install --root="${pkgdir}"
+
+  # fix miro startup script so --debug works with python2
+  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
+
+  # fix python scripts for python2
+  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" 
"${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
+  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py 
usr/share/miro/resources/searchengines/update-icons.py \
+usr/share/miro/resources/testdata/7digital-replies/generate.py; do
+sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
+  done
+
+  # Fakeroot segfaults on these; remove
+  if [ ${CARCH} == "i686" ]; then
+rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
+  else
+rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
+  fi
+}

Copied: miro/repos/staging-i686/ffmpeg.patch (from rev 168799, 
miro/trunk/ffmpeg.patch)
===
--- staging-i686/ffmpeg.patch   (rev 0)
+++ staging-i686/ffmpeg.patch   2012-10-16 01:40:22 UTC (rev 168800)
@@ -0,0 +1,63 @@
+--- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +
 miro-5.0.1/linux/miro-segmenter.c  2012-07-06 15:10:19.564146117 +
+@@ -156,7 +156,7 @@
+ exit(1);
+ }
+ 
+-ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++ret = avformat_open_input(&ic, input, ifmt, 0);
+ if (ret != 0) {
+ fprintf(stderr, "Could not open input file, make sure it is an mpegts 
file: %d\n", ret);
+ exit(1);
+@@ -215,12 +215,7 @@
+ }
+ }
+ 
+-if (av_set_parameters(oc, NULL) < 0) {
+-fprintf(stderr, "Invalid output format parameters\n");
+-exit(1);
+-}
+-
+-dump_format(oc, 0, input, 1);
++av_dump_format(oc, 0, input, 1);
+ 
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -233,12 +228,12 @@
+ }
+ }
+ 
+-if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+ 
+-if (av_write_header(oc)) {
++if (avformat_write_header(oc, NULL)) {
+ fprintf(stderr, "Could not write mpegts header to first output 
file\n");
+ 
+ exit(1);
+@@ -274,10 +269,1

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:40:06
  Author: eric
Revision: 168799

upgpkg: miro 5.0.4-2

Update depends for python2 pkg renaming, Fix removal of codegen.Linux on x86_64

Modified:
  miro/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 01:29:32 UTC (rev 168798)
+++ PKGBUILD2012-10-16 01:40:06 UTC (rev 168799)
@@ -3,16 +3,16 @@
 
 pkgname=miro
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com";
 license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
- 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
  'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
- 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
- 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
'python-pycurl' 
+ 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
'python2-pycurl' 
  'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
 makedepends=('pkg-config' 'boost')
 install=miro.install
@@ -34,16 +34,16 @@
   sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
 
   # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" 
${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py
+  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" 
"${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
   for i in usr/share/miro/resources/testdata/echonest-replies/generate.py 
usr/share/miro/resources/searchengines/update-icons.py \
 usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} 
+sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
   done
 
   # Fakeroot segfaults on these; remove
-  if [ ${arch} == "i686" ]; then
-rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true
+  if [ ${CARCH} == "i686" ]; then
+rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
   else
-rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true
+rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
   fi
 }

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:29:32
  Author: eric
Revision: 168798

archrelease: copy trunk to staging-any

Added:
  wicd/repos/staging-any/
  wicd/repos/staging-any/ChangeLog
(from rev 168797, wicd/trunk/ChangeLog)
  wicd/repos/staging-any/PKGBUILD
(from rev 168797, wicd/trunk/PKGBUILD)
  wicd/repos/staging-any/dbus_string_fix.patch
(from rev 168797, wicd/trunk/dbus_string_fix.patch)
  wicd/repos/staging-any/deepcopy+python27-fixes.patch
(from rev 168797, wicd/trunk/deepcopy+python27-fixes.patch)
  wicd/repos/staging-any/net-tools.patch
(from rev 168797, wicd/trunk/net-tools.patch)
  wicd/repos/staging-any/wicd-daemon
(from rev 168797, wicd/trunk/wicd-daemon)
  wicd/repos/staging-any/wicd-locale.patch
(from rev 168797, wicd/trunk/wicd-locale.patch)
  wicd/repos/staging-any/wicd-scripts-execution.patch
(from rev 168797, wicd/trunk/wicd-scripts-execution.patch)
  wicd/repos/staging-any/wicd.desktop
(from rev 168797, wicd/trunk/wicd.desktop)
  wicd/repos/staging-any/wicd.install
(from rev 168797, wicd/trunk/wicd.install)
  wicd/repos/staging-any/wicd_in_usr.patch
(from rev 168797, wicd/trunk/wicd_in_usr.patch)

---+
 ChangeLog |   40 +++
 PKGBUILD  |  101 +++
 dbus_string_fix.patch |   16 +++
 deepcopy+python27-fixes.patch |   72 +
 net-tools.patch   |   11 ++
 wicd-daemon   |   27 +
 wicd-locale.patch |   12 ++
 wicd-scripts-execution.patch  |   24 
 wicd.desktop  |   11 ++
 wicd.install  |   23 
 wicd_in_usr.patch |  208 
 11 files changed, 545 insertions(+)

Copied: wicd/repos/staging-any/ChangeLog (from rev 168797, wicd/trunk/ChangeLog)
===
--- staging-any/ChangeLog   (rev 0)
+++ staging-any/ChangeLog   2012-10-16 01:29:32 UTC (rev 168798)
@@ -0,0 +1,40 @@
+2008-10-07 Giovanni Scafora 
+
+   * wicd-1.5.3
+
+2008-09-03 Giovanni Scafora 
+
+   * wicd-1.5.1
+
+2008-01-11 Varun Acharya 
+
+   * wicd-1.4.1-4 moved to extra
+   * locale patch added to extra
+   * ethtool dependency fixed, thanks evdvelde (flyspray #9145)
+   * dhclient,wpa_supplicant are now deps
+   * wicd.install cleaned up
+
+2008-01-09 Varun Acharya 
+
+   * wicd-1.4.1-3 now in testing
+   * wicd-locale.patch added to cvs
+   * Locale issues fixed, see #9086
+
+2008-01-06 Varun Acharya 
+
+   * wicd-1.4.1 moved to extra
+   * tray icon bug fixed
+   * ChangeLog cleanup, thanks to evil overlord skeletor.
+  
+2008-01-03 Varun Acharya 
+
+   * wicd-1.4.0 now in testing
+
+2007-12-20 Varun Acharya 
+
+   * Added patch and removed sed from the PKGBUILD in testing
+
+2007-11-05 Varun Acharya 
+
+   * Cleaned up PKGBUILD, defaults to /usr/share
+   * Adopted from AUR and moved to testing/extra

Copied: wicd/repos/staging-any/PKGBUILD (from rev 168797, wicd/trunk/PKGBUILD)
===
--- staging-any/PKGBUILD(rev 0)
+++ staging-any/PKGBUILD2012-10-16 01:29:32 UTC (rev 168798)
@@ -0,0 +1,101 @@
+# $Id$
+# Maintainer: Daniel Isenmann 
+# Contributor: Rashif "Don Ray" Rahman 
+
+pkgbase=wicd
+pkgname=('wicd' 'wicd-gtk')
+pkgver=1.7.2.4
+pkgrel=4
+arch=(any)
+url="http://wicd.sourceforge.net/";
+license=('GPL2')
+conflicts=('wicd-svn')
+install=wicd.install
+source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
 wicd-daemon
+wicd.desktop
+dbus_string_fix.patch)
+makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext')
+options=('emptydirs')
+md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
+ 'f40e5f59998d0829707a7c9976afa8f8'
+ '326df163a5732d38741371baa4fce9e5'
+ '744b3c12fe901ed435351e884dc8cb1d')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
+  export PYTHON=python2
+  
+  patch -p0 < "$srcdir/dbus_string_fix.patch"
+  
+  python2 setup.py configure --no-install-init \
+--resume=/usr/share/wicd/scripts/ \
+ --suspend=/usr/share/wicd/scripts/ \
+ --verbose \
+ --python=/usr/bin/python2 \
+--lib=/usr/lib \
+--systemd=/usr/lib/systemd/system
+  
+  #HACK for https://bugs.launchpad.net/wicd/+bug/928589
+  mkdir -p translations/ast/LC_MESSAGES
+  msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
+}
+
+package_wicd() {
+  pkgdesc="Wired and wireless network manager for Linux"
+  depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
+   'inetutil

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:29:11
  Author: eric
Revision: 168797

upgpkg: wicd 1.7.2.4-4

Update depends and makedepends for python2 pkg renaming

Modified:
  wicd/trunk/PKGBUILD

--+
 PKGBUILD |   56 
 1 file changed, 28 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 01:12:35 UTC (rev 168796)
+++ PKGBUILD2012-10-16 01:29:11 UTC (rev 168797)
@@ -5,7 +5,7 @@
 pkgbase=wicd
 pkgname=('wicd' 'wicd-gtk')
 pkgver=1.7.2.4
-pkgrel=3
+pkgrel=4
 arch=(any)
 url="http://wicd.sourceforge.net/";
 license=('GPL2')
@@ -14,7 +14,7 @@
 source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
 wicd-daemon
 wicd.desktop
 dbus_string_fix.patch)
-makedepends=('python2' 'python-babel' 'python2-distribute' 'gettext')
+makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext')
 options=('emptydirs')
 md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
  'f40e5f59998d0829707a7c9976afa8f8'
@@ -22,12 +22,12 @@
  '744b3c12fe901ed435351e884dc8cb1d')
 
 build() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd "$srcdir/$pkgbase-$pkgver"
 
   find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
   export PYTHON=python2
   
-  patch -p0 < $srcdir/dbus_string_fix.patch
+  patch -p0 < "$srcdir/dbus_string_fix.patch"
   
   python2 setup.py configure --no-install-init \
 --resume=/usr/share/wicd/scripts/ \
@@ -44,30 +44,30 @@
 
 package_wicd() {
   pkgdesc="Wired and wireless network manager for Linux"
-  depends=('python2' 'dbus-python' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
-   'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 
'python2-urwid' 'pygobject' 'dbus-glib')
+  depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools'
+   'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 
'python2-urwid' 'python2-gobject2' 'dbus-glib')
   optdepends=('wicd-gtk: needed if you want the GTK interface')
   backup=('etc/wicd/encryption/templates/active')
   install=wicd.install  
 
-  cd $srcdir/$pkgbase-$pkgver
-  python2 setup.py install --optimize=1 --root=$pkgdir
+  cd "$srcdir/$pkgbase-$pkgver"
+  python2 setup.py install --optimize=1 --root="$pkgdir"
 
   # Add custom rc.d script
-  install -Dm755 $srcdir/wicd-daemon $pkgdir/etc/rc.d/wicd
+  install -Dm755 "$srcdir/wicd-daemon" "$pkgdir/etc/rc.d/wicd"
 
   cd build/lib/wicd
   for i in *.py; do
-install -Dm 755 $i $pkgdir/usr/lib/wicd/$i
+install -Dm 755 $i "$pkgdir/usr/lib/wicd/$i"
   done
   
-  rm -rf $pkgdir/usr/share/autostart
+  rm -rf "$pkgdir"/usr/share/autostart
 
   #deleting the GTK stuff
-  rm -rf $pkgdir/etc/xdg
-  rm -f $pkgdir/usr/bin/{wicd-client,wicd-gtk}
-  rm -rf $pkgdir/usr/share/{applications,icons,pixmaps}
-  rm -rf $pkgdir/usr/share/wicd/gtk  
+  rm -rf "$pkgdir"/etc/xdg
+  rm -f "$pkgdir"/usr/bin/{wicd-client,wicd-gtk}
+  rm -rf "$pkgdir"/usr/share/{applications,icons,pixmaps}
+  rm -rf "$pkgdir"/usr/share/wicd/gtk  
 }
 
 package_wicd-gtk() {
@@ -75,27 +75,27 @@
   depends=('wicd' 'pygtk')
   optdepends=('gksu: needed to access some preferences in gtk interface'
   'notification-daemon: needed if you want notifications'
-  'python-notify:  needed if you want notifications'
+  'python2-notify: needed if you want notifications'
   'hicolor-icon-theme')
 
-  cd $srcdir/$pkgbase-$pkgver
-  python2 setup.py install --optimize=1 --root=$pkgdir
+  cd "$srcdir/$pkgbase-$pkgver"
+  python2 setup.py install --optimize=1 --root="$pkgdir"
 
-  install -Dm644 $srcdir/wicd.desktop 
$pkgdir/usr/share/applications/wicd.desktop
+  install -Dm644 "$srcdir/wicd.desktop" 
"$pkgdir/usr/share/applications/wicd.desktop"
 
   cd build/lib/wicd
   for i in *.py; do
-install -Dm 755 $i $pkgdir/usr/lib/wicd/$i
+install -Dm 755 $i "$pkgdir"/usr/lib/wicd/$i
   done
   
   #deleting the core dirs which exists in wicd
-  rm -rf $pkgdir/etc/{wicd,dbus-1,rc.d,logrotate.d}
-  rm -rf $pkgdir/usr/{lib,sbin}
-  rm -rf 
$pkgdir/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli}
-  rm -rf $pkgdir/var
-  rm -f $pkgdir/usr/bin/{wicd-curses,wicd-cli}
+  rm -rf "$pkgdir"/etc/{wicd,dbus-1,rc.d,logrotate.d}
+  rm -rf "$pkgdir"/usr/{lib,sbin}
+  rm -rf 
"$pkgdir"/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli}
+  rm -rf "$pkgdir"/var
+  rm -f "$pkgdir"/usr/bin/{wicd-curses,wicd-cli}
 
-  rm -rf $pkgdir/usr/share/autostart
-  rm -rf $pkgdir/lib/
-  rm -rf $pkgdir/usr/share/dbus-1
+  rm -rf "$pkgdir"/usr/share/autostart
+  rm -rf "$pkgdir"/lib/
+  rm -rf "$pkgdir"/usr/share/dbus-1
 }

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:12:35
  Author: eric
Revision: 168796

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

Added:
  hplip/repos/staging-i686/
  hplip/repos/staging-i686/PKGBUILD
(from rev 168795, hplip/trunk/PKGBUILD)
  hplip/repos/staging-i686/cups-1.6-buildfix.diff
(from rev 168795, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/staging-i686/hplip.install
(from rev 168795, hplip/trunk/hplip.install)
  hplip/repos/staging-x86_64/
  hplip/repos/staging-x86_64/PKGBUILD
(from rev 168795, hplip/trunk/PKGBUILD)
  hplip/repos/staging-x86_64/cups-1.6-buildfix.diff
(from rev 168795, hplip/trunk/cups-1.6-buildfix.diff)
  hplip/repos/staging-x86_64/hplip.install
(from rev 168795, hplip/trunk/hplip.install)

---+
 staging-i686/PKGBUILD |   97 +++
 staging-i686/cups-1.6-buildfix.diff   |  392 
 staging-i686/hplip.install|   18 +
 staging-x86_64/PKGBUILD   |   97 +++
 staging-x86_64/cups-1.6-buildfix.diff |  392 
 staging-x86_64/hplip.install  |   18 +
 6 files changed, 1014 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 168795:168796 to see the changes.

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 21:12:19
  Author: eric
Revision: 168795

upgpkg: hplip 3.12.10.a-3

Update optdepends for python2 pkg renaming

Modified:
  hplip/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:45:16 UTC (rev 168794)
+++ PKGBUILD2012-10-16 01:12:19 UTC (rev 168795)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.12.10.a
-pkgrel=2
+pkgrel=3
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and 
some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com";
@@ -16,8 +16,8 @@
 optdepends=('cups: for printing support'
 'python2-dbus: for dbus support'
 'sane: for scanner support'
-'python-imaging: for commandline scanning support'
-'python-notify: for Desktop notification support'
+'python2-imaging: for commandline scanning support'
+'python2-notify: for Desktop notification support'
 'rpcbind: for network support'
 'python2-pyqt: for running hp-toolbox'
 'python2-gobject2: for running hp-toolbox'
@@ -37,7 +37,7 @@
  cd "$srcdir/$pkgname-${pkgver/.a/a}"
 
  # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
- patch -Np1 -i ${srcdir}/cups-1.6-buildfix.diff
+ patch -Np1 -i "${srcdir}/cups-1.6-buildfix.diff"
  
  export PYTHON=python2

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:45:16
  Author: allan
Revision: 168794

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

Added:
  pygobject/repos/staging-i686/
  pygobject/repos/staging-i686/PKGBUILD
(from rev 168793, pygobject/trunk/PKGBUILD)
  pygobject/repos/staging-x86_64/
  pygobject/repos/staging-x86_64/PKGBUILD
(from rev 168793, pygobject/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   58 ++
 staging-x86_64/PKGBUILD |   58 ++
 2 files changed, 116 insertions(+)

Copied: pygobject/repos/staging-i686/PKGBUILD (from rev 168793, 
pygobject/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 00:45:16 UTC (rev 168794)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ionut Biru 
+
+pkgbase=pygobject
+pkgname=(python-gobject python2-gobject pygobject-devel)
+pkgver=3.2.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://live.gnome.org/PyGObject";
+license=('LGPL')
+makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 
'gobject-introspection')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+options=('!libtool')
+sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
+
+build() {
+  cp -a "$pkgbase-$pkgver" python2-build
+  mkdir devel
+
+  (
+cd python2-build
+export PYTHON=/usr/bin/python2
+./configure --prefix=/usr
+make
+  )
+
+  (
+cd "$pkgbase-$pkgver"
+./configure --prefix=/usr
+make
+  )
+}
+
+package_python-gobject() {
+  pkgdesc="Python 3 bindings for GObject"
+  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
+
+  cd "$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
+}
+
+package_python2-gobject() {
+  pkgdesc="Python 2 bindings for GObject"
+  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
+
+  cd "python2-build"
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
+}
+
+package_pygobject-devel() {
+  pkgdesc="Development files for the pygobject bindings"
+  cd "devel"
+  mkdir -p "$pkgdir"/usr/{include,lib}
+  mv include "$pkgdir/usr/"
+  mv pkgconfig "$pkgdir/usr/lib/"
+}

Copied: pygobject/repos/staging-x86_64/PKGBUILD (from rev 168793, 
pygobject/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-16 00:45:16 UTC (rev 168794)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Ionut Biru 
+
+pkgbase=pygobject
+pkgname=(python-gobject python2-gobject pygobject-devel)
+pkgver=3.2.2
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://live.gnome.org/PyGObject";
+license=('LGPL')
+makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 
'gobject-introspection')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+options=('!libtool')
+sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
+
+build() {
+  cp -a "$pkgbase-$pkgver" python2-build
+  mkdir devel
+
+  (
+cd python2-build
+export PYTHON=/usr/bin/python2
+./configure --prefix=/usr
+make
+  )
+
+  (
+cd "$pkgbase-$pkgver"
+./configure --prefix=/usr
+make
+  )
+}
+
+package_python-gobject() {
+  pkgdesc="Python 3 bindings for GObject"
+  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
+
+  cd "$pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
+}
+
+package_python2-gobject() {
+  pkgdesc="Python 2 bindings for GObject"
+  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
+
+  cd "python2-build"
+  make DESTDIR="$pkgdir" install
+  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
+}
+
+package_pygobject-devel() {
+  pkgdesc="Development files for the pygobject bindings"
+  cd "devel"
+  mkdir -p "$pkgdir"/usr/{include,lib}
+  mv include "$pkgdir/usr/"
+  mv pkgconfig "$pkgdir/usr/lib/"
+}

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:44:28
  Author: allan
Revision: 168793

upgpkg: pygobject 3.2.2-2

python-3.3 rebuild

Modified:
  pygobject/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:40:21 UTC (rev 168792)
+++ PKGBUILD2012-10-16 00:44:28 UTC (rev 168793)
@@ -4,7 +4,7 @@
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject";
 license=('LGPL')

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:40:21
  Author: allan
Revision: 168792

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

Added:
  pygobject2/repos/staging-i686/
  pygobject2/repos/staging-i686/PKGBUILD
(from rev 168791, pygobject2/trunk/PKGBUILD)
  pygobject2/repos/staging-i686/python2-fix-type.patch
(from rev 168791, pygobject2/trunk/python2-fix-type.patch)
  pygobject2/repos/staging-i686/python3-fix-build.patch
(from rev 168791, pygobject2/trunk/python3-fix-build.patch)
  pygobject2/repos/staging-i686/python3-fix-maketrans.patch
(from rev 168791, pygobject2/trunk/python3-fix-maketrans.patch)
  pygobject2/repos/staging-x86_64/
  pygobject2/repos/staging-x86_64/PKGBUILD
(from rev 168791, pygobject2/trunk/PKGBUILD)
  pygobject2/repos/staging-x86_64/python2-fix-type.patch
(from rev 168791, pygobject2/trunk/python2-fix-type.patch)
  pygobject2/repos/staging-x86_64/python3-fix-build.patch
(from rev 168791, pygobject2/trunk/python3-fix-build.patch)
  pygobject2/repos/staging-x86_64/python3-fix-maketrans.patch
(from rev 168791, pygobject2/trunk/python3-fix-maketrans.patch)

+
 staging-i686/PKGBUILD  |   86 +++
 staging-i686/python2-fix-type.patch|   50 +++
 staging-i686/python3-fix-build.patch   |   34 ++
 staging-i686/python3-fix-maketrans.patch   |   36 +++
 staging-x86_64/PKGBUILD|   86 +++
 staging-x86_64/python2-fix-type.patch  |   50 +++
 staging-x86_64/python3-fix-build.patch |   34 ++
 staging-x86_64/python3-fix-maketrans.patch |   36 +++
 8 files changed, 412 insertions(+)

Copied: pygobject2/repos/staging-i686/PKGBUILD (from rev 168791, 
pygobject2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 00:40:21 UTC (rev 168792)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgbase=pygobject2
+pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
+pkgver=2.28.6
+pkgrel=7
+arch=('i686' 'x86_64')
+url="http://www.pygtk.org/";
+license=('LGPL')
+makedepends=('python' 'python2')
+source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
+python2-fix-type.patch
+python3-fix-build.patch
+python3-fix-maketrans.patch)
+options=('!libtool')
+sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
+'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
+'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
+'4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
+
+build() {
+  cd "${srcdir}"
+  cp -a "pygobject-${pkgver}" python2-build
+  mkdir devel
+
+  (
+cd python2-build
+export PYTHON=/usr/bin/python2
+./configure --prefix=/usr --disable-introspection
+make
+  )
+
+  (
+cd "pygobject-${pkgver}"
+#patches available in 2.28 branch but unreleased.
+patch -Np1 -i "${srcdir}/python2-fix-type.patch"
+patch -Np1 -i "${srcdir}/python3-fix-build.patch"
+patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+
+./configure --prefix=/usr --disable-introspection
+make
+  )
+}
+
+package_python-gobject2() {
+  pkgdesc="Python 3 bindings for GObject2"
+  depends=('glib2' 'pygobject2-devel' 'python')
+  replaces=('py3gobject')
+  provides=("py3gobject=$pkgver")
+
+  cd "${srcdir}/pygobject-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # Delete devel stuff
+  rm -r 
"$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
+}
+
+package_python2-gobject2() {
+  pkgdesc="Python 2 bindings for GObject2"
+  depends=('glib2' 'pygobject2-devel' 'python2')
+  replaces=('pygobject')
+  provides=("pygobject=$pkgver")
+
+  cd "${srcdir}/python2-build"
+  make DESTDIR="${pkgdir}" install
+
+  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
+xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # Split devel stuff
+  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
+"$srcdir/devel/"
+}
+
+package_pygobject2-devel() {
+  pkgdesc="Development files for the pygobject bindings"
+
+  cd "${srcdir}/devel"
+  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
+
+  mv include   "$pkgdir/usr/"
+  mv pkgconfig "$pkgdir/usr/lib/"
+  mv gtk-doc   "$pkgdir/usr/share/"
+  mv xsl   "$pkgdir/usr/share/pygobject/"
+}

Copied: pygobject2/repos/staging-i686/python2-fix-type.patch (from rev 168791, 
pygobject2/trunk/python2-fix-type.patch)
===
--- staging-i686/python2-fix-type.patch (rev 0)
+++ staging-i686/python2-fix-type.patch 2012-10-16 00:40:21 UTC (rev 168792)
@@ -0,0 +

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:39:17
  Author: allan
Revision: 168791

upgpkg: pygobject2 2.28.6-7

python-3.3 rebuild

Modified:
  pygobject2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:34:59 UTC (rev 168790)
+++ PKGBUILD2012-10-16 00:39:17 UTC (rev 168791)
@@ -4,7 +4,7 @@
 pkgbase=pygobject2
 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
 pkgver=2.28.6
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 url="http://www.pygtk.org/";
 license=('LGPL')

[arch-commits] Commit in vde2/repos (18 files)

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:34:59
  Author: allan
Revision: 168790

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

Added:
  vde2/repos/staging-i686/
  vde2/repos/staging-i686/PKGBUILD
(from rev 168789, vde2/trunk/PKGBUILD)
  vde2/repos/staging-i686/dhcpd.conf.sample
(from rev 168789, vde2/trunk/dhcpd.conf.sample)
  vde2/repos/staging-i686/iptables.rules.sample
(from rev 168789, vde2/trunk/iptables.rules.sample)
  vde2/repos/staging-i686/vde-config.sample
(from rev 168789, vde2/trunk/vde-config.sample)
  vde2/repos/staging-i686/vde-connection.sample
(from rev 168789, vde2/trunk/vde-connection.sample)
  vde2/repos/staging-i686/vde.conf
(from rev 168789, vde2/trunk/vde.conf)
  vde2/repos/staging-i686/vde.rc
(from rev 168789, vde2/trunk/vde.rc)
  vde2/repos/staging-i686/vde2.install
(from rev 168789, vde2/trunk/vde2.install)
  vde2/repos/staging-x86_64/
  vde2/repos/staging-x86_64/PKGBUILD
(from rev 168789, vde2/trunk/PKGBUILD)
  vde2/repos/staging-x86_64/dhcpd.conf.sample
(from rev 168789, vde2/trunk/dhcpd.conf.sample)
  vde2/repos/staging-x86_64/iptables.rules.sample
(from rev 168789, vde2/trunk/iptables.rules.sample)
  vde2/repos/staging-x86_64/vde-config.sample
(from rev 168789, vde2/trunk/vde-config.sample)
  vde2/repos/staging-x86_64/vde-connection.sample
(from rev 168789, vde2/trunk/vde-connection.sample)
  vde2/repos/staging-x86_64/vde.conf
(from rev 168789, vde2/trunk/vde.conf)
  vde2/repos/staging-x86_64/vde.rc
(from rev 168789, vde2/trunk/vde.rc)
  vde2/repos/staging-x86_64/vde2.install
(from rev 168789, vde2/trunk/vde2.install)

--+
 staging-i686/PKGBUILD|   50 ++
 staging-i686/dhcpd.conf.sample   |   12 +++
 staging-i686/iptables.rules.sample   |5 +
 staging-i686/vde-config.sample   |   35 ++
 staging-i686/vde-connection.sample   |6 +
 staging-i686/vde.conf|   11 +++
 staging-i686/vde.rc  |  113 +
 staging-i686/vde2.install|   10 ++
 staging-x86_64/PKGBUILD  |   50 ++
 staging-x86_64/dhcpd.conf.sample |   12 +++
 staging-x86_64/iptables.rules.sample |5 +
 staging-x86_64/vde-config.sample |   35 ++
 staging-x86_64/vde-connection.sample |6 +
 staging-x86_64/vde.conf  |   11 +++
 staging-x86_64/vde.rc|  113 +
 staging-x86_64/vde2.install  |   10 ++
 16 files changed, 484 insertions(+)

Copied: vde2/repos/staging-i686/PKGBUILD (from rev 168789, vde2/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 00:34:59 UTC (rev 168790)
@@ -0,0 +1,50 @@
+# $Id$
+# Contributor: Sergej Pupykin
+# Maintainer: Tobias Powalowski 
+pkgname=vde2
+pkgver=2.3.2
+pkgrel=2
+pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
+url="http://sourceforge.net/projects/vde/";
+license=("GPL" "LGPL" "CUSTOM")
+arch=('i686' 'x86_64')
+depends=('bash' 'libpcap' 'openssl')
+makedepends=('python')
+backup=(etc/conf.d/vde)
+source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
+dhcpd.conf.sample
+iptables.rules.sample
+vde-config.sample
+vde-connection.sample
+vde.conf
+vde.rc)
+install=vde2.install
+options=(!libtool !makeflags)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
+ --enable-experimental
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver 
+  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc 
libexecdir=$pkgdir/usr/lib/vde2 install
+  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
+  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
+  install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
+  install -D -m 644 ../vde-connection.sample 
$pkgdir/etc/vde/vde-connection.sample
+  install -D -m 644 ../dhcpd.conf.sample 
$pkgdir/usr/share/vde2/dhcpd.conf.sample
+  install -D -m 644 ../iptables.rules.sample 
$pkgdir/usr/share/vde2/iptables.rules.sample
+  # install slirp license
+  install -D -m 644 COPYING.slirpvde 
$pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
+}
+
+md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
+ '7d9bc56d2e561d849e915000d1c0f269'
+ 'a920123fc620bcedbccb703a8d1bdc55'
+ 'cb8ace28e8efd4dad128be4be71b3b07'
+ '63033c33565e2030541c5e05e9d9b063'
+ 'a22730f051f4840da4a3162a88ff8156'
+ '6c7dc01bc2f039f0ff1682ee70d3d1da')

Copied: vde2/repos/staging-i686/dhcpd.conf.sample (from rev 168789, 
vde2/trunk/dhcpd.conf.sample)
===
--- staging-i686/dhcpd.conf.sample  (rev 0)
+++ staging-i686/dhcpd.conf.sample

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:33:08
  Author: allan
Revision: 168789

upgpkg: vde2 2.3.2-2

python-3.3 rebuild

Modified:
  vde2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:26:49 UTC (rev 168788)
+++ PKGBUILD2012-10-16 00:33:08 UTC (rev 168789)
@@ -3,12 +3,13 @@
 # Maintainer: Tobias Powalowski 
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/";
 license=("GPL" "LGPL" "CUSTOM")
 arch=('i686' 'x86_64')
 depends=('bash' 'libpcap' 'openssl')
+makedepends=('python')
 backup=(etc/conf.d/vde)
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
 dhcpd.conf.sample

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:26:49
  Author: allan
Revision: 168788

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

Added:
  python-pyspi/repos/staging-i686/
  python-pyspi/repos/staging-i686/PKGBUILD
(from rev 168787, python-pyspi/trunk/PKGBUILD)
  python-pyspi/repos/staging-i686/pyspi-build.patch
(from rev 168787, python-pyspi/trunk/pyspi-build.patch)
  python-pyspi/repos/staging-x86_64/
  python-pyspi/repos/staging-x86_64/PKGBUILD
(from rev 168787, python-pyspi/trunk/PKGBUILD)
  python-pyspi/repos/staging-x86_64/pyspi-build.patch
(from rev 168787, python-pyspi/trunk/pyspi-build.patch)

--+
 staging-i686/PKGBUILD|   32 
 staging-i686/pyspi-build.patch   | 1693 +
 staging-x86_64/PKGBUILD  |   32 
 staging-x86_64/pyspi-build.patch | 1693 +
 4 files changed, 3450 insertions(+)

The diff is longer than the limit of 200KB.
Use svn diff -r 168787:168788 to see the changes.

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:26:07
  Author: allan
Revision: 168787

upgpkg: python-pyspi 0.6.1-1

python2 renaming

Modified:
  python-pyspi/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:08:04 UTC (rev 168786)
+++ PKGBUILD2012-10-16 00:26:07 UTC (rev 168787)
@@ -2,18 +2,18 @@
 # Maintainer: Jan de Groot 
 # Contributor: William Rea 
 
-pkgname=python-pyspi
+pkgbase=python-pyspi
+pkgname=python2-pyspi
 pkgver=0.6.1
-pkgrel=5
+pkgrel=1
 pkgdesc="Python AT-SPI bindings"
 arch=('i686' 'x86_64')
 url="http://people.redhat.com/zcerza/dogtail";
 license=('LGPL')
 depends=('python2' 'at-spi')
 makedepends=('pyrex')
-conflicts=('pyspi')
-provides=('pyspi')
-replaces=('pyspi')
+conflicts=('python-pyspi<=0.6.1-5')
+conflicts=('python-pyspi<=0.6.1-5')
 source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz";
 'pyspi-build.patch')
 md5sums=('def336bd566ea688a06ec03db7ccf1f4'
@@ -24,5 +24,9 @@
   patch -Np1 -i ${srcdir}/pyspi-build.patch
   # Pyrex tells us to use __cinit__ instead of __new__
   sed -i 's/__new__/__cinit__/' pyspi.pyx
+}
+
+package_python2-pyspi() {
+  cd ${srcdir}/pyspi-${pkgver}
   python2 setup.py install --root=${pkgdir}
 }

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:08:04
  Author: allan
Revision: 168786

archrelease: copy trunk to staging-any

Added:
  gajim/repos/staging-any/
  gajim/repos/staging-any/PKGBUILD
(from rev 168785, gajim/trunk/PKGBUILD)
  gajim/repos/staging-any/gajim.install
(from rev 168785, gajim/trunk/gajim.install)

---+
 PKGBUILD  |   38 ++
 gajim.install |   11 +++
 2 files changed, 49 insertions(+)

Copied: gajim/repos/staging-any/PKGBUILD (from rev 168785, gajim/trunk/PKGBUILD)
===
--- staging-any/PKGBUILD(rev 0)
+++ staging-any/PKGBUILD2012-10-16 00:08:04 UTC (rev 168786)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gajim
+pkgver=0.15.1
+pkgrel=2
+pkgdesc="A full featured and easy to use Jabber client"
+arch=('any')
+url="http://www.gajim.org/";
+license=('GPL3')
+depends=('pygtk' 'python2-pyopenssl' 'hicolor-icon-theme' 'dnsutils' 
'python2-pyasn1')
+makedepends=('gettext' 'intltool')
+optdepends=('dbus-python: dbus support'
+'farstream: for video/voice support'
+'gstreamer0.10-bad: for video/voice support'
+   'gstreamer0.10-python: for video/voice support'
+'gtkspell: for spelling support'
+'libxss: for idle module'
+'notification-daemon: for desktop notification'
+'python2-gnomekeyring: for GnomeKeyring support'
+'python2-crypto: support for E2E encryption'
+'python2-docutils: for RST generator support'
+'gupnp-igd: for UPnP-IGD support')
+options=('!libtool')
+install=gajim.install
+source=(http://www.gajim.org/downloads/${pkgver%.*}/gajim-${pkgver}.tar.bz2)
+sha1sums=('1a72f48a8d5b60169af456a2006457cbd32a4a9c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  PYTHON=python2 ./configure --prefix=/usr --enable-site-packages
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Copied: gajim/repos/staging-any/gajim.install (from rev 168785, 
gajim/trunk/gajim.install)
===
--- staging-any/gajim.install   (rev 0)
+++ staging-any/gajim.install   2012-10-16 00:08:04 UTC (rev 168786)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:07:38
  Author: allan
Revision: 168785

upgpkg: gajim 0.15.1-2

python2 dependency renaming

Modified:
  gajim/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-16 00:01:27 UTC (rev 168784)
+++ PKGBUILD2012-10-16 00:07:38 UTC (rev 168785)
@@ -3,7 +3,7 @@
 
 pkgname=gajim
 pkgver=0.15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A full featured and easy to use Jabber client"
 arch=('any')
 url="http://www.gajim.org/";
@@ -17,8 +17,8 @@
 'gtkspell: for spelling support'
 'libxss: for idle module'
 'notification-daemon: for desktop notification'
-'python-gnomekeyring: for GnomeKeyring support'
-'pycrypto: support for E2E encryption'
+'python2-gnomekeyring: for GnomeKeyring support'
+'python2-crypto: support for E2E encryption'
 'python2-docutils: for RST generator support'
 'gupnp-igd: for UPnP-IGD support')
 options=('!libtool')

[arch-commits] Commit in gnome-python-desktop/repos (6 files)

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:01:27
  Author: allan
Revision: 168784

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

Added:
  gnome-python-desktop/repos/staging-i686/
  gnome-python-desktop/repos/staging-i686/PKGBUILD
(from rev 168783, gnome-python-desktop/trunk/PKGBUILD)
  
gnome-python-desktop/repos/staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch
(from rev 168783, 
gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)
  gnome-python-desktop/repos/staging-x86_64/
  gnome-python-desktop/repos/staging-x86_64/PKGBUILD
(from rev 168783, gnome-python-desktop/trunk/PKGBUILD)
  
gnome-python-desktop/repos/staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch
(from rev 168783, 
gnome-python-desktop/trunk/gnome-python-desktop-2.32.0-metacity-build.patch)

-+
 staging-i686/PKGBUILD   |  107 
++
 staging-i686/gnome-python-desktop-2.32.0-metacity-build.patch   |   42 +++
 staging-x86_64/PKGBUILD |  107 
++
 staging-x86_64/gnome-python-desktop-2.32.0-metacity-build.patch |   42 +++
 4 files changed, 298 insertions(+)

Copied: gnome-python-desktop/repos/staging-i686/PKGBUILD (from rev 168783, 
gnome-python-desktop/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-16 00:01:27 UTC (rev 168784)
@@ -0,0 +1,107 @@
+# $Id$
+# Maintainer: Jan de Groot 
+# Contributor: Arjan Timmerman 
+# Contributor: Wael Nasreddine 
+
+pkgbase=gnome-python-desktop
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 
'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 
'python2-wnck')
+pkgver=2.32.0
+pkgrel=11
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+options=('!libtool')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 
'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
+url="http://www.gnome.org";
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
+gnome-python-desktop-2.32.0-metacity-build.patch)
+sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
+'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
+  make
+}
+
+package_gnome-python-desktop() {
+  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 
'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 
'gnome2-python')
+  pkgdesc="Python bindings for the GNOME desktop environment"
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make install-pkgconfigDATA DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomedesktop() {
+  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
+  pkgdesc="Python bindings for gnome-desktop 2.x"
+  conflicts=('python-gnomedesktop<=2.32.0-10')
+  replaces=('python-gnomedesktop<=2.32.0-10')
+  
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C gnomedesktop install DESTDIR="${pkgdir}"
+}
+
+package_python2-gnomekeyring() {
+  depends=('pygtk' 'libgnome-keyring')
+  pkgdesc="Python bindings for libgnome-keyring"
+  conflicts=('python-gnomekeyring<=2.32.0-10')
+  replaces=('python-gnomekeyring<=2.32.0-10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C gnomekeyring install DESTDIR="${pkgdir}"
+}
+
+package_python2-gtop() {
+  depends=('pygtk' 'libgtop')
+  pkgdesc="Python bindings for libgtop"
+  conflicts=('python-gtop<=2.32.0-10')
+  replaces=('python-gtop<=2.32.0-10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C gtop install DESTDIR="${pkgdir}"
+}
+
+package_python2-metacity() {
+  depends=('pygtk' 'metacity')
+  pkgdesc="Python bindings for metacity"
+  conflicts=('python-metacity<=2.32.0-10')
+  replaces=('python-metacity<=2.32.0-10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C metacity install DESTDIR="${pkgdir}"
+}
+
+package_python2-rsvg() {
+  depends=('pygtk' 'librsvg')
+  pkgdesc="Python bindings for librsvg"
+  conflicts=('python-rsvg<=2.32.0-10')
+  replaces=('python-rsvg<=2.32.0-10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C rsvg install DESTDIR="${pkgdir}"
+  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
+  install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
+}
+
+package_python2-totem-plparser() {
+  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
+  pkgdesc="Python bindings for totem-plparser"
+  conflicts=('python-totem-plparser<=2.32.0-10')
+  replaces=('python-totem-plparser<=2.32.0-10')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C totem install DESTDIR="${pkgdir}"
+  install -m755 -d "${pkgdir}/usr/share/py

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

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 20:00:41
  Author: allan
Revision: 168783

upgpkg: gnome-python-desktop 2.32.0-11

python2 renaming

Modified:
  gnome-python-desktop/trunk/PKGBUILD

--+
 PKGBUILD |   36 +---
 1 file changed, 25 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 23:26:45 UTC (rev 168782)
+++ PKGBUILD2012-10-16 00:00:41 UTC (rev 168783)
@@ -4,9 +4,9 @@
 # Contributor: Wael Nasreddine 
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-gnomedesktop' 'python-gnomekeyring' 
'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 
'python-wnck')
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 
'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 
'python2-wnck')
 pkgver=2.32.0
-pkgrel=10
+pkgrel=11
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 options=('!libtool')
@@ -25,48 +25,58 @@
 }
 
 package_gnome-python-desktop() {
-  depends=('python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 
'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 
'gnome-python')
+  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 
'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 
'gnome2-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
-package_python-gnomedesktop() {
+package_python2-gnomedesktop() {
   depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
   pkgdesc="Python bindings for gnome-desktop 2.x"
-
+  conflicts=('python-gnomedesktop<=2.32.0-10')
+  replaces=('python-gnomedesktop<=2.32.0-10')
+  
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gnomedesktop install DESTDIR="${pkgdir}"
 }
 
-package_python-gnomekeyring() {
+package_python2-gnomekeyring() {
   depends=('pygtk' 'libgnome-keyring')
   pkgdesc="Python bindings for libgnome-keyring"
+  conflicts=('python-gnomekeyring<=2.32.0-10')
+  replaces=('python-gnomekeyring<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gnomekeyring install DESTDIR="${pkgdir}"
 }
 
-package_python-gtop() {
+package_python2-gtop() {
   depends=('pygtk' 'libgtop')
   pkgdesc="Python bindings for libgtop"
+  conflicts=('python-gtop<=2.32.0-10')
+  replaces=('python-gtop<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C gtop install DESTDIR="${pkgdir}"
 }
 
-package_python-metacity() {
+package_python2-metacity() {
   depends=('pygtk' 'metacity')
   pkgdesc="Python bindings for metacity"
+  conflicts=('python-metacity<=2.32.0-10')
+  replaces=('python-metacity<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C metacity install DESTDIR="${pkgdir}"
 }
 
-package_python-rsvg() {
+package_python2-rsvg() {
   depends=('pygtk' 'librsvg')
   pkgdesc="Python bindings for librsvg"
+  conflicts=('python-rsvg<=2.32.0-10')
+  replaces=('python-rsvg<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C rsvg install DESTDIR="${pkgdir}"
@@ -74,9 +84,11 @@
   install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 }
 
-package_python-totem-plparser() {
+package_python2-totem-plparser() {
   depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
   pkgdesc="Python bindings for totem-plparser"
+  conflicts=('python-totem-plparser<=2.32.0-10')
+  replaces=('python-totem-plparser<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C totem install DESTDIR="${pkgdir}"
@@ -84,9 +96,11 @@
   install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
 }
 
-package_python-wnck() {
+package_python2-wnck() {
   depends=('pygtk' 'libwnck')
   pkgdesc="Python bindings for libwnck"
+  conflicts=('python-wnck<=2.32.0-10')
+  replaces=('python-wnck<=2.32.0-10')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make -C wnck install DESTDIR="${pkgdir}"

[arch-commits] Commit in systemd/repos (staging-x86_64)

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 19:26:45
  Author: allan
Revision: 168782

db-remove: systemd removed by allan

Deleted:
  systemd/repos/staging-x86_64/

[arch-commits] Commit in systemd/repos (staging-i686)

2012-10-15 Thread Allan McRae

Date: Monday, October 15, 2012 @ 19:26:36
  Author: allan
Revision: 168781

db-remove: systemd removed by allan

Deleted:
  systemd/repos/staging-i686/

[arch-commits] Commit in deluge/repos (9 files)

2012-10-15 Thread Jan Steffens

Date: Monday, October 15, 2012 @ 18:50:32
  Author: heftig
Revision: 168780

archrelease: copy trunk to staging-any

Added:
  deluge/repos/staging-any/
  deluge/repos/staging-any/PKGBUILD
(from rev 168779, deluge/trunk/PKGBUILD)
  deluge/repos/staging-any/deluge-web
(from rev 168779, deluge/trunk/deluge-web)
  deluge/repos/staging-any/deluge-web.service
(from rev 168779, deluge/trunk/deluge-web.service)
  deluge/repos/staging-any/deluge.install
(from rev 168779, deluge/trunk/deluge.install)
  deluge/repos/staging-any/deluge.tmpfiles.conf
(from rev 168779, deluge/trunk/deluge.tmpfiles.conf)
  deluge/repos/staging-any/deluged
(from rev 168779, deluge/trunk/deluged)
  deluge/repos/staging-any/deluged.conf
(from rev 168779, deluge/trunk/deluged.conf)
  deluge/repos/staging-any/deluged.service
(from rev 168779, deluge/trunk/deluged.service)

--+
 PKGBUILD |   56 +
 deluge-web   |   45 +++
 deluge-web.service   |   11 +
 deluge.install   |   28 
 deluge.tmpfiles.conf |1 
 deluged  |   43 +
 deluged.conf |2 +
 deluged.service  |   13 +++
 8 files changed, 199 insertions(+)

Copied: deluge/repos/staging-any/PKGBUILD (from rev 168779, 
deluge/trunk/PKGBUILD)
===
--- staging-any/PKGBUILD(rev 0)
+++ staging-any/PKGBUILD2012-10-15 22:50:32 UTC (rev 168780)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Ionut Biru 
+# Contributor: Hugo Doria 
+
+pkgname=deluge
+pkgver=1.3.5
+pkgrel=2
+pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
+arch=('any')
+url="http://deluge-torrent.org/";
+license=('GPL3')
+depends=(python2-xdg 'libtorrent-rasterbar>=0.15.0' twisted python2-pyopenssl
+ xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
+ python2-distribute)
+makedepends=(intltool pygtk librsvg python2-mako)
+optdepends=('python2-notify: libnotify notifications'
+'pygtk: needed for gtk ui'
+'librsvg: needed for gtk ui'
+'python2-mako: needed for web ui')
+backup=(etc/conf.d/deluged)
+install=deluge.install
+source=(http://download.deluge-torrent.org/source/$pkgname-$pkgver.tar.bz2
+deluge.tmpfiles.conf deluged deluge-web deluged.service 
deluge-web.service deluged.conf)
+md5sums=('f17ef6686f33e12694b44976e5ed7721'
+ 'c50385d32a2db0ef3f46b8caadb0e988'
+ '443690c730263b76a465dc413f695a86'
+ '37538a1b049b177e9ea1014331e29689'
+ '6b831c889f365f58317dc4b78c167a62'
+ 'b3fff6601a5971bba89fa9a85dcf9ce8'
+ '71d556cf7ce3bb59391797827347e80c')
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+  install -Dm644 deluge/data/pixmaps/deluge.svg 
"$pkgdir/usr/share/pixmaps/deluge.svg"
+
+  _dir="$pkgdir/usr/lib/python2.7/site-packages/deluge/ui"
+  sed -i '1s/python$/&2/' "$_dir"/{Win32IconImagePlugin.py,web/gen_gettext.py}
+
+  cd ..
+  install -Dm644 deluge.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/deluge.conf"
+  install -D deluged "$pkgdir/etc/rc.d/deluged"
+  install -D deluge-web "$pkgdir/etc/rc.d/deluge-web"
+  install -Dm644 deluged.service 
"$pkgdir/usr/lib/systemd/system/deluged.service"
+  install -Dm644 deluge-web.service 
"$pkgdir/usr/lib/systemd/system/deluge-web.service"
+  install -Dm644 deluged.conf "$pkgdir/etc/conf.d/deluged"
+ 
+  install -d "$pkgdir/srv"
+  install -d -m 664 -o 125 -g 125 "$pkgdir/srv/deluge"
+}

Copied: deluge/repos/staging-any/deluge-web (from rev 168779, 
deluge/trunk/deluge-web)
===
--- staging-any/deluge-web  (rev 0)
+++ staging-any/deluge-web  2012-10-15 22:50:32 UTC (rev 168780)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/deluged
+
+PIDFILE=/run/deluge/deluge-web.pid
+WEB_OPTIONS="-f $WEB_OPTIONS"
+
+[[ -f $PIDFILE ]] && PID=$(<$PIDFILE)
+[[ -z $PID ]] || kill -0 $PID || PID=
+
+case "$1" in
+  start)
+stat_busy "Starting Deluge WebUI"
+[[ -z $PID ]] && su -l -s /bin/sh -c "/usr/bin/deluge-web $WEB_OPTIONS 
>/dev/null" deluge
+if [ $? -gt 0 ]; then
+  stat_fail
+else
+  sleep 1
+  echo $(pgrep -u deluge deluge-web) > $PIDFILE
+  add_daemon deluge-web
+  stat_done
+fi
+;;
+  stop)
+stat_busy "Stopping Deluge WebUI"
+[[ ! -z $PID ]] && kill $PID &> /dev/null
+if [ $? -gt 0 ]; then
+  stat_fail
+else
+  rm $PIDFILE
+  rm_daemon deluge-web
+  stat_done
+fi
+;;
+  restart)
+$0 stop
+sleep 1

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

2012-10-15 Thread Jan Steffens

Date: Monday, October 15, 2012 @ 18:48:38
  Author: heftig
Revision: 168779

staging rebuild (python)

Modified:
  deluge/trunk/PKGBUILD
  deluge/trunk/deluge.install

+
 PKGBUILD   |   18 --
 deluge.install |2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 22:15:07 UTC (rev 168778)
+++ PKGBUILD2012-10-15 22:48:38 UTC (rev 168779)
@@ -1,20 +1,20 @@
 # $Id$
-# Maintainer: Jan "heftig" Steffens 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Ionut Biru 
 # Contributor: Hugo Doria 
 
 pkgname=deluge
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent client with multiple user interfaces in a client/server 
model"
 arch=('any')
 url="http://deluge-torrent.org/";
 license=('GPL3')
-depends=('pyxdg' 'libtorrent-rasterbar>=0.15.0' 'twisted' 'python2-pyopenssl'
- 'xdg-utils' 'python2-chardet' 'desktop-file-utils' 
'hicolor-icon-theme'
- 'python2-distribute')
-makedepends=('intltool' 'pygtk' 'librsvg' 'python2-mako')
-optdepends=('python-notify: libnotify notifications'
+depends=(python2-xdg 'libtorrent-rasterbar>=0.15.0' twisted python2-pyopenssl
+ xdg-utils python2-chardet desktop-file-utils hicolor-icon-theme
+ python2-distribute)
+makedepends=(intltool pygtk librsvg python2-mako)
+optdepends=('python2-notify: libnotify notifications'
 'pygtk: needed for gtk ui'
 'librsvg: needed for gtk ui'
 'python2-mako: needed for web ui')
@@ -41,9 +41,7 @@
   install -Dm644 deluge/data/pixmaps/deluge.svg 
"$pkgdir/usr/share/pixmaps/deluge.svg"
 
   _dir="$pkgdir/usr/lib/python2.7/site-packages/deluge/ui"
-  sed -e '1s/python$/&2/' \
-  -i "$_dir/Win32IconImagePlugin.py" \
-  -i "$_dir/web/gen_gettext.py"
+  sed -i '1s/python$/&2/' "$_dir"/{Win32IconImagePlugin.py,web/gen_gettext.py}
 
   cd ..
   install -Dm644 deluge.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/deluge.conf"

Modified: deluge.install
===
--- deluge.install  2012-10-15 22:15:07 UTC (rev 168778)
+++ deluge.install  2012-10-15 22:48:38 UTC (rev 168779)
@@ -8,7 +8,7 @@
   post_upgrade
 
 cat <>> The optional headless daemon started using /etc/rc.d/deluged uses the 
"deluge" user.
+>>> The optional headless daemon started using deluged.service uses the 
"deluge" user.
 Its default download directory is /srv/deluge.
 EOF
 }

[arch-commits] Commit in quodlibet-plugins/repos (staging-any staging-any/PKGBUILD)

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 18:15:07
  Author: eric
Revision: 168778

archrelease: copy trunk to staging-any

Added:
  quodlibet-plugins/repos/staging-any/
  quodlibet-plugins/repos/staging-any/PKGBUILD
(from rev 168777, quodlibet-plugins/trunk/PKGBUILD)

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

Copied: quodlibet-plugins/repos/staging-any/PKGBUILD (from rev 168777, 
quodlibet-plugins/trunk/PKGBUILD)
===
--- staging-any/PKGBUILD(rev 0)
+++ staging-any/PKGBUILD2012-10-15 22:15:07 UTC (rev 168778)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=quodlibet-plugins
+pkgver=2.4.1
+pkgrel=2
+pkgdesc="Various plugins for QuodLibet"
+arch=('any')
+url="http://code.google.com/p/quodlibet/";
+license=('GPL2')
+depends=('quodlibet')
+optdepends=('gnome-python: for "Automatic Masking" and "View in Nautilus" 
plugins' 
+'python2-dbus: for "DBus Multimedia Keys", "Gajim Status Message" 
and "Notify" plugins' 
+'cddb-py: for "CDDB Lookup" plugin' 
+'python2-musicbrainz2: for "MusicBrainz Lookup" plugin' 
+'lastfmsubmitd: for "Last.fm Submission" plugin'
+'python2-pyinotify: for "Automatic library update" plugin')
+source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('abc576604dee471f712322635e3c8df21a398fdd')
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+  sed -i 's#env python#env python2#' songsmenu/{replaygain.py,_subprocobj.py}
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages/quodlibet/plugins"
+  cp -r editing events playorder songsmenu 
"${pkgdir}/usr/lib/python2.7/site-packages/quodlibet/plugins"
+}

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 18:14:58
  Author: eric
Revision: 168777

upgpkg: quodlibet-plugins 2.4.1-2

Update optdepends

Modified:
  quodlibet-plugins/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 21:23:50 UTC (rev 168776)
+++ PKGBUILD2012-10-15 22:14:58 UTC (rev 168777)
@@ -3,7 +3,7 @@
 
 pkgname=quodlibet-plugins
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Various plugins for QuodLibet"
 arch=('any')
 url="http://code.google.com/p/quodlibet/";
@@ -12,7 +12,7 @@
 optdepends=('gnome-python: for "Automatic Masking" and "View in Nautilus" 
plugins' 
 'python2-dbus: for "DBus Multimedia Keys", "Gajim Status Message" 
and "Notify" plugins' 
 'cddb-py: for "CDDB Lookup" plugin' 
-'python-musicbrainz2: for "MusicBrainz Lookup" plugin' 
+'python2-musicbrainz2: for "MusicBrainz Lookup" plugin' 
 'lastfmsubmitd: for "Last.fm Submission" plugin'
 'python2-pyinotify: for "Automatic library update" plugin')
 source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)

[arch-commits] Commit in lvm2/repos (16 files)

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 17:23:50
  Author: thomas
Revision: 168776

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

Added:
  lvm2/repos/testing-i686/
  lvm2/repos/testing-i686/11-dm-initramfs.rules
(from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
  lvm2/repos/testing-i686/PKGBUILD
(from rev 168775, lvm2/trunk/PKGBUILD)
  lvm2/repos/testing-i686/lvm-on-crypt.service
(from rev 168775, lvm2/trunk/lvm-on-crypt.service)
  lvm2/repos/testing-i686/lvm.service
(from rev 168775, lvm2/trunk/lvm.service)
  lvm2/repos/testing-i686/lvm2.conf
(from rev 168775, lvm2/trunk/lvm2.conf)
  lvm2/repos/testing-i686/lvm2_hook
(from rev 168775, lvm2/trunk/lvm2_hook)
  lvm2/repos/testing-i686/lvm2_install
(from rev 168775, lvm2/trunk/lvm2_install)
  lvm2/repos/testing-x86_64/
  lvm2/repos/testing-x86_64/11-dm-initramfs.rules
(from rev 168775, lvm2/trunk/11-dm-initramfs.rules)
  lvm2/repos/testing-x86_64/PKGBUILD
(from rev 168775, lvm2/trunk/PKGBUILD)
  lvm2/repos/testing-x86_64/lvm-on-crypt.service
(from rev 168775, lvm2/trunk/lvm-on-crypt.service)
  lvm2/repos/testing-x86_64/lvm.service
(from rev 168775, lvm2/trunk/lvm.service)
  lvm2/repos/testing-x86_64/lvm2.conf
(from rev 168775, lvm2/trunk/lvm2.conf)
  lvm2/repos/testing-x86_64/lvm2_hook
(from rev 168775, lvm2/trunk/lvm2_hook)
  lvm2/repos/testing-x86_64/lvm2_install
(from rev 168775, lvm2/trunk/lvm2_install)

--+
 testing-i686/11-dm-initramfs.rules   |3 +
 testing-i686/PKGBUILD|   72 +
 testing-i686/lvm-on-crypt.service|   16 +++
 testing-i686/lvm.service |   16 +++
 testing-i686/lvm2.conf   |2 
 testing-i686/lvm2_hook   |   24 +++
 testing-i686/lvm2_install|   31 ++
 testing-x86_64/11-dm-initramfs.rules |3 +
 testing-x86_64/PKGBUILD  |   72 +
 testing-x86_64/lvm-on-crypt.service  |   16 +++
 testing-x86_64/lvm.service   |   16 +++
 testing-x86_64/lvm2.conf |2 
 testing-x86_64/lvm2_hook |   24 +++
 testing-x86_64/lvm2_install  |   31 ++
 14 files changed, 328 insertions(+)

Copied: lvm2/repos/testing-i686/11-dm-initramfs.rules (from rev 168775, 
lvm2/trunk/11-dm-initramfs.rules)
===
--- testing-i686/11-dm-initramfs.rules  (rev 0)
+++ testing-i686/11-dm-initramfs.rules  2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,3 @@
+# needed with new udev/mkinitcpio and as implemented in dracut:
+# 

+SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", 
OPTIONS="db_persist"

Copied: lvm2/repos/testing-i686/PKGBUILD (from rev 168775, lvm2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-15 21:23:50 UTC (rev 168776)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+# Maintainer: Thomas Bächler 
+
+pkgbase=lvm2
+pkgname=('lvm2' 'device-mapper')
+pkgver=2.02.98
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://sourceware.org/lvm2/";
+license=('GPL2' 'LGPL2.1')
+groups=('base')
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
+lvm2_install
+lvm2_hook
+11-dm-initramfs.rules
+lvm.service
+   lvm-on-crypt.service
+lvm2.conf)
+sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
+  '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
+  '3e1680f9b76ce9150d08865d99db90fd15532271'
+  'cedc9948123c870f9c5aa3357d0075b41a9c8135'
+  'f6a554eea9557c3c236df2943bb6e7e723945c41'
+  'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
+  '652fb58dd7676caa0515f0a06d537744e071c6cf'
+  'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
+
+build() {
+  cd "${srcdir}/LVM2.${pkgver}"
+  unset LDFLAGS
+
+  ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc 
--localstatedir=/var --datarootdir=/usr/share \
+--includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib 
--with-udev-prefix=/usr \
+--with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig 
--enable-readline \
+--enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync 
--enable-udev_rules  \
+--with-default-locking-dir=/run/lock/lvm
+  make
+}
+
+package_device-mapper() {
+  pkgdesc="Device mapper userspace library and tools"
+  url="http://sourceware.org/dm/";
+  depends=('glibc' 'udev')
+
+  cd "${srcdir}/LVM2.${pkgver}"
+  make DESTDIR="${pkgdir}" install_device-mapper
+  # extra udev rule for device-mapper in initramfs
+  install -D -m644 "${srcdir}/11-dm-initramfs.rules" 
"${pkgdir}/usr/lib/initc

[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm-on-crypt.service lvm.service)

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 17:22:36
  Author: thomas
Revision: 168775

upgpkg: lvm2 2.02.98-1: upstream update and fix service files

Modified:
  lvm2/trunk/PKGBUILD
  lvm2/trunk/lvm-on-crypt.service
  lvm2/trunk/lvm.service

--+
 PKGBUILD |   10 +-
 lvm-on-crypt.service |2 +-
 lvm.service  |2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 21:19:51 UTC (rev 168774)
+++ PKGBUILD2012-10-15 21:22:36 UTC (rev 168775)
@@ -4,7 +4,7 @@
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.97
+pkgver=2.02.98
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/";
@@ -17,13 +17,13 @@
 lvm.service
lvm-on-crypt.service
 lvm2.conf)
-sha1sums=('ca92d976628246745f0981d1514a79a4a8e32314'
-  '9f0c6047fe3c275db7af20f383bd41744fcafc33'
+sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
+  '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
   '3e1680f9b76ce9150d08865d99db90fd15532271'
   'cedc9948123c870f9c5aa3357d0075b41a9c8135'
   'f6a554eea9557c3c236df2943bb6e7e723945c41'
-  '17df8689630a77e46899a8bd56997d9db896d5af'
-  '7336aa1d53db9c843916b2cbb433434e4e354a24'
+  'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
+  '652fb58dd7676caa0515f0a06d537744e071c6cf'
   'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
 
 build() {

Modified: lvm-on-crypt.service
===
--- lvm-on-crypt.service2012-10-15 21:19:51 UTC (rev 168774)
+++ lvm-on-crypt.service2012-10-15 21:22:36 UTC (rev 168775)
@@ -7,7 +7,7 @@
 Conflicts=shutdown.target
 
 [Service]
-ExecStart=/sbin/vgchange --sysinit --available y
+ExecStart=/sbin/vgchange --available y
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes

Modified: lvm.service
===
--- lvm.service 2012-10-15 21:19:51 UTC (rev 168774)
+++ lvm.service 2012-10-15 21:22:36 UTC (rev 168775)
@@ -7,7 +7,7 @@
 Conflicts=shutdown.target
 
 [Service]
-ExecStart=/sbin/vgchange --sysinit --available y
+ExecStart=/sbin/vgchange --available y
 Type=oneshot
 TimeoutSec=0
 RemainAfterExit=yes

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 17:19:51
  Author: eric
Revision: 168774

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

Added:
  twisted/repos/staging-i686/
  twisted/repos/staging-i686/PKGBUILD
(from rev 168773, twisted/trunk/PKGBUILD)
  twisted/repos/staging-i686/twisted.install
(from rev 168773, twisted/trunk/twisted.install)
  twisted/repos/staging-x86_64/
  twisted/repos/staging-x86_64/PKGBUILD
(from rev 168773, twisted/trunk/PKGBUILD)
  twisted/repos/staging-x86_64/twisted.install
(from rev 168773, twisted/trunk/twisted.install)

+
 staging-i686/PKGBUILD  |   37 +
 staging-i686/twisted.install   |   11 +++
 staging-x86_64/PKGBUILD|   37 +
 staging-x86_64/twisted.install |   11 +++
 4 files changed, 96 insertions(+)

Copied: twisted/repos/staging-i686/PKGBUILD (from rev 168773, 
twisted/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-15 21:19:51 UTC (rev 168774)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Juergen Hoetzel 
+# Contributor:  Douglas Soares de Andrade 
+
+pkgname=twisted
+pkgver=12.2.0
+pkgrel=2
+pkgdesc="Asynchronous networking framework written in Python."
+arch=('i686' 'x86_64')
+url="http://twistedmatrix.com/";
+license=('MIT')
+depends=('python2-crypto' 'python2-zope-interface')
+optdepends=('python2-pyopenssl'
+'python2-soappy: for twisted.web.soap'
+   'python2-pyasn1: for using conch'
+   'pygtk: for using manhole'
+   'tk: for using tkconch')
+install=twisted.install
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
+sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
+
+build() {
+cd "$srcdir/Twisted-$pkgver"
+python2 setup.py build
+}
+
+package() {
+cd "$srcdir/Twisted-$pkgver"
+python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
+  
"$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
+  
"$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
+  "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
+}

Copied: twisted/repos/staging-i686/twisted.install (from rev 168773, 
twisted/trunk/twisted.install)
===
--- staging-i686/twisted.install(rev 0)
+++ staging-i686/twisted.install2012-10-15 21:19:51 UTC (rev 168774)
@@ -0,0 +1,11 @@
+post_install() {
+  python2 -c 'from twisted.plugin import IPlugin, getPlugins; 
list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | 
xargs -r rm -f
+}

Copied: twisted/repos/staging-x86_64/PKGBUILD (from rev 168773, 
twisted/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-15 21:19:51 UTC (rev 168774)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Juergen Hoetzel 
+# Contributor:  Douglas Soares de Andrade 
+
+pkgname=twisted
+pkgver=12.2.0
+pkgrel=2
+pkgdesc="Asynchronous networking framework written in Python."
+arch=('i686' 'x86_64')
+url="http://twistedmatrix.com/";
+license=('MIT')
+depends=('python2-crypto' 'python2-zope-interface')
+optdepends=('python2-pyopenssl'
+'python2-soappy: for twisted.web.soap'
+   'python2-pyasn1: for using conch'
+   'pygtk: for using manhole'
+   'tk: for using tkconch')
+install=twisted.install
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
+sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
+
+build() {
+cd "$srcdir/Twisted-$pkgver"
+python2 setup.py build
+}
+
+package() {
+cd "$srcdir/Twisted-$pkgver"
+python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
+  
"$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
+  
"$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
+  "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
+}

Copied: twisted/repos/staging-x86_64/twisted.install (from rev 168773, 
twisted/trunk/twisted.install)
===
--- staging-x86_64/twisted.install

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 17:19:39
  Author: eric
Revision: 168773

upgpkg: twisted 12.2.0-2

Update optdepends

Modified:
  twisted/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 21:04:59 UTC (rev 168772)
+++ PKGBUILD2012-10-15 21:19:39 UTC (rev 168773)
@@ -5,14 +5,14 @@
 
 pkgname=twisted
 pkgver=12.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/";
 license=('MIT')
 depends=('python2-crypto' 'python2-zope-interface')
 optdepends=('python2-pyopenssl'
-'python-soappy: for twisted.web.soap'
+'python2-soappy: for twisted.web.soap'
'python2-pyasn1: for using conch'
'pygtk: for using manhole'
'tk: for using tkconch')

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 17:04:59
  Author: eric
Revision: 168772

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

Added:
  bzr/repos/staging-i686/
  bzr/repos/staging-i686/PKGBUILD
(from rev 168771, bzr/trunk/PKGBUILD)
  bzr/repos/staging-x86_64/
  bzr/repos/staging-x86_64/PKGBUILD
(from rev 168771, bzr/trunk/PKGBUILD)

-+
 staging-i686/PKGBUILD   |   33 +
 staging-x86_64/PKGBUILD |   33 +
 2 files changed, 66 insertions(+)

Copied: bzr/repos/staging-i686/PKGBUILD (from rev 168771, bzr/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-15 21:04:59 UTC (rev 168772)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer :
+# Contributor: Hugo Doria 
+
+pkgname=bzr
+pkgver=2.5.1
+pkgrel=2
+pkgdesc="A decentralized revision control system (bazaar)"
+arch=('i686' 'x86_64')
+url="http://bazaar.canonical.com/en/";
+license=('GPL')
+depends=('python2')
+optdepends=('python2-paramiko: for sftp support')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('ac5079858364a046071000d5cdccb67b'
+ 'c83dd08dd2c3e27edbab873500d7d6eb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man/man1|share/man/man1|' setup.py
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+
+  # bash-completion
+  install -D -m644 contrib/bash/bzr \
+"${pkgdir}/usr/share/bash-completion/completions/bzr"
+}

Copied: bzr/repos/staging-x86_64/PKGBUILD (from rev 168771, bzr/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-15 21:04:59 UTC (rev 168772)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer :
+# Contributor: Hugo Doria 
+
+pkgname=bzr
+pkgver=2.5.1
+pkgrel=2
+pkgdesc="A decentralized revision control system (bazaar)"
+arch=('i686' 'x86_64')
+url="http://bazaar.canonical.com/en/";
+license=('GPL')
+depends=('python2')
+optdepends=('python2-paramiko: for sftp support')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
+md5sums=('ac5079858364a046071000d5cdccb67b'
+ 'c83dd08dd2c3e27edbab873500d7d6eb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man/man1|share/man/man1|' setup.py
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+
bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
+
+  # bash-completion
+  install -D -m644 contrib/bash/bzr \
+"${pkgdir}/usr/share/bash-completion/completions/bzr"
+}

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 17:04:22
  Author: eric
Revision: 168771

upgpkg: bzr 2.5.1-2

Update optdepends

Modified:
  bzr/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 19:50:22 UTC (rev 168770)
+++ PKGBUILD2012-10-15 21:04:22 UTC (rev 168771)
@@ -4,13 +4,13 @@
 
 pkgname=bzr
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A decentralized revision control system (bazaar)"
 arch=('i686' 'x86_64')
 url="http://bazaar.canonical.com/en/";
 license=('GPL')
 depends=('python2')
-optdepends=('python-paramiko: for sftp support')
+optdepends=('python2-paramiko: for sftp support')
 
source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
 md5sums=('ac5079858364a046071000d5cdccb67b'
  'c83dd08dd2c3e27edbab873500d7d6eb')

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:50:22
  Author: ronald
Revision: 168770

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

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

--+
 extra-i686/PKGBUILD  |  106 -
 extra-i686/gnuplot.install   |   70 +--
 extra-x86_64/PKGBUILD|  106 -
 extra-x86_64/gnuplot.install |   70 +--
 4 files changed, 176 insertions(+), 176 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 19:49:46 UTC (rev 168769)
+++ extra-i686/PKGBUILD 2012-10-15 19:50:22 UTC (rev 168770)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren 
-# Contributor: damir 
-# Contributor: Tom Newsom 
-
-pkgname=gnuplot 
-pkgver=4.6.0
-pkgrel=3
-pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and 
others" 
-arch=('i686' 'x86_64') 
-url="http://www.gnuplot.info"; 
-license=('custom') 
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
-makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
-install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";)
-sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix default source location; use the GDFONTPATH variable to modify at 
runtime 
-  sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' 
src/variable.c
-
-  sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
-  -e 
's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
-  src/variable.c
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-  --infodir=/usr/share/info \
-  --libexecdir=/usr/bin \
-  --with-gihdir=/usr/share/gnuplot \
-  --datadir=/usr/share \
-  --with-readline=gnu \
-  --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
-  make pkglibexecdir=/usr/bin
-}
-
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
- mandir=$pkgdir/usr/share/man \
-infodir=$pkgdir/usr/share/info \
-pkglibexecdir=$pkgdir/usr/bin \
-GIHDIR=$pkgdir/usr/share/gnuplot \
-datadir=$pkgdir/usr/share install
-
-  install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs
-  install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright
-
-  rm -f $pkgdir/usr/share/texmf-dist/ls-R
-}

Copied: gnuplot/repos/extra-i686/PKGBUILD (from rev 168769, 
gnuplot/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 19:50:22 UTC (rev 168770)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+# Contributor: damir 
+# Contributor: Tom Newsom 
+
+pkgname=gnuplot 
+pkgver=4.6.1
+pkgrel=1
+pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and 
others" 
+arch=('i686' 'x86_64') 
+url="http://www.gnuplot.info"; 
+license=('custom') 
+depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
+makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+install=gnuplot.install 
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";)
+sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # fix default source location; use the GDFONTPATH variable to modify at 
runtime 
+  sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' 
src/variable.c
+
+  sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
+  -e 
's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
+  src/variable.c
+
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+  --infodir=/usr/share/info \
+  --libexecdir=/usr/bin \
+  --with-gihdir=/usr/share/gnuplot \
+  --datadir=/usr/share \
+  --with-readline=gnu \
+  --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
+  make pkglibexecdir=/usr/bin
+}
+
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
+ mandir=$pkgdir/usr/share/man \
+infodir=$pkgdir/usr/share/inf

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:49:46
  Author: ronald
Revision: 168769

upgpkg: gnuplot 4.6.1-1

update to 4.6.1

Modified:
  gnuplot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 19:27:04 UTC (rev 168768)
+++ PKGBUILD2012-10-15 19:49:46 UTC (rev 168769)
@@ -4,8 +4,8 @@
 # Contributor: Tom Newsom 
 
 pkgname=gnuplot 
-pkgver=4.6.0
-pkgrel=3
+pkgver=4.6.1
+pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and 
others" 
 arch=('i686' 'x86_64') 
 url="http://www.gnuplot.info"; 
@@ -14,7 +14,7 @@
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
 install=gnuplot.install 
 
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";)
-sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
+sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:27:04
  Author: ronald
Revision: 168768

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

Added:
  miro/repos/extra-i686/PKGBUILD
(from rev 168767, miro/trunk/PKGBUILD)
  miro/repos/extra-i686/ffmpeg.patch
(from rev 168767, miro/trunk/ffmpeg.patch)
  miro/repos/extra-i686/miro.install
(from rev 168767, miro/trunk/miro.install)
  miro/repos/extra-x86_64/PKGBUILD
(from rev 168767, miro/trunk/PKGBUILD)
  miro/repos/extra-x86_64/ffmpeg.patch
(from rev 168767, miro/trunk/ffmpeg.patch)
  miro/repos/extra-x86_64/miro.install
(from rev 168767, miro/trunk/miro.install)
Deleted:
  miro/repos/extra-i686/PKGBUILD
  miro/repos/extra-i686/ffmpeg.patch
  miro/repos/extra-i686/miro.install
  miro/repos/extra-x86_64/PKGBUILD
  miro/repos/extra-x86_64/ffmpeg.patch
  miro/repos/extra-x86_64/miro.install

---+
 extra-i686/PKGBUILD   |   98 +-
 extra-i686/ffmpeg.patch   |  126 ++--
 extra-i686/miro.install   |   34 +--
 extra-x86_64/PKGBUILD |   98 +-
 extra-x86_64/ffmpeg.patch |  126 ++--
 extra-x86_64/miro.install |   34 +--
 6 files changed, 258 insertions(+), 258 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 19:26:09 UTC (rev 168767)
+++ extra-i686/PKGBUILD 2012-10-15 19:27:04 UTC (rev 168768)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren 
-
-pkgname=miro
-pkgver=5.0.2
-pkgrel=1
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com";
-license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
- 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
- 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
- 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
- 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
'python-pycurl' 
- 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
-install=miro.install
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz";
-'ffmpeg.patch')
-sha1sums=('67babcf76cc08b72b8f55d425b1372ae0a979805'
-  'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cd linux
-  patch -p2 -i "${srcdir}"/ffmpeg.patch
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-
-  # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" 
${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py
-  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py 
usr/share/miro/resources/searchengines/update-icons.py \
-usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} 
-  done
-
-  # Fakeroot segfaults on these; remove
-  if [ ${arch} == "i686" ]; then
-rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true
-  else
-rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true
-  fi
-}

Copied: miro/repos/extra-i686/PKGBUILD (from rev 168767, miro/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 19:27:04 UTC (rev 168768)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+
+pkgname=miro
+pkgver=5.0.4
+pkgrel=1
+pkgdesc="The free and open source internet TV platform"
+arch=('i686' 'x86_64')
+url="http://www.getmiro.com";
+license=('GPL2')
+depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
+ 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
+ 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
+ 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
+ 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
'python-pycurl' 
+ 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
+makedepends=('pkg-config' 'boost')
+install=miro.install
+source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz";
+'ffmpeg.patch')
+sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
+  'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cd linux
+  patch -p2 -i "${srcdir}"/ffmpeg.patch
+
+  python2 setup.py install --root="${pkgdir}"
+
+  # fix miro startup script so --debug works with python2
+  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
+  sed -i "s|./mi

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:26:09
  Author: ronald
Revision: 168767

upgpkg: miro 5.0.4-1

update to 5.0.4

Modified:
  miro/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 19:16:03 UTC (rev 168766)
+++ PKGBUILD2012-10-15 19:26:09 UTC (rev 168767)
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren 
 
 pkgname=miro
-pkgver=5.0.2
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 install=miro.install
 
source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz";
 'ffmpeg.patch')
-sha1sums=('67babcf76cc08b72b8f55d425b1372ae0a979805'
+sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
   'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
 build() {

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

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 15:16:03
  Author: thomas
Revision: 168766

db-move: moved wpa_supplicant from [testing] to [core] (i686, x86_64)

Added:
  wpa_supplicant/repos/core-i686/PKGBUILD
(from rev 168764, wpa_supplicant/repos/testing-i686/PKGBUILD)
  wpa_supplicant/repos/core-i686/config
(from rev 168764, wpa_supplicant/repos/testing-i686/config)
  wpa_supplicant/repos/core-i686/hostap_allow-linking-with-libnl-3.2.patch
(from rev 168764, 
wpa_supplicant/repos/testing-i686/hostap_allow-linking-with-libnl-3.2.patch)
  wpa_supplicant/repos/core-x86_64/PKGBUILD
(from rev 168764, wpa_supplicant/repos/testing-x86_64/PKGBUILD)
  wpa_supplicant/repos/core-x86_64/config
(from rev 168764, wpa_supplicant/repos/testing-x86_64/config)
  wpa_supplicant/repos/core-x86_64/hostap_allow-linking-with-libnl-3.2.patch
(from rev 168764, 
wpa_supplicant/repos/testing-x86_64/hostap_allow-linking-with-libnl-3.2.patch)
Deleted:
  wpa_supplicant/repos/core-i686/PKGBUILD
  wpa_supplicant/repos/core-i686/config
  wpa_supplicant/repos/core-i686/hostap_allow-linking-with-libnl-3.2.patch
  wpa_supplicant/repos/core-x86_64/PKGBUILD
  wpa_supplicant/repos/core-x86_64/config
  wpa_supplicant/repos/core-x86_64/hostap_allow-linking-with-libnl-3.2.patch
  wpa_supplicant/repos/testing-i686/
  wpa_supplicant/repos/testing-x86_64/

---+
 core-i686/PKGBUILD|  111 -
 core-i686/config  |  950 
 core-i686/hostap_allow-linking-with-libnl-3.2.patch   |   24 
 core-x86_64/PKGBUILD  |  111 -
 core-x86_64/config|  950 
 core-x86_64/hostap_allow-linking-with-libnl-3.2.patch |   24 
 6 files changed, 1098 insertions(+), 1072 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 168765:168766 to see the changes.

[arch-commits] Commit in nfs-utils/repos (90 files)

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 15:16:00
  Author: thomas
Revision: 168765

db-move: moved nfs-utils from [testing] to [core] (i686, x86_64)

Added:
  nfs-utils/repos/core-i686/PKGBUILD
(from rev 168764, nfs-utils/repos/testing-i686/PKGBUILD)
  nfs-utils/repos/core-i686/blkmapd.service
(from rev 168764, nfs-utils/repos/testing-i686/blkmapd.service)
  nfs-utils/repos/core-i686/exports
(from rev 168764, nfs-utils/repos/testing-i686/exports)
  nfs-utils/repos/core-i686/idmapd.conf
(from rev 168764, nfs-utils/repos/testing-i686/idmapd.conf)
  nfs-utils/repos/core-i686/nfs
(from rev 168764, nfs-utils/repos/testing-i686/nfs)
  nfs-utils/repos/core-i686/nfs-common
(from rev 168764, nfs-utils/repos/testing-i686/nfs-common)
  nfs-utils/repos/core-i686/nfs-common.conf
(from rev 168764, nfs-utils/repos/testing-i686/nfs-common.conf)
  nfs-utils/repos/core-i686/nfs-server
(from rev 168764, nfs-utils/repos/testing-i686/nfs-server)
  nfs-utils/repos/core-i686/nfs-server.conf
(from rev 168764, nfs-utils/repos/testing-i686/nfs-server.conf)
  nfs-utils/repos/core-i686/nfs-utils-1.1.4-mtab-sym.patch
(from rev 168764, 
nfs-utils/repos/testing-i686/nfs-utils-1.1.4-mtab-sym.patch)
  nfs-utils/repos/core-i686/nfs-utils-1.1.4-no-exec.patch
(from rev 168764, 
nfs-utils/repos/testing-i686/nfs-utils-1.1.4-no-exec.patch)
  nfs-utils/repos/core-i686/nfs-utils.conf
(from rev 168764, nfs-utils/repos/testing-i686/nfs-utils.conf)
  nfs-utils/repos/core-i686/nfs-utils.install
(from rev 168764, nfs-utils/repos/testing-i686/nfs-utils.install)
  nfs-utils/repos/core-i686/nfsd.service
(from rev 168764, nfs-utils/repos/testing-i686/nfsd.service)
  nfs-utils/repos/core-i686/proc-fs-nfsd.mount
(from rev 168764, nfs-utils/repos/testing-i686/proc-fs-nfsd.mount)
  nfs-utils/repos/core-i686/rpc-gssd.service
(from rev 168764, nfs-utils/repos/testing-i686/rpc-gssd.service)
  nfs-utils/repos/core-i686/rpc-idmapd.service
(from rev 168764, nfs-utils/repos/testing-i686/rpc-idmapd.service)
  nfs-utils/repos/core-i686/rpc-mountd.service
(from rev 168764, nfs-utils/repos/testing-i686/rpc-mountd.service)
  nfs-utils/repos/core-i686/rpc-statd.service
(from rev 168764, nfs-utils/repos/testing-i686/rpc-statd.service)
  nfs-utils/repos/core-i686/rpc-svcgssd.service
(from rev 168764, nfs-utils/repos/testing-i686/rpc-svcgssd.service)
  nfs-utils/repos/core-i686/start-statd.patch
(from rev 168764, nfs-utils/repos/testing-i686/start-statd.patch)
  nfs-utils/repos/core-i686/var-lib-nfs-rpc_pipefs.mount
(from rev 168764, nfs-utils/repos/testing-i686/var-lib-nfs-rpc_pipefs.mount)
  nfs-utils/repos/core-x86_64/PKGBUILD
(from rev 168764, nfs-utils/repos/testing-x86_64/PKGBUILD)
  nfs-utils/repos/core-x86_64/blkmapd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/blkmapd.service)
  nfs-utils/repos/core-x86_64/exports
(from rev 168764, nfs-utils/repos/testing-x86_64/exports)
  nfs-utils/repos/core-x86_64/idmapd.conf
(from rev 168764, nfs-utils/repos/testing-x86_64/idmapd.conf)
  nfs-utils/repos/core-x86_64/nfs
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs)
  nfs-utils/repos/core-x86_64/nfs-common
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-common)
  nfs-utils/repos/core-x86_64/nfs-common.conf
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-common.conf)
  nfs-utils/repos/core-x86_64/nfs-server
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-server)
  nfs-utils/repos/core-x86_64/nfs-server.conf
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-server.conf)
  nfs-utils/repos/core-x86_64/nfs-utils-1.1.4-mtab-sym.patch
(from rev 168764, 
nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-mtab-sym.patch)
  nfs-utils/repos/core-x86_64/nfs-utils-1.1.4-no-exec.patch
(from rev 168764, 
nfs-utils/repos/testing-x86_64/nfs-utils-1.1.4-no-exec.patch)
  nfs-utils/repos/core-x86_64/nfs-utils.conf
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-utils.conf)
  nfs-utils/repos/core-x86_64/nfs-utils.install
(from rev 168764, nfs-utils/repos/testing-x86_64/nfs-utils.install)
  nfs-utils/repos/core-x86_64/nfsd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/nfsd.service)
  nfs-utils/repos/core-x86_64/proc-fs-nfsd.mount
(from rev 168764, nfs-utils/repos/testing-x86_64/proc-fs-nfsd.mount)
  nfs-utils/repos/core-x86_64/rpc-gssd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/rpc-gssd.service)
  nfs-utils/repos/core-x86_64/rpc-idmapd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/rpc-idmapd.service)
  nfs-utils/repos/core-x86_64/rpc-mountd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/rpc-mountd.service)
  nfs-utils/repos/core-x86_64/rpc-statd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/rpc-statd.service)
  nfs-utils/repos/core-x86_64/rpc-svcgssd.service
(from rev 168764, nfs-utils/repos/testing-x86_64/rpc-svcgssd.service)
  nfs-utils/repos/c

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

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 15:14:22
  Author: thomas
Revision: 168764

archrelease: copy trunk to testing-any

Added:
  netcfg/repos/testing-any/
  netcfg/repos/testing-any/PKGBUILD
(from rev 168763, netcfg/trunk/PKGBUILD)

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

Copied: netcfg/repos/testing-any/PKGBUILD (from rev 168763, 
netcfg/trunk/PKGBUILD)
===
--- testing-any/PKGBUILD(rev 0)
+++ testing-any/PKGBUILD2012-10-15 19:14:22 UTC (rev 168764)
@@ -0,0 +1,37 @@
+# Maintainer: Jouke Witteveen 
+
+pkgname=netcfg
+pkgver=2.8.11
+pkgrel=2
+pkgdesc="Network configuration and profile scripts"
+url="http://archlinux.org/netcfg/";
+license=("BSD")
+backup=(etc/iftab etc/conf.d/netcfg)
+groups=(base)
+depends=("coreutils" "dhcpcd" "iproute2")
+#makedepends=('asciidoc')  # The source tarball includes pre-built 
documentation.
+optdepends=('dialog: for the menu based profile and wifi selectors'
+'wpa_supplicant: for wireless networking support'
+'ifplugd: for automatic wired connections through net-auto-wired'
+'wpa_actiond: for automatic wireless connections through 
net-auto-wireless'
+'wireless_tools: for interface renaming through net-rename'
+'ifenslave: for bond connections'
+'bridge-utils: for bridge connections'
+   )
+source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.xz)
+arch=(any)
+md5sums=('f2df46de696aac36f67bd1479eadf259')
+
+package() {
+  cd "$srcdir/netcfg-${pkgver}"
+  make DESTDIR="$pkgdir" install
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/netcfg/LICENSE"
+
+  # Shell Completion
+  install -D -m644 contrib/bash-completion 
"$pkgdir/usr/share/bash-completion/completions/netcfg"
+  install -D -m644 contrib/zsh-completion 
"$pkgdir/usr/share/zsh/site-functions/_netcfg"
+
+  # Compatibility
+  ln -s netcfg.service "$pkgdir/usr/lib/systemd/system/net-profiles.service"
+}
+

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

2012-10-15 Thread Thomas Bächler

Date: Monday, October 15, 2012 @ 15:14:11
  Author: thomas
Revision: 168763

upgpkg: netcfg 2.8.11-2: add to base group

Modified:
  netcfg/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 19:04:27 UTC (rev 168762)
+++ PKGBUILD2012-10-15 19:14:11 UTC (rev 168763)
@@ -2,11 +2,12 @@
 
 pkgname=netcfg
 pkgver=2.8.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Network configuration and profile scripts"
 url="http://archlinux.org/netcfg/";
 license=("BSD")
 backup=(etc/iftab etc/conf.d/netcfg)
+groups=(base)
 depends=("coreutils" "dhcpcd" "iproute2")
 #makedepends=('asciidoc')  # The source tarball includes pre-built 
documentation.
 optdepends=('dialog: for the menu based profile and wifi selectors'

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:04:27
  Author: ronald
Revision: 168762

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

Added:
  e2fsprogs/repos/testing-i686/
  e2fsprogs/repos/testing-i686/MIT-LICENSE
(from rev 168761, e2fsprogs/trunk/MIT-LICENSE)
  e2fsprogs/repos/testing-i686/PKGBUILD
(from rev 168761, e2fsprogs/trunk/PKGBUILD)
  e2fsprogs/repos/testing-i686/e2fsprogs.install
(from rev 168761, e2fsprogs/trunk/e2fsprogs.install)
  e2fsprogs/repos/testing-i686/mke2fs.conf
(from rev 168761, e2fsprogs/trunk/mke2fs.conf)
  e2fsprogs/repos/testing-x86_64/
  e2fsprogs/repos/testing-x86_64/MIT-LICENSE
(from rev 168761, e2fsprogs/trunk/MIT-LICENSE)
  e2fsprogs/repos/testing-x86_64/PKGBUILD
(from rev 168761, e2fsprogs/trunk/PKGBUILD)
  e2fsprogs/repos/testing-x86_64/e2fsprogs.install
(from rev 168761, e2fsprogs/trunk/e2fsprogs.install)
  e2fsprogs/repos/testing-x86_64/mke2fs.conf
(from rev 168761, e2fsprogs/trunk/mke2fs.conf)

--+
 testing-i686/MIT-LICENSE |   25 +++
 testing-i686/PKGBUILD|   48 +
 testing-i686/e2fsprogs.install   |   20 +++
 testing-i686/mke2fs.conf |   26 
 testing-x86_64/MIT-LICENSE   |   25 +++
 testing-x86_64/PKGBUILD  |   48 +
 testing-x86_64/e2fsprogs.install |   20 +++
 testing-x86_64/mke2fs.conf   |   26 
 8 files changed, 238 insertions(+)

Copied: e2fsprogs/repos/testing-i686/MIT-LICENSE (from rev 168761, 
e2fsprogs/trunk/MIT-LICENSE)
===
--- testing-i686/MIT-LICENSE(rev 0)
+++ testing-i686/MIT-LICENSE2012-10-15 19:04:27 UTC (rev 168762)
@@ -0,0 +1,25 @@
+Copyright (c) 2003-2007 Theodore Ts'o 
+Copyright (c) 1997-2003 Yann Dirson 
+Copyright (c) 2001 Alcove 
+Copyright (c) 1997 Klee Dienes
+Copyright (c) 1995-1996 Michael Nonweiler 
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

Copied: e2fsprogs/repos/testing-i686/PKGBUILD (from rev 168761, 
e2fsprogs/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-15 19:04:27 UTC (rev 168762)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Ronald van Haren  
+# Contributor: judd 
+
+pkgname=e2fsprogs
+pkgver=1.42.6
+pkgrel=1
+pkgdesc="Ext2/3/4 filesystem utilities"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'MIT')
+url="http://e2fsprogs.sourceforge.net";
+groups=('base')
+depends=('sh' 'util-linux')
+makedepends=('bc')
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz";
+'MIT-LICENSE')
+backup=('etc/mke2fs.conf')
+install=${pkgname}.install
+sha1sums=('cd05cd4205a00d01a6da821660cff386788e9be3'
+  'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Remove unnecessary init.d directory
+  sed -i '/init\.d/s|^|#|' misc/Makefile.in
+
+  ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
+  --enable-elf-shlibs --disable-fsck --disable-uuidd \
+  --disable-libuuid --disable-libblkid
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install install-libs
+
+  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
+  
+  # remove references to build directory
+  sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
+  sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' 
"${pkgdir}/usr/bin/compile_et"
+
+  # install MIT license
+  install -Dm644 "${srcdir}/MIT-LICENSE" \
+"${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
+}

Copied: e2fsprogs/repos/testing-i686/e2fsprogs.install (from rev 168761, 
e2fsprogs/trunk/e2fsprogs.install)

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 15:03:52
  Author: ronald
Revision: 168761

upgpkg: e2fsprogs 1.42.6-1

update to 1.42.6

Modified:
  e2fsprogs/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 18:55:23 UTC (rev 168760)
+++ PKGBUILD2012-10-15 19:03:52 UTC (rev 168761)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=e2fsprogs
-pkgver=1.42.5
+pkgver=1.42.6
 pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-sha1sums=('41bc6d247238eac65864193e6de941956da493cb'
+sha1sums=('cd05cd4205a00d01a6da821660cff386788e9be3'
   'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 14:55:23
  Author: ronald
Revision: 168760

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

Added:
  iproute2/repos/testing-i686/
  iproute2/repos/testing-i686/PKGBUILD
(from rev 168759, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-i686/iproute2-fhs.patch
(from rev 168759, iproute2/trunk/iproute2-fhs.patch)
  iproute2/repos/testing-x86_64/
  iproute2/repos/testing-x86_64/PKGBUILD
(from rev 168759, iproute2/trunk/PKGBUILD)
  iproute2/repos/testing-x86_64/iproute2-fhs.patch
(from rev 168759, iproute2/trunk/iproute2-fhs.patch)

---+
 testing-i686/PKGBUILD |   50 
 testing-i686/iproute2-fhs.patch   |   75 
 testing-x86_64/PKGBUILD   |   50 
 testing-x86_64/iproute2-fhs.patch |   75 
 4 files changed, 250 insertions(+)

Copied: iproute2/repos/testing-i686/PKGBUILD (from rev 168759, 
iproute2/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2012-10-15 18:55:23 UTC (rev 168760)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Ronald van Haren 
+# Contributor: Judd Vinet 
+
+pkgname=iproute2
+pkgver=3.6.0
+pkgrel=1
+pkgdesc="IP Routing Utilities"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
+depends=('glibc' 'db' 'iptables')
+makedepends=('linux-atm')
+optdepends=('linux-atm: ATM support')
+provides=('iproute')
+conflicts=('iproute')
+replaces=('iproute')
+options=('!makeflags')
+backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 
'etc/iproute2/rt_protos' \
+   'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
+source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
+ iproute2-fhs.patch)
+sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d'
+  '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # set correct fhs structure
+  patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+
+  ./configure
+
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # allow loopback to be started before /usr is mounted, this may not be 
supported in the future
+  mkdir -p "$pkgdir/sbin"
+  mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip"
+  ln -s /sbin/ip "$pkgdir/usr/sbin/ip"
+
+  # libnetlink isn't installed, install it FS#19385
+  install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h"
+  install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a"
+}

Copied: iproute2/repos/testing-i686/iproute2-fhs.patch (from rev 168759, 
iproute2/trunk/iproute2-fhs.patch)
===
--- testing-i686/iproute2-fhs.patch (rev 0)
+++ testing-i686/iproute2-fhs.patch 2012-10-15 18:55:23 UTC (rev 168760)
@@ -0,0 +1,75 @@
+diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
+--- iproute2-3.4.0/Makefile2012-05-21 23:12:19.0 +0200
 iproute2-3.4.0.new/Makefile2012-06-18 10:23:53.896760158 +0200
+@@ -1,7 +1,8 @@
+ ROOTDIR=$(DESTDIR)
+ PREFIX=/usr
+ LIBDIR=$(PREFIX)/lib
+-SBINDIR=/sbin
++SBINDIR=/usr/sbin
++SHAREDIR=/usr/share
+ CONFDIR=/etc/iproute2
+ DATADIR=$(PREFIX)/share
+ DOCDIR=$(DATADIR)/doc/iproute2
+diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
+--- iproute2-3.4.0/netem/Makefile  2012-05-21 23:12:19.0 +0200
 iproute2-3.4.0.new/netem/Makefile  2012-06-18 10:23:53.896760158 +0200
+@@ -20,9 +20,9 @@
+   $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-  mkdir -p $(DESTDIR)$(LIBDIR)/tc
++  mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+   for i in $(DISTDATA); \
+-  do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++  do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+   done
+ 
+ clean:
+diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
+--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.0 +0200
 iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200
+@@ -105,18 +105,11 @@
+   $(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-  mkdir -p $(MODDESTDIR)
++  mkdir -p $(DESTDIR)$(LIBDIR)/tc
+   install -m 0755 tc $(DESTDIR)$(SBINDIR)
+   for i in $(TCSO); \
+-  do install -m 755 $$i $(MODDESTDIR); \
++  do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
+   done
+-  if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+-  if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-  then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+-  elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+-  then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+-  fi; \
+-  fi
+ 
+ clean:
+   rm -f $(TCOBJ) $(

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 14:54:55
  Author: ronald
Revision: 168759

upgpkg: iproute2 3.6.0-1

update to 3.6.0; add iptables dependency

Modified:
  iproute2/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 18:45:48 UTC (rev 168758)
+++ PKGBUILD2012-10-15 18:54:55 UTC (rev 168759)
@@ -3,13 +3,13 @@
 # Contributor: Judd Vinet 
 
 pkgname=iproute2
-pkgver=3.5.1
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2";
-depends=('glibc' 'db')
+depends=('glibc' 'db' 'iptables')
 makedepends=('linux-atm')
 optdepends=('linux-atm: ATM support')
 provides=('iproute')
@@ -20,7 +20,7 @@
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 
'etc/iproute2/rt_tables')
 
source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
  iproute2-fhs.patch)
-sha1sums=('461f3e97d84264a597176de3ba94633114959df5'
+sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d'
   '35b8cf2dc94b73eccad427235c07596146cd6f6c')
 
 build() {

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 14:45:48
  Author: ronald
Revision: 168758

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

Added:
  iptables/repos/testing-i686/
  iptables/repos/testing-i686/0503-extension_cppflags.patch
(from rev 168757, iptables/trunk/0503-extension_cppflags.patch)
  iptables/repos/testing-i686/PKGBUILD
(from rev 168757, iptables/trunk/PKGBUILD)
  iptables/repos/testing-i686/empty-filter.rules
(from rev 168757, iptables/trunk/empty-filter.rules)
  iptables/repos/testing-i686/empty-mangle.rules
(from rev 168757, iptables/trunk/empty-mangle.rules)
  iptables/repos/testing-i686/empty-nat.rules
(from rev 168757, iptables/trunk/empty-nat.rules)
  iptables/repos/testing-i686/empty-raw.rules
(from rev 168757, iptables/trunk/empty-raw.rules)
  iptables/repos/testing-i686/empty-security.rules
(from rev 168757, iptables/trunk/empty-security.rules)
  iptables/repos/testing-i686/empty.rules
(from rev 168757, iptables/trunk/empty.rules)
  iptables/repos/testing-i686/ip6tables
(from rev 168757, iptables/trunk/ip6tables)
  iptables/repos/testing-i686/ip6tables.service
(from rev 168757, iptables/trunk/ip6tables.service)
  iptables/repos/testing-i686/iptables
(from rev 168757, iptables/trunk/iptables)
  iptables/repos/testing-i686/iptables-1.4.12-fixresore.patch
(from rev 168757, iptables/trunk/iptables-1.4.12-fixresore.patch)
  iptables/repos/testing-i686/iptables-flush
(from rev 168757, iptables/trunk/iptables-flush)
  iptables/repos/testing-i686/iptables.conf.d
(from rev 168757, iptables/trunk/iptables.conf.d)
  iptables/repos/testing-i686/iptables.service
(from rev 168757, iptables/trunk/iptables.service)
  iptables/repos/testing-i686/simple_firewall.rules
(from rev 168757, iptables/trunk/simple_firewall.rules)
  iptables/repos/testing-x86_64/
  iptables/repos/testing-x86_64/0503-extension_cppflags.patch
(from rev 168757, iptables/trunk/0503-extension_cppflags.patch)
  iptables/repos/testing-x86_64/PKGBUILD
(from rev 168757, iptables/trunk/PKGBUILD)
  iptables/repos/testing-x86_64/empty-filter.rules
(from rev 168757, iptables/trunk/empty-filter.rules)
  iptables/repos/testing-x86_64/empty-mangle.rules
(from rev 168757, iptables/trunk/empty-mangle.rules)
  iptables/repos/testing-x86_64/empty-nat.rules
(from rev 168757, iptables/trunk/empty-nat.rules)
  iptables/repos/testing-x86_64/empty-raw.rules
(from rev 168757, iptables/trunk/empty-raw.rules)
  iptables/repos/testing-x86_64/empty-security.rules
(from rev 168757, iptables/trunk/empty-security.rules)
  iptables/repos/testing-x86_64/empty.rules
(from rev 168757, iptables/trunk/empty.rules)
  iptables/repos/testing-x86_64/ip6tables
(from rev 168757, iptables/trunk/ip6tables)
  iptables/repos/testing-x86_64/ip6tables.service
(from rev 168757, iptables/trunk/ip6tables.service)
  iptables/repos/testing-x86_64/iptables
(from rev 168757, iptables/trunk/iptables)
  iptables/repos/testing-x86_64/iptables-1.4.12-fixresore.patch
(from rev 168757, iptables/trunk/iptables-1.4.12-fixresore.patch)
  iptables/repos/testing-x86_64/iptables-flush
(from rev 168757, iptables/trunk/iptables-flush)
  iptables/repos/testing-x86_64/iptables.conf.d
(from rev 168757, iptables/trunk/iptables.conf.d)
  iptables/repos/testing-x86_64/iptables.service
(from rev 168757, iptables/trunk/iptables.service)
  iptables/repos/testing-x86_64/simple_firewall.rules
(from rev 168757, iptables/trunk/simple_firewall.rules)

+
 testing-i686/0503-extension_cppflags.patch |   13 +++
 testing-i686/PKGBUILD  |   83 +++
 testing-i686/empty-filter.rules|6 +
 testing-i686/empty-mangle.rules|8 ++
 testing-i686/empty-nat.rules   |7 +
 testing-i686/empty-raw.rules   |5 +
 testing-i686/empty-security.rules  |6 +
 testing-i686/empty.rules   |6 +
 testing-i686/ip6tables |   69 +++
 testing-i686/ip6tables.service |   11 +++
 testing-i686/iptables  |   68 ++
 testing-i686/iptables-1.4.12-fixresore.patch   |   28 +++
 testing-i686/iptables-flush|   18 
 testing-i686/iptables.conf.d   |   12 +++
 testing-i686/iptables.service  |   11 +++
 testing-i686/simple_firewall.rules |   11 +++
 testing-x86_64/0503-extension_cppflags.patch   |   13 +++
 testing-x86_64/PKGBUILD|   83 +++
 testing-x86_64/empty-filter.rules  |6 +
 testing-x86_64/empty-mangle.rules  |8 ++
 testing-x86_64/empty-nat.rules |7 +
 testing-x86_64/empty-raw.rules |5 +
 testing-x86_64/empty-security.rules|

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

2012-10-15 Thread Ronald van Haren

Date: Monday, October 15, 2012 @ 14:43:48
  Author: ronald
Revision: 168757

upgpkg: iptables 1.4.16.2-1

update to 1.4.16.2

Modified:
  iptables/trunk/PKGBUILD
Deleted:
  iptables/trunk/iptables-1.4.15-linux-3.5-compatibility.patch

---+
 PKGBUILD  |8 -
 iptables-1.4.15-linux-3.5-compatibility.patch |  106 
 2 files changed, 2 insertions(+), 112 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 18:29:42 UTC (rev 168756)
+++ PKGBUILD2012-10-15 18:43:48 UTC (rev 168757)
@@ -3,7 +3,7 @@
 # Contributor: Thomas Baechler 
 
 pkgname=iptables
-pkgver=1.4.15
+pkgver=1.4.16.2
 pkgrel=1
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64')
@@ -13,7 +13,6 @@
 makedepends=('linux-api-headers')
 options=('!libtool')
 
source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2";
-iptables-1.4.15-linux-3.5-compatibility.patch
 iptables
 ip6tables
 empty.rules
@@ -29,8 +28,7 @@
 ip6tables.service
 iptables-flush)
 backup=(etc/conf.d/iptables)
-sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207'
-  '9b7885ee6d6d32f6600515c01e462b737e89ba9e'
+sha1sums=('6fd368c4f6c31752011a716cccd951601157a493'
   '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
   '2db68906b603e5268736f48c8e251f3a49da1d75'
   '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -45,7 +43,6 @@
   '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
   'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
   'e7abda09c61142121b6695928d3b71ccd8fdf73a')
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -53,7 +50,6 @@
   rm include/linux/types.h
 
   patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
-  patch -Np1 -i ${srcdir}/iptables-1.4.15-linux-3.5-compatibility.patch
 
  ./configure --prefix=/usr \
  --libexecdir=/usr/lib/iptables --sysconfdir=/etc \

Deleted: iptables-1.4.15-linux-3.5-compatibility.patch
===
--- iptables-1.4.15-linux-3.5-compatibility.patch   2012-10-15 18:29:42 UTC 
(rev 168756)
+++ iptables-1.4.15-linux-3.5-compatibility.patch   2012-10-15 18:43:48 UTC 
(rev 168757)
@@ -1,106 +0,0 @@
-From a624e0a1b2d075253b599ababd4ea1351ef42b2a Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso 
-Date: Fri, 3 Aug 2012 10:41:40 +0200
-Subject: [PATCH] include: add missing linux/netfilter_ipv4/ip_queue.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-This patch fixes compilation of libipq with headers from Linux
-kernel 3.5:
-
- In file included from libipq.c:34:0:
- ../include/libipq/libipq.h:33:43: fatal error: 
linux/netfilter_ipv4/ip_queue.h: No such file or directory
-
-ip_queue is gone since Linux kernel 3.5. However, you can still use
-new iptables versions with old Linux kernels. We have to keep libipq
-in this tree for a while (1.5-2 years should be OK).
-
-Reported-by: Arkadiusz MiÅkiewicz 
-Signed-off-by: Pablo Neira Ayuso 

- include/linux/netfilter_ipv4/ip_queue.h |   72 +++
- 1 files changed, 72 insertions(+), 0 deletions(-)
- create mode 100644 include/linux/netfilter_ipv4/ip_queue.h
-
-diff --git a/include/linux/netfilter_ipv4/ip_queue.h 
b/include/linux/netfilter_ipv4/ip_queue.h
-new file mode 100644
-index 000..a03507f
 /dev/null
-+++ b/include/linux/netfilter_ipv4/ip_queue.h
-@@ -0,0 +1,72 @@
-+/*
-+ * This is a module which is used for queueing IPv4 packets and
-+ * communicating with userspace via netlink.
-+ *
-+ * (C) 2000 James Morris, this code is GPL.
-+ */
-+#ifndef _IP_QUEUE_H
-+#define _IP_QUEUE_H
-+
-+#ifdef __KERNEL__
-+#ifdef DEBUG_IPQ
-+#define QDEBUG(x...) printk(KERN_DEBUG ## x)
-+#else
-+#define QDEBUG(x...)
-+#endif  /* DEBUG_IPQ */
-+#else
-+#include 
-+#endif/* ! __KERNEL__ */
-+
-+/* Messages sent from kernel */
-+typedef struct ipq_packet_msg {
-+  unsigned long packet_id;/* ID of queued packet */
-+  unsigned long mark; /* Netfilter mark value */
-+  long timestamp_sec; /* Packet arrival time (seconds) */
-+  long timestamp_usec;/* Packet arrvial time (+useconds) */
-+  unsigned int hook;  /* Netfilter hook we rode in on */
-+  char indev_name[IFNAMSIZ];  /* Name of incoming interface */
-+  char outdev_name[IFNAMSIZ]; /* Name of outgoing interface */
-+  __be16 hw_protocol; /* Hardware protocol (network order) */
-+  unsigned short hw_type; /* Hardware type */
-+  unsigned char hw_addrlen;   /* Hardware address length */
-+  unsigned char hw_addr[8];   /* Hardware address */
-+  size_t data_len;/* Length of packet data */
-+  unsigned char payload[0];   /* Optional pack

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

2012-10-15 Thread Dave Reisner

Date: Monday, October 15, 2012 @ 14:29:42
  Author: dreisner
Revision: 168756

remove from base, as the journal provides rudimentary logging support

Modified:
  syslog-ng/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 17:52:10 UTC (rev 168755)
+++ PKGBUILD2012-10-15 18:29:42 UTC (rev 168756)
@@ -9,7 +9,6 @@
 pkgdesc="Next-generation syslogd with advanced networking and filtering 
capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
-groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/";
 depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
 makedepends=('flex' 'pkg-config')

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 13:52:10
  Author: eric
Revision: 168755

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

Added:
  foobillard++/repos/extra-i686/PKGBUILD
(from rev 168754, foobillard++/trunk/PKGBUILD)
  foobillard++/repos/extra-x86_64/PKGBUILD
(from rev 168754, foobillard++/trunk/PKGBUILD)
Deleted:
  foobillard++/repos/extra-i686/PKGBUILD
  foobillard++/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 17:51:36 UTC (rev 168754)
+++ extra-i686/PKGBUILD 2012-10-15 17:52:10 UTC (rev 168755)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=foobillard++
-pkgver=3.42beta
-pkgrel=3
-pkgdesc="An OpenGL billiard game"
-arch=('i686' 'x86_64')
-url="http://foobillardplus.sourceforge.net/";
-license=('GPL2')
-depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
-replaces=('foobillard')
-source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
-sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
-
-build() {
-  cd "${srcdir}/foobillardplus-${pkgver}"
-  sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
-  sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-  aclocal --force
-  autoconf -f
-  autoheader -f
-  automake -a -c -f 
-  ./configure --prefix=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/foobillardplus-${pkgver}"
-  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
-prefix="${pkgdir}/usr/share" install
-
-  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
-  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} 
"${pkgdir}/usr/share/foobillardplus" 
-  mv "${pkgdir}"/usr/share/foobillardplus.desktop 
"${pkgdir}"/usr/share/applications
-  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} 
"${pkgdir}"/usr/share/pixmaps
-  ln -s /usr/share/foobillardplus/bin/foobillardplus 
"${pkgdir}"/usr/bin/foobillardplus
-}

Copied: foobillard++/repos/extra-i686/PKGBUILD (from rev 168754, 
foobillard++/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 17:52:10 UTC (rev 168755)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=foobillard++
+pkgver=3.42beta
+pkgrel=4
+pkgdesc="An OpenGL billiard game"
+arch=('i686' 'x86_64')
+url="http://foobillardplus.sourceforge.net/";
+license=('GPL2')
+depends=('freetype2' 'libpng' 'glu' 'sdl_net' 'sdl_mixer')
+makedepends=('mesa')
+replaces=('foobillard')
+source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
+sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
+
+build() {
+  cd "${srcdir}/foobillardplus-${pkgver}"
+  sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
+  sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
+  aclocal --force
+  autoconf -f
+  autoheader -f
+  automake -a -c -f 
+  ./configure --prefix=/usr/share
+  make
+}
+
+package() {
+  cd "${srcdir}/foobillardplus-${pkgver}"
+  make DESTDIR="${pkgdir}" datadir="${pkgdir}/usr/share/foobillardplus/data" \
+prefix="${pkgdir}/usr/share" install
+
+  install -d "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
+  mv "${pkgdir}"/usr/share/{AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO} 
"${pkgdir}/usr/share/foobillardplus" 
+  mv "${pkgdir}"/usr/share/foobillardplus.desktop 
"${pkgdir}"/usr/share/applications
+  mv "${pkgdir}"/usr/share/foobillardplus.{png,xbm} 
"${pkgdir}"/usr/share/pixmaps
+  ln -s /usr/share/foobillardplus/bin/foobillardplus 
"${pkgdir}"/usr/bin/foobillardplus
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-15 17:51:36 UTC (rev 168754)
+++ extra-x86_64/PKGBUILD   2012-10-15 17:52:10 UTC (rev 168755)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=foobillard++
-pkgver=3.42beta
-pkgrel=3
-pkgdesc="An OpenGL billiard game"
-arch=('i686' 'x86_64')
-url="http://foobillardplus.sourceforge.net/";
-license=('GPL2')
-depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
-replaces=('foobillard')
-source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
-sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')
-
-build() {
-  cd "${srcdir}/foobillardplus-${pkgver}"
-  sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop
-  sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop
-  aclocal --force
-  autoconf -f
-  autoheader -f
-  automake -a -c -f 
-  ./configure --prefix=/usr/share
-  make
-}
-
-package() {
-  cd "${srcdir}/foobillardplus-${pkgv

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

2012-10-15 Thread Eric Bélanger

Date: Monday, October 15, 2012 @ 13:51:36
  Author: eric
Revision: 168754

upgpkg: foobillard++ 3.42beta-4

Add glu depends, Change mesa depends to makedepends (close FS#31977)

Modified:
  foobillard++/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 14:42:49 UTC (rev 168753)
+++ PKGBUILD2012-10-15 17:51:36 UTC (rev 168754)
@@ -3,12 +3,13 @@
 
 pkgname=foobillard++
 pkgver=3.42beta
-pkgrel=3
+pkgrel=4
 pkgdesc="An OpenGL billiard game"
 arch=('i686' 'x86_64')
 url="http://foobillardplus.sourceforge.net/";
 license=('GPL2')
-depends=('freetype2' 'libpng' 'mesa' 'sdl_net' 'sdl_mixer')
+depends=('freetype2' 'libpng' 'glu' 'sdl_net' 'sdl_mixer')
+makedepends=('mesa')
 replaces=('foobillard')
 
source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz)
 sha1sums=('51507efab0f595cfff26149003faf669c0a42f32')

[arch-commits] Commit in xfce4-xkb-plugin/repos (6 files)

2012-10-15 Thread Evangelos Foutras

Date: Monday, October 15, 2012 @ 10:42:49
  Author: foutrelis
Revision: 168753

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

Added:
  xfce4-xkb-plugin/repos/extra-i686/PKGBUILD
(from rev 168752, xfce4-xkb-plugin/trunk/PKGBUILD)
  
xfce4-xkb-plugin/repos/extra-i686/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
(from rev 168752, 
xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
  xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD
(from rev 168752, xfce4-xkb-plugin/trunk/PKGBUILD)
  
xfce4-xkb-plugin/repos/extra-x86_64/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
(from rev 168752, 
xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
Deleted:
  xfce4-xkb-plugin/repos/extra-i686/PKGBUILD
  xfce4-xkb-plugin/repos/extra-x86_64/PKGBUILD

-+
 extra-i686/PKGBUILD |   80 
+-
 extra-i686/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch   |   59 
+++
 extra-x86_64/PKGBUILD   |   80 
+-
 extra-x86_64/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch |   59 
+++
 4 files changed, 210 insertions(+), 68 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 14:42:29 UTC (rev 168752)
+++ extra-i686/PKGBUILD 2012-10-15 14:42:49 UTC (rev 168753)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR 
-# Contributor: Tobias Kieslich 
-
-pkgname=xfce4-xkb-plugin
-pkgver=0.5.4.3
-pkgrel=2
-pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
-groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
-makedepends=('intltool')
-options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
-
-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 -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}

Copied: xfce4-xkb-plugin/repos/extra-i686/PKGBUILD (from rev 168752, 
xfce4-xkb-plugin/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 14:42:49 UTC (rev 168753)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: AndyRTR 
+# Contributor: Tobias Kieslich 
+
+pkgname=xfce4-xkb-plugin
+pkgver=0.5.4.3
+pkgrel=3
+pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
+arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
+license=('custom')
+groups=('xfce4-goodies')
+depends=('xfce4-panel' 'libxklavier' 'librsvg')
+makedepends=('intltool')
+options=('!libtool')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2
+xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
+sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d'
+'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugs.archlinux.org/task/31880
+  patch -Np1 -i 
"$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch"
+
+  ./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 -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: 
xfce4-xkb-plugin/repos/extra-i686/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
 (from rev 168752, 
xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
===
--- extra-i686/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch   
(rev 0)
+++ extra-i686/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch   
2012-10-15 14:42:49 UTC (rev 168753)
@@ -0,0 +1,59 @@
+From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001
+From: Igor Slepchin 
+Date: Thu, 19 Jul 2012 05:59:40 +
+Subject: Fix memory corruption.
+
+g_free(c) in the original code was freeing memory at the pointer
+that was incremented a few times since the allocation.
+
+This is similar to ubuntu bug #899290 and fedora

[arch-commits] Commit in xfce4-xkb-plugin/trunk (2 files)

2012-10-15 Thread Evangelos Foutras

Date: Monday, October 15, 2012 @ 10:42:29
  Author: foutrelis
Revision: 168752

upgpkg: xfce4-xkb-plugin 0.5.4.3-3

Fix memory corruption. (FS#31880)

Added:
  xfce4-xkb-plugin/trunk/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
Modified:
  xfce4-xkb-plugin/trunk/PKGBUILD

+
 PKGBUILD   |   11 ++
 xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch |   59 +++
 2 files changed, 67 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 14:14:41 UTC (rev 168751)
+++ PKGBUILD2012-10-15 14:42:29 UTC (rev 168752)
@@ -5,7 +5,7 @@
 
 pkgname=xfce4-xkb-plugin
 pkgver=0.5.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
@@ -14,12 +14,17 @@
 depends=('xfce4-panel' 'libxklavier' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2)
-sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2
+xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch)
+sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d'
+'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # https://bugs.archlinux.org/task/31880
+  patch -Np1 -i 
"$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch"
+
   ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \

Added: xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch
===
--- xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch  
(rev 0)
+++ xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch  2012-10-15 
14:42:29 UTC (rev 168752)
@@ -0,0 +1,59 @@
+From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001
+From: Igor Slepchin 
+Date: Thu, 19 Jul 2012 05:59:40 +
+Subject: Fix memory corruption.
+
+g_free(c) in the original code was freeing memory at the pointer
+that was incremented a few times since the allocation.
+
+This is similar to ubuntu bug #899290 and fedora bug 589898.
+---
+diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c
+index d0d0230..324928f 100644
+--- a/panel-plugin/xkb-util.c
 b/panel-plugin/xkb-util.c
+@@ -66,11 +66,10 @@ xkb_util_get_layout_string (const gchar *group_name, const 
gchar *variant)
+ gchar*
+ xkb_util_normalize_group_name (const gchar* group_name)
+ {
+-gchar *c;
++const gchar *c;
+ gchar *result;
+ gint cut_length;
+ gint index_of_na = -1;
+-gint index_tmp = -1;
+ 
+ if (!group_name)
+ return NULL;
+@@ -78,27 +77,19 @@ xkb_util_normalize_group_name (const gchar* group_name)
+ if (strlen (group_name) <= 3)
+ return g_strdup (group_name);
+ 
+-c = g_strdup (group_name);
+-
+-while (*c)
++for (c = group_name; *c; c++)
+ {
+-index_tmp++;
+-
+ if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z')))
+ {
+-index_of_na = index_tmp;
++index_of_na = group_name - c;
+ break;
+ }
+-
+-c++;
+ }
+ 
+ cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3;
+ 
+ result = g_strndup (group_name, cut_length);
+ 
+-g_free (c);
+-
+ return result;
+ }
+ 
+--
+cgit v0.9.0.3

[arch-commits] Commit in hwids/repos (core-any/PKGBUILD core-any/PKGBUILD testing-any)

2012-10-15 Thread Tom Gundersen

Date: Monday, October 15, 2012 @ 10:14:41
  Author: tomegun
Revision: 168751

db-move: moved hwids from [testing] to [core] (any)

Added:
  hwids/repos/core-any/PKGBUILD
(from rev 168749, hwids/repos/testing-any/PKGBUILD)
Deleted:
  hwids/repos/core-any/PKGBUILD
  hwids/repos/testing-any/

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

Deleted: core-any/PKGBUILD
===
--- core-any/PKGBUILD   2012-10-15 14:14:40 UTC (rev 168750)
+++ core-any/PKGBUILD   2012-10-15 14:14:41 UTC (rev 168751)
@@ -1,17 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-pkgname=hwids
-pkgver=20120922
-pkgrel=1
-pkgdesc="hardware identification databases"
-url=https://github.com/gentoo/hwids
-license=('GPL2')
-arch=('any')
-source=("https://github.com/gentoo/${pkgname}/tarball/${pkgname}-${pkgver}";)
-
-package() {
-  cd ${srcdir}/*
-  mkdir -p "${pkgdir}/usr/share/hwdata"
-  cp pci.ids usb.ids "${pkgdir}/usr/share/hwdata/"
-}
-md5sums=('b37eba5bf9192e08fdda164a512d529e')

Copied: hwids/repos/core-any/PKGBUILD (from rev 168749, 
hwids/repos/testing-any/PKGBUILD)
===
--- core-any/PKGBUILD   (rev 0)
+++ core-any/PKGBUILD   2012-10-15 14:14:41 UTC (rev 168751)
@@ -0,0 +1,17 @@
+# $Id$
+# Maintainer: Tom Gundersen 
+pkgname=hwids
+pkgver=20121012
+pkgrel=1
+pkgdesc="hardware identification databases"
+url=https://github.com/gentoo/hwids
+license=('GPL2')
+arch=('any')
+source=("https://github.com/gentoo/${pkgname}/tarball/${pkgname}-${pkgver}";)
+
+package() {
+  cd ${srcdir}/*
+  mkdir -p "${pkgdir}/usr/share/hwdata"
+  cp pci.ids usb.ids "${pkgdir}/usr/share/hwdata/"
+}
+md5sums=('c2eb487c4d61d874255d12b2e1aa95b3')

[arch-commits] Commit in util-linux/repos (30 files)

2012-10-15 Thread Tom Gundersen

Date: Monday, October 15, 2012 @ 10:14:40
  Author: tomegun
Revision: 168750

db-move: moved util-linux from [testing] to [core] (i686, x86_64)

Added:
  util-linux/repos/core-i686/PKGBUILD
(from rev 168749, util-linux/repos/testing-i686/PKGBUILD)
  util-linux/repos/core-i686/pam-common
(from rev 168749, util-linux/repos/testing-i686/pam-common)
  util-linux/repos/core-i686/pam-login
(from rev 168749, util-linux/repos/testing-i686/pam-login)
  util-linux/repos/core-i686/pam-su
(from rev 168749, util-linux/repos/testing-i686/pam-su)
  util-linux/repos/core-i686/util-linux.install
(from rev 168749, util-linux/repos/testing-i686/util-linux.install)
  util-linux/repos/core-i686/uuidd.tmpfiles
(from rev 168749, util-linux/repos/testing-i686/uuidd.tmpfiles)
  util-linux/repos/core-x86_64/PKGBUILD
(from rev 168749, util-linux/repos/testing-x86_64/PKGBUILD)
  util-linux/repos/core-x86_64/pam-common
(from rev 168749, util-linux/repos/testing-x86_64/pam-common)
  util-linux/repos/core-x86_64/pam-login
(from rev 168749, util-linux/repos/testing-x86_64/pam-login)
  util-linux/repos/core-x86_64/pam-su
(from rev 168749, util-linux/repos/testing-x86_64/pam-su)
  util-linux/repos/core-x86_64/util-linux.install
(from rev 168749, util-linux/repos/testing-x86_64/util-linux.install)
  util-linux/repos/core-x86_64/uuidd.tmpfiles
(from rev 168749, util-linux/repos/testing-x86_64/uuidd.tmpfiles)
Deleted:
  util-linux/repos/core-i686/PKGBUILD
  util-linux/repos/core-i686/hwclock-systz.patch
  util-linux/repos/core-i686/pam-common
  util-linux/repos/core-i686/pam-login
  util-linux/repos/core-i686/pam-su
  util-linux/repos/core-i686/su.1
  util-linux/repos/core-i686/util-linux.install
  util-linux/repos/core-i686/uuidd.tmpfiles
  util-linux/repos/core-x86_64/PKGBUILD
  util-linux/repos/core-x86_64/hwclock-systz.patch
  util-linux/repos/core-x86_64/pam-common
  util-linux/repos/core-x86_64/pam-login
  util-linux/repos/core-x86_64/pam-su
  util-linux/repos/core-x86_64/su.1
  util-linux/repos/core-x86_64/util-linux.install
  util-linux/repos/core-x86_64/uuidd.tmpfiles
  util-linux/repos/testing-i686/
  util-linux/repos/testing-x86_64/

-+
 core-i686/PKGBUILD  |  179 +
 core-i686/hwclock-systz.patch   |   96 ---
 core-i686/pam-common|   12 -
 core-i686/pam-login |   14 +-
 core-i686/pam-su|   18 +-
 core-i686/su.1  |  230 --
 core-i686/util-linux.install|   40 +++---
 core-i686/uuidd.tmpfiles|2 
 core-x86_64/PKGBUILD|  179 +
 core-x86_64/hwclock-systz.patch |   96 ---
 core-x86_64/pam-common  |   12 -
 core-x86_64/pam-login   |   14 +-
 core-x86_64/pam-su  |   18 +-
 core-x86_64/su.1|  230 --
 core-x86_64/util-linux.install  |   40 +++---
 core-x86_64/uuidd.tmpfiles  |2 
 16 files changed, 250 insertions(+), 932 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-10-15 14:11:49 UTC (rev 168749)
+++ core-i686/PKGBUILD  2012-10-15 14:14:40 UTC (rev 168750)
@@ -1,97 +0,0 @@
-# $Id$
-# Maintainer: Tom Gundersen 
-# Contributor: judd 
-
-pkgname=util-linux
-pkgver=2.22
-pkgrel=7
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/";
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('pam' 'shadow')
-makedepends=('bc') # for check() only, change this to checkdepends for pacman 
4.1
-conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
-su.1
-uuidd.tmpfiles
-pam-login
-pam-common
-pam-su
-   hwclock-systz.patch)
-backup=(etc/pam.d/chfn
-etc/pam.d/chsh
-etc/pam.d/login
-etc/pam.d/su
-etc/pam.d/su-l)
-install=util-linux.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i ../hwclock-systz.patch
-
-  # unbreak --localstatedir
-  # TODO(dreisner): find out what sami had in mind with these heuristics
-  sed -i '71,75d' configure.ac
-  ./autogen.sh
-
-  ./configure --prefix=/usr \
-  --libdir=/usr/lib \
-  --localstatedir=/run \
-  --enable-fs-paths-extra=/usr/bin:/usr/sbin \
-  --enable-raw \
-  --enable-vipw \
-  --enable-newgrp \
-  --enable-chfn-chsh \
-  --enable-write \
-  --enable-mesg \
-  --enable-socket-activation
-
-#  --enable-reset \ # part of ncurses
-#  --enable-last \ # not part of any package
-#  --enable-

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

2012-10-15 Thread Evangelos Foutras

Date: Monday, October 15, 2012 @ 10:11:49
  Author: foutrelis
Revision: 168749

Adopt and tweak PKGBUILD.

Modified:
  xfce4-xkb-plugin/trunk/PKGBUILD

--+
 PKGBUILD |   37 ++---
 1 file changed, 22 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 13:21:21 UTC (rev 168748)
+++ PKGBUILD2012-10-15 14:11:49 UTC (rev 168749)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: AndyRTR 
+# Maintainer: Evangelos Foutras 
+# Contributor: AndyRTR 
 # Contributor: Tobias Kieslich 
 
 pkgname=xfce4-xkb-plugin
@@ -7,28 +8,34 @@
 pkgrel=2
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
 arch=('i686' 'x86_64')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
 license=('custom')
-url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin";
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
+depends=('xfce4-panel' 'libxklavier' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4dc42f96dc16a3bd78f86454ea3a931464e18497')
+source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2)
+sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-   --sysconfdir=/etc \
-   --libexecdir=/usr/lib \
-   --localstatedir=/var \
-   --disable-static \
-   --disable-debug
+  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 -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+# vim:set ts=2 sw=2 et:

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

2012-10-15 Thread Evangelos Foutras

Date: Monday, October 15, 2012 @ 09:21:21
  Author: foutrelis
Revision: 168748

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

Added:
  xfce4-session/repos/staging-i686/PKGBUILD
(from rev 168747, xfce4-session/trunk/PKGBUILD)
  
xfce4-session/repos/staging-i686/xfce4-session-4.10.0-add-systemd-support.patch
(from rev 168747, 
xfce4-session/trunk/xfce4-session-4.10.0-add-systemd-support.patch)
  xfce4-session/repos/staging-i686/xfce4-session.install
(from rev 168747, xfce4-session/trunk/xfce4-session.install)
  xfce4-session/repos/staging-x86_64/PKGBUILD
(from rev 168747, xfce4-session/trunk/PKGBUILD)
  
xfce4-session/repos/staging-x86_64/xfce4-session-4.10.0-add-systemd-support.patch
(from rev 168747, 
xfce4-session/trunk/xfce4-session-4.10.0-add-systemd-support.patch)
  xfce4-session/repos/staging-x86_64/xfce4-session.install
(from rev 168747, xfce4-session/trunk/xfce4-session.install)
Deleted:
  xfce4-session/repos/staging-i686/PKGBUILD
  
xfce4-session/repos/staging-i686/xfce4-session-4.10.0-add-systemd-support.patch
  xfce4-session/repos/staging-i686/xfce4-session.install
  xfce4-session/repos/staging-x86_64/PKGBUILD
  
xfce4-session/repos/staging-x86_64/xfce4-session-4.10.0-add-systemd-support.patch
  xfce4-session/repos/staging-x86_64/xfce4-session.install

---+
 staging-i686/PKGBUILD |  103 -
 staging-i686/xfce4-session-4.10.0-add-systemd-support.patch   |  776 +-
 staging-i686/xfce4-session.install|   26 
 staging-x86_64/PKGBUILD   |  103 -
 staging-x86_64/xfce4-session-4.10.0-add-systemd-support.patch |  776 +-
 staging-x86_64/xfce4-session.install  |   26 
 6 files changed, 904 insertions(+), 906 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 168747:168748 to see the changes.

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

2012-10-15 Thread Evangelos Foutras

Date: Monday, October 15, 2012 @ 09:20:55
  Author: foutrelis
Revision: 168747

upgpkg: xfce4-session 4.10.0-6

Re-enable legacy session management to fix theming issues in Qt apps like 
smplayer and virtualbox.

Modified:
  xfce4-session/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 12:11:10 UTC (rev 168746)
+++ PKGBUILD2012-10-15 13:20:55 UTC (rev 168747)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.10.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/";
@@ -39,7 +39,6 @@
 --libexecdir=/usr/lib/xfce4 \
 --localstatedir=/var \
 --disable-static \
---disable-legacy-sm \
 --disable-debug
   make
 }

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

2012-10-15 Thread Jan Steffens

Date: Monday, October 15, 2012 @ 08:11:10
  Author: heftig
Revision: 168746

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

Added:
  perl-sdl/repos/extra-i686/PKGBUILD
(from rev 168745, perl-sdl/trunk/PKGBUILD)
  perl-sdl/repos/extra-x86_64/PKGBUILD
(from rev 168745, perl-sdl/trunk/PKGBUILD)
Deleted:
  perl-sdl/repos/extra-i686/PKGBUILD
  perl-sdl/repos/extra-x86_64/PKGBUILD

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 12:09:57 UTC (rev 168745)
+++ extra-i686/PKGBUILD 2012-10-15 12:11:10 UTC (rev 168746)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Allan McRae 
-# Contributor: Sarah Hay 
-
-pkgname=perl-sdl
-pkgver=2.540
-pkgrel=2
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org";
-depends=(perl-alien-sdl perl-tie-simple
- sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
-makedepends=('perl-module-build>=0.40')
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=JTPALMER
-source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('1a5d7849cbdfde4982b28458e38ab172')
-
-build() {
-  cd SDL-$pkgver
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd SDL-$pkgver
-  perl Build test || true
-}
-
-package() {
-  cd SDL-$pkgver
-  perl Build install destdir="$pkgdir"
-}

Copied: perl-sdl/repos/extra-i686/PKGBUILD (from rev 168745, 
perl-sdl/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 12:11:10 UTC (rev 168746)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Allan McRae 
+# Contributor: Sarah Hay 
+
+pkgname=perl-sdl
+pkgver=2.540
+pkgrel=3
+pkgdesc="Simple DirectMedia Layer for Perl"
+arch=(i686 x86_64)
+license=(LGPL)
+url="http://sdl.perl.org";
+depends=(perl-alien-sdl perl-tie-simple
+ sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango smpeg)
+makedepends=('perl-module-build>=0.40')
+options=('!emptydirs')
+replaces=(sdl_perl)
+conflicts=(sdl_perl)
+provides=("sdl_perl=$pkgver")
+# http://search.cpan.org/dist/SDL/
+_author=JTPALMER
+source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
+md5sums=('1a5d7849cbdfde4982b28458e38ab172')
+
+build() {
+  cd SDL-$pkgver
+  # Perl selects the proper CFLAGS set for binary modules
+  unset CFLAGS
+  # install module in vendor directories
+  perl Build.PL installdirs=vendor
+  perl Build
+}
+
+check() {
+  cd SDL-$pkgver
+  perl Build test || true
+}
+
+package() {
+  cd SDL-$pkgver
+  perl Build install destdir="$pkgdir"
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-15 12:09:57 UTC (rev 168745)
+++ extra-x86_64/PKGBUILD   2012-10-15 12:11:10 UTC (rev 168746)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Allan McRae 
-# Contributor: Sarah Hay 
-
-pkgname=perl-sdl
-pkgver=2.540
-pkgrel=2
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org";
-depends=(perl-alien-sdl perl-tie-simple
- sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
-makedepends=('perl-module-build>=0.40')
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=JTPALMER
-source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('1a5d7849cbdfde4982b28458e38ab172')
-
-build() {
-  cd SDL-$pkgver
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd SDL-$pkgver
-  perl Build test || true
-}
-
-package() {
-  cd SDL-$pkgver
-  perl Build install destdir="$pkgdir"
-}

Copied: perl-sdl/repos/extra-x86_64/PKGBUILD (from rev 168745, 
perl-sdl/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-15 12:11:10 UTC (rev 168746)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Allan McRae 
+# Co

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

2012-10-15 Thread Jan Steffens

Date: Monday, October 15, 2012 @ 08:09:57
  Author: heftig
Revision: 168745

drop mesa dep FS#31990

Modified:
  perl-sdl/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 09:20:47 UTC (rev 168744)
+++ PKGBUILD2012-10-15 12:09:57 UTC (rev 168745)
@@ -5,13 +5,13 @@
 
 pkgname=perl-sdl
 pkgver=2.540
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple DirectMedia Layer for Perl"
 arch=(i686 x86_64)
 license=(LGPL)
 url="http://sdl.perl.org";
 depends=(perl-alien-sdl perl-tie-simple
- sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
+ sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango smpeg)
 makedepends=('perl-module-build>=0.40')
 options=('!emptydirs')
 replaces=(sdl_perl)

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

2012-10-15 Thread Andrea Scarpino

Date: Monday, October 15, 2012 @ 05:20:47
  Author: andrea
Revision: 168744

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

Added:
  pyqt/repos/staging-i686/PKGBUILD
(from rev 168743, pyqt/trunk/PKGBUILD)
  pyqt/repos/staging-x86_64/PKGBUILD
(from rev 168743, pyqt/trunk/PKGBUILD)
Deleted:
  pyqt/repos/staging-i686/PKGBUILD
  pyqt/repos/staging-x86_64/PKGBUILD

-+
 staging-i686/PKGBUILD   |  182 ++
 staging-x86_64/PKGBUILD |  182 ++
 2 files changed, 180 insertions(+), 184 deletions(-)

Deleted: staging-i686/PKGBUILD
===
--- staging-i686/PKGBUILD   2012-10-15 07:45:26 UTC (rev 168743)
+++ staging-i686/PKGBUILD   2012-10-15 09:20:47 UTC (rev 168744)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Douglas Soares de Andrade 
-# Contributor: riai  Ben 
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.5
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro";
-license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
- 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
- 
source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
-md5sums=('e4cdd6619c63655f7510efb4df8462fb')
-
-build() {
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd 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 ../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-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  cd PyQt-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-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-  'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-  'qscintilla: QScintilla API'
-  'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
-
-  cd Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use 
DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}

Copied: pyqt/repos/staging-i686/PKGBUILD (from rev 168743, pyqt/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-15 09:20:47 UTC (rev 168744)
@@ -0,0 +1,90 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+# Contributor: riai  Ben 
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro";
+license=('GPL')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+ 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
+
+build() {
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${

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

2012-10-15 Thread Andrea Scarpino

Date: Monday, October 15, 2012 @ 03:45:26
  Author: andrea
Revision: 168743

Move the designer plugin to the pyqt package as it only works with Python3 
(FS#31952)

Modified:
  pyqt/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-10-15 07:00:19 UTC (rev 168742)
+++ PKGBUILD2012-10-15 07:45:26 UTC (rev 168743)
@@ -6,13 +6,13 @@
 pkgbase=pyqt
 pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
 pkgver=4.9.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro";
 license=('GPL')
 makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
  'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
- 
source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
+source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz";)
 md5sums=('e4cdd6619c63655f7510efb4df8462fb')
 
 build() {
@@ -47,7 +47,6 @@
   cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
   make -C pylupdate DESTDIR="${pkgdir}" install
-  make -C designer INSTALL_ROOT="${pkgdir}" install
   
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
@@ -65,7 +64,6 @@
 
   # Provided by pyqt-common
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
 }
 
@@ -85,7 +83,7 @@
   # Fix conflicts with pyqt
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt-common
+  # Provided by pyqt
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
   rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
   rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api

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

2012-10-15 Thread Florian Pritz

Date: Monday, October 15, 2012 @ 03:00:19
  Author: bluewind
Revision: 168742

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

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

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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2012-10-15 06:58:24 UTC (rev 168741)
+++ extra-i686/PKGBUILD 2012-10-15 07:00:19 UTC (rev 168742)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz< f...@xinu.at>
-# Contributor: Dany Martineau 
-
-pkgname=qrencode
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
-depends=('libpng>=1.5.0')
-makedepends=(sdl)
-url="http://megaui.net/fukuchi/works/qrencode/index.en.html";
-license=('GPL')
-options=(!libtool)
-source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('14920ba9d0515bddcaebfbd728229c5d')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make prefix="$pkgdir/usr" install
-}

Copied: qrencode/repos/extra-i686/PKGBUILD (from rev 168741, 
qrencode/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-15 07:00:19 UTC (rev 168742)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Florian Pritz< f...@xinu.at>
+# Contributor: Dany Martineau 
+
+pkgname=qrencode
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="C library for encoding data in a QR Code symbol."
+arch=(i686 x86_64)
+depends=('libpng>=1.5.0')
+makedepends=(sdl)
+url="http://megaui.net/fukuchi/works/qrencode/index.en.html";
+license=('GPL')
+options=(!libtool)
+source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('5af7879ab5b300663f2076c287c09030')
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
+#  autoreconf
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+
+  make prefix="$pkgdir/usr" install
+}

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2012-10-15 06:58:24 UTC (rev 168741)
+++ extra-x86_64/PKGBUILD   2012-10-15 07:00:19 UTC (rev 168742)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz< f...@xinu.at>
-# Contributor: Dany Martineau 
-
-pkgname=qrencode
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
-depends=('libpng>=1.5.0')
-makedepends=(sdl)
-url="http://megaui.net/fukuchi/works/qrencode/index.en.html";
-license=('GPL')
-options=(!libtool)
-source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('14920ba9d0515bddcaebfbd728229c5d')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-#  autoreconf
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make prefix="$pkgdir/usr" install
-}

Copied: qrencode/repos/extra-x86_64/PKGBUILD (from rev 168741, 
qrencode/trunk/PKGBUILD)
===
--- extra-x86_64/PKGBUILD   (rev 0)
+++ extra-x86_64/PKGBUILD   2012-10-15 07:00:19 UTC (rev 168742)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Florian Pritz< f...@xinu.at>
+# Contributor: Dany Martineau 
+
+pkgname=qrencode
+pkgver=3.4.0
+pkgrel=1
+pkgdesc="C library for encoding data in a QR Code symbol."
+arch=(i686 x86_64)
+depends=('libpng>=1.5.0')
+makedepends=(sdl)
+url="http://megaui.net/fukuchi/works/qrencode/index.en.html";
+license=('GPL')
+options=(!libtool)
+source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('5af7879ab5b300663f2076c287c09030')
+
+build() {
+  cd "${srcdir}/$pkgname-$pkgver"
+#  autoreconf
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/$pkgname-$pkgver"
+
+  make prefix="$pkgdir/usr" install
+}

65 matches

Mail list logo