[arch-commits] Commit in haskell-haskeline/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:55:37
  Author: vesa
Revision: 61215

Initialized merge tracking via "svnmerge" with revisions "1-61213" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-haskeline/trunk

Modified:
  haskell-haskeline/repos/testing-i686/ (properties)


Property changes on: haskell-haskeline/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-haskeline/trunk:1-61213



[arch-commits] Commit in haskell-haskeline/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:55:24
  Author: vesa
Revision: 61214

archrelease: new repo testing-i686

Added:
  haskell-haskeline/repos/testing-i686/



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

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:54:45
  Author: vesa
Revision: 61213

ghc-6.12 & newver

Modified:
  haskell-haskeline/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:52:34 UTC (rev 61212)
+++ PKGBUILD2009-12-13 07:54:45 UTC (rev 61213)
@@ -3,25 +3,25 @@
 # Package generated by cabal2arch 0.5.2
 pkgname=haskell-haskeline
 pkgrel=1
-pkgver=0.6.1.5
+pkgver=0.6.2.2
 pkgdesc="A command-line interface for user input, written in Haskell."
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/haskeline";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'haskell-cabal' 'haskell-extensible-exceptions' 
'haskell-terminfo' 'haskell-utf8-string')
-depends=('ghc' 'haskell-cabal' 'haskell-extensible-exceptions' 
'haskell-terminfo' 'haskell-utf8-string' sh)
+depends=('ghc=6.12.1' 'haskell-extensible-exceptions' 'haskell-utf8-string' sh)
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/haskeline/$pkgver/haskeline-$pkgver.tar.gz)
 install=haskell-haskeline.install
-md5sums=('0f1730bb24c898cd176aa1039f50802e')
+
 build() {
-cd $startdir/src/haskeline-$pkgver
+cd $srcdir/haskeline-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
+md5sums=('c23a8ffbcff7cb42f0ee6ca6946285bb')



[arch-commits] Commit in haskell-utf8-string/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:52:34
  Author: vesa
Revision: 61212

Initialized merge tracking via "svnmerge" with revisions "1-61210" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-utf8-string/trunk

Modified:
  haskell-utf8-string/repos/testing-i686/   (properties)


Property changes on: haskell-utf8-string/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-utf8-string/trunk:1-61210



[arch-commits] Commit in haskell-utf8-string/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:52:21
  Author: vesa
Revision: 61211

archrelease: new repo testing-i686

Added:
  haskell-utf8-string/repos/testing-i686/



[arch-commits] Commit in haskell-utf8-string/trunk (PKGBUILD)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:51:50
  Author: vesa
Revision: 61210

bump & ghc-6.12

Modified:
  haskell-utf8-string/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:48:20 UTC (rev 61209)
+++ PKGBUILD2009-12-13 07:51:50 UTC (rev 61210)
@@ -2,26 +2,26 @@
 # Contributor: Arch Haskell Team 
 # Package generated by cabal2arch 0.4.1
 pkgname=haskell-utf8-string
-pkgver=0.3.5
-pkgrel=1.1
+pkgver=0.3.6
+pkgrel=1
 pkgdesc="Support for reading and writing UTF8 Strings"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/utf8-string";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc' 'haskell-cabal' sh)
+depends=('ghc=6.12.1' sh)
 options=('strip')
 install=haskell-utf8-string.install
 
source=(http://hackage.haskell.org/packages/archive/utf8-string/$pkgver/utf8-string-$pkgver.tar.gz)
-md5sums=('d5198209bd81ea4f8af7692e2467336c')
 
 build() {
-cd $startdir/src/utf8-string-$pkgver
+cd $srcdir/utf8-string-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
+md5sums=('be8c5ef52a0824babdc89d60c1e9b600')



[arch-commits] Commit in haskell-hashed-storage/repos (2 files)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:48:20
  Author: vesa
Revision: 61209

Merged revisions 61208 via svnmerge from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-hashed-storage/trunk


  r61208 | vesa | 2009-12-13 09:47:43 +0200 (Sun, 13 Dec 2009) | 2 lines
  
  ah, bump down since this sucks


Modified:
  haskell-hashed-storage/repos/testing-i686/(properties)
  haskell-hashed-storage/repos/testing-i686/PKGBUILD

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


Property changes on: haskell-hashed-storage/repos/testing-i686
___
Modified: svnmerge-integrated
   - /haskell-hashed-storage/trunk:1-61205
   + /haskell-hashed-storage/trunk:1-61208

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-13 07:47:43 UTC (rev 61208)
+++ testing-i686/PKGBUILD   2009-12-13 07:48:20 UTC (rev 61209)
@@ -3,7 +3,7 @@
 # Package generated by cabal2arch 0.5.3
 pkgname=haskell-hashed-storage
 pkgrel=1
-pkgver=0.4.3
+pkgver=0.3.9
 pkgdesc="Hashed file storage support code."
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hashed-storage";
 license=('custom:BSD3')
@@ -25,4 +25,4 @@
 runhaskell Setup copy --destdir=$pkgdir || return 1
 install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
-md5sums=('a8427578dc13006689158cd9f2c90e56')
+md5sums=('8310b334aa0464f7a72d27c45b042dfd')



[arch-commits] Commit in haskell-hashed-storage/trunk (PKGBUILD)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:47:43
  Author: vesa
Revision: 61208

ah, bump down since this sucks

Modified:
  haskell-hashed-storage/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:40:12 UTC (rev 61207)
+++ PKGBUILD2009-12-13 07:47:43 UTC (rev 61208)
@@ -3,7 +3,7 @@
 # Package generated by cabal2arch 0.5.3
 pkgname=haskell-hashed-storage
 pkgrel=1
-pkgver=0.4.3
+pkgver=0.3.9
 pkgdesc="Hashed file storage support code."
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hashed-storage";
 license=('custom:BSD3')
@@ -25,4 +25,4 @@
 runhaskell Setup copy --destdir=$pkgdir || return 1
 install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
-md5sums=('a8427578dc13006689158cd9f2c90e56')
+md5sums=('8310b334aa0464f7a72d27c45b042dfd')



[arch-commits] Commit in haskell-hashed-storage/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:40:12
  Author: vesa
Revision: 61207

Initialized merge tracking via "svnmerge" with revisions "1-61205" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-hashed-storage/trunk

Modified:
  haskell-hashed-storage/repos/testing-i686/(properties)


Property changes on: haskell-hashed-storage/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-hashed-storage/trunk:1-61205



[arch-commits] Commit in haskell-hashed-storage/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:39:58
  Author: vesa
Revision: 61206

archrelease: new repo testing-i686

Added:
  haskell-hashed-storage/repos/testing-i686/



[arch-commits] Commit in haskell-hashed-storage/trunk (PKGBUILD)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:39:42
  Author: vesa
Revision: 61205

ghc-6.12 bump & newer version

Modified:
  haskell-hashed-storage/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:37:10 UTC (rev 61204)
+++ PKGBUILD2009-12-13 07:39:42 UTC (rev 61205)
@@ -3,26 +3,26 @@
 # Package generated by cabal2arch 0.5.3
 pkgname=haskell-hashed-storage
 pkgrel=1
-pkgver=0.3.8
+pkgver=0.4.3
 pkgdesc="Hashed file storage support code."
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/hashed-storage";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' 'haskell-extensible-exceptions' 
'haskell-mmap>=0.4' 'haskell-zlib')
+depends=('ghc=6.12.1' 'haskell-cabal' 'haskell-extensible-exceptions' 
'haskell-mmap>=0.4' 'haskell-zlib' 'haskell-binary' 'haskell-mtl' 
'haskell-dataenc')
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/hashed-storage/$pkgver/hashed-storage-$pkgver.tar.gz)
 install=haskell-hashed-storage.install
 
 build() {
-cd $startdir/src/hashed-storage-$pkgver
+cd $srcdir/hashed-storage-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
-md5sums=('2151f3bb83f44d195e6f73f86a57c2e7')
+md5sums=('a8427578dc13006689158cd9f2c90e56')



[arch-commits] Commit in expat/repos (testing-x86_64)

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 02:37:10
  Author: allan
Revision: 61204

archrelease: new repo testing-x86_64

Added:
  expat/repos/testing-x86_64/



[arch-commits] Commit in haskell-dataenc/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:36:47
  Author: vesa
Revision: 61203

Initialized merge tracking via "svnmerge" with revisions "1-61201" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-dataenc/trunk

Modified:
  haskell-dataenc/repos/testing-i686/   (properties)


Property changes on: haskell-dataenc/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-dataenc/trunk:1-61201



[arch-commits] Commit in haskell-dataenc/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:36:33
  Author: vesa
Revision: 61202

archrelease: new repo testing-i686

Added:
  haskell-dataenc/repos/testing-i686/




[arch-commits] Commit in (5 files)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:36:01
  Author: vesa
Revision: 61201

ghc-6.12 library separation

Added:
  haskell-dataenc/
  haskell-dataenc/repos/
  haskell-dataenc/trunk/
  haskell-dataenc/trunk/PKGBUILD
  haskell-dataenc/trunk/haskell-dataenc.install

-+
 PKGBUILD|   26 ++
 haskell-dataenc.install |   13 +
 2 files changed, 39 insertions(+)

Added: haskell-dataenc/trunk/PKGBUILD
===
--- haskell-dataenc/trunk/PKGBUILD  (rev 0)
+++ haskell-dataenc/trunk/PKGBUILD  2009-12-13 07:36:01 UTC (rev 61201)
@@ -0,0 +1,26 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+pkgname=haskell-dataenc
+pkgrel=1
+pkgver=0.13.0.2
+pkgdesc="Monad transformer library"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/dataenc";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/dataenc/$pkgver/dataenc-$pkgver.tar.gz)
+install=haskell-dataenc.install
+
+build() {
+cd $srcdir/dataenc-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
+}
+md5sums=('65f6e8fdbc0adef572afdacd2c492289')

Added: haskell-dataenc/trunk/haskell-dataenc.install
===
--- haskell-dataenc/trunk/haskell-dataenc.install   
(rev 0)
+++ haskell-dataenc/trunk/haskell-dataenc.install   2009-12-13 07:36:01 UTC 
(rev 61201)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-dataenc
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in expat/repos (testing-i686)

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 02:35:31
  Author: allan
Revision: 61200

Initialized merge tracking via "svnmerge" with revisions "1-61198" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/expat/trunk

Modified:
  expat/repos/testing-i686/ (properties)


Property changes on: expat/repos/testing-i686
___
Added: svnmerge-integrated
   + /expat/trunk:1-61198



[arch-commits] Commit in expat/repos (testing-i686)

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 02:35:10
  Author: allan
Revision: 61199

archrelease: new repo testing-i686

Added:
  expat/repos/testing-i686/



[arch-commits] Commit in expat/trunk (CVE-2009-3560.patch PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 02:34:45
  Author: allan
Revision: 61198

upgpkg: expat 2.0.1-3
fix CVE-2009-3560

Added:
  expat/trunk/CVE-2009-3560.patch
Modified:
  expat/trunk/PKGBUILD

-+
 CVE-2009-3560.patch |   11 +++
 PKGBUILD|   16 +---
 2 files changed, 20 insertions(+), 7 deletions(-)

Added: CVE-2009-3560.patch
===
--- CVE-2009-3560.patch (rev 0)
+++ CVE-2009-3560.patch 2009-12-13 07:34:45 UTC (rev 61198)
@@ -0,0 +1,11 @@
+diff -Naur expat-2.0.1-old/lib/xmlparse.c expat-2.0.1/lib/xmlparse.c
+--- expat-2.0.1-old/lib/xmlparse.c 2007-05-08 12:25:35.0 +1000
 expat-2.0.1/lib/xmlparse.c 2009-12-13 17:26:52.0 +1000
+@@ -3725,7 +3725,6 @@
+ return XML_ERROR_NO_ELEMENTS;
+   default:
+ tok = -tok;
+-next = end;
+ break;
+   }
+ }

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:25:42 UTC (rev 61197)
+++ PKGBUILD2009-12-13 07:34:45 UTC (rev 61198)
@@ -4,21 +4,23 @@
 
 pkgname=expat
 pkgver=2.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An XML Parser library written in C"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://expat.sourceforge.net/";
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
-url="http://expat.sourceforge.net/";
-md5sums=('ee8b492592568805593f81f8cdf2a04c')
+source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz
+CVE-2009-3560.patch)
+md5sums=('ee8b492592568805593f81f8cdf2a04c'
+ '50aa6f7693fda07f4720a0495d12e695')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/CVE-2009-3560.patch
   ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || 
return 1
 }



[arch-commits] Commit in haskell-mtl/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:25:42
  Author: vesa
Revision: 61197

Initialized merge tracking via "svnmerge" with revisions "1-61195" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-mtl/trunk

Modified:
  haskell-mtl/repos/testing-i686/   (properties)


Property changes on: haskell-mtl/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-mtl/trunk:1-61195



[arch-commits] Commit in haskell-mtl/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:25:28
  Author: vesa
Revision: 61196

archrelease: new repo testing-i686

Added:
  haskell-mtl/repos/testing-i686/



[arch-commits] Commit in (5 files)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:24:59
  Author: vesa
Revision: 61195

separated from ghc-6.12, but essential lib for darcs

Added:
  haskell-mtl/
  haskell-mtl/repos/
  haskell-mtl/trunk/
  haskell-mtl/trunk/PKGBUILD
  haskell-mtl/trunk/haskell-mtl.install

-+
 PKGBUILD|   26 ++
 haskell-mtl.install |   13 +
 2 files changed, 39 insertions(+)

Added: haskell-mtl/trunk/PKGBUILD
===
--- haskell-mtl/trunk/PKGBUILD  (rev 0)
+++ haskell-mtl/trunk/PKGBUILD  2009-12-13 07:24:59 UTC (rev 61195)
@@ -0,0 +1,26 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+pkgname=haskell-mtl
+pkgrel=1
+pkgver=1.1.0.2
+pkgdesc="Monad transformer library"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/mtl/$pkgver/mtl-$pkgver.tar.gz)
+install=haskell-mtl.install
+
+build() {
+cd $srcdir/mtl-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
+}
+md5sums=('1e933bb7abb38b7bb423929ba37219db')

Added: haskell-mtl/trunk/haskell-mtl.install
===
--- haskell-mtl/trunk/haskell-mtl.install   (rev 0)
+++ haskell-mtl/trunk/haskell-mtl.install   2009-12-13 07:24:59 UTC (rev 
61195)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-mtl
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in haskell-binary/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:22:31
  Author: vesa
Revision: 61194

Initialized merge tracking via "svnmerge" with revisions "1-61192" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-binary/trunk

Modified:
  haskell-binary/repos/testing-i686/(properties)


Property changes on: haskell-binary/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-binary/trunk:1-61192



[arch-commits] Commit in haskell-binary/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:22:18
  Author: vesa
Revision: 61193

archrelease: new repo testing-i686

Added:
  haskell-binary/repos/testing-i686/



[arch-commits] Commit in (5 files)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:21:45
  Author: vesa
Revision: 61192

add haskell-binary to extra (separated from extralibs in ghc-6.12)

Added:
  haskell-binary/
  haskell-binary/repos/
  haskell-binary/trunk/
  haskell-binary/trunk/PKGBUILD
  haskell-binary/trunk/haskell-binary.install

+
 PKGBUILD   |   26 ++
 haskell-binary.install |   13 +
 2 files changed, 39 insertions(+)

Added: haskell-binary/trunk/PKGBUILD
===
--- haskell-binary/trunk/PKGBUILD   (rev 0)
+++ haskell-binary/trunk/PKGBUILD   2009-12-13 07:21:45 UTC (rev 61192)
@@ -0,0 +1,26 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+pkgname=haskell-binary
+pkgrel=1
+pkgver=0.5.0.2
+pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/binary";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz)
+install=haskell-binary.install
+
+build() {
+cd $srcdir/binary-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
+}
+md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926')

Added: haskell-binary/trunk/haskell-binary.install
===
--- haskell-binary/trunk/haskell-binary.install (rev 0)
+++ haskell-binary/trunk/haskell-binary.install 2009-12-13 07:21:45 UTC (rev 
61192)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-binary
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in haskell-extensible-exceptions/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:15:59
  Author: vesa
Revision: 61191

Initialized merge tracking via "svnmerge" with revisions "1-61189" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-extensible-exceptions/trunk

Modified:
  haskell-extensible-exceptions/repos/testing-i686/ (properties)


Property changes on: haskell-extensible-exceptions/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-extensible-exceptions/trunk:1-61189



[arch-commits] Commit in haskell-extensible-exceptions/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:15:45
  Author: vesa
Revision: 61190

archrelease: new repo testing-i686

Added:
  haskell-extensible-exceptions/repos/testing-i686/



[arch-commits] Commit in haskell-extensible-exceptions/trunk (PKGBUILD)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:15:13
  Author: vesa
Revision: 61189

ghc-6.12 bump and others

Modified:
  haskell-extensible-exceptions/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:13:04 UTC (rev 61188)
+++ PKGBUILD2009-12-13 07:15:13 UTC (rev 61189)
@@ -2,26 +2,25 @@
 # Contributor: Arch Haskell Team 
 # Package generated by cabal2arch 0.4.1
 pkgname=haskell-extensible-exceptions
-pkgrel=1
+pkgrel=1.1
 pkgver=0.1.1.0
 pkgdesc="Extensible exceptions"
 
url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/extensible-exceptions";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'haskell-cabal')
-depends=('ghc' 'haskell-cabal' sh)
+depends=('ghc=6.12.1'  sh)
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/extensible-exceptions/$pkgver/extensible-exceptions-$pkgver.tar.gz)
 install=haskell-extensible-exceptions.install
 md5sums=('7aba82acc64fa2f2dc89d8ac27e24a43')
 build() {
-cd $startdir/src/extensible-exceptions-$pkgver
+cd $srcdir/extensible-exceptions-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }



[arch-commits] Commit in haskell-mmap/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:13:04
  Author: vesa
Revision: 61188

Initialized merge tracking via "svnmerge" with revisions "1-61186" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-mmap/trunk

Modified:
  haskell-mmap/repos/testing-i686/  (properties)


Property changes on: haskell-mmap/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-mmap/trunk:1-61186



[arch-commits] Commit in haskell-mmap/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:12:50
  Author: vesa
Revision: 61187

archrelease: new repo testing-i686

Added:
  haskell-mmap/repos/testing-i686/



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

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:12:26
  Author: vesa
Revision: 61186

ghc-6.12 bump $pkgdir $srcdir replacements

Modified:
  haskell-mmap/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:06:49 UTC (rev 61185)
+++ PKGBUILD2009-12-13 07:12:26 UTC (rev 61186)
@@ -2,26 +2,26 @@
 # Contributor: Arch Haskell Team 
 # Package generated by cabal2arch 0.5.3
 pkgname=haskell-mmap
-pkgrel=1
+pkgrel=1.1
 pkgver=0.4.1
 pkgdesc="Memory mapped files for POSIX and Windows"
 url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mmap";
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=()
-depends=('ghc' 'haskell-cabal' sh)
+depends=('ghc=6.12.1' sh)
 options=('strip')
 
source=(http://hackage.haskell.org/packages/archive/mmap/$pkgver/mmap-$pkgver.tar.gz)
 install=haskell-mmap.install
 md5sums=('2ebe9772a0efd0a6febfbc67c02faab2')
 build() {
-cd $startdir/src/mmap-$pkgver
+cd $srcdir/mmap-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }



[arch-commits] Commit in haskell-zlib/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:06:49
  Author: vesa
Revision: 61185

Initialized merge tracking via "svnmerge" with revisions "1-61183" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/haskell-zlib/trunk

Modified:
  haskell-zlib/repos/testing-i686/  (properties)


Property changes on: haskell-zlib/repos/testing-i686
___
Added: svnmerge-integrated
   + /haskell-zlib/trunk:1-61183



[arch-commits] Commit in haskell-zlib/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:06:36
  Author: vesa
Revision: 61184

archrelease: new repo testing-i686

Added:
  haskell-zlib/repos/testing-i686/



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

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:06:10
  Author: vesa
Revision: 61183

$startdir/pkg => $pkgdir

Modified:
  haskell-zlib/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 07:03:12 UTC (rev 61182)
+++ PKGBUILD2009-12-13 07:06:10 UTC (rev 61183)
@@ -14,14 +14,14 @@
 install=haskell-zlib.install
 
 build() {
-cd $startdir/src/zlib-$pkgver
+cd $srcdir/zlib-$pkgver
 runhaskell Setup configure --prefix=/usr || return 1
 runhaskell Setup build   || return 1
 runhaskell Setup register   --gen-script || return 1
 runhaskell Setup unregister --gen-script || return 1
-install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
-install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
-runhaskell Setup copy --destdir=$startdir/pkg || return 1
-install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+install -D -m744 register.sh   
$pkgdir/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$pkgdir/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$pkgdir || return 1
+install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE || 
return 1
 }
 md5sums=('19859e241dc18ef1501a5d44d8523507')



[arch-commits] Commit in (5 files)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 02:03:12
  Author: vesa
Revision: 61182

bring haskell-zlib from community (it's a dep of darcs->hashed-storage)

Added:
  haskell-zlib/
  haskell-zlib/repos/
  haskell-zlib/trunk/
  haskell-zlib/trunk/PKGBUILD
  haskell-zlib/trunk/haskell-zlib.install

--+
 PKGBUILD |   27 +++
 haskell-zlib.install |   13 +
 2 files changed, 40 insertions(+)

Added: haskell-zlib/trunk/PKGBUILD
===
--- haskell-zlib/trunk/PKGBUILD (rev 0)
+++ haskell-zlib/trunk/PKGBUILD 2009-12-13 07:03:12 UTC (rev 61182)
@@ -0,0 +1,27 @@
+# Maintainer: Vesa Kaihlavirta 
+# Contributor: Arch Haskell Team 
+# Package originally generated by cabal2arch 0.4.1
+pkgname=haskell-zlib
+pkgrel=1.1
+pkgver=0.5.2.0
+pkgdesc="Compression and decompression in the gzip and zlib formats"
+url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/zlib";
+license=('custom:BSD3')
+arch=('i686' 'x86_64')
+depends=(ghc=6.12.1 'zlib' sh)
+options=('strip')
+source=(http://hackage.haskell.org/packages/archive/zlib/$pkgver/zlib-$pkgver.tar.gz)
+install=haskell-zlib.install
+
+build() {
+cd $startdir/src/zlib-$pkgver
+runhaskell Setup configure --prefix=/usr || return 1
+runhaskell Setup build   || return 1
+runhaskell Setup register   --gen-script || return 1
+runhaskell Setup unregister --gen-script || return 1
+install -D -m744 register.sh   
$startdir/pkg/usr/share/haskell/$pkgname/register.sh
+install-m744 unregister.sh 
$startdir/pkg/usr/share/haskell/$pkgname/unregister.sh
+runhaskell Setup copy --destdir=$startdir/pkg || return 1
+install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE 
|| return 1
+}
+md5sums=('19859e241dc18ef1501a5d44d8523507')


Property changes on: haskell-zlib/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

Added: haskell-zlib/trunk/haskell-zlib.install
===
--- haskell-zlib/trunk/haskell-zlib.install (rev 0)
+++ haskell-zlib/trunk/haskell-zlib.install 2009-12-13 07:03:12 UTC (rev 
61182)
@@ -0,0 +1,13 @@
+HS_DIR=/usr/share/haskell/haskell-zlib
+post_install() {
+  ${HS_DIR}/register.sh
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}



[arch-commits] Commit in ghc/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 01:02:47
  Author: vesa
Revision: 61181

Initialized merge tracking via "svnmerge" with revisions "1-61179" from 
svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/ghc/trunk

Modified:
  ghc/repos/testing-i686/   (properties)


Property changes on: ghc/repos/testing-i686
___
Added: svnmerge-integrated
   + /ghc/trunk:1-61179



[arch-commits] Commit in ghc/repos (testing-i686)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 01:02:32
  Author: vesa
Revision: 61180

archrelease: new repo testing-i686

Added:
  ghc/repos/testing-i686/



[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk)

2009-12-12 Thread Vesa Kaihlavirta
Date: Sunday, December 13, 2009 @ 01:02:00
  Author: vesa
Revision: 61179

bump => 6.12.1

Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/build.mk

--+
 PKGBUILD |   23 ++-
 build.mk |   93 +++--
 2 files changed, 76 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 05:17:07 UTC (rev 61178)
+++ PKGBUILD2009-12-13 06:02:00 UTC (rev 61179)
@@ -1,37 +1,34 @@
 # $Id$
 # Maintainer: Vesa Kaihlavirta 
 pkgname=ghc
-pkgver=6.10.4
+pkgver=6.12.1
 pkgrel=1
 pkgdesc="The Glasgow Haskell Compiler"
 arch=(i686 x86_64)
 url="http://www.haskell.org/ghc/";
 license=("custom")
-depends=(gmp)
+depends=(gmp perl)
 makedepends=(ghc happy perl)
 provides=(haskell-cabal)
 replaces=("haskell-cabal<1.6.0.3")
-backup=(usr/lib/ghc-6.10.4/package.conf)
+backup=(usr/lib/ghc-6.12.1/package.conf)
 install=(ghc.install)
 
 source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2"; 
\
-
"http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2";
+#
"http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2";
  build.mk ghc.install)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
-  cp $startdir/build.mk mk/build.mk
+  cp ../../build.mk mk/build.mk
 
   ./configure --prefix=/usr 
-  make -j2 || return 1
-  make DESTDIR=$startdir/pkg install
+  make -j1 || return 1
+  make DESTDIR=$pkgdir install
 
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
 }
-
-
-md5sums=('167687fa582ef6702aaac24e139ec982'
- '37ce285617d7cebabc3cf6805bdbca25'
- 'a05681b982aad44cc6770bd021e35b67'
+md5sums=('3a2b23f29013605f721ebdfc29de9c92'
+ '31f83779da0e727dbe536ba671281e47'
  'd03bca6b591043c0fe996d72dd448919')

Modified: build.mk
===
--- build.mk2009-12-13 05:17:07 UTC (rev 61178)
+++ build.mk2009-12-13 06:02:00 UTC (rev 61179)
@@ -16,14 +16,16 @@
 # Fast build with optimised libraries:
 #BuildFlavour = quick
 
+# Profile the stage2 compiler:
+#BuildFlavour = prof
+
 # A development build, working on the stage 1 compiler:
 #BuildFlavour = devel1
 
 # A development build, working on the stage 2 compiler:
 #BuildFlavour = devel2
 
-# Which warnings we like to use
-MyWarningOpts   = -W -fno-warn-unused-matches -fwarn-unused-imports
+GhcLibWays = v
 
 #  1. A Performance/Distribution build
 
@@ -36,20 +38,27 @@
 GhcStage2HcOpts = -O2 -fasm
 GhcHcOpts   = -Rghc-timing
 GhcLibHcOpts= -O2 -XGenerics
-GhcLibWays  = p
+GhcLibWays += p
 
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
 endif
 
+endif
+
 #  A Fast build --
 
 ifeq "$(BuildFlavour)" "quickest"
 
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts= -O0 -fasm
-GhcLibWays  =
-SplitObjs   = NO
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O0 -fasm
+GhcLibHcOpts   = -O0 -fasm
+SplitObjs  = NO
+HADDOCK_DOCS   = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS   = NO
+BUILD_DOCBOOK_PDF  = NO
 
 endif
 
@@ -57,25 +66,52 @@
 
 ifeq "$(BuildFlavour)" "quick"
 
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts= -O -fasm
-GhcLibWays  =
-SplitObjs   = NO
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O0 -fasm
+GhcLibHcOpts   = -O -fasm
+SplitObjs  = NO
+HADDOCK_DOCS   = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS   = NO
+BUILD_DOCBOOK_PDF  = NO
 
 endif
 
+#  Profile the stage2 compiler ---
+
+ifeq "$(BuildFlavour)" "prof"
+
+SRC_HC_OPTS= -H64m -O0 -fasm
+GhcStage1HcOpts= -O -fasm
+GhcStage2HcOpts= -O -fasm
+GhcLibHcOpts   = -O -fasm
+
+GhcLibWays += p
+GhcProfiled= YES
+
+SplitObjs  = NO
+HADDOCK_DOCS   = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS   = NO
+BUILD_DOCBOOK_PDF  = NO
+
+endif
+
+
 #  A Development build (stage 1) -
 
 ifeq "$(BuildFlavour)" "devel1"
 
-SRC_HC_OPTS = -H64m -O -fasm $(MyWarningOpts)
-GhcLibHcOpts= -O -dcore-lint $(MyWarningOpts)
-GhcLibWays  =
-GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts = -Rghc-timing -O -fasm
-SplitObjs = NO
+SRC_HC_OPTS= -H64m -O -fasm
+GhcLibHcOpts   = -O -dcore-lint
+GhcStage1HcOpts= -Rghc-timing -O0 -DDEBUG
+GhcStage2HcOpts= -Rghc-timing -O -fasm
+SplitObjs  = NO
+HADDOCK_DOCS   = NO
+BUILD_DOCBOOK_HTML = NO
+BUILD_DOCBOOK_PS   = NO
+BUILD_DOCBOOK_PDF  = NO
 
 endif
 
@@ -83,12 +119,15 @@
 
 i

[arch-commits] Commit in automake/repos (core-i686 core-x86_64)

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 00:17:07
  Author: allan
Revision: 61178

clean up any conversion

Deleted:
  automake/repos/core-i686/
  automake/repos/core-x86_64/



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

2009-12-12 Thread Allan McRae
Date: Sunday, December 13, 2009 @ 00:16:20
  Author: allan
Revision: 61177

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

Added:
  automake/repos/core-any/
Deleted:
  automake/repos/testing-any/



[arch-commits] Commit in gimp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 22:00:05
  Author: eric
Revision: 61176

Merged revisions 61174 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gimp/trunk


  r61174 | eric | 2009-12-12 21:54:57 -0500 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: gimp 2.6.8-1
  Upstream update


Modified:
  gimp/repos/extra-x86_64/  (properties)
  gimp/repos/extra-x86_64/PKGBUILD

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


Property changes on: gimp/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /gimp/trunk:1-60029
   + /gimp/trunk:1-61175

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-13 02:55:17 UTC (rev 61175)
+++ extra-x86_64/PKGBUILD   2009-12-13 03:00:05 UTC (rev 61176)
@@ -2,7 +2,7 @@
 # Maintainer: tobias 
 
 pkgname=gimp
-pkgver=2.6.7
+pkgver=2.6.8
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
@@ -25,8 +25,8 @@
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
 linux.gpl)
-md5sums=('77ed86a8de9b48587efb24f2b115ad38' 'bb27bc214261d36484093e857f015f38')
-sha1sums=('0661d162fecfd907e183ce42853dd5b9d3cb4c51' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
+md5sums=('a4d9462c9420954824a80c9b1963f9d9' 'bb27bc214261d36484093e857f015f38')
+sha1sums=('a550943f086abc9bf6b96d576741337b7186a4f4' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"



[arch-commits] Commit in gimp/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 21:55:17
  Author: eric
Revision: 61175

Merged revisions 61174 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gimp/trunk


  r61174 | eric | 2009-12-12 21:54:57 -0500 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: gimp 2.6.8-1
  Upstream update


Modified:
  gimp/repos/extra-i686/(properties)
  gimp/repos/extra-i686/PKGBUILD

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


Property changes on: gimp/repos/extra-i686
___
Modified: svnmerge-integrated
   - /gimp/trunk:1-60028
   + /gimp/trunk:1-61174

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-13 02:54:57 UTC (rev 61174)
+++ extra-i686/PKGBUILD 2009-12-13 02:55:17 UTC (rev 61175)
@@ -2,7 +2,7 @@
 # Maintainer: tobias 
 
 pkgname=gimp
-pkgver=2.6.7
+pkgver=2.6.8
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
@@ -25,8 +25,8 @@
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
 linux.gpl)
-md5sums=('77ed86a8de9b48587efb24f2b115ad38' 'bb27bc214261d36484093e857f015f38')
-sha1sums=('0661d162fecfd907e183ce42853dd5b9d3cb4c51' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
+md5sums=('a4d9462c9420954824a80c9b1963f9d9' 'bb27bc214261d36484093e857f015f38')
+sha1sums=('a550943f086abc9bf6b96d576741337b7186a4f4' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 21:54:57
  Author: eric
Revision: 61174

upgpkg: gimp 2.6.8-1
Upstream update

Modified:
  gimp/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-13 01:25:09 UTC (rev 61173)
+++ PKGBUILD2009-12-13 02:54:57 UTC (rev 61174)
@@ -2,7 +2,7 @@
 # Maintainer: tobias 
 
 pkgname=gimp
-pkgver=2.6.7
+pkgver=2.6.8
 pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
@@ -25,8 +25,8 @@
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
 linux.gpl)
-md5sums=('77ed86a8de9b48587efb24f2b115ad38' 'bb27bc214261d36484093e857f015f38')
-sha1sums=('0661d162fecfd907e183ce42853dd5b9d3cb4c51' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
+md5sums=('a4d9462c9420954824a80c9b1963f9d9' 'bb27bc214261d36484093e857f015f38')
+sha1sums=('a550943f086abc9bf6b96d576741337b7186a4f4' 
'110ce9798173b19a662d086ed7b882b4729f06cf')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"



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

2009-12-12 Thread Pierre Schmitz
Date: Saturday, December 12, 2009 @ 20:25:09
  Author: pierre
Revision: 61173

Merged revisions 61171 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk


  r61171 | pierre | 2009-12-13 00:57:16 +0100 (So, 13 Dez 2009) | 1 line
  
  fix source generation; downgrade to official beta revision


Added:
  chromium/repos/testing-i686/chromium.sh
(from rev 61171, chromium/trunk/chromium.sh)
Modified:
  chromium/repos/testing-i686/  (properties)
  chromium/repos/testing-i686/PKGBUILD

-+
 PKGBUILD|   48 +++-
 chromium.sh |5 +
 2 files changed, 32 insertions(+), 21 deletions(-)


Property changes on: chromium/repos/testing-i686
___
Modified: svnmerge-integrated
   - /chromium/trunk:1-61087
   + /chromium/trunk:1-61172

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-13 01:02:50 UTC (rev 61172)
+++ testing-i686/PKGBUILD   2009-12-13 01:25:09 UTC (rev 61173)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
-pkgver=4.0.267.0
-pkgrel=2
+pkgver=4.0.249.30
+pkgrel=1
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -13,11 +13,13 @@
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 install='chromium.install'
+# downgrade from 4.0.267.0-2
+options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop'
-'drop_sse2.patch')
-md5sums=('c6498cf5586205981dedf244460dea50'
+'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
+ 'a2fbdd2744e2dd92d3fa480815485725'
  'a4a920d7b198c0a2f6e39d60ec75abd5')
 
 build() {
@@ -63,8 +65,7 @@
src/chrome/app/theme/chromium/product_logo_${size}.png \

${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
-   install -m 0755 -d  
${pkgdir}/usr/bin
-   ln -sf /usr/lib/chromium/chromium   
${pkgdir}/usr/bin/chromium
+   install -m 0755 -D ${srcdir}/chromium.sh
${pkgdir}/usr/bin/chromium
 
install -m 0644 -D src/LICENSE  
${pkgdir}/usr/share/licenses/chromium/LICENSE
 }
@@ -90,29 +91,34 @@
 
local _current=$(pwd)
local _tmp=$(mktemp -d)
-   local _target=$(mktemp -d)
+   mkdir -p $_tmp/chromium-$pkgver
+   cd $_tmp/chromium-$pkgver
 
-   cd $_tmp
-
svn co http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
 
export PATH=./depot_tools/:$PATH
-   gclient config http://src.chromium.org/svn/releases/$pkgver/src
-   sed -i '15i\  "src/third_party/WebKit/LayoutTests": None,' .gclient
-   gclient sync --nohooks
+   gclient config http://src.chromium.org/svn/releases/$pkgver
+   sed -e '15i\  "src/third_party/WebKit/LayoutTests": None,' \
+   -e '15i\  "src/chrome/tools/test/reference_build": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
+   -e '15i\  "src/third_party/ffmpeg/binaries/chromium/linux/x64": 
None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
+   -i .gclient
+   gclient sync --force --nohooks
 
-   mkdir -p $_target/chromium-$pkgver
-   cp -a .gclient $_target/chromium-$pkgver
-   svn export depot_tools $_target/chromium-$pkgver/depot_tools
-   gclient export $_target/chromium-$pkgver
+   svnversion src > src/build/LASTCHANGE.in
 
for i in ${_nonessential_di...@]}; do
-   rm -rf $_target/chromium-$pkgver/$i
+   rm -rf $i
done
+   find . -name '.svn' -type d -exec rm -rf {} \;
+   find . -iname '*.dll' -delete
+   find . -iname '*.exe' -delete
 
-   cd $_target
-   tar -cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
+   cd ..
+   bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
cd $_current
 
-   rm -rf $_target $_tmp
+   rm -rf $_tmp
 }

Copied: chromium/repos/testing-i686/chromium.sh (from rev 61171, 
chromium/trunk/chromium.sh)
===
--- testing-i686/chromium.sh(rev 0)
+++ testing-i686/chromium.sh2009-12-13 01:25:09 UTC (

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

2009-12-12 Thread Pierre Schmitz
Date: Saturday, December 12, 2009 @ 20:02:50
  Author: pierre
Revision: 61172

Merged revisions 61171 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/chromium/trunk


  r61171 | pierre | 2009-12-13 00:57:16 +0100 (So, 13 Dez 2009) | 1 line
  
  fix source generation; downgrade to official beta revision


Added:
  chromium/repos/testing-x86_64/chromium.sh
(from rev 61171, chromium/trunk/chromium.sh)
Modified:
  chromium/repos/testing-x86_64/(properties)
  chromium/repos/testing-x86_64/PKGBUILD

-+
 PKGBUILD|   48 +++-
 chromium.sh |5 +
 2 files changed, 32 insertions(+), 21 deletions(-)


Property changes on: chromium/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /chromium/trunk:1-61088
   + /chromium/trunk:1-61171

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-12 23:57:16 UTC (rev 61171)
+++ testing-x86_64/PKGBUILD 2009-12-13 01:02:50 UTC (rev 61172)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
-pkgver=4.0.267.0
-pkgrel=2
+pkgver=4.0.249.30
+pkgrel=1
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -13,11 +13,13 @@
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 install='chromium.install'
+# downgrade from 4.0.267.0-2
+options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop'
-'drop_sse2.patch')
-md5sums=('c6498cf5586205981dedf244460dea50'
+'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
+ 'a2fbdd2744e2dd92d3fa480815485725'
  'a4a920d7b198c0a2f6e39d60ec75abd5')
 
 build() {
@@ -63,8 +65,7 @@
src/chrome/app/theme/chromium/product_logo_${size}.png \

${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
-   install -m 0755 -d  
${pkgdir}/usr/bin
-   ln -sf /usr/lib/chromium/chromium   
${pkgdir}/usr/bin/chromium
+   install -m 0755 -D ${srcdir}/chromium.sh
${pkgdir}/usr/bin/chromium
 
install -m 0644 -D src/LICENSE  
${pkgdir}/usr/share/licenses/chromium/LICENSE
 }
@@ -90,29 +91,34 @@
 
local _current=$(pwd)
local _tmp=$(mktemp -d)
-   local _target=$(mktemp -d)
+   mkdir -p $_tmp/chromium-$pkgver
+   cd $_tmp/chromium-$pkgver
 
-   cd $_tmp
-
svn co http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
 
export PATH=./depot_tools/:$PATH
-   gclient config http://src.chromium.org/svn/releases/$pkgver/src
-   sed -i '15i\  "src/third_party/WebKit/LayoutTests": None,' .gclient
-   gclient sync --nohooks
+   gclient config http://src.chromium.org/svn/releases/$pkgver
+   sed -e '15i\  "src/third_party/WebKit/LayoutTests": None,' \
+   -e '15i\  "src/chrome/tools/test/reference_build": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
+   -e '15i\  "src/third_party/ffmpeg/binaries/chromium/linux/x64": 
None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
+   -i .gclient
+   gclient sync --force --nohooks
 
-   mkdir -p $_target/chromium-$pkgver
-   cp -a .gclient $_target/chromium-$pkgver
-   svn export depot_tools $_target/chromium-$pkgver/depot_tools
-   gclient export $_target/chromium-$pkgver
+   svnversion src > src/build/LASTCHANGE.in
 
for i in ${_nonessential_di...@]}; do
-   rm -rf $_target/chromium-$pkgver/$i
+   rm -rf $i
done
+   find . -name '.svn' -type d -exec rm -rf {} \;
+   find . -iname '*.dll' -delete
+   find . -iname '*.exe' -delete
 
-   cd $_target
-   tar -cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
+   cd ..
+   bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
cd $_current
 
-   rm -rf $_target $_tmp
+   rm -rf $_tmp
 }

Copied: chromium/repos/testing-x86_64/chromium.sh (from rev 61171, 
chromium/trunk/chromium.sh)
===
--- testing-x86_64/chromium.sh  (rev 0)
+++ testing-x86_64/chromium.sh  2009-12

[arch-commits] Commit in chromium/trunk (PKGBUILD chromium.sh)

2009-12-12 Thread Pierre Schmitz
Date: Saturday, December 12, 2009 @ 18:57:16
  Author: pierre
Revision: 61171

fix source generation; downgrade to official beta revision

Added:
  chromium/trunk/chromium.sh
Modified:
  chromium/trunk/PKGBUILD

-+
 PKGBUILD|   48 +++-
 chromium.sh |5 +
 2 files changed, 32 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 22:58:09 UTC (rev 61170)
+++ PKGBUILD2009-12-12 23:57:16 UTC (rev 61171)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz 
 
 pkgname=chromium
-pkgver=4.0.267.0
-pkgrel=2
+pkgver=4.0.249.30
+pkgrel=1
 pkgdesc='An open-source browser project that aims to build a safer, faster, 
and more stable way for all users to experience the web'
 arch=('i686' 'x86_64')
 url='http://www.chromium.org/'
@@ -13,11 +13,13 @@
 provides=('chromium-browser')
 conflicts=('chromium-browser')
 install='chromium.install'
+# downgrade from 4.0.267.0-2
+options=('force')
 source=("ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz";
-'chromium.desktop'
-'drop_sse2.patch')
-md5sums=('c6498cf5586205981dedf244460dea50'
+'chromium.desktop' 'chromium.sh' 'drop_sse2.patch')
+md5sums=('59d316bd0f319178e1faffce7b2c81d2'
  '312df68330d6e288cbb2260bad620a32'
+ 'a2fbdd2744e2dd92d3fa480815485725'
  'a4a920d7b198c0a2f6e39d60ec75abd5')
 
 build() {
@@ -63,8 +65,7 @@
src/chrome/app/theme/chromium/product_logo_${size}.png \

${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
done
-   install -m 0755 -d  
${pkgdir}/usr/bin
-   ln -sf /usr/lib/chromium/chromium   
${pkgdir}/usr/bin/chromium
+   install -m 0755 -D ${srcdir}/chromium.sh
${pkgdir}/usr/bin/chromium
 
install -m 0644 -D src/LICENSE  
${pkgdir}/usr/share/licenses/chromium/LICENSE
 }
@@ -90,29 +91,34 @@
 
local _current=$(pwd)
local _tmp=$(mktemp -d)
-   local _target=$(mktemp -d)
+   mkdir -p $_tmp/chromium-$pkgver
+   cd $_tmp/chromium-$pkgver
 
-   cd $_tmp
-
svn co http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools
 
export PATH=./depot_tools/:$PATH
-   gclient config http://src.chromium.org/svn/releases/$pkgver/src
-   sed -i '15i\  "src/third_party/WebKit/LayoutTests": None,' .gclient
-   gclient sync --nohooks
+   gclient config http://src.chromium.org/svn/releases/$pkgver
+   sed -e '15i\  "src/third_party/WebKit/LayoutTests": None,' \
+   -e '15i\  "src/chrome/tools/test/reference_build": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \
+   -e '15i\  "src/third_party/ffmpeg/binaries/chromium/linux/x64": 
None,' \
+   -e '15i\  
"src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \
+   -i .gclient
+   gclient sync --force --nohooks
 
-   mkdir -p $_target/chromium-$pkgver
-   cp -a .gclient $_target/chromium-$pkgver
-   svn export depot_tools $_target/chromium-$pkgver/depot_tools
-   gclient export $_target/chromium-$pkgver
+   svnversion src > src/build/LASTCHANGE.in
 
for i in ${_nonessential_di...@]}; do
-   rm -rf $_target/chromium-$pkgver/$i
+   rm -rf $i
done
+   find . -name '.svn' -type d -exec rm -rf {} \;
+   find . -iname '*.dll' -delete
+   find . -iname '*.exe' -delete
 
-   cd $_target
-   tar -cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
+   cd ..
+   bsdtar cvJf $_current/chromium-$pkgver.tar.xz chromium-$pkgver
cd $_current
 
-   rm -rf $_target $_tmp
+   rm -rf $_tmp
 }

Added: chromium.sh
===
--- chromium.sh (rev 0)
+++ chromium.sh 2009-12-12 23:57:16 UTC (rev 61171)
@@ -0,0 +1,5 @@
+#!/bin/sh
+export PATH=$PATH:/usr/lib/chromium
+export CHROME_WRAPPER=/usr/lib/chromium/chromium
+export CHROME_DESKTOP=chromium.desktop
+/usr/lib/chromium/chromium $@


Property changes on: chromium/trunk/chromium.sh
___
Added: svn:executable
   + *



[arch-commits] Commit in git/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Dan McGee
Date: Saturday, December 12, 2009 @ 17:58:09
  Author: dan
Revision: 61170

Merged revisions 61168 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/git/trunk


  r61168 | dan | 2009-12-12 16:15:45 -0600 (Sat, 12 Dec 2009) | 2 lines
  
  Version bump


Modified:
  git/repos/extra-i686/ (properties)
  git/repos/extra-i686/PKGBUILD

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


Property changes on: git/repos/extra-i686
___
Modified: svnmerge-integrated
   - /git/trunk:1-60732
   + /git/trunk:1-61169

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 22:16:05 UTC (rev 61169)
+++ extra-i686/PKGBUILD 2009-12-12 22:58:09 UTC (rev 61170)
@@ -2,8 +2,8 @@
 # Maintainer: Dan McGee 
 
 pkgname=git
-pkgver=1.6.5.5
-pkgrel=2
+pkgver=1.6.5.6
+pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/";
@@ -44,7 +44,7 @@
   rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('fd575f22e67adbea1d17e5bc66a80f8d'
- '223c2d831927c0b11830feadb56df77d')
-sha256sums=('4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3'
-'1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73')
+md5sums=('03aefaaecae7a236b88d04d1a83698d9'
+ '27fd3012af534f9e1ad2c67fdac7')
+sha256sums=('8e6261fc2fe162b0f1f5f0ad7aa42f8922491b9a1c43b3a1e9e6a7d049f2f106'
+'344b4e85afc4a07595c745adda3b3fe9ef7a4c6780ed1cb9d2a4350b8d2063a2')



[arch-commits] Commit in git/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Dan McGee
Date: Saturday, December 12, 2009 @ 17:16:05
  Author: dan
Revision: 61169

Merged revisions 61168 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/git/trunk


  r61168 | dan | 2009-12-12 16:15:45 -0600 (Sat, 12 Dec 2009) | 2 lines
  
  Version bump


Modified:
  git/repos/extra-x86_64/   (properties)
  git/repos/extra-x86_64/PKGBUILD

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


Property changes on: git/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /git/trunk:1-60731
   + /git/trunk:1-61168

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 22:15:45 UTC (rev 61168)
+++ extra-x86_64/PKGBUILD   2009-12-12 22:16:05 UTC (rev 61169)
@@ -2,8 +2,8 @@
 # Maintainer: Dan McGee 
 
 pkgname=git
-pkgver=1.6.5.5
-pkgrel=2
+pkgver=1.6.5.6
+pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/";
@@ -44,7 +44,7 @@
   rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('fd575f22e67adbea1d17e5bc66a80f8d'
- '223c2d831927c0b11830feadb56df77d')
-sha256sums=('4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3'
-'1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73')
+md5sums=('03aefaaecae7a236b88d04d1a83698d9'
+ '27fd3012af534f9e1ad2c67fdac7')
+sha256sums=('8e6261fc2fe162b0f1f5f0ad7aa42f8922491b9a1c43b3a1e9e6a7d049f2f106'
+'344b4e85afc4a07595c745adda3b3fe9ef7a4c6780ed1cb9d2a4350b8d2063a2')



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

2009-12-12 Thread Dan McGee
Date: Saturday, December 12, 2009 @ 17:15:45
  Author: dan
Revision: 61168

Version bump

Modified:
  git/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 21:09:56 UTC (rev 61167)
+++ PKGBUILD2009-12-12 22:15:45 UTC (rev 61168)
@@ -2,8 +2,8 @@
 # Maintainer: Dan McGee 
 
 pkgname=git
-pkgver=1.6.5.5
-pkgrel=2
+pkgver=1.6.5.6
+pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
 url="http://git-scm.com/";
@@ -44,7 +44,7 @@
   rm -rf $pkgdir/usr/lib/perl5
 }
 
-md5sums=('fd575f22e67adbea1d17e5bc66a80f8d'
- '223c2d831927c0b11830feadb56df77d')
-sha256sums=('4d1aaf16b4c37c8412cceab09b009bfc0f8d7b9f30a809b82027ab7fa66fdbb3'
-'1462c3c71985d760679bfd27219c03572c92d3149aaef8cae802fe6217d05c73')
+md5sums=('03aefaaecae7a236b88d04d1a83698d9'
+ '27fd3012af534f9e1ad2c67fdac7')
+sha256sums=('8e6261fc2fe162b0f1f5f0ad7aa42f8922491b9a1c43b3a1e9e6a7d049f2f106'
+'344b4e85afc4a07595c745adda3b3fe9ef7a4c6780ed1cb9d2a4350b8d2063a2')



[arch-commits] Commit in xf86-input-evdev/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Ionut Biru
Date: Saturday, December 12, 2009 @ 16:09:56
  Author: ibiru
Revision: 61167

Merged revisions 61162 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-input-evdev/trunk


  r61162 | jgc | 2009-12-12 19:52:30 +0200 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: xf86-input-evdev 2.3.2-1
  Update to 2.3.2


Modified:
  xf86-input-evdev/repos/extra-x86_64/  (properties)
  xf86-input-evdev/repos/extra-x86_64/PKGBUILD

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


Property changes on: xf86-input-evdev/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xf86-input-evdev/trunk:1-59250
   + /xf86-input-evdev/trunk:1-61166

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 20:46:30 UTC (rev 61166)
+++ extra-x86_64/PKGBUILD   2009-12-12 21:09:56 UTC (rev 61167)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 # Contributor: Alexander Baldeck 

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

2009-12-12 Thread Ionut Biru
Date: Saturday, December 12, 2009 @ 15:46:30
  Author: ibiru
Revision: 61166

Merged revisions 61160 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk


  r61160 | jgc | 2009-12-12 19:01:01 +0200 (Sat, 12 Dec 2009) | 3 lines
  
  upgpkg: xorg-server 1.7.3.901-1
  Update to latest RC, remove patches included in the RC
  Remove the sigaction patch, as it seems to cause FS#17380


Modified:
  xorg-server/repos/extra-x86_64/   (properties)
  xorg-server/repos/extra-x86_64/PKGBUILD
Deleted:
  xorg-server/repos/extra-x86_64/dix-fix-memleak.patch
  xorg-server/repos/extra-x86_64/dix-remove-core-devices-on-shutdown.patch
  xorg-server/repos/extra-x86_64/exa-fix-defragment.patch
  xorg-server/repos/extra-x86_64/exa-fix-mixed-pixmaps.patch
  xorg-server/repos/extra-x86_64/fix-repeat-events.patch
  xorg-server/repos/extra-x86_64/xserver-1.7.1-sigaction.patch
  xorg-server/repos/extra-x86_64/xv-fix-adjustframe-reputimage.patch

---+
 PKGBUILD  |   29 
 dix-fix-memleak.patch |   33 --
 dix-remove-core-devices-on-shutdown.patch |   31 -
 exa-fix-defragment.patch  |   67 
 exa-fix-mixed-pixmaps.patch   |   46 --
 fix-repeat-events.patch   |   26 
 xserver-1.7.1-sigaction.patch |   91 
 xv-fix-adjustframe-reputimage.patch   |   38 ---
 8 files changed, 2 insertions(+), 359 deletions(-)


Property changes on: xorg-server/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-60854
   + /xorg-server/trunk:1-61165

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/PKGBUILD   2009-12-12 20:46:30 UTC (rev 61166)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.3
+pkgver=1.7.3.901
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -21,30 +21,16 @@
 xserver-1.7.1-window-pictures.patch
 xserver-1.7.1-nvidia-performance.patch
 xserver-1.7.1-libcrypto.patch
-xserver-1.7.1-sigaction.patch
 xserver-1.7.1-gamma-kdm-fix.patch
-exa-fix-mixed-pixmaps.patch
-exa-fix-defragment.patch
-fix-repeat-events.patch
-dix-remove-core-devices-on-shutdown.patch
-dix-fix-memleak.patch
-xv-fix-adjustframe-reputimage.patch
 revert-bug25136.patch
 xvfb-run
 xvfb-run.1)
-md5sums=('4c63b22cad9ed8ae8b86561f0f92c327'
+md5sums=('cae5564c2f42212346ed4b44d3b97353'
  '1a336eb22e27cbf443ec5a2ecddfa93c'
  '01507da1a18737a3a9202fbd00213f4c'
  'd5c6e2de2e15bcff98d69f4772ee09ac'
  '957d429cad03ac87281b7e40d963497c'
- '9de9025a8c93b57188fce137b3262d1e'
  '8eae23916552e609c36ecae1827c2e9d'
- 'ba5389a2b0ded91a7e48bd1cd1d16f54'
- '33e209ebfd7ad1ad2489e96a58aa3e2c'
- '2df6d883a22d1c9121618cb90347c21e'
- '29ce13f606fb2de78e34d4317a9634ea'
- 'aa67e7be85a86f922b5582c3bcdb8338'
- '955240ad0a18d77ced04fa5d1514de9f'
  'e3b6a19dc7e708b10fac22180a4cb3d3'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b')
@@ -66,20 +52,9 @@
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
 
-  # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-sigaction.patch?view=log
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-sigaction.patch" || return 1
-
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
 
-  # Upstream patches from 1.7-nominations branch
-  patch -Np1 -i "${srcdir}/exa-fix-mixed-pixmaps.patch" || return 1
-  patch -Np1 -i "${srcdir}/exa-fix-defragment.patch" || return 1
-  patch -Np1 -i "${srcdir}/fix-repeat-events.patch" || return 1
-  patch -Np1 -i "${srcdir}/dix-remove-core-devices-on-shutdown.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/dix-fix-memleak.patch" || return 1
-  patch -Np1 -i "${srcdir}/xv-fix-adjustframe-reputimage.patch" || return 1
-
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Deleted: extra-x86_64/dix-fix-memleak.patch
===
--- extra-x86_64/dix-fix-memleak.patch  2009-12-12 19:56:19 UTC (rev 61165)
+++ extra-x86_64/dix-fix-memleak.patch  2009-12-12 20:46:30 UTC (rev 61166)
@@ -1,33 +0,0 @@
-From 21bf1de28c7f10bcee1b199cc976d58319dc9ecd Mon Sep

[arch-commits] Commit in libmsn/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Ionut Biru
Date: Saturday, December 12, 2009 @ 14:56:19
  Author: ibiru
Revision: 61165

Merged revisions 61143,61145,61164 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmsn/trunk


  r61143 | andrea | 2009-12-12 17:24:23 +0200 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: libmsn 4.0beta8-2
  downgraded (kdenetwork 4.3.4 does not build with this version)

  r61145 | andrea | 2009-12-12 17:30:44 +0200 (Sat, 12 Dec 2009) | 1 line
  
  prepare kde-unstable repo

  r61164 | ibiru | 2009-12-12 21:55:33 +0200 (Sat, 12 Dec 2009) | 3 lines
  
  upgpkg: libmsn 4.0beta8-2
   downgraded (kdenetwork 4.3.4 does not build with this version)


Modified:
  libmsn/repos/extra-x86_64/(properties)
  libmsn/repos/extra-x86_64/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)


Property changes on: libmsn/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /libmsn/trunk:1-61094
   + /libmsn/trunk:1-61164

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 19:55:33 UTC (rev 61164)
+++ extra-x86_64/PKGBUILD   2009-12-12 19:56:19 UTC (rev 61165)
@@ -3,22 +3,24 @@
 # Contributor: Charly Ghislain 
 
 pkgname=libmsn
-pkgver=4.0
-pkgrel=1
+pkgver=4.0beta8
+_pkgver=4.0-beta8
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('027442e7366dac7c365e8e57eabffc4a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
+md5sums=('29d110b36402cfb0c3affeb10be8a6c6')
+options=('force')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-${_pkgver} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release || return 1
   make DESTDIR=${pkgdir} install



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

2009-12-12 Thread Ionut Biru
Date: Saturday, December 12, 2009 @ 14:55:33
  Author: ibiru
Revision: 61164

upgpkg: libmsn 4.0beta8-2
 downgraded (kdenetwork 4.3.4 does not build with this version)

Modified:
  libmsn/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 17:52:54 UTC (rev 61163)
+++ PKGBUILD2009-12-12 19:55:33 UTC (rev 61164)
@@ -3,22 +3,24 @@
 # Contributor: Charly Ghislain 
 
 pkgname=libmsn
-pkgver=4.0
-pkgrel=1
+pkgver=4.0beta8
+_pkgver=4.0-beta8
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('027442e7366dac7c365e8e57eabffc4a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
+md5sums=('29d110b36402cfb0c3affeb10be8a6c6')
+options=('force')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-${_pkgver} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release || return 1
   make DESTDIR=${pkgdir} install



[arch-commits] Commit in xf86-input-evdev/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Jan de Groot
Date: Saturday, December 12, 2009 @ 12:52:54
  Author: jgc
Revision: 61163

Merged revisions 61162 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-input-evdev/trunk


  r61162 | jgc | 2009-12-12 18:52:30 +0100 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: xf86-input-evdev 2.3.2-1
  Update to 2.3.2


Modified:
  xf86-input-evdev/repos/extra-i686/(properties)
  xf86-input-evdev/repos/extra-i686/PKGBUILD

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


Property changes on: xf86-input-evdev/repos/extra-i686
___
Modified: svnmerge-integrated
   - /xf86-input-evdev/trunk:1-59228
   + /xf86-input-evdev/trunk:1-61162

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 17:52:30 UTC (rev 61162)
+++ extra-i686/PKGBUILD 2009-12-12 17:52:54 UTC (rev 61163)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 # Contributor: Alexander Baldeck 

[arch-commits] Commit in xf86-input-evdev/trunk (PKGBUILD)

2009-12-12 Thread Jan de Groot
Date: Saturday, December 12, 2009 @ 12:52:30
  Author: jgc
Revision: 61162

upgpkg: xf86-input-evdev 2.3.2-1
Update to 2.3.2

Modified:
  xf86-input-evdev/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 17:01:39 UTC (rev 61161)
+++ PKGBUILD2009-12-12 17:52:30 UTC (rev 61162)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 # Contributor: Alexander Baldeck 

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

2009-12-12 Thread Jan de Groot
Date: Saturday, December 12, 2009 @ 12:01:39
  Author: jgc
Revision: 61161

Merged revisions 61160 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server/trunk


  r61160 | jgc | 2009-12-12 18:01:01 +0100 (Sat, 12 Dec 2009) | 3 lines
  
  upgpkg: xorg-server 1.7.3.901-1
  Update to latest RC, remove patches included in the RC
  Remove the sigaction patch, as it seems to cause FS#17380


Modified:
  xorg-server/repos/extra-i686/ (properties)
  xorg-server/repos/extra-i686/PKGBUILD
Deleted:
  xorg-server/repos/extra-i686/dix-fix-memleak.patch
  xorg-server/repos/extra-i686/dix-remove-core-devices-on-shutdown.patch
  xorg-server/repos/extra-i686/exa-fix-defragment.patch
  xorg-server/repos/extra-i686/exa-fix-mixed-pixmaps.patch
  xorg-server/repos/extra-i686/fix-repeat-events.patch
  xorg-server/repos/extra-i686/xserver-1.7.1-sigaction.patch
  xorg-server/repos/extra-i686/xv-fix-adjustframe-reputimage.patch

---+
 PKGBUILD  |   29 
 dix-fix-memleak.patch |   33 --
 dix-remove-core-devices-on-shutdown.patch |   31 -
 exa-fix-defragment.patch  |   67 
 exa-fix-mixed-pixmaps.patch   |   46 --
 fix-repeat-events.patch   |   26 
 xserver-1.7.1-sigaction.patch |   91 
 xv-fix-adjustframe-reputimage.patch   |   38 ---
 8 files changed, 2 insertions(+), 359 deletions(-)


Property changes on: xorg-server/repos/extra-i686
___
Modified: svnmerge-integrated
   - /xorg-server/trunk:1-60855
   + /xorg-server/trunk:1-61160

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 17:01:01 UTC (rev 61160)
+++ extra-i686/PKGBUILD 2009-12-12 17:01:39 UTC (rev 61161)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.3
+pkgver=1.7.3.901
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -21,30 +21,16 @@
 xserver-1.7.1-window-pictures.patch
 xserver-1.7.1-nvidia-performance.patch
 xserver-1.7.1-libcrypto.patch
-xserver-1.7.1-sigaction.patch
 xserver-1.7.1-gamma-kdm-fix.patch
-exa-fix-mixed-pixmaps.patch
-exa-fix-defragment.patch
-fix-repeat-events.patch
-dix-remove-core-devices-on-shutdown.patch
-dix-fix-memleak.patch
-xv-fix-adjustframe-reputimage.patch
 revert-bug25136.patch
 xvfb-run
 xvfb-run.1)
-md5sums=('4c63b22cad9ed8ae8b86561f0f92c327'
+md5sums=('cae5564c2f42212346ed4b44d3b97353'
  '1a336eb22e27cbf443ec5a2ecddfa93c'
  '01507da1a18737a3a9202fbd00213f4c'
  'd5c6e2de2e15bcff98d69f4772ee09ac'
  '957d429cad03ac87281b7e40d963497c'
- '9de9025a8c93b57188fce137b3262d1e'
  '8eae23916552e609c36ecae1827c2e9d'
- 'ba5389a2b0ded91a7e48bd1cd1d16f54'
- '33e209ebfd7ad1ad2489e96a58aa3e2c'
- '2df6d883a22d1c9121618cb90347c21e'
- '29ce13f606fb2de78e34d4317a9634ea'
- 'aa67e7be85a86f922b5582c3bcdb8338'
- '955240ad0a18d77ced04fa5d1514de9f'
  'e3b6a19dc7e708b10fac22180a4cb3d3'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b')
@@ -66,20 +52,9 @@
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
 
-  # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-sigaction.patch?view=log
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-sigaction.patch" || return 1
-
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
 
-  # Upstream patches from 1.7-nominations branch
-  patch -Np1 -i "${srcdir}/exa-fix-mixed-pixmaps.patch" || return 1
-  patch -Np1 -i "${srcdir}/exa-fix-defragment.patch" || return 1
-  patch -Np1 -i "${srcdir}/fix-repeat-events.patch" || return 1
-  patch -Np1 -i "${srcdir}/dix-remove-core-devices-on-shutdown.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/dix-fix-memleak.patch" || return 1
-  patch -Np1 -i "${srcdir}/xv-fix-adjustframe-reputimage.patch" || return 1
-
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Deleted: extra-i686/dix-fix-memleak.patch
===
--- extra-i686/dix-fix-memleak.patch2009-12-12 17:01:01 UTC (rev 61160)
+++ extra-i686/dix-fix-memleak.patch2009-12-12 17:01:39 UTC (rev 61161)
@@ -1,33 +0,0 @@
-From 21bf1de28c7f10bcee1b199cc976d58319dc9ecd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer 
-Date: 

[arch-commits] Commit in xorg-server/trunk (8 files)

2009-12-12 Thread Jan de Groot
Date: Saturday, December 12, 2009 @ 12:01:01
  Author: jgc
Revision: 61160

upgpkg: xorg-server 1.7.3.901-1
Update to latest RC, remove patches included in the RC
Remove the sigaction patch, as it seems to cause FS#17380

Modified:
  xorg-server/trunk/PKGBUILD
Deleted:
  xorg-server/trunk/dix-fix-memleak.patch
  xorg-server/trunk/dix-remove-core-devices-on-shutdown.patch
  xorg-server/trunk/exa-fix-defragment.patch
  xorg-server/trunk/exa-fix-mixed-pixmaps.patch
  xorg-server/trunk/fix-repeat-events.patch
  xorg-server/trunk/xserver-1.7.1-sigaction.patch
  xorg-server/trunk/xv-fix-adjustframe-reputimage.patch

---+
 PKGBUILD  |   29 
 dix-fix-memleak.patch |   33 --
 dix-remove-core-devices-on-shutdown.patch |   31 -
 exa-fix-defragment.patch  |   67 
 exa-fix-mixed-pixmaps.patch   |   46 --
 fix-repeat-events.patch   |   26 
 xserver-1.7.1-sigaction.patch |   91 
 xv-fix-adjustframe-reputimage.patch   |   38 ---
 8 files changed, 2 insertions(+), 359 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 15:50:42 UTC (rev 61159)
+++ PKGBUILD2009-12-12 17:01:01 UTC (rev 61160)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot 
 
 pkgname=xorg-server
-pkgver=1.7.3
+pkgver=1.7.3.901
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -21,30 +21,16 @@
 xserver-1.7.1-window-pictures.patch
 xserver-1.7.1-nvidia-performance.patch
 xserver-1.7.1-libcrypto.patch
-xserver-1.7.1-sigaction.patch
 xserver-1.7.1-gamma-kdm-fix.patch
-exa-fix-mixed-pixmaps.patch
-exa-fix-defragment.patch
-fix-repeat-events.patch
-dix-remove-core-devices-on-shutdown.patch
-dix-fix-memleak.patch
-xv-fix-adjustframe-reputimage.patch
 revert-bug25136.patch
 xvfb-run
 xvfb-run.1)
-md5sums=('4c63b22cad9ed8ae8b86561f0f92c327'
+md5sums=('cae5564c2f42212346ed4b44d3b97353'
  '1a336eb22e27cbf443ec5a2ecddfa93c'
  '01507da1a18737a3a9202fbd00213f4c'
  'd5c6e2de2e15bcff98d69f4772ee09ac'
  '957d429cad03ac87281b7e40d963497c'
- '9de9025a8c93b57188fce137b3262d1e'
  '8eae23916552e609c36ecae1827c2e9d'
- 'ba5389a2b0ded91a7e48bd1cd1d16f54'
- '33e209ebfd7ad1ad2489e96a58aa3e2c'
- '2df6d883a22d1c9121618cb90347c21e'
- '29ce13f606fb2de78e34d4317a9634ea'
- 'aa67e7be85a86f922b5582c3bcdb8338'
- '955240ad0a18d77ced04fa5d1514de9f'
  'e3b6a19dc7e708b10fac22180a4cb3d3'
  '52fd3effd80d7bc6c1660d4ecf23d31c'
  '376c70308715cd2643f7bff936d9934b')
@@ -66,20 +52,9 @@
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
 
-  # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-sigaction.patch?view=log
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-sigaction.patch" || return 1
-
   # 
http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-gamma-kdm-fix.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-gamma-kdm-fix.patch" || return 1
 
-  # Upstream patches from 1.7-nominations branch
-  patch -Np1 -i "${srcdir}/exa-fix-mixed-pixmaps.patch" || return 1
-  patch -Np1 -i "${srcdir}/exa-fix-defragment.patch" || return 1
-  patch -Np1 -i "${srcdir}/fix-repeat-events.patch" || return 1
-  patch -Np1 -i "${srcdir}/dix-remove-core-devices-on-shutdown.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/dix-fix-memleak.patch" || return 1
-  patch -Np1 -i "${srcdir}/xv-fix-adjustframe-reputimage.patch" || return 1
-
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Deleted: dix-fix-memleak.patch
===
--- dix-fix-memleak.patch   2009-12-12 15:50:42 UTC (rev 61159)
+++ dix-fix-memleak.patch   2009-12-12 17:01:01 UTC (rev 61160)
@@ -1,33 +0,0 @@
-From 21bf1de28c7f10bcee1b199cc976d58319dc9ecd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer 
-Date: Fri, 27 Nov 2009 06:01:53 +
-Subject: dix: fix memory leak, free event list on shutdown. (#25028)
-
-X.Org Bug 25028 
-
-Signed-off-by: Peter Hutterer 
-Reviewed-by: Keith Packard 
-(cherry picked from commit c20c8897272427cb3f755a3e28e80a9ad46f08a1)

-diff --git a/dix/events.c b/dix/events.c
-index 3e23262..1d7ceef 100644
 a/dix/events.c
-+++ b/dix/events.c
-@@ -5086,12 +5086,9 @@ InitEvents(void)
- void
- CloseDownEvents(void)
- {
--int len;
--EventListPtr list;
--
--len = GetEventList(&list);
--while(len--)
--xfree

[arch-commits] Commit in (5 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:50:42
  Author: andrea
Revision: 61159

prepare kde-unstable repo

Added:
  kdeplasma-applets-networkmanagement/
  kdeplasma-applets-networkmanagement/kde-unstable/
  kdeplasma-applets-networkmanagement/kde-unstable/PKGBUILD
  kdeplasma-applets-networkmanagement/repos/
  kdeplasma-applets-networkmanagement/trunk/

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

Added: kdeplasma-applets-networkmanagement/kde-unstable/PKGBUILD
===
--- kdeplasma-applets-networkmanagement/kde-unstable/PKGBUILD   
(rev 0)
+++ kdeplasma-applets-networkmanagement/kde-unstable/PKGBUILD   2009-12-12 
15:50:42 UTC (rev 61159)
@@ -0,0 +1,31 @@
+# $Id: $
+# Maintainer: Andrea Scarpino 
+# Contributor: Jakub Schmidtke 
+
+pkgname=kdeplasma-applets-networkmanagement
+pkgver=1061284
+pkgrel=1
+pkgdesc="KDE4 Network Management and plasmoid"
+arch=('i686' 'x86_64')
+url="http://plasma.kde.org/";
+license=('GPL')
+depends=('kdelibs' 'kdebase-workspace' 'networkmanager')
+makedepends=('cmake' 'python' 'automoc4')
+provides=('knetworkmanagement')
+conflicts=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
+replaces=('networkmanager-plasmoid-svn' 'kdeplasma-applets-networkmanager')
+#svn co -q svn://websvn.kde.org:443/home/kde/trunk/kdereview/networkmanagement 
${pkgname}
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-r${pkgver}.tar.bz2";)
+md5sums=('81ba34a2ec80f21b331aa6ef8e12943a')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release \
+-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
+  make  || return 1
+  make DESTDIR=${pkgdir} install
+}



[arch-commits] Commit in kdebindings (kde-unstable kde-unstable/PKGBUILD)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:48:20
  Author: andrea
Revision: 61158

prepare kde-unstable repo

Added:
  kdebindings/kde-unstable/
  kdebindings/kde-unstable/PKGBUILD

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

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:48:20 UTC (rev 61158)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 59825 2009-11-28 01:40:17Z andrea $
+# Maintainer: Pierre Schmitz 
+
+pkgbase=kdebindings
+pkgname=('kdebindings-python'
+'kdebindings-ruby'
+ 'kdebindings-smoke')
+groups=('kdebindings')
+pkgver=4.3.80
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdepimlibs' 'pyqt' 'polkit-qt' 
'qimageblitz' 'qscintilla' 'kdegraphics-okular')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
+md5sums=('3fd12db9000aa2c11e8812182d7a0820')
+
+build() {
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../${pkgbase}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DBUILD_csharp=OFF \
+   -DBUILD_java=OFF \
+   -DBUILD_php=OFF \
+   -DBUILD_falcon=OFF
+   make
+}
+
+package_kdebindings-python() {
+   pkgdesc='KDE bindings for python'
+   depends=('kdepimlibs' 'pyqt' 'polkit-qt')
+   cd $srcdir/build/python
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebindings-ruby() {
+   pkgdesc='KDE bindings for ruby'
+   depends=('kdebindings-smoke' 'ruby')
+   cd $srcdir/build/ruby
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebindings-smoke() {
+   pkgdesc='Language independent library for Qt and KDE bindings'
+   depends=('kdepimlibs' 'qscintilla')
+   groups=()
+   cd $srcdir/build/smoke
+   make DESTDIR=$pkgdir install
+}



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:47:29
  Author: andrea
Revision: 61157

prepare kde-unstable repo

Added:
  kdebase/kde-unstable/
  kdebase/kde-unstable/PKGBUILD
  kdebase/kde-unstable/kdebase.install

-+
 PKGBUILD|  135 ++
 kdebase.install |   11 
 2 files changed, 146 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:47:29 UTC (rev 61157)
@@ -0,0 +1,135 @@
+# $Id: PKGBUILD 59827 2009-11-28 01:40:24Z andrea $
+# Maintainer: Pierre Schmitz 
+
+pkgbase=kdebase
+pkgname=('kdebase-dolphin'
+ 'kdebase-kappfinder'
+ 'kdebase-kdepasswd'
+ 'kdebase-kdialog'
+ 'kdebase-kfind'
+ 'kdebase-kinfocenter'
+ 'kdebase-konqueror'
+ 'kdebase-konsole'
+ 'kdebase-kwrite'
+ 'kdebase-lib'
+ 'kdebase-plasma')
+pkgver=4.3.80
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdebase')
+makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'libraw1394')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
+md5sums=('83af816034448c0b21667457efe1a455')
+
+build() {
+   cd $srcdir
+   mkdir build
+   cd build
+   cmake ../${pkgbase}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   make
+}
+
+package_kdebase-dolphin() {
+   pkgdesc='File Manager'
+   depends=('kdebase-runtime' 'kdebase-lib')
+   cd $srcdir/build/apps/dolphin
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/dolphin
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kappfinder() {
+   pkgdesc='Menu Updating Tool'
+   depends=('kdebase-runtime' 'kdelibs')
+   install='kdebase.install'
+   cd $srcdir/build/apps/kappfinder
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/kappfinder
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kdepasswd() {
+   pkgdesc='Change Password'
+   depends=('kdebase-runtime' 'kdebase-lib')
+   cd $srcdir/build/apps/kdepasswd
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/kdepasswd
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kdialog() {
+   pkgdesc='a utility for displaying dialog boxes from shell scripts'
+   depends=('kdebase-runtime' 'kdelibs')
+   cd $srcdir/build/apps/kdialog
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kfind() {
+   pkgdesc='Find Files/Folders'
+   depends=('kdebase-runtime' 'kdebase-lib')
+   install='kdebase.install'
+   cd $srcdir/build/apps/kfind
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/kfind
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kinfocenter() {
+   pkgdesc='Info Center'
+   depends=('kdebase-runtime' 'libraw1394' 'kdelibs')
+   cd $srcdir/build/apps/kinfocenter
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/kinfocenter
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-konqueror() {
+   pkgdesc='KDE File Manager & Web Browser'
+   depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-dolphin')
+   install='kdebase.install'
+   conflicts=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+   replaces=('kdebase-keditbookmarks' 'kdebase-nsplugins')
+   for i in konqueror doc/konqueror keditbookmarks nsplugins; do
+   cd $srcdir/build/apps/${i}
+   make DESTDIR=$pkgdir install
+   done
+}
+
+package_kdebase-konsole() {
+   pkgdesc='Terminal'
+   depends=('kdebase-runtime' 'kdelibs')
+   cd $srcdir/build/apps/konsole
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/konsole
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-kwrite() {
+   pkgdesc='Text Editor'
+   depends=('kdebase-runtime' 'kdelibs')
+   cd $srcdir/build/apps/kwrite
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/apps/doc/kwrite
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-lib() {
+   pkgdesc='KDE libraries for the basic desktop applications'
+   groups=()
+   depends=('kdelibs')
+   cd $srcdir/build/apps/lib
+   make DESTDIR=$pkgdir install
+}
+
+package_kdebase-plasma() {
+   pkgdesc='Display the contents of folders (User´s home folder as 
default)'
+   depends=('kdebase-workspace' 'kdebase-lib')
+   cd $srcdir/build/apps/plasma
+   make DESTDIR=$pkgdir install
+}

Added: kde-unstable/kdebase.install
===
--- kde-uns

[arch-commits] Commit in kdebase-workspace (9 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:46:54
  Author: andrea
Revision: 61156

prepare kde-unstable repo

Added:
  kdebase-workspace/kde-unstable/
  kdebase-workspace/kde-unstable/PKGBUILD
  kdebase-workspace/kde-unstable/fixpath.patch
  kdebase-workspace/kde-unstable/kde-np.pam
  kdebase-workspace/kde-unstable/kde.pam
  kdebase-workspace/kde-unstable/kdm
  kdebase-workspace/kde-unstable/kdm-zsh-profile.patch
  kdebase-workspace/kde-unstable/kscreensaver.pam
  kdebase-workspace/kde-unstable/terminate-server.patch

+
 PKGBUILD   |   69 +++
 fixpath.patch  |   34 +++
 kde-np.pam |7 
 kde.pam|7 
 kdm|   37 +
 kdm-zsh-profile.patch  |   11 +++
 kscreensaver.pam   |1 
 terminate-server.patch |   11 +++
 8 files changed, 177 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:46:54 UTC (rev 61156)
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 59826 2009-11-28 01:40:21Z andrea $
+# Maintainer: Pierre Schmitz 
+
+pkgname=kdebase-workspace
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="KDE Base Workspace"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde')
+# note on libxdamage:
+#  not detected by namcap because libgl depends on it
+#  but nvidia providing libgl does not depend on libxdamage
+depends=('kdelibs' 'kdepimlibs' 'kdebase-runtime' 'libxxf86misc' 
'libxcomposite'
+'libxss' 'lm_sensors' 'libxklavier' 'qimageblitz' 'polkit-qt' 'libxft' 
'libxdamage')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'networkmanager' 'bluez' 
'kdebindings-python')
+replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde')
+conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde')
+optdepends=('kdebindings-python: plasma scriptengine for Python')
+install='kdebase-workspace.install'
+backup=('usr/share/config/kdm/kdmrc'
+'etc/pam.d/kde'
+'etc/pam.d/kde-np'
+'etc/pam.d/kscreensaver')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+'fixpath.patch' 'terminate-server.patch')
+md5sums=('68177b5c0dd8ab4bebe682393871f82c'
+ '721e97031b62aee8914e8617e86f9235'
+ '5d80164932e0d44d8b802d3929a004ab'
+ '10a490653b002e6f9e7476ff9d37c011'
+ '552337fd9a3982d809ea16c7f0033d42'
+ '367a3538f54db71f108b34cfa31088ac'
+ '47a1f12673f66e62e2463efd7037a26a'
+ '814350c52c135d6f7bdada1e29223d38')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   patch -p0 -i ${srcdir}/kdm-zsh-profile.patch || return 1
+   patch -p0 -i ${srcdir}/fixpath.patch || return 1
+   patch -p0 -i ${srcdir}/terminate-server.patch || return 1
+
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DWITH_Xmms=OFF \
+   -DWITH_Googlegadgets=OFF \
+   -DWITH_QEdje=OFF
+   make || return 1
+}
+
+package() {
+   cd $srcdir/build
+   make DESTDIR=$pkgdir install
+
+   install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm
+   install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde
+   install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np
+   install -D -m644 ${srcdir}/kscreensaver.pam 
${pkgdir}/etc/pam.d/kscreensaver
+   install -d -m755 ${pkgdir}/etc/X11/sessions/
+   ln -sf /usr/share/apps/kdm/sessions/kde{,-safe}.desktop 
${pkgdir}/etc/X11/sessions/
+   install -d -m755 ${pkgdir}/etc/kde/{env,shutdown}
+}

Added: kde-unstable/fixpath.patch
===
--- kde-unstable/fixpath.patch  (rev 0)
+++ kde-unstable/fixpath.patch  2009-12-12 15:46:54 UTC (rev 61156)
@@ -0,0 +1,34 @@
+--- startkde.cmake.orig2009-01-15 14:24:44.0 +0100
 startkde.cmake 2009-01-15 14:33:08.0 +0100
+@@ -34,22 +34,6 @@
+ MALLOC_CHECK_=2 
+ export MALLOC_CHECK_
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`$bindir/kde4-config --qt-binaries`
+-  if [ -n "$qbindir" ]; then
+-case $PATH in
+-  $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
+-  *) PATH=$qbindir:$PATH; export PATH;;
+-esac
+-  fi
+-  case $PATH in
+-$bindir|$bindir:*|*

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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:45:49
  Author: andrea
Revision: 61155

prepare kde-unstable repo

Added:
  kdegraphics/kde-unstable/
  kdegraphics/kde-unstable/PKGBUILD
  kdegraphics/kde-unstable/kdegraphics.install

-+
 PKGBUILD|  132 ++
 kdegraphics.install |   11 
 2 files changed, 143 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:45:49 UTC (rev 61155)
@@ -0,0 +1,132 @@
+# $Id: PKGBUILD 59824 2009-11-28 01:40:14Z andrea $
+# Maintainer: Pierre Schmitz 
+
+pkgbase=kdegraphics
+pkgname=('kdegraphics-gwenview'
+ 'kdegraphics-kamera'
+ 'kdegraphics-kcolorchooser'
+ 'kdegraphics-kgamma'
+ 'kdegraphics-kolourpaint'
+ 'kdegraphics-kruler'
+ 'kdegraphics-ksnapshot'
+ 'kdegraphics-libs'
+ 'kdegraphics-okular')
+pkgver=4.3.80
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegraphics')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'kdebase-runtime'
+ 'poppler-qt' 'libspectre' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca'
+ 'qimageblitz' 'ebook-tools' 'libxxf86vm')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";)
+md5sums=('a18906933f28235ebe77b52df576bfc7')
+
+build() {
+   cd $srcdir
+   mkdir build
+   cd build
+   cmake ../${pkgbase}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   make
+}
+
+package_kdegraphics-gwenview() {
+   pkgdesc='A simple image viewer'
+   depends=('kdebase-runtime' 'kdegraphics-libs')
+   replaces=('gwenview' 'gwenview-i18n')
+   install='kdegraphics.install'
+   cd $srcdir/build/gwenview
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/doc/gwenview
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-kamera() {
+   pkgdesc='Configure Kamera'
+   depends=('kdelibs' 'libgphoto2')
+   cd $srcdir/build/kamera
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-kcolorchooser() {
+   pkgdesc='Color Chooser'
+   depends=('kdelibs' 'kdebase-runtime')
+   install='kdegraphics.install'
+   cd $srcdir/build/kcolorchooser
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-kgamma() {
+   pkgdesc='A monitor calibration tool'
+   # note on libxxf86vm:
+   #   not detected by namcap because libgl depends on it
+   #   but nvidia providing libgl does not depend on libxxf86vm
+   depends=('kdelibs' 'kdebase-runtime' 'libxxf86vm')
+   install='kdegraphics.install'
+   cd $srcdir/build/kgamma
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/doc/kgamma
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-kolourpaint() {
+   pkgdesc='Paint Program'
+   depends=('kdelibs' 'kdebase-runtime' 'qimageblitz' 'kdegraphics-libs')
+   install='kdegraphics.install'
+   cd $srcdir/build/kolourpaint
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/doc/kolourpaint
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-kruler() {
+   pkgdesc='Screen Ruler'
+   depends=('kdelibs' 'kdebase-runtime')
+   install='kdegraphics.install'
+   cd $srcdir/build/kruler
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/doc/kruler
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-ksnapshot() {
+   pkgdesc='Screen Capture Program'
+   depends=('kdelibs' 'kdebase-runtime')
+   install='kdegraphics.install'
+   cd $srcdir/build/ksnapshot
+   make DESTDIR=$pkgdir install
+   cd $srcdir/build/doc/ksnapshot
+   make DESTDIR=$pkgdir install
+}
+
+package_kdegraphics-libs() {
+   pkgdesc='Support library for KDE Graphics Software'
+   groups=()
+   depends=('kdelibs' 'sane' 'lcms')
+   conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer' 
'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
+   replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin' 
'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers')
+   install='kdegraphics.install'
+   for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do
+   cd $srcdir/build/${i}
+   make DESTDIR=$pkgdir install
+   done
+   install -D -m644 
$srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \
+   $pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake
+}
+
+package_kdegraphics-okular() {
+   pkgdesc='Document Viewer'
+   depends=('kdelibs' 'kdebas

[arch-commits] Commit in kdebase-runtime (4 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:45:09
  Author: andrea
Revision: 61154

prepare kde-unstable repo

Added:
  kdebase-runtime/kde-unstable/
  kdebase-runtime/kde-unstable/PKGBUILD
  kdebase-runtime/kde-unstable/kdebase-runtime.install
  kdebase-runtime/kde-unstable/nepomukserverrc

-+
 PKGBUILD|   42 ++
 kdebase-runtime.install |   12 
 nepomukserverrc |2 ++
 3 files changed, 56 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:45:09 UTC (rev 61154)
@@ -0,0 +1,42 @@
+# $Id: $
+# Maintainer: Pierre Schmitz 
+
+pkgname=kdebase-runtime
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="KDE Base Runtime Environment"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+depends=('kdelibs' 'oxygen-icons' 'xorg-xauth' 'hicolor-icon-theme'
+   'smbclient' 'rarian' 'libssh')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdepimlibs' 'openslp')
+optdepends=('htdig: to build the search index'
+'gdb: drkonq crash handler')
+install='kdebase-runtime.install'
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
+'nepomukserverrc')
+md5sums=('a7e0ce1a6c1c58821566502e6c5dd58c'
+ '6505676fcc075625733e4251e0ec9d43')
+
+build() {
+   cd $srcdir
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DWITH_PulseAudio=OFF \
+   -DWITH_LibAttica=OFF
+   make
+}
+
+package() {
+   cd $srcdir/build
+   make DESTDIR=$pkgdir install
+   rm -f ${pkgdir}/usr/share/icons/hicolor/index.theme
+   ln -sf /usr/lib/kde4/libexec/kdesu ${pkgdir}/usr/bin/
+   install -D -m644 ${srcdir}/nepomukserverrc 
${pkgdir}/usr/share/config/nepomukserverrc
+}

Added: kde-unstable/kdebase-runtime.install
===
--- kde-unstable/kdebase-runtime.install(rev 0)
+++ kde-unstable/kdebase-runtime.install2009-12-12 15:45:09 UTC (rev 
61154)
@@ -0,0 +1,12 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}

Added: kde-unstable/nepomukserverrc
===
--- kde-unstable/nepomukserverrc(rev 0)
+++ kde-unstable/nepomukserverrc2009-12-12 15:45:09 UTC (rev 61154)
@@ -0,0 +1,2 @@
+[Service-nepomukstrigiservice]
+autostart=false



[arch-commits] Commit in oxygen-icons (kde-unstable kde-unstable/PKGBUILD)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:44:30
  Author: andrea
Revision: 61153

prepare kde-unstable repo

Added:
  oxygen-icons/kde-unstable/
  oxygen-icons/kde-unstable/PKGBUILD

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

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:44:30 UTC (rev 61153)
@@ -0,0 +1,37 @@
+# $Id: $
+# Maintainer: Pierre Schmitz 
+
+pkgbase=oxygen-icons
+pkgname=('oxygen-icons'
+ 'oxygen-icons-svg')
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="The Oxygen Icon Theme"
+arch=('any')
+url='http://www.oxygen-icons.org/'
+license=('LGPL')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('97a391478720b670a97ad7d18054f1b6')
+
+build() {
+   cd $srcdir
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   make
+}
+
+package_oxygen-icons() {
+   cd $srcdir/build
+   make DESTDIR=$pkgdir install
+}
+
+package_oxygen-icons-svg() {
+   pkgdesc="The Oxygen Icon Theme (Scalable Vector Graphics)"
+   cd $srcdir/${pkgname}-${pkgver}
+   find scalable -type f ! -name '*.sh' -exec \
+   install -D -m644 "{}" "${pkgdir}/usr/share/icons/oxygen/{}" \;
+}



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:43:07
  Author: andrea
Revision: 61152

prepare kde-unstable repo

Added:
  kdepimlibs/kde-unstable/
  kdepimlibs/kde-unstable/PKGBUILD
  kdepimlibs/kde-unstable/kdepimlibs.install

+
 PKGBUILD   |   32 
 kdepimlibs.install |   11 +++
 2 files changed, 43 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:43:07 UTC (rev 61152)
@@ -0,0 +1,32 @@
+# $Id: $
+# Maintainer: Pierre Schmitz 
+
+pkgname=kdepimlibs
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="KDE PIM Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL')
+depends=('kdelibs' 'akonadi>=1.2.80' 'libical' 'gpgme')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
+install='kdepimlibs.install'
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('e7dee79a6ca9393ef9fdbcdd0614e611')
+
+build() {
+   cd $srcdir
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DCMAKE_INSTALL_PREFIX=/usr
+   make
+}
+
+package() {
+   cd $srcdir/build
+   make DESTDIR=$pkgdir install
+}

Added: kde-unstable/kdepimlibs.install
===
--- kde-unstable/kdepimlibs.install (rev 0)
+++ kde-unstable/kdepimlibs.install 2009-12-12 15:43:07 UTC (rev 61152)
@@ -0,0 +1,11 @@
+post_install() {
+   update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
\ No newline at end of file



[arch-commits] Commit in kdelibs (6 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:42:35
  Author: andrea
Revision: 61151

prepare kde-unstable repo

Added:
  kdelibs/kde-unstable/
  kdelibs/kde-unstable/PKGBUILD
  kdelibs/kde-unstable/abs-syntax-highlight.patch
  kdelibs/kde-unstable/archlinux-menu.patch
  kdelibs/kde-unstable/kde-applications-menu.patch
  kdelibs/kde-unstable/kdelibs.install

-+
 PKGBUILD|   59 ++
 abs-syntax-highlight.patch  |   12 
 archlinux-menu.patch|   24 +
 kde-applications-menu.patch |   24 +
 kdelibs.install |   12 
 5 files changed, 131 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:42:35 UTC (rev 61151)
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 60156 2009-12-01 10:21:15Z andrea $
+# Maintainer: Pierre Schmitz 
+
+pkgname=kdelibs
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+depends=('shared-mime-info' 'hal' 'xz-utils' 'enchant' 'jasper' 'openexr'
+   'strigi' 'libxtst' 'soprano' 'ca-certificates' 'xdg-utils' 'qca' 
'polkit-qt'
+   'libxss' 'phonon' 'shared-desktop-ontologies')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 
'hspell' 'libxslt')
+replaces=('arts')
+install='kdelibs.install'
+source=(http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
+'kde-applications-menu.patch' 'archlinux-menu.patch' 
'abs-syntax-highlight.patch')
+md5sums=('3d4fe702be4a85c02e56e80a8f06ae76'
+ '280f34ee159845f8902c31bd499254fc'
+ '79e39afdfc7081f44971da21a8427879'
+ '18ea42696a7f41332a092d6ead7efc6a')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+
+   # avoid file conflict with gnome-menu
+   patch -p1 -i $srcdir/kde-applications-menu.patch
+   # add Archlinux menu entry
+   patch -p1 -i $srcdir/archlinux-menu.patch
+   # add syntax highlightning for PKGBUILD and .install files
+   patch -p1 -i $srcdir/abs-syntax-highlight.patch
+
+   cd ${srcdir}
+   mkdir build
+   cd build
+   cmake ../${pkgname}-${pkgver} \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_SKIP_RPATH=ON \
+   -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+   -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DSYSCONF_INSTALL_DIR=/etc \
+   -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
+   -DKDE_DEFAULT_HOME='.kde4' \
+   -DWITH_FAM=OFF \
+   -DWITH_LibAttica=OFF
+   make
+}
+
+package() {
+   cd $srcdir/build
+   make DESTDIR=$pkgdir install
+
+   # cert bundle seems to be hardcoded
+   # link it to the one from ca-certificates
+   rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
+   ln -sf /etc/ssl/certs/ca-certificates.crt 
$pkgdir/usr/share/apps/kssl/ca-bundle.crt
+}

Added: kde-unstable/abs-syntax-highlight.patch
===
--- kde-unstable/abs-syntax-highlight.patch (rev 0)
+++ kde-unstable/abs-syntax-highlight.patch 2009-12-12 15:42:35 UTC (rev 
61151)
@@ -0,0 +1,12 @@
+diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 
kdelibs-4.3.0/kate/syntax/data/bash.xml
+--- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml   2009-04-15 
12:26:37.0 +0200
 kdelibs-4.3.0/kate/syntax/data/bash.xml2009-07-30 13:24:01.0 
+0200
+@@ -8,7 +8,7 @@
+ 
+  
+ ]>
+-
++
+ 
+ 

[arch-commits] Commit in (6 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:40:52
  Author: andrea
Revision: 61150

prepare kde-unstable repo

Added:
  phonon/
  phonon/kde-unstable/
  phonon/kde-unstable/PKGBUILD
  phonon/kde-unstable/phonon.install
  phonon/repos/
  phonon/trunk/

+
 PKGBUILD   |   32 
 phonon.install |   11 +++
 2 files changed, 43 insertions(+)

Added: phonon/kde-unstable/PKGBUILD
===
--- phonon/kde-unstable/PKGBUILD(rev 0)
+++ phonon/kde-unstable/PKGBUILD2009-12-12 15:40:52 UTC (rev 61150)
@@ -0,0 +1,32 @@
+# $Id: $
+# Maintainer: Andrea Scarpino 
+
+pkgname=phonon
+pkgver=4.3.80
+pkgrel=1
+pkgdesc="The multimedia API for KDE4"
+arch=('i686' 'x86_64')
+url="http://phonon.kde.org";
+license=('LGPL')
+depends=('qt' 'xine-lib')
+makedepends=('cmake' 'automoc4')
+conflicts=('phonon-xine')
+install=${pkgname}.install
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('6b0c5554291615433c14c3c38f741690')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed' \
+-DWITH_GStreamer=OFF \
+-DWITH_GStreamerPlugins=OFF \
+-DWITH_PulseAudio=OFF
+  make || return 1
+  make DESTDIR=${pkgdir} install
+}

Added: phonon/kde-unstable/phonon.install
===
--- phonon/kde-unstable/phonon.install  (rev 0)
+++ phonon/kde-unstable/phonon.install  2009-12-12 15:40:52 UTC (rev 61150)
@@ -0,0 +1,11 @@
+post_install() {
+   update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:40:01
  Author: andrea
Revision: 61149

prepare kde-unstable repo

Added:
  qscintilla/kde-unstable/
  qscintilla/kde-unstable/PKGBUILD

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

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:40:01 UTC (rev 61149)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 46926 2009-07-22 04:56:17Z pierre $
+# Maintainer: Douglas Soares de Andrade 
+# Contributor: Michal Krenek 
+# Bug #8577 Modifications made by DaNiMoTh 
+
+pkgname=qscintilla
+pkgver=2.4.120091101
+_pkgver=2.4.1-snapshot-20091101
+pkgrel=1
+license=('GPL')
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class."
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/download";
+depends=('qt')
+provides=('qscintilla2')
+conflicts=('qscintilla2')
+replaces=('qscintilla2')
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$_pkgver.tar.gz)
+md5sums=('92b11af2205fb6329ff1e9861e4bc3dd')
+
+build() {
+cd $srcdir/QScintilla-gpl-$_pkgver/Qt4
+sed -i "s|DESTDIR = .*|DESTDIR = $pkgdir/usr/lib|g" qscintilla.pro
+sed -i "s|header.path = .*|header.path = $pkgdir/usr/include|g" 
qscintilla.pro
+sed -i "s|trans.path = .*|trans.path = 
$pkgdir/usr/share/qt/translations|g" qscintilla.pro
+sed -i "s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g" 
qscintilla.pro
+
+qmake qscintilla.pro
+sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile
+make || return 1
+make DESTDIR=$pkgdir install
+
+cd ../designer-Qt4
+
+# Qt4 designer qscintilla2 plugin
+mkdir -p $pkgdir/usr/lib/qt/plugins/designer
+
+echo "INCPATH += ../Qt4" >> designer.pro
+sed -i "s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g" designer.pro
+qmake designer.pro
+make || return 1
+cp libqscintillaplugin.so $pkgdir/usr/lib/qt/plugins/designer/ || return 1
+
+msg "Installing the libs to the right place"
+
+cd ../Qt4
+cp libqscintilla2.so.5.2.0 $pkgdir/usr/lib/ || return 1
+
+pushd $pkgdir/usr/lib/
+ln -s libqscintilla2.so.5.2.0 libqscintilla2.so
+ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5
+ln -s libqscintilla2.so.5.2.0 libqscintilla2.so.5.2
+popd
+}



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:37:40
  Author: andrea
Revision: 61148

prepare kde-unstable repo

Added:
  akonadi/kde-unstable/
  akonadi/kde-unstable/PKGBUILD
  akonadi/kde-unstable/akonadi.install

-+
 PKGBUILD|   29 +
 akonadi.install |   11 +++
 2 files changed, 40 insertions(+)

Added: kde-unstable/PKGBUILD
===
--- kde-unstable/PKGBUILD   (rev 0)
+++ kde-unstable/PKGBUILD   2009-12-12 15:37:40 UTC (rev 61148)
@@ -0,0 +1,29 @@
+# $Id: $
+# Maintainer: Andrea Scarpino 
+# Contributor: Pierre Schmitz 
+
+pkgname=akonadi
+pkgver=1.2.80
+pkgrel=1
+pkgdesc="PIM layer, which provides an asynchronous API to access all kind of 
PIM data"
+arch=('i686' 'x86_64')
+url='http://www.akonadi-project.org'
+license=('LGPL')
+depends=('shared-mime-info' 'boost' 'mysql' 'soprano')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+install=$pkgname.install
+source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('86efecca13035df77d2da534cbd0074e')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_SKIP_RPATH=ON \
+-DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined 
-Wl,--as-needed'
+  make || return 1
+  make DESTDIR=${pkgdir} install
+}

Added: kde-unstable/akonadi.install
===
--- kde-unstable/akonadi.install(rev 0)
+++ kde-unstable/akonadi.install2009-12-12 15:37:40 UTC (rev 61148)
@@ -0,0 +1,11 @@
+post_install() {
+   update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:34:00
  Author: andrea
Revision: 61147

undo

Modified:
  konversation/trunk/PKGBUILD
  soprano/trunk/PKGBUILD

-+
 konversation/trunk/PKGBUILD |2 +-
 soprano/trunk/PKGBUILD  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: konversation/trunk/PKGBUILD
===
--- konversation/trunk/PKGBUILD 2009-12-12 15:32:02 UTC (rev 61146)
+++ konversation/trunk/PKGBUILD 2009-12-12 15:34:00 UTC (rev 61147)
@@ -5,7 +5,7 @@
 
 pkgname=konversation
 pkgver=1.2.1
-pkgrel=2
+pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
 url="http://konversation.kde.org";

Modified: soprano/trunk/PKGBUILD
===
--- soprano/trunk/PKGBUILD  2009-12-12 15:32:02 UTC (rev 61146)
+++ soprano/trunk/PKGBUILD  2009-12-12 15:34:00 UTC (rev 61147)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski 
 
 pkgname=soprano
-pkgver=2.3.70
+pkgver=2.3.1
 pkgrel=2
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 
framework for RDF data'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('cmake' 'openjdk6')
 optdepends=('openjdk6: Sesame2 backend')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('de5cf230a95fc7218425aafdfb4a5e47')
+md5sums=('c9a2c008b80cd5d76599e9d48139dfe9')
 
 build() {
   . /etc/profile.d/openjdk6.sh



[arch-commits] Commit in (10 files)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:32:02
  Author: andrea
Revision: 61146

prepare kde-unstable repo

Added:
  libssh/
  libssh/kde-unstable/
  libssh/kde-unstable/PKGBUILD
  libssh/repos/
  libssh/trunk/
  soprano/kde-unstable/
  soprano/kde-unstable/PKGBUILD
Modified:
  konversation/trunk/PKGBUILD
  pyqt/trunk/PKGBUILD
  soprano/trunk/PKGBUILD

---+
 konversation/trunk/PKGBUILD   |2 +-
 libssh/kde-unstable/PKGBUILD  |   27 +++
 pyqt/trunk/PKGBUILD   |4 ++--
 soprano/kde-unstable/PKGBUILD |   30 ++
 soprano/trunk/PKGBUILD|4 ++--
 5 files changed, 62 insertions(+), 5 deletions(-)

Modified: konversation/trunk/PKGBUILD
===
--- konversation/trunk/PKGBUILD 2009-12-12 15:30:44 UTC (rev 61145)
+++ konversation/trunk/PKGBUILD 2009-12-12 15:32:02 UTC (rev 61146)
@@ -5,7 +5,7 @@
 
 pkgname=konversation
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
 url="http://konversation.kde.org";

Added: libssh/kde-unstable/PKGBUILD
===
--- libssh/kde-unstable/PKGBUILD(rev 0)
+++ libssh/kde-unstable/PKGBUILD2009-12-12 15:32:02 UTC (rev 61146)
@@ -0,0 +1,27 @@
+# $Id: $
+# Maintainer: Andrea Scarpino 
+# Contributor: ice-man 
+# Contributor: sergeantspoon 
+
+pkgname=libssh
+pkgver=0.4.0
+pkgrel=1 
+pkgdesc="Library for accessing ssh client services through C libraries"
+url="http://www.libssh.org/";
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('openssl')
+makedepends=('cmake' 'automoc4')
+source=(http://www.libssh.org/files/$pkgname-$pkgver.tar.gz)
+md5sums=('bcb3d567bacd54c9f6b5b0e8c4d1102c')
+
+build() {
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=Release || return 1
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+}

Modified: pyqt/trunk/PKGBUILD
===
--- pyqt/trunk/PKGBUILD 2009-12-12 15:30:44 UTC (rev 61145)
+++ pyqt/trunk/PKGBUILD 2009-12-12 15:32:02 UTC (rev 61146)
@@ -5,11 +5,11 @@
 
 pkgname=pyqt
 pkgver=4.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of Python bindings for the Qt toolkit."
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro";
-depends=('sip>=4.9.3' 'qscintilla>=2.4.0' 'qt>=4.5.3' 'dbus-python' 'openssl')
+depends=('sip>=4.9.3' 'qscintilla>=2.4.1' 'qt>=4.6.0' 'dbus-python' 'openssl')
 license=('GPL')
 provides=('pyqt4')
 replaces=('pyqt4')

Added: soprano/kde-unstable/PKGBUILD
===
--- soprano/kde-unstable/PKGBUILD   (rev 0)
+++ soprano/kde-unstable/PKGBUILD   2009-12-12 15:32:02 UTC (rev 61146)
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 53575 2009-10-02 16:19:01Z andrea $
+# Maintainer: Andrea Scarpino 
+# Contributor: Tobias Powalowski 
+
+pkgname=soprano
+pkgver=2.3.70
+pkgrel=1
+pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 
framework for RDF data'
+arch=('i686' 'x86_64')
+url='http://soprano.sourceforge.net/'
+license=('GPL' 'LGPL')
+depends=('qt' 'clucene' 'redland')
+makedepends=('cmake' 'openjdk6')
+optdepends=("openjdk6: Sesame2 backend")
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('de5cf230a95fc7218425aafdfb4a5e47')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  # we need the rpath
+  cmake "../${pkgname}-${pkgver}" \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_SKIP_RPATH=OFF \
+-DCMAKE_INSTALL_PREFIX=/usr || return 1 \
+-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=ON
+  make || return 1
+  make DESTDIR="${pkgdir}" install || return 1
+}

Modified: soprano/trunk/PKGBUILD
===
--- soprano/trunk/PKGBUILD  2009-12-12 15:30:44 UTC (rev 61145)
+++ soprano/trunk/PKGBUILD  2009-12-12 15:32:02 UTC (rev 61146)
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski 
 
 pkgname=soprano
-pkgver=2.3.1
+pkgver=2.3.70
 pkgrel=2
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 
framework for RDF data'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 makedepends=('cmake' 'openjdk6')
 optdepends=('openjdk6: Sesame2 backend')
 
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('c9a2c008b80cd5d76599e9d48139dfe9')
+md5sums=('de5cf230a95fc7218425aafdfb4a5e47')
 
 build() {
   . /etc/profile.d/openjdk6.sh



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:30:44
  Author: andrea
Revision: 61145

prepare kde-unstable repo

Modified:
  libmsn/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 15:25:06 UTC (rev 61144)
+++ PKGBUILD2009-12-12 15:30:44 UTC (rev 61145)
@@ -3,24 +3,22 @@
 # Contributor: Charly Ghislain 
 
 pkgname=libmsn
-pkgver=4.0beta8
-_pkgver=4.0-beta8
-pkgrel=2
+pkgver=4.0
+pkgrel=1
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
-md5sums=('29d110b36402cfb0c3affeb10be8a6c6')
-options=('force')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('027442e7366dac7c365e8e57eabffc4a')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${_pkgver} \
+  cmake ../${pkgname}-${pkgver} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release || return 1
   make DESTDIR=${pkgdir} install



[arch-commits] Commit in libmsn/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:25:06
  Author: andrea
Revision: 61144

Merged revisions 61143 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libmsn/trunk


  r61143 | andrea | 2009-12-12 16:24:23 +0100 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: libmsn 4.0beta8-2
  downgraded (kdenetwork 4.3.4 does not build with this version)


Modified:
  libmsn/repos/extra-i686/  (properties)
  libmsn/repos/extra-i686/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)


Property changes on: libmsn/repos/extra-i686
___
Modified: svnmerge-integrated
   - /libmsn/trunk:1-61093
   + /libmsn/trunk:1-61143

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 15:24:23 UTC (rev 61143)
+++ extra-i686/PKGBUILD 2009-12-12 15:25:06 UTC (rev 61144)
@@ -3,22 +3,24 @@
 # Contributor: Charly Ghislain 
 
 pkgname=libmsn
-pkgver=4.0
-pkgrel=1
+pkgver=4.0beta8
+_pkgver=4.0-beta8
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('027442e7366dac7c365e8e57eabffc4a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
+md5sums=('29d110b36402cfb0c3affeb10be8a6c6')
+options=('force')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-${_pkgver} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release || return 1
   make DESTDIR=${pkgdir} install



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:24:23
  Author: andrea
Revision: 61143

upgpkg: libmsn 4.0beta8-2
downgraded (kdenetwork 4.3.4 does not build with this version)

Modified:
  libmsn/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 15:22:55 UTC (rev 61142)
+++ PKGBUILD2009-12-12 15:24:23 UTC (rev 61143)
@@ -3,22 +3,24 @@
 # Contributor: Charly Ghislain 
 
 pkgname=libmsn
-pkgver=4.0
-pkgrel=1
+pkgver=4.0beta8
+_pkgver=4.0-beta8
+pkgrel=2
 pkgdesc="A reusable, open-source, fully documented library for connecting to 
Microsoft's MSN"
 url="http://sourceforge.net/projects/libmsn/";
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('openssl')
 makedepends=('cmake')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('027442e7366dac7c365e8e57eabffc4a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2)
+md5sums=('29d110b36402cfb0c3affeb10be8a6c6')
+options=('force')
 
 build() {
   cd ${srcdir}
   mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgname}-${_pkgver} \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release || return 1
   make DESTDIR=${pkgdir} install



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 10:22:55
  Author: andrea
Revision: 61142

undo (build fails)

Modified:
  kdenetwork/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 14:41:32 UTC (rev 61141)
+++ PKGBUILD2009-12-12 15:22:55 UTC (rev 61142)
@@ -10,14 +10,14 @@
  'kdenetwork-krdc'
  'kdenetwork-krfb')
 pkgver=4.3.4
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 
'qca-ossl'
'kdelibs-experimental' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-   'libmsn>=4.0-1' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 
'libxss'
+   'libmsn' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss'
'libxdamage' 'libgadu')
 
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
 'add-overwrite-option-in-kget.patch')



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

2009-12-12 Thread Andrea Scarpino
Date: Saturday, December 12, 2009 @ 09:41:32
  Author: andrea
Revision: 61141

needs a rebuild with the new libmsn

Modified:
  kdenetwork/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 12:42:30 UTC (rev 61140)
+++ PKGBUILD2009-12-12 14:41:32 UTC (rev 61141)
@@ -10,14 +10,14 @@
  'kdenetwork-krdc'
  'kdenetwork-krfb')
 pkgver=4.3.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 
'qca-ossl'
'kdelibs-experimental' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-   'libmsn' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 'libxss'
+   'libmsn>=4.0-1' 'ppp' 'libv4l' 'libidn' 'rdesktop' 'qimageblitz' 
'libxss'
'libxdamage' 'libgadu')
 
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2";
 'add-overwrite-option-in-kget.patch')



[arch-commits] Commit in pil/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:42:30
  Author: allan
Revision: 61140

Merged revisions 61138 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/pil/trunk


  r61138 | allan | 2009-12-12 22:40:03 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: pil 1.1.7-1
  upstream update, add tk optdep (FS#17411)


Modified:
  pil/repos/extra-x86_64/   (properties)
  pil/repos/extra-x86_64/PKGBUILD

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


Property changes on: pil/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /pil/trunk:1-43956
   + /pil/trunk:1-61139

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 12:40:59 UTC (rev 61139)
+++ extra-x86_64/PKGBUILD   2009-12-12 12:42:30 UTC (rev 61140)
@@ -3,16 +3,17 @@
 # Contributor: simo 
 
 pkgname=pil
-pkgver=1.1.6
-pkgrel=6
+pkgver=1.1.7
+pkgrel=1
 pkgdesc="Python imaging library"
 arch=('i686' 'x86_64')
 url="http://www.pythonware.com/products/pil/index.htm";
 license=('custom:"pil"')
-depends=('python' 'libjpeg>=7' 'freetype2') 
-makedepends=('tk>=8.5.0')
+depends=('python' 'libjpeg' 'freetype2') 
+makedepends=('tk')
+optdepends=('tk')
 source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
-md5sums=('3a9b5c20ca52f0a9900512d2c7347622')
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
 
 build() {
   cd $srcdir/Imaging-$pkgver



[arch-commits] Commit in pil/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:40:59
  Author: allan
Revision: 61139

Merged revisions 61138 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/pil/trunk


  r61138 | allan | 2009-12-12 22:40:03 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: pil 1.1.7-1
  upstream update, add tk optdep (FS#17411)


Modified:
  pil/repos/extra-i686/ (properties)
  pil/repos/extra-i686/PKGBUILD

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


Property changes on: pil/repos/extra-i686
___
Modified: svnmerge-integrated
   - /pil/trunk:1-43954
   + /pil/trunk:1-61138

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 12:40:03 UTC (rev 61138)
+++ extra-i686/PKGBUILD 2009-12-12 12:40:59 UTC (rev 61139)
@@ -3,16 +3,17 @@
 # Contributor: simo 
 
 pkgname=pil
-pkgver=1.1.6
-pkgrel=6
+pkgver=1.1.7
+pkgrel=1
 pkgdesc="Python imaging library"
 arch=('i686' 'x86_64')
 url="http://www.pythonware.com/products/pil/index.htm";
 license=('custom:"pil"')
-depends=('python' 'libjpeg>=7' 'freetype2') 
-makedepends=('tk>=8.5.0')
+depends=('python' 'libjpeg' 'freetype2') 
+makedepends=('tk')
+optdepends=('tk')
 source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
-md5sums=('3a9b5c20ca52f0a9900512d2c7347622')
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
 
 build() {
   cd $srcdir/Imaging-$pkgver



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

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:40:03
  Author: allan
Revision: 61138

upgpkg: pil 1.1.7-1
upstream update, add tk optdep (FS#17411)

Modified:
  pil/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 12:30:33 UTC (rev 61137)
+++ PKGBUILD2009-12-12 12:40:03 UTC (rev 61138)
@@ -3,16 +3,17 @@
 # Contributor: simo 
 
 pkgname=pil
-pkgver=1.1.6
-pkgrel=6
+pkgver=1.1.7
+pkgrel=1
 pkgdesc="Python imaging library"
 arch=('i686' 'x86_64')
 url="http://www.pythonware.com/products/pil/index.htm";
 license=('custom:"pil"')
-depends=('python' 'libjpeg>=7' 'freetype2') 
-makedepends=('tk>=8.5.0')
+depends=('python' 'libjpeg' 'freetype2') 
+makedepends=('tk')
+optdepends=('tk')
 source=(http://effbot.org/downloads/Imaging-$pkgver.tar.gz)
-md5sums=('3a9b5c20ca52f0a9900512d2c7347622')
+md5sums=('fc14a54e1ce02a0225be8854bfba478e')
 
 build() {
   cd $srcdir/Imaging-$pkgver



[arch-commits] Commit in ruby/repos (extra-x86_64 extra-x86_64/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:30:33
  Author: allan
Revision: 61137

Merged revisions 61135 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ruby/trunk


  r61135 | allan | 2009-12-12 22:22:00 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: ruby 1.9.1_p376-1
  upstream update, remove versioned deps as they were mostly out of date 
anyway...


Modified:
  ruby/repos/extra-x86_64/  (properties)
  ruby/repos/extra-x86_64/PKGBUILD

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


Property changes on: ruby/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /ruby/trunk:1-53113
   + /ruby/trunk:1-61136

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 12:22:59 UTC (rev 61136)
+++ extra-x86_64/PKGBUILD   2009-12-12 12:30:33 UTC (rev 61137)
@@ -4,18 +4,17 @@
 # Contributor: Jeramy Rutley 
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.1_p243
-_pkgver=1.9.1-p243
-pkgrel=2
+pkgver=1.9.1_p376
+_pkgver=1.9.1-p376
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.ruby-lang.org/en/";
-makedepends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' \
- 'readline>=5.2.013' 'tk>=8.5')
+makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk')
 source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgname}-${_pkgver}.tar.bz2) 
 options=('!emptydirs')
-md5sums=('66d4f8403d13623051091347764881a0')
+md5sums=('e019ae9c643c5efe91be49e29781fb94')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
@@ -25,7 +24,7 @@
 
 package_ruby()
 {
-  depends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' 
'readline>=5.2.013')
+  depends=('gdbm' 'db' 'openssl' 'zlib' 'readline')
   provides=('rubygems' 'rake')
   conflicts=('rubygems' 'rake')
   optdepends=('tk: for Ruby/TK')



[arch-commits] Commit in ruby/repos (extra-i686 extra-i686/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:22:59
  Author: allan
Revision: 61136

Merged revisions 61135 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ruby/trunk


  r61135 | allan | 2009-12-12 22:22:00 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: ruby 1.9.1_p376-1
  upstream update, remove versioned deps as they were mostly out of date 
anyway...


Modified:
  ruby/repos/extra-i686/(properties)
  ruby/repos/extra-i686/PKGBUILD

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


Property changes on: ruby/repos/extra-i686
___
Modified: svnmerge-integrated
   - /ruby/trunk:1-53111
   + /ruby/trunk:1-61135

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 12:22:00 UTC (rev 61135)
+++ extra-i686/PKGBUILD 2009-12-12 12:22:59 UTC (rev 61136)
@@ -4,18 +4,17 @@
 # Contributor: Jeramy Rutley 
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.1_p243
-_pkgver=1.9.1-p243
-pkgrel=2
+pkgver=1.9.1_p376
+_pkgver=1.9.1-p376
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.ruby-lang.org/en/";
-makedepends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' \
- 'readline>=5.2.013' 'tk>=8.5')
+makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk')
 source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgname}-${_pkgver}.tar.bz2) 
 options=('!emptydirs')
-md5sums=('66d4f8403d13623051091347764881a0')
+md5sums=('e019ae9c643c5efe91be49e29781fb94')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
@@ -25,7 +24,7 @@
 
 package_ruby()
 {
-  depends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' 
'readline>=5.2.013')
+  depends=('gdbm' 'db' 'openssl' 'zlib' 'readline')
   provides=('rubygems' 'rake')
   conflicts=('rubygems' 'rake')
   optdepends=('tk: for Ruby/TK')



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

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 07:22:00
  Author: allan
Revision: 61135

upgpkg: ruby 1.9.1_p376-1
upstream update, remove versioned deps as they were mostly out of date 
anyway...

Modified:
  ruby/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 11:39:58 UTC (rev 61134)
+++ PKGBUILD2009-12-12 12:22:00 UTC (rev 61135)
@@ -4,18 +4,17 @@
 # Contributor: Jeramy Rutley 
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.1_p243
-_pkgver=1.9.1-p243
-pkgrel=2
+pkgver=1.9.1_p376
+_pkgver=1.9.1-p376
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.ruby-lang.org/en/";
-makedepends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' \
- 'readline>=5.2.013' 'tk>=8.5')
+makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk')
 source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgname}-${_pkgver}.tar.bz2) 
 options=('!emptydirs')
-md5sums=('66d4f8403d13623051091347764881a0')
+md5sums=('e019ae9c643c5efe91be49e29781fb94')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
@@ -25,7 +24,7 @@
 
 package_ruby()
 {
-  depends=('gdbm>=1.8.3' 'db>=4.8' 'openssl>=0.9.8k' 'zlib>=1.2.3.3' 
'readline>=5.2.013')
+  depends=('gdbm' 'db' 'openssl' 'zlib' 'readline')
   provides=('rubygems' 'rake')
   conflicts=('rubygems' 'rake')
   optdepends=('tk: for Ruby/TK')



[arch-commits] Commit in gpm/repos (core-x86_64)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:39:57
  Author: eric
Revision: 61133

db-move: gpm removed by eric for move to core

Deleted:
  gpm/repos/core-x86_64/



[arch-commits] Commit in gpm/repos (core-x86_64 testing-x86_64)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:39:58
  Author: eric
Revision: 61134

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

Added:
  gpm/repos/core-x86_64/
Deleted:
  gpm/repos/testing-x86_64/



[arch-commits] Commit in gpm/repos (core-i686 testing-i686)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:39:16
  Author: eric
Revision: 61132

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

Added:
  gpm/repos/core-i686/
Deleted:
  gpm/repos/testing-i686/



[arch-commits] Commit in gpm/repos (core-i686)

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:39:16
  Author: eric
Revision: 61131

db-move: gpm removed by eric for move to core

Deleted:
  gpm/repos/core-i686/



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:36:42
  Author: eric
Revision: 61130

Merged revisions 61129 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/imagemagick-doc/trunk


  r61129 | eric | 2009-12-12 06:36:24 -0500 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: imagemagick-doc 6.5.8.5-1
  Upstream update


Modified:
  imagemagick-doc/repos/extra-any/  (properties)
  imagemagick-doc/repos/extra-any/ChangeLog
  imagemagick-doc/repos/extra-any/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


Property changes on: imagemagick-doc/repos/extra-any
___
Modified: svnmerge-integrated
   - /imagemagick-doc/trunk:1-59360
   + /imagemagick-doc/trunk:1-61129

Modified: extra-any/ChangeLog
===
--- extra-any/ChangeLog 2009-12-12 11:36:24 UTC (rev 61129)
+++ extra-any/ChangeLog 2009-12-12 11:36:42 UTC (rev 61130)
@@ -1,3 +1,8 @@
+2009-12-12  Eric Belanger  
+
+   * imagemagick-doc 6.5.8.5-1
+   * Upstream update
+
 2009-11-22  Eric Belanger  
 
* imagemagick-doc 6.5.7.10-1

Modified: extra-any/PKGBUILD
===
--- extra-any/PKGBUILD  2009-12-12 11:36:24 UTC (rev 61129)
+++ extra-any/PKGBUILD  2009-12-12 11:36:42 UTC (rev 61130)
@@ -3,7 +3,7 @@
 # Contributor: Eric Belanger 
 
 pkgname=imagemagick-doc
-pkgver=6.5.7.10
+pkgver=6.5.8.5
 pkgrel=1
 pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
 arch=('any')
@@ -12,8 +12,8 @@
 depends=('imagemagick')
 options=('!makeflags')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2)
-md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2')
-sha1sums=('f3d802f2ba01f63c60847341149021a93967979c')
+md5sums=('bf34ec0e7eca940989fb3f79a353d621')
+sha1sums=('f33bcce33cb8ca379de20958419cb8dcb8b86230')
 
 build() {
   cd "${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}"



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:36:24
  Author: eric
Revision: 61129

upgpkg: imagemagick-doc 6.5.8.5-1
Upstream update

Modified:
  imagemagick-doc/trunk/ChangeLog
  imagemagick-doc/trunk/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2009-12-12 11:34:10 UTC (rev 61128)
+++ ChangeLog   2009-12-12 11:36:24 UTC (rev 61129)
@@ -1,3 +1,8 @@
+2009-12-12  Eric Belanger  
+
+   * imagemagick-doc 6.5.8.5-1
+   * Upstream update
+
 2009-11-22  Eric Belanger  
 
* imagemagick-doc 6.5.7.10-1

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 11:34:10 UTC (rev 61128)
+++ PKGBUILD2009-12-12 11:36:24 UTC (rev 61129)
@@ -3,7 +3,7 @@
 # Contributor: Eric Belanger 
 
 pkgname=imagemagick-doc
-pkgver=6.5.7.10
+pkgver=6.5.8.5
 pkgrel=1
 pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
 arch=('any')
@@ -12,8 +12,8 @@
 depends=('imagemagick')
 options=('!makeflags')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2)
-md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2')
-sha1sums=('f3d802f2ba01f63c60847341149021a93967979c')
+md5sums=('bf34ec0e7eca940989fb3f79a353d621')
+sha1sums=('f33bcce33cb8ca379de20958419cb8dcb8b86230')
 
 build() {
   cd "${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}"



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:34:10
  Author: eric
Revision: 61128

Merged revisions 61126 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/imagemagick/trunk


  r61126 | eric | 2009-12-12 06:32:52 -0500 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: imagemagick 6.5.8.5-1
  Upstream update


Modified:
  imagemagick/repos/extra-x86_64/   (properties)
  imagemagick/repos/extra-x86_64/ChangeLog
  imagemagick/repos/extra-x86_64/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


Property changes on: imagemagick/repos/extra-x86_64
___
Modified: svnmerge-integrated
   - /imagemagick/trunk:1-59357
   + /imagemagick/trunk:1-61127

Modified: extra-x86_64/ChangeLog
===
--- extra-x86_64/ChangeLog  2009-12-12 11:33:14 UTC (rev 61127)
+++ extra-x86_64/ChangeLog  2009-12-12 11:34:10 UTC (rev 61128)
@@ -1,3 +1,8 @@
+2009-12-12  Eric Belanger  
+
+   * imagemagick 6.5.8.5-1
+   * Upstream update
+
 2009-11-22  Eric Belanger  
 
* imagemagick 6.5.7.10-1

Modified: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2009-12-12 11:33:14 UTC (rev 61127)
+++ extra-x86_64/PKGBUILD   2009-12-12 11:34:10 UTC (rev 61128)
@@ -6,7 +6,7 @@
 # Just uninstalling ImageMagick before build fails as it is used during the 
build processs
 
 pkgname=imagemagick
-pkgver=6.5.7.10
+pkgver=6.5.8.5
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@
 options=('!makeflags' '!docs')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2
 \
 libpng_mmx_patch_x86_64.patch add_delegate.patch 
perlmagick.rpath.patch)
-md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2' '069980fc2590c02aed86420996259302'\
+md5sums=('bf34ec0e7eca940989fb3f79a353d621' '069980fc2590c02aed86420996259302'\
  '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('f3d802f2ba01f63c60847341149021a93967979c' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+sha1sums=('f33bcce33cb8ca379de20958419cb8dcb8b86230' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
  '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' 
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:33:14
  Author: eric
Revision: 61127

Merged revisions 61126 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/imagemagick/trunk


  r61126 | eric | 2009-12-12 06:32:52 -0500 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: imagemagick 6.5.8.5-1
  Upstream update


Modified:
  imagemagick/repos/extra-i686/ (properties)
  imagemagick/repos/extra-i686/ChangeLog
  imagemagick/repos/extra-i686/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)


Property changes on: imagemagick/repos/extra-i686
___
Modified: svnmerge-integrated
   - /imagemagick/trunk:1-59368
   + /imagemagick/trunk:1-61126

Modified: extra-i686/ChangeLog
===
--- extra-i686/ChangeLog2009-12-12 11:32:52 UTC (rev 61126)
+++ extra-i686/ChangeLog2009-12-12 11:33:14 UTC (rev 61127)
@@ -1,3 +1,8 @@
+2009-12-12  Eric Belanger  
+
+   * imagemagick 6.5.8.5-1
+   * Upstream update
+
 2009-11-22  Eric Belanger  
 
* imagemagick 6.5.7.10-1

Modified: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2009-12-12 11:32:52 UTC (rev 61126)
+++ extra-i686/PKGBUILD 2009-12-12 11:33:14 UTC (rev 61127)
@@ -6,7 +6,7 @@
 # Just uninstalling ImageMagick before build fails as it is used during the 
build processs
 
 pkgname=imagemagick
-pkgver=6.5.7.10
+pkgver=6.5.8.5
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@
 options=('!makeflags' '!docs')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2
 \
 libpng_mmx_patch_x86_64.patch add_delegate.patch 
perlmagick.rpath.patch)
-md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2' '069980fc2590c02aed86420996259302'\
+md5sums=('bf34ec0e7eca940989fb3f79a353d621' '069980fc2590c02aed86420996259302'\
  '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('f3d802f2ba01f63c60847341149021a93967979c' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+sha1sums=('f33bcce33cb8ca379de20958419cb8dcb8b86230' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
  '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' 
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {



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

2009-12-12 Thread Eric Bélanger
Date: Saturday, December 12, 2009 @ 06:32:52
  Author: eric
Revision: 61126

upgpkg: imagemagick 6.5.8.5-1
Upstream update

Modified:
  imagemagick/trunk/ChangeLog
  imagemagick/trunk/PKGBUILD

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2009-12-12 10:47:39 UTC (rev 61125)
+++ ChangeLog   2009-12-12 11:32:52 UTC (rev 61126)
@@ -1,3 +1,8 @@
+2009-12-12  Eric Belanger  
+
+   * imagemagick 6.5.8.5-1
+   * Upstream update
+
 2009-11-22  Eric Belanger  
 
* imagemagick 6.5.7.10-1

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 10:47:39 UTC (rev 61125)
+++ PKGBUILD2009-12-12 11:32:52 UTC (rev 61126)
@@ -6,7 +6,7 @@
 # Just uninstalling ImageMagick before build fails as it is used during the 
build processs
 
 pkgname=imagemagick
-pkgver=6.5.7.10
+pkgver=6.5.8.5
 pkgrel=1
 pkgdesc="An image viewing/manipulation program"
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@
 options=('!makeflags' '!docs')
 
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2
 \
 libpng_mmx_patch_x86_64.patch add_delegate.patch 
perlmagick.rpath.patch)
-md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2' '069980fc2590c02aed86420996259302'\
+md5sums=('bf34ec0e7eca940989fb3f79a353d621' '069980fc2590c02aed86420996259302'\
  '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb')
-sha1sums=('f3d802f2ba01f63c60847341149021a93967979c' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
+sha1sums=('f33bcce33cb8ca379de20958419cb8dcb8b86230' 
'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\
  '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' 
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {



[arch-commits] Commit in coreutils/repos (testing-x86_64 testing-x86_64/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 05:47:39
  Author: allan
Revision: 61125

Merged revisions 61123 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/coreutils/trunk


  r61123 | allan | 2009-12-12 20:40:42 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: coreutils 8.2-1
  upstream update


Modified:
  coreutils/repos/testing-x86_64/   (properties)
  coreutils/repos/testing-x86_64/PKGBUILD

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


Property changes on: coreutils/repos/testing-x86_64
___
Modified: svnmerge-integrated
   - /coreutils/trunk:1-59849
   + /coreutils/trunk:1-61124

Modified: testing-x86_64/PKGBUILD
===
--- testing-x86_64/PKGBUILD 2009-12-12 10:41:36 UTC (rev 61124)
+++ testing-x86_64/PKGBUILD 2009-12-12 10:47:39 UTC (rev 61125)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=coreutils
-pkgver=8.1
+pkgver=8.2
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU 
operating system"
 arch=('i686' 'x86_64')
@@ -23,7 +23,7 @@
coreutils-pam.patch
coreutils-6.10-configuration.patch
su)
-md5sums=('4cde9f31604f4da188ed302ca55545ea'
+md5sums=('dfb0d3dbc5f555386339f4f74621cda0'
  '0ccdad826d251515b61d4b60da93a7e5'
  'c4fcca138b6abf6d443d48a6f0cd8833'
  '7efee4d5b3653711f9e229493316841c'
@@ -63,7 +63,7 @@
   chmod -v 4555 ${pkgdir}/bin/su
 
   # binaries required by various scripts
-  _bin="cut dd dir dircolors du install mkfifo readlink shred \
+  _bin="cut dir dircolors du install mkfifo readlink shred \
 sleep touch tr vdir"
   mv ${_bin} $pkgdir/bin
   ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep



[arch-commits] Commit in coreutils/repos (testing-i686 testing-i686/PKGBUILD)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 05:41:36
  Author: allan
Revision: 61124

Merged revisions 61123 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/coreutils/trunk


  r61123 | allan | 2009-12-12 20:40:42 +1000 (Sat, 12 Dec 2009) | 2 lines
  
  upgpkg: coreutils 8.2-1
  upstream update


Modified:
  coreutils/repos/testing-i686/ (properties)
  coreutils/repos/testing-i686/PKGBUILD

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


Property changes on: coreutils/repos/testing-i686
___
Modified: svnmerge-integrated
   - /coreutils/trunk:1-59847
   + /coreutils/trunk:1-61123

Modified: testing-i686/PKGBUILD
===
--- testing-i686/PKGBUILD   2009-12-12 10:40:42 UTC (rev 61123)
+++ testing-i686/PKGBUILD   2009-12-12 10:41:36 UTC (rev 61124)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=coreutils
-pkgver=8.1
+pkgver=8.2
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU 
operating system"
 arch=('i686' 'x86_64')
@@ -23,7 +23,7 @@
coreutils-pam.patch
coreutils-6.10-configuration.patch
su)
-md5sums=('4cde9f31604f4da188ed302ca55545ea'
+md5sums=('dfb0d3dbc5f555386339f4f74621cda0'
  '0ccdad826d251515b61d4b60da93a7e5'
  'c4fcca138b6abf6d443d48a6f0cd8833'
  '7efee4d5b3653711f9e229493316841c'
@@ -63,7 +63,7 @@
   chmod -v 4555 ${pkgdir}/bin/su
 
   # binaries required by various scripts
-  _bin="cut dd dir dircolors du install mkfifo readlink shred \
+  _bin="cut dir dircolors du install mkfifo readlink shred \
 sleep touch tr vdir"
   mv ${_bin} $pkgdir/bin
   ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep



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

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 05:40:42
  Author: allan
Revision: 61123

upgpkg: coreutils 8.2-1
upstream update

Modified:
  coreutils/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 10:07:42 UTC (rev 61122)
+++ PKGBUILD2009-12-12 10:40:42 UTC (rev 61123)
@@ -3,7 +3,7 @@
 # Contributor: judd 
 
 pkgname=coreutils
-pkgver=8.1
+pkgver=8.2
 pkgrel=1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU 
operating system"
 arch=('i686' 'x86_64')
@@ -23,7 +23,7 @@
coreutils-pam.patch
coreutils-6.10-configuration.patch
su)
-md5sums=('4cde9f31604f4da188ed302ca55545ea'
+md5sums=('dfb0d3dbc5f555386339f4f74621cda0'
  '0ccdad826d251515b61d4b60da93a7e5'
  'c4fcca138b6abf6d443d48a6f0cd8833'
  '7efee4d5b3653711f9e229493316841c'
@@ -63,7 +63,7 @@
   chmod -v 4555 ${pkgdir}/bin/su
 
   # binaries required by various scripts
-  _bin="cut dd dir dircolors du install mkfifo readlink shred \
+  _bin="cut dir dircolors du install mkfifo readlink shred \
 sleep touch tr vdir"
   mv ${_bin} $pkgdir/bin
   ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep



[arch-commits] Commit in gcc/repos (testing-x86_64)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 05:07:42
  Author: allan
Revision: 61122

Initialized merge tracking via "svnmerge" with revisions "1-61120" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcc/trunk

Modified:
  gcc/repos/testing-x86_64/ (properties)


Property changes on: gcc/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /gcc/trunk:1-61120



[arch-commits] Commit in gcc/repos (testing-x86_64)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 05:07:21
  Author: allan
Revision: 61121

archrelease: new repo testing-x86_64

Added:
  gcc/repos/testing-x86_64/



[arch-commits] Commit in gcc/repos (testing-i686)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 04:15:33
  Author: allan
Revision: 61120

Initialized merge tracking via "svnmerge" with revisions "1-61118" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcc/trunk

Modified:
  gcc/repos/testing-i686/   (properties)


Property changes on: gcc/repos/testing-i686
___
Added: svnmerge-integrated
   + /gcc/trunk:1-61118



[arch-commits] Commit in gcc/repos (testing-i686)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 04:15:12
  Author: allan
Revision: 61119

archrelease: new repo testing-i686

Added:
  gcc/repos/testing-i686/



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

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 04:14:47
  Author: allan
Revision: 61118

upgpkg: gcc 4.4.2-4
glibc-2.11.1 toolchain rebuild, bump to current 4.4 snapshot

Modified:
  gcc/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2009-12-12 08:28:11 UTC (rev 61117)
+++ PKGBUILD2009-12-12 09:14:47 UTC (rev 61118)
@@ -7,8 +7,8 @@
 
 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada')
 pkgver=4.4.2
-pkgrel=3
-#_snapshot=4.4-20090630
+pkgrel=4
+_snapshot=4.4-20091208
 _libstdcppmanver=4.4.0
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@@ -16,29 +16,33 @@
 url="http://gcc.gnu.org";
 makedepends=('binutils>=2.20' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3' 'gcc-ada')
 options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2
-   
#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2
+   
ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2

ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
-   
#ftp://ftp.archlinux.org/other/${pkgname}/libstdc++-man.${_libstdcppmanver}.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch)
-md5sums=('d50ec5af20508974411d0c83c5f4e396'
- '43b1e4879eb282dc4b05e4c016d356d7'
- '184897e1b5e8c76760813c1955ee02c2'
- 'd8d26187d386a0591222a580b5a5b3d3'
- '7e68d87a335e8ebb832bf5390070f13e'
+md5sums=('4bb3d4871e1a8bc56a6069c029be56db'
+ '6da1a15e82bc00f9374bf19e3b2979ae'
+ '066927b94be8f92b575b8eab8c3c353b'
+ 'a538eb3f64e7102b4a89c155b2adb98b'
+ '99398c9aec34a479a748d260b5d14708'
  '3b94fe4a3cd49819bf57ecc407851b9b'
  '4030ee1c08dd1e843c0225b772360e76'
  '6fd395bacbd7b6e47c7b74854b478363')
 
+if [ -n "${_snapshot}" ]; then 
+  _basedir="${srcdir}/gcc-${_snapshot}"
+else
+  _basedir="${srcdir}/gcc-${pkgver}"
+fi
+
 build() {
   if ! locale -a | grep ^de_DE > /dev/null; then
 echo "You need the de_DE locale to build gcc."
 return 1
   fi
   
-  cd ${srcdir}/gcc-${pkgver}
-  #cd ${srcdir}/gcc-${_snapshot}
+  cd ${_basedir}
   
   # Do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -70,7 +74,7 @@
   depends=('glibc>=2.10.1-5')
   install=gcc-libs.install
 
-  cd ${srcdir}/gcc-${pkgver}/build
+  cd ${_basedir}/build
   make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
   for lib in libmudflap libgomp libssp libstdc++-v3/src; do
 make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
@@ -88,7 +92,7 @@
   find ${pkgdir} -name *.a -delete
   
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
 ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
 }
 
@@ -98,7 +102,7 @@
   groups=('base-devel')
   install=gcc.install
 
-  cd ${srcdir}/gcc-${pkgver}/build
+  cd ${_basedir}/build
   
   # much, much easier to install the lot and clean-up the mess
   make -j1 DESTDIR=${pkgdir} install || return 1
@@ -124,7 +128,7 @@
   rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3
 
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
 ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
 }
 
@@ -134,7 +138,7 @@
   depends=("gcc=$pkgver")
   install=gcc-fortran.install
 
-  cd ${srcdir}/gcc-${pkgver}/build
+  cd ${_basedir}/build
   make -j1 DESTDIR=$pkgdir install-target-libgfortran
   make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
   make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
@@ -144,7 +148,7 @@
   rm -f ${pkgdir}/usr/lib/libgfortran.so*
   
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \
 ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
 }
 
@@ -153,7 +157,7 @@
   pkgdesc="Objective-C front-end for GCC"
   depends=("gcc=$pkgver")
 
-  cd ${srcdir}/gcc-${pkgver}/build
+  cd ${_basedir}/build
   make -j1 DESTDIR=$pkgdir install-target-libobjc
   install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
   install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
@@ -162,7 +166,7 @@
   rm -f ${pkgdir}/usr/lib/libobjc.so*
 
   # Install Runtime Library Exception
-  install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+  install -Dm644 ${_basedir}/COPYING.RUNTIME \

[arch-commits] Commit in binutils/repos (testing-x86_64)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 03:28:11
  Author: allan
Revision: 61117

Initialized merge tracking via "svnmerge" with revisions "1-61115" from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/binutils/trunk

Modified:
  binutils/repos/testing-x86_64/(properties)


Property changes on: binutils/repos/testing-x86_64
___
Added: svnmerge-integrated
   + /binutils/trunk:1-61115



[arch-commits] Commit in binutils/repos (testing-x86_64)

2009-12-12 Thread Allan McRae
Date: Saturday, December 12, 2009 @ 03:27:48
  Author: allan
Revision: 61116

archrelease: new repo testing-x86_64

Added:
  binutils/repos/testing-x86_64/



  1   2   >