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

2011-08-21 Thread Tobias Powalowski
Date: Monday, August 22, 2011 @ 02:28:37
  Author: tpowa
Revision: 136054

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

Added:
  usbutils/repos/core-x86_64/PKGBUILD
(from rev 136052, usbutils/repos/testing-x86_64/PKGBUILD)
  usbutils/repos/core-x86_64/fix-python2.patch
(from rev 136052, usbutils/repos/testing-x86_64/fix-python2.patch)
  usbutils/repos/core-x86_64/usb.ids-2011.08.17
(from rev 136052, usbutils/repos/testing-x86_64/usb.ids-2011.08.17)
Deleted:
  usbutils/repos/core-x86_64/PKGBUILD
  usbutils/repos/core-x86_64/fix-python2.patch
  usbutils/repos/core-x86_64/usb.ids-2011.04.14
  usbutils/repos/testing-x86_64/

+
 PKGBUILD   |   83 
 fix-python2.patch  |   34 
 usb.ids-2011.04.14 |16374 --
 usb.ids-2011.08.17 |16529 +++
 4 files changed, 16589 insertions(+), 16431 deletions(-)

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


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

2011-08-21 Thread Tobias Powalowski
Date: Monday, August 22, 2011 @ 02:28:35
  Author: tpowa
Revision: 136053

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

Added:
  usbutils/repos/core-i686/PKGBUILD
(from rev 136052, usbutils/repos/testing-i686/PKGBUILD)
  usbutils/repos/core-i686/fix-python2.patch
(from rev 136052, usbutils/repos/testing-i686/fix-python2.patch)
  usbutils/repos/core-i686/usb.ids-2011.08.17
(from rev 136052, usbutils/repos/testing-i686/usb.ids-2011.08.17)
Deleted:
  usbutils/repos/core-i686/PKGBUILD
  usbutils/repos/core-i686/fix-python2.patch
  usbutils/repos/core-i686/usb.ids-2011.04.14
  usbutils/repos/testing-i686/

+
 PKGBUILD   |   83 
 fix-python2.patch  |   34 
 usb.ids-2011.04.14 |16374 --
 usb.ids-2011.08.17 |16529 +++
 4 files changed, 16589 insertions(+), 16431 deletions(-)

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


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

2011-08-21 Thread andyrtr
Date: Monday, August 22, 2011 @ 01:38:38
  Author: andyrtr
Revision: 136052

remove optional dep on an AUR pkg; FS#24775

Modified:
  claws-mail/trunk/PKGBUILD
  claws-mail/trunk/claws-mail.install

+
 PKGBUILD   |3 +--
 claws-mail.install |7 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 05:09:50 UTC (rev 136051)
+++ PKGBUILD2011-08-22 05:38:38 UTC (rev 136052)
@@ -14,8 +14,7 @@
 optdepends=('python2:   needed for some tools'
 'perl:  needed for some tools'
 'spamassassin:  adds support for spamfiltering'
-'bogofilter:adds support for spamfiltering'
-'html2ps:  AUR pkg - adds support for printing html mails 
together with html plugins')
+'bogofilter:adds support for spamfiltering')
 replaces=('sylpheed-claws')
 provides=('claws')
 options=(!libtool)

Modified: claws-mail.install
===
--- claws-mail.install  2011-08-22 05:09:50 UTC (rev 136051)
+++ claws-mail.install  2011-08-22 05:38:38 UTC (rev 136052)
@@ -1,13 +1,16 @@
 post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails 
together with html plugins"
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 
 post_remove() {
-  post_install
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
 }
 



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

2011-08-21 Thread Eric Bélanger
Date: Monday, August 22, 2011 @ 01:09:50
  Author: eric
Revision: 136051

Add rgb.txt to vim-runtime (close FS#22661), Add quotes around srcdir and pkgdir

Modified:
  vim/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 04:56:03 UTC (rev 136050)
+++ PKGBUILD2011-08-22 05:09:50 UTC (rev 136051)
@@ -31,7 +31,7 @@
 # Build #
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
 
   msg2 'Checking out source from Mercurial...'
 
@@ -70,7 +70,7 @@
 
   cp -a vim-build gvim-build
 
-  cd ${srcdir}/vim-build
+  cd "${srcdir}"/vim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
 --mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -81,7 +81,7 @@
 
   make
 
-  cd ${srcdir}/gvim-build
+  cd "${srcdir}"/gvim-build
 
   ./configure --prefix=/usr --localstatedir=/var/lib/vim \
 --mandir=/usr/share/man --with-compiledby=ArchLinux \
@@ -100,14 +100,14 @@
   depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'perl')
   conflicts=('gvim')
 
-  cd ${srcdir}/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/vim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
 while read _mandir; do
 cd ${_mandir}
 rm -f ex.1 view.1 # provided by (n)vi
@@ -115,12 +115,12 @@
   done
 
   # Runtime provided by runtime package
-  rm -r ${pkgdir}/usr/share/vim
+  rm -r "${pkgdir}"/usr/share/vim
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/vim
+  install -dm755 "${pkgdir}"/usr/share/licenses/vim
   ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-${pkgdir}/usr/share/licenses/vim/license.txt
+"${pkgdir}"/usr/share/licenses/vim/license.txt
 }
 
 package_gvim() {
@@ -131,31 +131,31 @@
   conflicts=('vim')
   install=gvim.install
 
-  cd ${srcdir}/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR=${pkgdir} install
+  cd "${srcdir}"/gvim-build
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
   # provided by (n)vi in core
-  rm ${pkgdir}/usr/bin/{ex,view}
+  rm "${pkgdir}"/usr/bin/{ex,view}
 
   # delete some manpages
-  find ${pkgdir}/usr/share/man -type d -name 'man1' 2>/dev/null | \
+  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
 while read _mandir; do
 cd ${_mandir}
 rm -f ex.1 view.1 # provided by (n)vi
   done
 
   # Move the runtime for later packaging
-  mv ${pkgdir}/usr/share/vim ${srcdir}/runtime-install
+  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
 
   # freedesktop links
-  install -Dm644 ${srcdir}/gvim.desktop \
-${pkgdir}/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png ${pkgdir}/usr/share/pixmaps/gvim.png
+  install -Dm644 "${srcdir}"/gvim.desktop \
+"${pkgdir}"/usr/share/applications/gvim.desktop
+  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
 
   # license
-  install -dm755 ${pkgdir}/usr/share/licenses/gvim
+  install -dm755 "${pkgdir}"/usr/share/licenses/gvim
   ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-${pkgdir}/usr/share/licenses/gvim/license.txt
+"${pkgdir}"/usr/share/licenses/gvim/license.txt
 }
 
 package_vim-runtime() {
@@ -163,36 +163,40 @@
   backup=(etc/vimrc)
 
   # Install the runtime split from gvim
-  install -dm755 ${pkgdir}/usr/share
-  mv ${srcdir}/runtime-install ${pkgdir}/usr/share/vim
+  install -dm755 "${pkgdir}"/usr/share
+  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
 
   # Don't forget logtalk.dict
-  install -Dm644 ${srcdir}/gvim-build/runtime/ftplugin/logtalk.dict \
-${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+"${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216
   sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+"${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
 
   # patch filetype.vim for better handling of pacman related files
   sed -i 
"s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-${pkgdir}/usr/share/vim/${_versiondir}/filetype.vim
+"${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
   sed -i "/find the 
end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-${pkgdir}/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+"${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
 
   # make Aaron happy
-  install -Dm644 ${srcdir}/pythoncomplete.vim \
-${pkgdir}/

[arch-commits] Commit in ghostscript/repos/extra-x86_64 (6 files)

2011-08-21 Thread andyrtr
Date: Monday, August 22, 2011 @ 00:56:03
  Author: andyrtr
Revision: 136050

archrelease: copy trunk to extra-x86_64

Added:
  ghostscript/repos/extra-x86_64/PKGBUILD
(from rev 136049, ghostscript/trunk/PKGBUILD)
  ghostscript/repos/extra-x86_64/gs_bug691759and691760.diff
(from rev 136049, ghostscript/trunk/gs_bug691759and691760.diff)
  ghostscript/repos/extra-x86_64/svn_rev11948.diff
(from rev 136049, ghostscript/trunk/svn_rev11948.diff)
Deleted:
  ghostscript/repos/extra-x86_64/PKGBUILD
  ghostscript/repos/extra-x86_64/gs_bug691759and691760.diff
  ghostscript/repos/extra-x86_64/svn_rev11948.diff

+
 PKGBUILD   |  135 +++--
 gs_bug691759and691760.diff |  430 +--
 svn_rev11948.diff  |   32 +--
 3 files changed, 301 insertions(+), 296 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 04:55:16 UTC (rev 136049)
+++ PKGBUILD2011-08-22 04:56:03 UTC (rev 136050)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR 
-
-pkgname=ghostscript
-pkgver=9.04
-pkgrel=3
-pkgdesc="An interpreter for the PostScript language"
-arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff') # 'lcms' 'lcms2') # move in libpaper from community?
-makedepends=('gtk2' 'gnutls')
-optdepends=('texlive-core:  needed for dvipdf'
-'gtk2:  needed for gsx')
-url="http://www.ghostscript.com/";
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('9f6899e821ab6d78ab2c856f10fa3023')
-
-build() {
-  cd ${srcdir}/ghostscript-${pkgver}
-
-  # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff freetype #lcms lcms2 # system 
lcms2 would not be used. lcms breaks color printing 
https://bugs.archlinux.org/task/25519
-
-  ./configure --prefix=/usr \
-   --enable-dynamic \
-   --with-ijs \
-   --with-jbig2dec \
-   --with-omni \
-   --with-x \
-   --with-drivers=ALL\
-   --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-   --with-install-cups \
-   --enable-fontconfig \
-   --enable-freetype \
-   --without-luratech \
-   --disable-compile-inits #--help # needed for linking with system-zlib
-  make
-  
-  # Build IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/ghostscript-${pkgver}
-  make DESTDIR=${pkgdir} \
-   cups_serverroot=${pkgdir}/etc/cups \
-   cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
-
-  # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 
${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt}
 ${pkgdir}/usr/share/ghostscript/$pkgver/doc/
-  
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
-
-  # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
-
-  # install IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  make DESTDIR=${pkgdir} install
-}

Copied: ghostscript/repos/extra-x86_64/PKGBUILD (from rev 136049, 
ghostscript/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 04:56:03 UTC (rev 136050)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: AndyRTR 
+
+pkgname=ghostscript
+pkgver=9.04
+pkgrel=4
+pkgdesc="An interpreter for the PostScript language"
+arch=('i686' 'x86_64')
+license=('GPL3' 'custom')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core:  needed for dvipdf'
+'gtk2:  needed for gsx')
+url="http://www.ghostscript.com/";
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+   ghostscript-cups-rgbw.patch)
+options=('!libtool' '!makeflags')
+md5sums=('9f6899e821ab6d78ab2c856f10fa3023'
+ '7c1477e1cadd9c451ea8d6ec3fbbc670')
+
+build() {
+  cd ${srcdir}/ghostscript-${pkgver}
+  
+  # fix broken color printing https://bugs.archlinux.org/task/25519
+  patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
+
+  # force it to use system-libs
+  rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
+
+  ./configure --prefix=/usr \
+   --enable-dynamic \
+   --with-ijs \
+   --with-jbig2dec \
+   --with-omni \
+   --with-x \
+   --with-drivers=ALL\
+   --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+   --with-install-cups \
+   --enable-fontconfig \
+   --enable-freetype \
+   --without-luratech \
+   --disable-compile-inits #

[arch-commits] Commit in ghostscript/repos/extra-i686 (6 files)

2011-08-21 Thread andyrtr
Date: Monday, August 22, 2011 @ 00:55:16
  Author: andyrtr
Revision: 136049

archrelease: copy trunk to extra-i686

Added:
  ghostscript/repos/extra-i686/PKGBUILD
(from rev 136048, ghostscript/trunk/PKGBUILD)
  ghostscript/repos/extra-i686/gs_bug691759and691760.diff
(from rev 136048, ghostscript/trunk/gs_bug691759and691760.diff)
  ghostscript/repos/extra-i686/svn_rev11948.diff
(from rev 136048, ghostscript/trunk/svn_rev11948.diff)
Deleted:
  ghostscript/repos/extra-i686/PKGBUILD
  ghostscript/repos/extra-i686/gs_bug691759and691760.diff
  ghostscript/repos/extra-i686/svn_rev11948.diff

+
 PKGBUILD   |  135 +++--
 gs_bug691759and691760.diff |  430 +--
 svn_rev11948.diff  |   32 +--
 3 files changed, 301 insertions(+), 296 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 04:54:23 UTC (rev 136048)
+++ PKGBUILD2011-08-22 04:55:16 UTC (rev 136049)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR 
-
-pkgname=ghostscript
-pkgver=9.04
-pkgrel=3
-pkgdesc="An interpreter for the PostScript language"
-arch=('i686' 'x86_64')
-license=('GPL3' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff') # 'lcms' 'lcms2') # move in libpaper from community?
-makedepends=('gtk2' 'gnutls')
-optdepends=('texlive-core:  needed for dvipdf'
-'gtk2:  needed for gsx')
-url="http://www.ghostscript.com/";
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('9f6899e821ab6d78ab2c856f10fa3023')
-
-build() {
-  cd ${srcdir}/ghostscript-${pkgver}
-
-  # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff freetype #lcms lcms2 # system 
lcms2 would not be used. lcms breaks color printing 
https://bugs.archlinux.org/task/25519
-
-  ./configure --prefix=/usr \
-   --enable-dynamic \
-   --with-ijs \
-   --with-jbig2dec \
-   --with-omni \
-   --with-x \
-   --with-drivers=ALL\
-   --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
-   --with-install-cups \
-   --enable-fontconfig \
-   --enable-freetype \
-   --without-luratech \
-   --disable-compile-inits #--help # needed for linking with system-zlib
-  make
-  
-  # Build IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/ghostscript-${pkgver}
-  make DESTDIR=${pkgdir} \
-   cups_serverroot=${pkgdir}/etc/cups \
-   cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
-
-  # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 
${srcdir}/ghostscript-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt}
 ${pkgdir}/usr/share/ghostscript/$pkgver/doc/
-  
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
-
-  # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
-
-  # install IJS
-  cd ${srcdir}/ghostscript-${pkgver}/ijs
-  make DESTDIR=${pkgdir} install
-}

Copied: ghostscript/repos/extra-i686/PKGBUILD (from rev 136048, 
ghostscript/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 04:55:16 UTC (rev 136049)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: AndyRTR 
+
+pkgname=ghostscript
+pkgver=9.04
+pkgrel=4
+pkgdesc="An interpreter for the PostScript language"
+arch=('i686' 'x86_64')
+license=('GPL3' 'custom')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
+makedepends=('gtk2' 'gnutls')
+optdepends=('texlive-core:  needed for dvipdf'
+'gtk2:  needed for gsx')
+url="http://www.ghostscript.com/";
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+   ghostscript-cups-rgbw.patch)
+options=('!libtool' '!makeflags')
+md5sums=('9f6899e821ab6d78ab2c856f10fa3023'
+ '7c1477e1cadd9c451ea8d6ec3fbbc670')
+
+build() {
+  cd ${srcdir}/ghostscript-${pkgver}
+  
+  # fix broken color printing https://bugs.archlinux.org/task/25519
+  patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
+
+  # force it to use system-libs
+  rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
+
+  ./configure --prefix=/usr \
+   --enable-dynamic \
+   --with-ijs \
+   --with-jbig2dec \
+   --with-omni \
+   --with-x \
+   --with-drivers=ALL\
+   --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \
+   --with-install-cups \
+   --enable-fontconfig \
+   --enable-freetype \
+   --without-luratech \
+   --disable-compile-inits #--help # needed 

[arch-commits] Commit in ghostscript/trunk (PKGBUILD ghostscript-cups-rgbw.patch)

2011-08-21 Thread andyrtr
Date: Monday, August 22, 2011 @ 00:54:23
  Author: andyrtr
Revision: 136048

upgpkg: ghostscript 9.04-4

add an upstream patch to fix broken color printing FS#25519; use system 
lcms

Added:
  ghostscript/trunk/ghostscript-cups-rgbw.patch
Modified:
  ghostscript/trunk/PKGBUILD

-+
 PKGBUILD|   15 +-
 ghostscript-cups-rgbw.patch |  227 ++
 2 files changed, 237 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 03:29:54 UTC (rev 136047)
+++ PKGBUILD2011-08-22 04:54:23 UTC (rev 136048)
@@ -3,24 +3,29 @@
 
 pkgname=ghostscript
 pkgver=9.04
-pkgrel=3
+pkgrel=4
 pkgdesc="An interpreter for the PostScript language"
 arch=('i686' 'x86_64')
 license=('GPL3' 'custom')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff') # 'lcms' 'lcms2') # move in libpaper from community?
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 
'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community?
 makedepends=('gtk2' 'gnutls')
 optdepends=('texlive-core:  needed for dvipdf'
 'gtk2:  needed for gsx')
 url="http://www.ghostscript.com/";
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+   ghostscript-cups-rgbw.patch)
 options=('!libtool' '!makeflags')
-md5sums=('9f6899e821ab6d78ab2c856f10fa3023')
+md5sums=('9f6899e821ab6d78ab2c856f10fa3023'
+ '7c1477e1cadd9c451ea8d6ec3fbbc670')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
+  
+  # fix broken color printing https://bugs.archlinux.org/task/25519
+  patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff freetype #lcms lcms2 # system 
lcms2 would not be used. lcms breaks color printing 
https://bugs.archlinux.org/task/25519
+  rm -rf jpeg libpng zlib jasper expat tiff freetype lcms
 
   ./configure --prefix=/usr \
--enable-dynamic \

Added: ghostscript-cups-rgbw.patch
===
--- ghostscript-cups-rgbw.patch (rev 0)
+++ ghostscript-cups-rgbw.patch 2011-08-22 04:54:23 UTC (rev 136048)
@@ -0,0 +1,227 @@
+diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw 
ghostscript-9.04/cups/gdevcups.c
+--- ghostscript-9.04/cups/gdevcups.c.cups-rgbw 2011-08-16 14:47:10.311813968 
+0100
 ghostscript-9.04/cups/gdevcups.c   2011-08-16 14:48:02.291224871 +0100
+@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s
+   unsigned short  EncodeLUT[gx_max_color_value + 1];/* RGB value to 
output color LUT */
+   int Density[CUPS_MAX_VALUE + 1];/* Density LUT */
+   int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform 
matrix LUT */
++  int   user_icc;
+   int   cupsRasterVersion;
+ 
+   /* Used by cups_put_params(): */
+@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device =
+   {0x00},  /* EncodeLUT */
+   {0x00},  /* Density */
+   {0x00},  /* Matrix */
++  0,
+   3 /* cupsRasterVersion */
+ };
+ 
+@@ -1183,15 +1185,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D
+ 
+ case CUPS_CSPACE_RGB :
+ case CUPS_CSPACE_RGBW :
++c0 = c + k;
++c1 = m + k;
++c2 = y + k;
+ if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+-c0 = c;
+-c1 = m;
+-c2 = y;
+-c3 = k;
+-  } else {
+-c0 = c + k;
+-c1 = m + k;
+-c2 = y + k;
++if ((k >= frac_1 - 1) ||
++((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) {
++  c0 = frac_1;
++  c1 = frac_1;
++  c2 = frac_1;
++  c3 = frac_1;
++} else
++  c3 = 0;
+   }
+ 
+ if (c0 < 0)
+@@ -1213,11 +1218,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D
+   out[2] = frac_1 - (frac)cups->Density[c2];
+ 
+ if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) {
+-if (c3 < 0)
+-  c3 = 0;
+-else if (c3 > frac_1)
+-  c3 = frac_1;
+-out[3] = frac_1 - (frac)cups->Density[c3];
++if (c3 == 0)
++  out[3] = frac_1;
++else if (c3 == frac_1)
++  out[3] = 0;
++else
++  out[3] = frac_1;
+   }
+ break;
+ 
+@@ -2035,10 +2041,15 @@ cups_map_color_rgb(gx_device  *pdev,
+ * cups->DecodeLUT actually maps to RGBW, not CMYK...
+   */
+ 
+-k = cups->DecodeLUT[c3];
+-c = cups->DecodeLUT[c0] + k - gx_max_color_value;
+-m = cups->DecodeLUT[c1] + k - gx_max_color_value;
+-y = cups->DecodeLU

[arch-commits] Commit in fetchmail/repos/extra-x86_64 (8 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:29:54
  Author: eric
Revision: 136047

archrelease: copy trunk to extra-x86_64

Added:
  fetchmail/repos/extra-x86_64/PKGBUILD
(from rev 136046, fetchmail/trunk/PKGBUILD)
  fetchmail/repos/extra-x86_64/fetchmail.conf
(from rev 136046, fetchmail/trunk/fetchmail.conf)
  fetchmail/repos/extra-x86_64/fetchmail.install
(from rev 136046, fetchmail/trunk/fetchmail.install)
  fetchmail/repos/extra-x86_64/fetchmail.rc
(from rev 136046, fetchmail/trunk/fetchmail.rc)
Deleted:
  fetchmail/repos/extra-x86_64/PKGBUILD
  fetchmail/repos/extra-x86_64/fetchmail.conf
  fetchmail/repos/extra-x86_64/fetchmail.install
  fetchmail/repos/extra-x86_64/fetchmail.rc

---+
 PKGBUILD  |   76 -
 fetchmail.conf|   10 +++---
 fetchmail.install |   40 +-
 fetchmail.rc  |   80 ++--
 4 files changed, 103 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 03:29:23 UTC (rev 136046)
+++ PKGBUILD2011-08-22 03:29:54 UTC (rev 136047)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin 
-
-pkgname=fetchmail
-pkgver=6.3.20
-pkgrel=1
-pkgdesc="A remote-mail retrieval utility"
-arch=('i686' 'x86_64')
-url="http://fetchmail.berlios.de/";
-license=('GPL')
-depends=('glibc' 'openssl' 'python2')
-optdepends=('tk: for using fetchmailconf')
-backup=('etc/conf.d/fetchmail')
-options=('!makeflags')
-install=fetchmail.install
-source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
-fetchmail.rc fetchmail.conf)
-md5sums=('9176a9005a816946f766774bc4cbc642'
- '89fdde15bf81b3a5c065949322b5d138'
- '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('797b5b0050763ad111c244aba606b2fcb4dfdaad'
-  '910ec21ad0a619db67e4665189dc46d2a0634ea5'
-  '30401729386d6f774c6c36ab8530842166de54a8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
-  ./configure --prefix=/usr --with-ssl=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-  install -d "${pkgdir}/var/lib/fetchmail"
-}

Copied: fetchmail/repos/extra-x86_64/PKGBUILD (from rev 136046, 
fetchmail/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 03:29:54 UTC (rev 136047)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Aaron Griffin 
+
+pkgname=fetchmail
+pkgver=6.3.21
+pkgrel=1
+pkgdesc="A remote-mail retrieval utility"
+arch=('i686' 'x86_64')
+url="http://fetchmail.berlios.de/";
+license=('GPL')
+depends=('glibc' 'openssl' 'python2')
+optdepends=('tk: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
+options=('!makeflags')
+install=fetchmail.install
+source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
+fetchmail.rc fetchmail.conf)
+md5sums=('0ad8eac47e85bd0ae63870daa09992af'
+ '89fdde15bf81b3a5c065949322b5d138'
+ '8fcd6a22dfbc247755fdd050c5c5c4d3')
+sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7'
+  '910ec21ad0a619db67e4665189dc46d2a0634ea5'
+  '30401729386d6f774c6c36ab8530842166de54a8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
+  ./configure --prefix=/usr --with-ssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
+  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
+  install -d "${pkgdir}/var/lib/fetchmail"
+}

Deleted: fetchmail.conf
===
--- fetchmail.conf  2011-08-22 03:29:23 UTC (rev 136046)
+++ fetchmail.conf  2011-08-22 03:29:54 UTC (rev 136047)
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc

Copied: fetchmail/repos/extra-x86_64/fetchmail.conf (from rev 136046, 
fetchmail/trunk/fetchmail.conf)
===
--- fetchmail.conf  (rev 0)
+++ fetchmail.conf  2011-08-22 03:29:54 UTC (rev 136047)
@@ -0,0 +1,5 @@
+# Daemon polling interval
+INTERVAL=60
+
+# Config location
+CONFIG=/etc/fetchmailrc

Deleted: fetchmail.install
===
--- fetchmail.install   2011-08-22 03:29:23 UTC (rev 136046)
+++ fetchmail.install   2011-08-22 03:29:54 UTC (rev 136047)
@@ -1,20 +0,0 @@
-post_install() {
-  # /etc/fetchmail

[arch-commits] Commit in fetchmail/repos/extra-i686 (8 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:29:23
  Author: eric
Revision: 136046

archrelease: copy trunk to extra-i686

Added:
  fetchmail/repos/extra-i686/PKGBUILD
(from rev 136045, fetchmail/trunk/PKGBUILD)
  fetchmail/repos/extra-i686/fetchmail.conf
(from rev 136045, fetchmail/trunk/fetchmail.conf)
  fetchmail/repos/extra-i686/fetchmail.install
(from rev 136045, fetchmail/trunk/fetchmail.install)
  fetchmail/repos/extra-i686/fetchmail.rc
(from rev 136045, fetchmail/trunk/fetchmail.rc)
Deleted:
  fetchmail/repos/extra-i686/PKGBUILD
  fetchmail/repos/extra-i686/fetchmail.conf
  fetchmail/repos/extra-i686/fetchmail.install
  fetchmail/repos/extra-i686/fetchmail.rc

---+
 PKGBUILD  |   76 -
 fetchmail.conf|   10 +++---
 fetchmail.install |   40 +-
 fetchmail.rc  |   80 ++--
 4 files changed, 103 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 03:28:54 UTC (rev 136045)
+++ PKGBUILD2011-08-22 03:29:23 UTC (rev 136046)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin 
-
-pkgname=fetchmail
-pkgver=6.3.20
-pkgrel=1
-pkgdesc="A remote-mail retrieval utility"
-arch=('i686' 'x86_64')
-url="http://fetchmail.berlios.de/";
-license=('GPL')
-depends=('glibc' 'openssl' 'python2')
-optdepends=('tk: for using fetchmailconf')
-backup=('etc/conf.d/fetchmail')
-options=('!makeflags')
-install=fetchmail.install
-source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
-fetchmail.rc fetchmail.conf)
-md5sums=('9176a9005a816946f766774bc4cbc642'
- '89fdde15bf81b3a5c065949322b5d138'
- '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('797b5b0050763ad111c244aba606b2fcb4dfdaad'
-  '910ec21ad0a619db67e4665189dc46d2a0634ea5'
-  '30401729386d6f774c6c36ab8530842166de54a8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
-  ./configure --prefix=/usr --with-ssl=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-  install -d "${pkgdir}/var/lib/fetchmail"
-}

Copied: fetchmail/repos/extra-i686/PKGBUILD (from rev 136045, 
fetchmail/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 03:29:23 UTC (rev 136046)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Aaron Griffin 
+
+pkgname=fetchmail
+pkgver=6.3.21
+pkgrel=1
+pkgdesc="A remote-mail retrieval utility"
+arch=('i686' 'x86_64')
+url="http://fetchmail.berlios.de/";
+license=('GPL')
+depends=('glibc' 'openssl' 'python2')
+optdepends=('tk: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
+options=('!makeflags')
+install=fetchmail.install
+source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
+fetchmail.rc fetchmail.conf)
+md5sums=('0ad8eac47e85bd0ae63870daa09992af'
+ '89fdde15bf81b3a5c065949322b5d138'
+ '8fcd6a22dfbc247755fdd050c5c5c4d3')
+sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7'
+  '910ec21ad0a619db67e4665189dc46d2a0634ea5'
+  '30401729386d6f774c6c36ab8530842166de54a8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
+  ./configure --prefix=/usr --with-ssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
+  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
+  install -d "${pkgdir}/var/lib/fetchmail"
+}

Deleted: fetchmail.conf
===
--- fetchmail.conf  2011-08-22 03:28:54 UTC (rev 136045)
+++ fetchmail.conf  2011-08-22 03:29:23 UTC (rev 136046)
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc

Copied: fetchmail/repos/extra-i686/fetchmail.conf (from rev 136045, 
fetchmail/trunk/fetchmail.conf)
===
--- fetchmail.conf  (rev 0)
+++ fetchmail.conf  2011-08-22 03:29:23 UTC (rev 136046)
@@ -0,0 +1,5 @@
+# Daemon polling interval
+INTERVAL=60
+
+# Config location
+CONFIG=/etc/fetchmailrc

Deleted: fetchmail.install
===
--- fetchmail.install   2011-08-22 03:28:54 UTC (rev 136045)
+++ fetchmail.install   2011-08-22 03:29:23 UTC (rev 136046)
@@ -1,20 +0,0 @@
-post_install() {
-  # /etc/fetchmail must be owned by fetc

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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:28:54
  Author: eric
Revision: 136045

upgpkg: fetchmail 6.3.21-1

Upstream update

Modified:
  fetchmail/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 03:18:52 UTC (rev 136044)
+++ PKGBUILD2011-08-22 03:28:54 UTC (rev 136045)
@@ -2,7 +2,7 @@
 # Maintainer: Aaron Griffin 
 
 pkgname=fetchmail
-pkgver=6.3.20
+pkgver=6.3.21
 pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
@@ -15,10 +15,10 @@
 install=fetchmail.install
 source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
 fetchmail.rc fetchmail.conf)
-md5sums=('9176a9005a816946f766774bc4cbc642'
+md5sums=('0ad8eac47e85bd0ae63870daa09992af'
  '89fdde15bf81b3a5c065949322b5d138'
  '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('797b5b0050763ad111c244aba606b2fcb4dfdaad'
+sha1sums=('e32a0d40ec133d651782543ecd7bc9bbee52dff7'
   '910ec21ad0a619db67e4665189dc46d2a0634ea5'
   '30401729386d6f774c6c36ab8530842166de54a8')
 



[arch-commits] Commit in gtkpod/repos/extra-x86_64 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:18:52
  Author: eric
Revision: 136044

archrelease: copy trunk to extra-x86_64

Added:
  gtkpod/repos/extra-x86_64/PKGBUILD
(from rev 136043, gtkpod/trunk/PKGBUILD)
  gtkpod/repos/extra-x86_64/gtkpod.install
(from rev 136043, gtkpod/trunk/gtkpod.install)
Deleted:
  gtkpod/repos/extra-x86_64/PKGBUILD
  gtkpod/repos/extra-x86_64/gtkpod.install

+
 PKGBUILD   |   60 ---
 gtkpod.install |   22 ++--
 2 files changed, 42 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 03:18:36 UTC (rev 136043)
+++ PKGBUILD2011-08-22 03:18:52 UTC (rev 136044)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Aaron Griffin 
-
-pkgname=gtkpod
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gtkpod.sourceforge.net";
-install=gtkpod.install
-depends=('libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 
'hicolor-icon-theme')
-optdepends=('libmp4v2: MP4/h264 support')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gtkpod/repos/extra-x86_64/PKGBUILD (from rev 136043, 
gtkpod/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 03:18:52 UTC (rev 136044)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Aaron Griffin 
+
+pkgname=gtkpod
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net";
+license=('GPL')
+depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 
'libglade' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('libmp4v2: MP4/h264 support'
+'vorbis-tools: OGG support'
+'id3v2: mp3 conversion support')
+install=gtkpod.install
+source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: gtkpod.install
===
--- gtkpod.install  2011-08-22 03:18:36 UTC (rev 136043)
+++ gtkpod.install  2011-08-22 03:18:52 UTC (rev 136044)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gtkpod/repos/extra-x86_64/gtkpod.install (from rev 136043, 
gtkpod/trunk/gtkpod.install)
===
--- gtkpod.install  (rev 0)
+++ gtkpod.install  2011-08-22 03:18:52 UTC (rev 136044)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}



[arch-commits] Commit in gtkpod/repos/extra-i686 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:18:36
  Author: eric
Revision: 136043

archrelease: copy trunk to extra-i686

Added:
  gtkpod/repos/extra-i686/PKGBUILD
(from rev 136042, gtkpod/trunk/PKGBUILD)
  gtkpod/repos/extra-i686/gtkpod.install
(from rev 136042, gtkpod/trunk/gtkpod.install)
Deleted:
  gtkpod/repos/extra-i686/PKGBUILD
  gtkpod/repos/extra-i686/gtkpod.install

+
 PKGBUILD   |   60 ---
 gtkpod.install |   22 ++--
 2 files changed, 42 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 03:18:11 UTC (rev 136042)
+++ PKGBUILD2011-08-22 03:18:36 UTC (rev 136043)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Aaron Griffin 
-
-pkgname=gtkpod
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gtkpod.sourceforge.net";
-install=gtkpod.install
-depends=('libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 
'hicolor-icon-theme')
-optdepends=('libmp4v2: MP4/h264 support')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gtkpod/repos/extra-i686/PKGBUILD (from rev 136042, 
gtkpod/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 03:18:36 UTC (rev 136043)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Aaron Griffin 
+
+pkgname=gtkpod
+pkgver=1.0.0
+pkgrel=2
+pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net";
+license=('GPL')
+depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 
'libglade' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('libmp4v2: MP4/h264 support'
+'vorbis-tools: OGG support'
+'id3v2: mp3 conversion support')
+install=gtkpod.install
+source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: gtkpod.install
===
--- gtkpod.install  2011-08-22 03:18:11 UTC (rev 136042)
+++ gtkpod.install  2011-08-22 03:18:36 UTC (rev 136043)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: gtkpod/repos/extra-i686/gtkpod.install (from rev 136042, 
gtkpod/trunk/gtkpod.install)
===
--- gtkpod.install  (rev 0)
+++ gtkpod.install  2011-08-22 03:18:36 UTC (rev 136043)
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}



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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 23:18:11
  Author: eric
Revision: 136042

upgpkg: gtkpod 1.0.0-2

Add vorbis-tools optdepends (close FS#24464), Add id3v2 optdepends 
(close FS#24809), Add awk depends

Modified:
  gtkpod/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 00:36:55 UTC (rev 136041)
+++ PKGBUILD2011-08-22 03:18:11 UTC (rev 136042)
@@ -4,15 +4,17 @@
 
 pkgname=gtkpod
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A platform independent GUI for Apple's iPod using GTK2"
 arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net";
 license=('GPL')
-url="http://gtkpod.sourceforge.net";
+depends=('awk' 'libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 
'libglade' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('libmp4v2: MP4/h264 support'
+'vorbis-tools: OGG support'
+'id3v2: mp3 conversion support')
 install=gtkpod.install
-depends=('libgpod>=0.8.0' 'libid3tag' 'flac' 'libvorbis' 'curl' 'libglade' 
'hicolor-icon-theme')
-optdepends=('libmp4v2: MP4/h264 support')
-makedepends=('intltool')
 source=(http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz)
 md5sums=('cadd402dcd1cfbedda0357bf24965a7c')
 



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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 20:36:55
  Author: eric
Revision: 136041

archrelease: copy trunk to extra-x86_64

Added:
  evilwm/repos/extra-x86_64/LICENSE
(from rev 136040, evilwm/trunk/LICENSE)
  evilwm/repos/extra-x86_64/PKGBUILD
(from rev 136040, evilwm/trunk/PKGBUILD)
Deleted:
  evilwm/repos/extra-x86_64/PKGBUILD

--+
 LICENSE  |   40 
 PKGBUILD |   52 ++--
 2 files changed, 66 insertions(+), 26 deletions(-)

Copied: evilwm/repos/extra-x86_64/LICENSE (from rev 136040, 
evilwm/trunk/LICENSE)
===
--- LICENSE (rev 0)
+++ LICENSE 2011-08-22 00:36:55 UTC (rev 136041)
@@ -0,0 +1,40 @@
+LICENCE
+
+evilwm 1.1
+Copyright (C) 1999-2011 Ciaran Anscomb 
+
+This is free software.  You can do what you want to it, but if it
+breaks something, you get to pay for the counselling.  The code was
+originally based on aewm, so this is distributed under the same terms,
+which follow.
+
+
+AEWM LICENCE
+
+Copyright (c) 1998-2000 Decklin Foster.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+
+You are granted permission to copy, publish, distribute, and/or sell
+copies of this program and any modified versions or derived works,
+provided that this copyright and notice are not removed or altered.
+
+Portions of the code were based on 9wm, which contains this license:
+
+> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
+> Permission is granted to all sentient beings to use this software,
+> to make copies of it, and to distribute those copies, provided
+> that:
+>
+> (1) the copyright and licence notices are left intact
+> (2) the recipients are aware that it is free software
+> (3) any unapproved changes in functionality are either
+>   (i) only distributed as patches
+>   or (ii) distributed as a new program which is not called 9wm
+>   and whose documentation gives credit where it is due
+> (4) the author is not held responsible for any defects
+> or shortcomings in the software, or damages caused by it.
+>
+> There is no warranty for this software.  Have a nice day.

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 00:35:50 UTC (rev 136040)
+++ PKGBUILD2011-08-22 00:36:55 UTC (rev 136041)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Jochem Kossen 
-
-pkgname=evilwm
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
-url="http://evilwm.sourceforge.net";
-license=('custom')
-depends=('libxrandr')
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('5f14cc3019320860c85bb07c60a76bd7'
- '0941ad3e96597ef75c6310f43a0342a0')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
-  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: evilwm/repos/extra-x86_64/PKGBUILD (from rev 136040, 
evilwm/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 00:36:55 UTC (rev 136041)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Jochem Kossen 
+
+pkgname=evilwm
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A minimalist but usable window manager for the X Window System."
+arch=('i686' 'x86_64')
+url="http://evilwm.sourceforge.net";
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+ '0941ad3e96597ef75c6310f43a0342a0')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}



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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 20:35:50
  Author: eric
Revision: 136040

archrelease: copy trunk to extra-i686

Added:
  evilwm/repos/extra-i686/LICENSE
(from rev 136039, evilwm/trunk/LICENSE)
  evilwm/repos/extra-i686/PKGBUILD
(from rev 136039, evilwm/trunk/PKGBUILD)
Deleted:
  evilwm/repos/extra-i686/PKGBUILD

--+
 LICENSE  |   40 
 PKGBUILD |   52 ++--
 2 files changed, 66 insertions(+), 26 deletions(-)

Copied: evilwm/repos/extra-i686/LICENSE (from rev 136039, evilwm/trunk/LICENSE)
===
--- LICENSE (rev 0)
+++ LICENSE 2011-08-22 00:35:50 UTC (rev 136040)
@@ -0,0 +1,40 @@
+LICENCE
+
+evilwm 1.1
+Copyright (C) 1999-2011 Ciaran Anscomb 
+
+This is free software.  You can do what you want to it, but if it
+breaks something, you get to pay for the counselling.  The code was
+originally based on aewm, so this is distributed under the same terms,
+which follow.
+
+
+AEWM LICENCE
+
+Copyright (c) 1998-2000 Decklin Foster.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+
+You are granted permission to copy, publish, distribute, and/or sell
+copies of this program and any modified versions or derived works,
+provided that this copyright and notice are not removed or altered.
+
+Portions of the code were based on 9wm, which contains this license:
+
+> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
+> Permission is granted to all sentient beings to use this software,
+> to make copies of it, and to distribute those copies, provided
+> that:
+>
+> (1) the copyright and licence notices are left intact
+> (2) the recipients are aware that it is free software
+> (3) any unapproved changes in functionality are either
+>   (i) only distributed as patches
+>   or (ii) distributed as a new program which is not called 9wm
+>   and whose documentation gives credit where it is due
+> (4) the author is not held responsible for any defects
+> or shortcomings in the software, or damages caused by it.
+>
+> There is no warranty for this software.  Have a nice day.

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 00:34:01 UTC (rev 136039)
+++ PKGBUILD2011-08-22 00:35:50 UTC (rev 136040)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Jochem Kossen 
-
-pkgname=evilwm
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
-url="http://evilwm.sourceforge.net";
-license=('custom')
-depends=('libxrandr')
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
-md5sums=('5f14cc3019320860c85bb07c60a76bd7'
- '0941ad3e96597ef75c6310f43a0342a0')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
-  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: evilwm/repos/extra-i686/PKGBUILD (from rev 136039, 
evilwm/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 00:35:50 UTC (rev 136040)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Jochem Kossen 
+
+pkgname=evilwm
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A minimalist but usable window manager for the X Window System."
+arch=('i686' 'x86_64')
+url="http://evilwm.sourceforge.net";
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+ '0941ad3e96597ef75c6310f43a0342a0')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}



[arch-commits] Commit in evilwm/repos/extra-x86_64 (PKGBUILD PKGBUILD evilwm.desktop)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 20:34:01
  Author: eric
Revision: 136039

archrelease: copy trunk to extra-x86_64

Added:
  evilwm/repos/extra-x86_64/PKGBUILD
(from rev 136038, evilwm/trunk/PKGBUILD)
Deleted:
  evilwm/repos/extra-x86_64/PKGBUILD
  evilwm/repos/extra-x86_64/evilwm.desktop

+
 PKGBUILD   |   49 ++---
 evilwm.desktop |8 
 2 files changed, 26 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 00:33:49 UTC (rev 136038)
+++ PKGBUILD2011-08-22 00:34:01 UTC (rev 136039)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Jochem Kossen 
-
-pkgname=evilwm
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
-depends=('libxrandr')
-url="http://evilwm.sourceforge.net";
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop)
-license=(custom)
-md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/evilwm.desktop \
-  $startdir/pkg/etc/X11/sessions/evilwm.desktop
-  install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README
-}

Copied: evilwm/repos/extra-x86_64/PKGBUILD (from rev 136038, 
evilwm/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 00:34:01 UTC (rev 136039)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Jochem Kossen 
+
+pkgname=evilwm
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A minimalist but usable window manager for the X Window System."
+arch=('i686' 'x86_64')
+url="http://evilwm.sourceforge.net";
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+ '0941ad3e96597ef75c6310f43a0342a0')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: evilwm.desktop
===
--- evilwm.desktop  2011-08-22 00:33:49 UTC (rev 136038)
+++ evilwm.desktop  2011-08-22 00:34:01 UTC (rev 136039)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Evilwm
-Comment=The evilwm window manager
-Exec=evilwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application



[arch-commits] Commit in evilwm/repos/extra-i686 (PKGBUILD PKGBUILD evilwm.desktop)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 20:33:49
  Author: eric
Revision: 136038

archrelease: copy trunk to extra-i686

Added:
  evilwm/repos/extra-i686/PKGBUILD
(from rev 136037, evilwm/trunk/PKGBUILD)
Deleted:
  evilwm/repos/extra-i686/PKGBUILD
  evilwm/repos/extra-i686/evilwm.desktop

+
 PKGBUILD   |   49 ++---
 evilwm.desktop |8 
 2 files changed, 26 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-22 00:33:36 UTC (rev 136037)
+++ PKGBUILD2011-08-22 00:33:49 UTC (rev 136038)
@@ -1,23 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche 
-# Contributor: Jochem Kossen 
-
-pkgname=evilwm
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="A minimalist but usable window manager for the X Window System."
-arch=('i686' 'x86_64')
-depends=('libxrandr')
-url="http://evilwm.sourceforge.net";
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop)
-license=(custom)
-md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/evilwm.desktop \
-  $startdir/pkg/etc/X11/sessions/evilwm.desktop
-  install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README
-}

Copied: evilwm/repos/extra-i686/PKGBUILD (from rev 136037, 
evilwm/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-22 00:33:49 UTC (rev 136038)
@@ -0,0 +1,26 @@
+# $Id$
+# Maintainer: Kevin Piche 
+# Contributor: Jochem Kossen 
+
+pkgname=evilwm
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="A minimalist but usable window manager for the X Window System."
+arch=('i686' 'x86_64')
+url="http://evilwm.sourceforge.net";
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+ '0941ad3e96597ef75c6310f43a0342a0')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: evilwm.desktop
===
--- evilwm.desktop  2011-08-22 00:33:36 UTC (rev 136037)
+++ evilwm.desktop  2011-08-22 00:33:49 UTC (rev 136038)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Evilwm
-Comment=The evilwm window manager
-Exec=evilwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application



[arch-commits] Commit in evilwm/trunk (LICENSE PKGBUILD evilwm.desktop)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 20:33:36
  Author: eric
Revision: 136037

upgpkg: evilwm 1.1.0-1

Upstream update, Clean up license file, Moved evilwm.desktop to 
/usr/share/xsessions (close FS#25647) and switch to upstream one, Clean up 
PKGBUILD

Added:
  evilwm/trunk/LICENSE
Modified:
  evilwm/trunk/PKGBUILD
Deleted:
  evilwm/trunk/evilwm.desktop

+
 LICENSE|   40 
 PKGBUILD   |   25 ++---
 evilwm.desktop |8 
 3 files changed, 54 insertions(+), 19 deletions(-)

Added: LICENSE
===
--- LICENSE (rev 0)
+++ LICENSE 2011-08-22 00:33:36 UTC (rev 136037)
@@ -0,0 +1,40 @@
+LICENCE
+
+evilwm 1.1
+Copyright (C) 1999-2011 Ciaran Anscomb 
+
+This is free software.  You can do what you want to it, but if it
+breaks something, you get to pay for the counselling.  The code was
+originally based on aewm, so this is distributed under the same terms,
+which follow.
+
+
+AEWM LICENCE
+
+Copyright (c) 1998-2000 Decklin Foster.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+
+You are granted permission to copy, publish, distribute, and/or sell
+copies of this program and any modified versions or derived works,
+provided that this copyright and notice are not removed or altered.
+
+Portions of the code were based on 9wm, which contains this license:
+
+> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
+> Permission is granted to all sentient beings to use this software,
+> to make copies of it, and to distribute those copies, provided
+> that:
+>
+> (1) the copyright and licence notices are left intact
+> (2) the recipients are aware that it is free software
+> (3) any unapproved changes in functionality are either
+>   (i) only distributed as patches
+>   or (ii) distributed as a new program which is not called 9wm
+>   and whose documentation gives credit where it is due
+> (4) the author is not held responsible for any defects
+> or shortcomings in the software, or damages caused by it.
+>
+> There is no warranty for this software.  Have a nice day.

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 23:32:17 UTC (rev 136036)
+++ PKGBUILD2011-08-22 00:33:36 UTC (rev 136037)
@@ -3,21 +3,24 @@
 # Contributor: Jochem Kossen 
 
 pkgname=evilwm
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="A minimalist but usable window manager for the X Window System."
 arch=('i686' 'x86_64')
+url="http://evilwm.sourceforge.net";
+license=('custom')
 depends=('libxrandr')
-url="http://evilwm.sourceforge.net";
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop)
-license=(custom)
-md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+ '0941ad3e96597ef75c6310f43a0342a0')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/evilwm.desktop \
-  $startdir/pkg/etc/X11/sessions/evilwm.desktop
-  install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README
+  cd "$srcdir"/$pkgname-$pkgver
+  make
 }
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE 
"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: evilwm.desktop
===
--- evilwm.desktop  2011-08-21 23:32:17 UTC (rev 136036)
+++ evilwm.desktop  2011-08-22 00:33:36 UTC (rev 136037)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Evilwm
-Comment=The evilwm window manager
-Exec=evilwm
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application



[arch-commits] Commit in soundtouch/repos/extra-x86_64 (7 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 19:32:17
  Author: eric
Revision: 136036

archrelease: copy trunk to extra-x86_64

Added:
  soundtouch/repos/extra-x86_64/PKGBUILD
(from rev 136035, soundtouch/trunk/PKGBUILD)
  soundtouch/repos/extra-x86_64/soundtouch-1.4.0-mmx-sse-compile-fix.patch
(from rev 136035, 
soundtouch/trunk/soundtouch-1.4.0-mmx-sse-compile-fix.patch)
  soundtouch/repos/extra-x86_64/soundtouch-1.4.0-x86_64-asm-broken.patch
(from rev 136035, soundtouch/trunk/soundtouch-1.4.0-x86_64-asm-broken.patch)
Deleted:
  soundtouch/repos/extra-x86_64/ChangeLog
  soundtouch/repos/extra-x86_64/PKGBUILD
  soundtouch/repos/extra-x86_64/soundtouch-1.4.0-mmx-sse-compile-fix.patch
  soundtouch/repos/extra-x86_64/soundtouch-1.4.0-x86_64-asm-broken.patch

+
 ChangeLog  |   10 ---
 PKGBUILD   |   73 +--
 soundtouch-1.4.0-mmx-sse-compile-fix.patch |   28 +-
 soundtouch-1.4.0-x86_64-asm-broken.patch   |   24 
 4 files changed, 63 insertions(+), 72 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2011-08-21 23:31:51 UTC (rev 136035)
+++ ChangeLog   2011-08-21 23:32:17 UTC (rev 136036)
@@ -1,10 +0,0 @@
-2010-02-06  Eric Belanger  
-
-   * soundtouch 1.5.0-1
-   * Upstream update
-   * Added shared libs
-
-2008-12-12  Eric Belanger  
-
-   * soundtouch 1.3.1-3
-   * Added to [extra] repo

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 23:31:51 UTC (rev 136035)
+++ PKGBUILD2011-08-21 23:32:17 UTC (rev 136036)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger 
-# Contributor: Jaroslaw Swierczynski 
-# Contributor: Raymano 
-
-pkgname=soundtouch
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="An audio processing library"
-arch=('i686' 'x86_64')
-url="http://www.surina.net/soundtouch/";
-license=('LGPL')
-depends=('gcc-libs')
-options=('!libtool')
-source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
-soundtouch-1.4.0-mmx-sse-compile-fix.patch
-soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
- '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' 
'39815091c4cb1817f8a56b8fb29fa684984514d1'\
- '95282cca856b3b8645fadb530ce5eb892074f193')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 
1
-  if [ "${CARCH}" = "x86_64" ]; then
-./configure --prefix=/usr --enable-shared --with-pic || return 1
-  else
-./configure --prefix=/usr --enable-shared || return 1
-  fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || 
return 1
-  # Upstream changed pkgconfig filename
-  ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || 
return 1
-}

Copied: soundtouch/repos/extra-x86_64/PKGBUILD (from rev 136035, 
soundtouch/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 23:32:17 UTC (rev 136036)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=soundtouch
+pkgver=1.6.0
+pkgrel=1
+pkgdesc="An audio processing library"
+arch=('i686' 'x86_64')
+url="http://www.surina.net/soundtouch/";
+license=('LGPL')
+depends=('gcc-libs')
+options=('!libtool')
+source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
+soundtouch-1.4.0-mmx-sse-compile-fix.patch
+soundtouch-1.4.0-x86_64-asm-broken.patch)
+md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
+ '108cd080b4b0ebe8ed1f950ff1315e7a'
+ '0d856bb5b519b18c6ba3a2e1770bdfd2')
+sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
+  '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
+  '95282cca856b3b8645fadb530ce5eb892074f193')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
+}

Deleted: soundtouch-1.4.0-mmx-sse-compile-fix.patch
===
--- soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:31:51 UTC (rev 
136035)
+++ soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:32:17 UTC (rev 
136036)
@@ -1,14 +0,0 @@
-diff -up soundtouch/source/SoundTouch/Makefile.in~ 
soundtouch/source/SoundTouch/Makefile.i

[arch-commits] Commit in soundtouch/repos/extra-i686 (7 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 19:31:51
  Author: eric
Revision: 136035

archrelease: copy trunk to extra-i686

Added:
  soundtouch/repos/extra-i686/PKGBUILD
(from rev 136034, soundtouch/trunk/PKGBUILD)
  soundtouch/repos/extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch
(from rev 136034, 
soundtouch/trunk/soundtouch-1.4.0-mmx-sse-compile-fix.patch)
  soundtouch/repos/extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch
(from rev 136034, soundtouch/trunk/soundtouch-1.4.0-x86_64-asm-broken.patch)
Deleted:
  soundtouch/repos/extra-i686/ChangeLog
  soundtouch/repos/extra-i686/PKGBUILD
  soundtouch/repos/extra-i686/soundtouch-1.4.0-mmx-sse-compile-fix.patch
  soundtouch/repos/extra-i686/soundtouch-1.4.0-x86_64-asm-broken.patch

+
 ChangeLog  |   10 ---
 PKGBUILD   |   73 +--
 soundtouch-1.4.0-mmx-sse-compile-fix.patch |   28 +-
 soundtouch-1.4.0-x86_64-asm-broken.patch   |   24 
 4 files changed, 63 insertions(+), 72 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2011-08-21 23:31:11 UTC (rev 136034)
+++ ChangeLog   2011-08-21 23:31:51 UTC (rev 136035)
@@ -1,10 +0,0 @@
-2010-02-06  Eric Belanger  
-
-   * soundtouch 1.5.0-1
-   * Upstream update
-   * Added shared libs
-
-2008-12-12  Eric Belanger  
-
-   * soundtouch 1.3.1-3
-   * Added to [extra] repo

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 23:31:11 UTC (rev 136034)
+++ PKGBUILD2011-08-21 23:31:51 UTC (rev 136035)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger 
-# Contributor: Jaroslaw Swierczynski 
-# Contributor: Raymano 
-
-pkgname=soundtouch
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="An audio processing library"
-arch=('i686' 'x86_64')
-url="http://www.surina.net/soundtouch/";
-license=('LGPL')
-depends=('gcc-libs')
-options=('!libtool')
-source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
-soundtouch-1.4.0-mmx-sse-compile-fix.patch
-soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
- '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' 
'39815091c4cb1817f8a56b8fb29fa684984514d1'\
- '95282cca856b3b8645fadb530ce5eb892074f193')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 
1
-  if [ "${CARCH}" = "x86_64" ]; then
-./configure --prefix=/usr --enable-shared --with-pic || return 1
-  else
-./configure --prefix=/usr --enable-shared || return 1
-  fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || 
return 1
-  # Upstream changed pkgconfig filename
-  ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || 
return 1
-}

Copied: soundtouch/repos/extra-i686/PKGBUILD (from rev 136034, 
soundtouch/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 23:31:51 UTC (rev 136035)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=soundtouch
+pkgver=1.6.0
+pkgrel=1
+pkgdesc="An audio processing library"
+arch=('i686' 'x86_64')
+url="http://www.surina.net/soundtouch/";
+license=('LGPL')
+depends=('gcc-libs')
+options=('!libtool')
+source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
+soundtouch-1.4.0-mmx-sse-compile-fix.patch
+soundtouch-1.4.0-x86_64-asm-broken.patch)
+md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
+ '108cd080b4b0ebe8ed1f950ff1315e7a'
+ '0d856bb5b519b18c6ba3a2e1770bdfd2')
+sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
+  '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
+  '95282cca856b3b8645fadb530ce5eb892074f193')
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
+}

Deleted: soundtouch-1.4.0-mmx-sse-compile-fix.patch
===
--- soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:31:11 UTC (rev 
136034)
+++ soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:31:51 UTC (rev 
136035)
@@ -1,14 +0,0 @@
-diff -up soundtouch/source/SoundTouch/Makefile.in~ 
soundtouch/source/SoundTouch/Makefile.in
 soundtouch/

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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 19:31:11
  Author: eric
Revision: 136034

upgpkg: soundtouch 1.6.0-1

Upstream update, Update patch, Remove ChangeLog, Clean up PKGBUILD

Modified:
  soundtouch/trunk/PKGBUILD
  soundtouch/trunk/soundtouch-1.4.0-mmx-sse-compile-fix.patch
Deleted:
  soundtouch/trunk/ChangeLog

+
 ChangeLog  |   10 ---
 PKGBUILD   |   37 +--
 soundtouch-1.4.0-mmx-sse-compile-fix.patch |   28 ++--
 3 files changed, 33 insertions(+), 42 deletions(-)

Deleted: ChangeLog
===
--- ChangeLog   2011-08-21 23:13:31 UTC (rev 136033)
+++ ChangeLog   2011-08-21 23:31:11 UTC (rev 136034)
@@ -1,10 +0,0 @@
-2010-02-06  Eric Belanger  
-
-   * soundtouch 1.5.0-1
-   * Upstream update
-   * Added shared libs
-
-2008-12-12  Eric Belanger  
-
-   * soundtouch 1.3.1-3
-   * Added to [extra] repo

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 23:13:31 UTC (rev 136033)
+++ PKGBUILD2011-08-21 23:31:11 UTC (rev 136034)
@@ -1,10 +1,8 @@
 # $Id$
-# Maintainer: Eric Belanger 
-# Contributor: Jaroslaw Swierczynski 
-# Contributor: Raymano 
+# Maintainer: Eric Bélanger 
 
 pkgname=soundtouch
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="An audio processing library"
 arch=('i686' 'x86_64')
@@ -15,22 +13,25 @@
 source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz
 soundtouch-1.4.0-mmx-sse-compile-fix.patch
 soundtouch-1.4.0-x86_64-asm-broken.patch)
-md5sums=('5456481d8707d2a2c27466ea64a099cb' 'f0204136c90ce4f6d4761073151eb4dc'\
+md5sums=('aa1c63d4d67b033f044a6a48d2be5bdd'
+ '108cd080b4b0ebe8ed1f950ff1315e7a'
  '0d856bb5b519b18c6ba3a2e1770bdfd2')
-sha1sums=('c3e73419acec242a49a408b78c55883def937fc0' 
'39815091c4cb1817f8a56b8fb29fa684984514d1'\
- '95282cca856b3b8645fadb530ce5eb892074f193')
+sha1sums=('9871dcbf75a68665a3515bb9dda4727beb0358e7'
+  '7a245aacadcb3003e73c1c202c8de0ecc09283ac'
+  '95282cca856b3b8645fadb530ce5eb892074f193')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch" || 
return 1
-  patch -Np1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch" || return 
1
-  if [ "${CARCH}" = "x86_64" ]; then
-./configure --prefix=/usr --enable-shared --with-pic || return 1
-  else
-./configure --prefix=/usr --enable-shared || return 1
-  fi
-  make || return 1
-  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install || 
return 1
-  # Upstream changed pkgconfig filename
-  ln -sf soundtouch-1.4.pc "${pkgdir}/usr/lib/pkgconfig/soundtouch-1.0.pc" || 
return 1
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-mmx-sse-compile-fix.patch"
+  patch -p1 -i "${srcdir}/soundtouch-1.4.0-x86_64-asm-broken.patch"
+
+  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
+  ./bootstrap
+  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR="${pkgdir}" pkgdocdir=/usr/share/doc/soundtouch install
+}

Modified: soundtouch-1.4.0-mmx-sse-compile-fix.patch
===
--- soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:13:31 UTC (rev 
136033)
+++ soundtouch-1.4.0-mmx-sse-compile-fix.patch  2011-08-21 23:31:11 UTC (rev 
136034)
@@ -1,14 +1,14 @@
-diff -up soundtouch/source/SoundTouch/Makefile.in~ 
soundtouch/source/SoundTouch/Makefile.in
 soundtouch/source/SoundTouch/Makefile.in~  2009-02-15 11:21:36.0 
+0100
-+++ soundtouch/source/SoundTouch/Makefile.in   2009-02-15 11:23:30.0 
+0100
-@@ -209,7 +209,9 @@ libSoundTouch_la_SOURCES = AAFilter.cpp 
- # Note by authore: '-msse2' might not work in non-X86 compilations. If 
someone can
- # fix this script to automatically check for CPU architecture, please submit 
a patch 
- # to me.
--AM_CXXFLAGS = -O3 -msse2 -fcheck-new -I../../include
-+AM_CXXFLAGS = -fcheck-new -I../../include
-+mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
-+sse_optimized.lo : AM_CXXFLAGS = -msse -fcheck-new -I../../include
- all: all-am
- 
- .SUFFIXES:
+diff -up soundtouch/source/SoundTouch/Makefile.am~ 
soundtouch/source/SoundTouch/Makefile.am
+--- soundtouch/source/SoundTouch/Makefile.am~  2009-02-15 11:21:36.0 
+0100
 soundtouch/source/SoundTouch/Makefile.am   2009-02-15 11:23:30.0 
+0100
+@@ -36,7 +36,9 @@
+ # Note by authore: '-msse2' might not work in non-X86 compilations. If 
someone can
+ # fix this script to automatically check for CPU architecture, please submit 
a patch 
+ # to me.
+-AM_CXXFLAGS=-O3 -msse2 -fcheck-new -I../../include
++AM_CXXFLAGS = -fcheck-new -I../../include
++mmx_optimized.lo : AM_CXXFLAGS = -mmmx -fcheck-new -I../../include
++sse

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

2011-08-21 Thread Andrea Scarpino
Date: Sunday, August 21, 2011 @ 19:13:31
  Author: andrea
Revision: 136033

db-move: moved gpsd from [testing] to [extra] (x86_64)

Added:
  gpsd/repos/extra-x86_64/PKGBUILD
(from rev 136031, gpsd/repos/testing-x86_64/PKGBUILD)
  gpsd/repos/extra-x86_64/gpsd
(from rev 136031, gpsd/repos/testing-x86_64/gpsd)
  gpsd/repos/extra-x86_64/gpsd.conf.d
(from rev 136031, gpsd/repos/testing-x86_64/gpsd.conf.d)
  gpsd/repos/extra-x86_64/gpsd.install
(from rev 136031, gpsd/repos/testing-x86_64/gpsd.install)
Deleted:
  gpsd/repos/extra-x86_64/LICENSE
  gpsd/repos/extra-x86_64/PKGBUILD
  gpsd/repos/extra-x86_64/gpsd
  gpsd/repos/extra-x86_64/gpsd.install
  gpsd/repos/testing-x86_64/

--+
 LICENSE  |   38 --
 PKGBUILD |  152 -
 gpsd |   87 
 gpsd.conf.d  |5 +
 gpsd.install |   32 ++--
 5 files changed, 140 insertions(+), 174 deletions(-)

Deleted: extra-x86_64/LICENSE
===
--- extra-x86_64/LICENSE2011-08-21 23:13:30 UTC (rev 136032)
+++ extra-x86_64/LICENSE2011-08-21 23:13:31 UTC (rev 136033)
@@ -1,38 +0,0 @@
-   COPYRIGHTS
-
-Compilation copyright is held by the GPSD project.  All rights reserved.
-
-GPSD project copyrights are assigned to the project lead, currently
-Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
-1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
-Copyright (c) 2005 by Eric S. Raymond.  For other copyrights, see
-individual files.
-
-   BSD LICENSE
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither name of the GPSD project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: extra-x86_64/PKGBUILD
===
--- extra-x86_64/PKGBUILD   2011-08-21 23:13:30 UTC (rev 136032)
+++ extra-x86_64/PKGBUILD   2011-08-21 23:13:31 UTC (rev 136033)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Sergej Pupykin 
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Giacomo Rizzo 
-
-pkgname=gpsd
-pkgver=2.96
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://gpsd.berlios.de";
-license=('BSD')
-depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-'php-gd: image support for the PHP status page')
-makedepends=('docbook-xsl')
-backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'gpsd' 'LICENSE')
-md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
- 'f929322fc4670543fcb36dafc7bb9e03'
- 'd217a23f408e91c94359447735bc1800')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # install python to the same DESTDIR given make
-  sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} 
--root=$(DESTDIR)|' Makefile.am Makefile.in
-
-  # fix python 2.7 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
-  sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
-gpsfake gpsprof xgps xgpsspeed gps/gps.py
-  
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
---disable-libQgpsmm \
---disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pa

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

2011-08-21 Thread Andrea Scarpino
Date: Sunday, August 21, 2011 @ 19:13:30
  Author: andrea
Revision: 136032

db-move: moved gpsd from [testing] to [extra] (i686)

Added:
  gpsd/repos/extra-i686/PKGBUILD
(from rev 136031, gpsd/repos/testing-i686/PKGBUILD)
  gpsd/repos/extra-i686/gpsd
(from rev 136031, gpsd/repos/testing-i686/gpsd)
  gpsd/repos/extra-i686/gpsd.conf.d
(from rev 136031, gpsd/repos/testing-i686/gpsd.conf.d)
  gpsd/repos/extra-i686/gpsd.install
(from rev 136031, gpsd/repos/testing-i686/gpsd.install)
Deleted:
  gpsd/repos/extra-i686/LICENSE
  gpsd/repos/extra-i686/PKGBUILD
  gpsd/repos/extra-i686/gpsd
  gpsd/repos/extra-i686/gpsd.install
  gpsd/repos/testing-i686/

--+
 LICENSE  |   38 --
 PKGBUILD |  152 -
 gpsd |   87 
 gpsd.conf.d  |5 +
 gpsd.install |   32 ++--
 5 files changed, 140 insertions(+), 174 deletions(-)

Deleted: extra-i686/LICENSE
===
--- extra-i686/LICENSE  2011-08-21 21:09:53 UTC (rev 136031)
+++ extra-i686/LICENSE  2011-08-21 23:13:30 UTC (rev 136032)
@@ -1,38 +0,0 @@
-   COPYRIGHTS
-
-Compilation copyright is held by the GPSD project.  All rights reserved.
-
-GPSD project copyrights are assigned to the project lead, currently
-Eric S. Raymond. Other portions of the GPSD code are Copyright (c)
-1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
-Copyright (c) 2005 by Eric S. Raymond.  For other copyrights, see
-individual files.
-
-   BSD LICENSE
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither name of the GPSD project nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-08-21 21:09:53 UTC (rev 136031)
+++ extra-i686/PKGBUILD 2011-08-21 23:13:30 UTC (rev 136032)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Sergej Pupykin 
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Giacomo Rizzo 
-
-pkgname=gpsd
-pkgver=2.96
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://gpsd.berlios.de";
-license=('BSD')
-depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-'php-gd: image support for the PHP status page')
-makedepends=('docbook-xsl')
-backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'gpsd' 'LICENSE')
-md5sums=('26a7a04d4298bc3a3a5d89fef4582b64'
- 'f929322fc4670543fcb36dafc7bb9e03'
- 'd217a23f408e91c94359447735bc1800')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # install python to the same DESTDIR given make
-  sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} 
--root=$(DESTDIR)|' Makefile.am Makefile.in
-
-  # fix python 2.7 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper}
-  sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \
-gpsfake gpsprof xgps xgpsspeed gps/gps.py
-  
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
---disable-libQgpsmm \
---disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps

[arch-commits] Commit in tomcat7/repos/extra-any (8 files)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 17:09:53
  Author: guillaume
Revision: 136031

archrelease: copy trunk to extra-any

Added:
  tomcat7/repos/extra-any/PKGBUILD
(from rev 136030, tomcat7/trunk/PKGBUILD)
  tomcat7/repos/extra-any/tomcat7
(from rev 136030, tomcat7/trunk/tomcat7)
  tomcat7/repos/extra-any/tomcat7.conf.d
(from rev 136030, tomcat7/trunk/tomcat7.conf.d)
  tomcat7/repos/extra-any/tomcat7.install
(from rev 136030, tomcat7/trunk/tomcat7.install)
Deleted:
  tomcat7/repos/extra-any/PKGBUILD
  tomcat7/repos/extra-any/tomcat7
  tomcat7/repos/extra-any/tomcat7.conf.d
  tomcat7/repos/extra-any/tomcat7.install

-+
 PKGBUILD|  159 ++
 tomcat7 |  158 ++---
 tomcat7.conf.d  |   26 +---
 tomcat7.install |   54 +-
 4 files changed, 198 insertions(+), 199 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 21:08:54 UTC (rev 136030)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -1,80 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat7
-pkgver=7.0.20
-pkgrel=1
-pkgdesc="Servlet-3.0/JSP-2.2 Container"
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment>=6' 'apache-ant>=1.8' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat7/catalina.policy
-etc/tomcat7/catalina.properties
-etc/tomcat7/context.xml
-etc/tomcat7/logging.properties
-etc/tomcat7/server.xml
-etc/tomcat7/tomcat-users.xml
-etc/tomcat7/web.xml
-etc/conf.d/tomcat7)
-install=tomcat7.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-7/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-tomcat7.conf.d
-tomcat7
-tomcat7.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '13eb5570b4d7dcbbe8b8372575c010c9'
- '70eabcf5bbfa0978e738d95c64abb7a7'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
-  . /etc/profile.d/apache-ant.sh
-  ant \
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat7/repos/extra-any/PKGBUILD (from rev 136030, 
tomcat7/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 21:09:53 UTC (rev 136031)
@@ -0,0 +1,79 @@
+# Maintainer: Guillaume ALAUX 
+pkgname=tomcat7
+pkgver=7.0.20
+pkgrel=2
+pkgdesc="Servlet-3.0/JSP-2.2 Container"
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime>=6' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment>=6' 'apache-ant>=1.8' 'java-commons-daemon')
+optdepends=('tomcat-native: to allow optimal performance in production 
environments')
+backup=(etc/tomcat7/catalina.policy
+etc/tomcat7/catalina.properties
+etc/tomcat7/context.xml
+etc/tomcat7/logging.properties
+etc/tomcat7/server.xml
+etc/tomcat7/tomcat-users.xml
+etc/tomcat7/web.xml
+

[arch-commits] Commit in tomcat7/trunk (PKGBUILD tomcat7 tomcat7.conf.d)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 17:08:54
  Author: guillaume
Revision: 136030

upgpkg: tomcat7 7.0.20-2

Fixed start at boot and pid number retrieval

Modified:
  tomcat7/trunk/PKGBUILD
  tomcat7/trunk/tomcat7
  tomcat7/trunk/tomcat7.conf.d

+
 PKGBUILD   |   11 +--
 tomcat7|8 ++--
 tomcat7.conf.d |4 
 3 files changed, 11 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
+++ PKGBUILD2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat7
 pkgver=7.0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="Servlet-3.0/JSP-2.2 Container"
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -23,10 +23,9 @@
 tomcat7
 tomcat7.install)
 
-noextract=(dbcp-${pkgver}.jar)
 md5sums=('bb13b2910cc71c29e571ea062ad6ab3a'
- '13eb5570b4d7dcbbe8b8372575c010c9'
- '70eabcf5bbfa0978e738d95c64abb7a7'
+ '0fa46eae1746d6cd564905bfb0072776'
+ '361a41c02930a4e43245ab7379a617e9'
  '1be39071bd27781c352b2d73b765e29d')
 
 build() {
@@ -74,7 +73,7 @@
   ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
 
   # Arch scripts
-  install -Dm644 ${srcdir}/tomcat7.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/tomcat7 ${pkgdir}/etc/rc.d/${pkgname}
+  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
 }
 

Modified: tomcat7
===
--- tomcat7 2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7 2011-08-21 21:08:54 UTC (rev 136030)
@@ -6,15 +6,11 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${daemon_name}
 
-get_pid() {
-   pidof -o %PPID ${daemon_name}
-}
-
 case "$1" in
   start)
 stat_busy "Starting ${daemon_name} daemon"
 
-PID=$(get_pid)
+PID=$(get_pid 'jsvc.exec')
 if [ -z "$PID" ]; then
   [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid
   # RUN
@@ -24,6 +20,7 @@
 -Djava.io.tmpdir=/var/tmp/tomcat7/temp \
 -cp 
/usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar
 \
 -user tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
 -wait 10 \
 -pidfile /var/run/${daemon_name}.pid \
 -errfile /var/log/tomcat7/catalina.err \
@@ -46,7 +43,6 @@
 
   stop)
 stat_busy "Stopping ${daemon_name} daemon"
-PID=$(get_pid)
 # STOP
 /usr/bin/jsvc \
   -pidfile /var/run/${daemon_name}.pid \

Modified: tomcat7.conf.d
===
--- tomcat7.conf.d  2011-08-21 20:28:55 UTC (rev 136029)
+++ tomcat7.conf.d  2011-08-21 21:08:54 UTC (rev 136030)
@@ -1,3 +1,7 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
 # Tomcat home directory
 CATALINA_HOME=/usr/share/tomcat7
 



[arch-commits] Commit in tomcat6/repos/extra-any (8 files)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 16:28:55
  Author: guillaume
Revision: 136029

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 136028, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 136028, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136028, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 136028, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  172 +++---
 tomcat6 |  158 -
 tomcat6.conf.d  |   26 
 tomcat6.install |   54 
 4 files changed, 205 insertions(+), 205 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat6
-pkgver=6.0.33
-pkgrel=1
-pkgdesc="Servlet-2.5/JSP-2.1 Container"
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
- 'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install "${srcdir}/dbcp-${pkgver}.jar" \
-  ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
-  ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136028, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 20:28:55 UTC (rev 136029)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX 
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=2
+pkgdesc="Servlet-2.5/JSP-2.1 Container"
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment

[arch-commits] Commit in tomcat6/trunk (PKGBUILD tomcat6 tomcat6.conf.d)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 16:27:55
  Author: guillaume
Revision: 136028

upgpkg: tomcat6 6.0.33-2

Fixed start at boot and pid number retrieval

Modified:
  tomcat6/trunk/PKGBUILD
  tomcat6/trunk/tomcat6
  tomcat6/trunk/tomcat6.conf.d

+
 PKGBUILD   |6 +++---
 tomcat6|1 +
 tomcat6.conf.d |4 
 3 files changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 18:06:36 UTC (rev 136027)
+++ PKGBUILD2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat6
 pkgver=6.0.33
-pkgrel=1
+pkgrel=2
 pkgdesc="Servlet-2.5/JSP-2.1 Container"
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -27,8 +27,8 @@
 noextract=(dbcp-${pkgver}.jar)
 md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
  'a6ff671562c9ac91e8cc2812760df49d'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
+ 'b9f482437de11587d72b53ddaa2a'
+ '8f2ccc09837577394441d29a03b0e667'
  '1be39071bd27781c352b2d73b765e29d')
 
 build() {

Modified: tomcat6
===
--- tomcat6 2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6 2011-08-21 20:27:55 UTC (rev 136028)
@@ -20,6 +20,7 @@
 -Djava.io.tmpdir=/var/tmp/tomcat6/temp \
 -cp 
/usr/share/java/commons-daemon.jar:/usr/share/java/eclipse-ecj.jar:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar
 \
 -user tomcat \
+-java-home ${TOMCAT_JAVA_HOME} \
 -wait 10 \
 -pidfile /var/run/${daemon_name}.pid \
 -errfile /var/log/tomcat6/catalina.err \

Modified: tomcat6.conf.d
===
--- tomcat6.conf.d  2011-08-21 18:06:36 UTC (rev 136027)
+++ tomcat6.conf.d  2011-08-21 20:27:55 UTC (rev 136028)
@@ -1,3 +1,7 @@
+# The JAVA_HOME of the JVM for Tomcat to use
+# (compulsory to enable tomcat to start at boot)
+TOMCAT_JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+
 # Tomcat home directory
 CATALINA_HOME=/usr/share/tomcat6
 



[arch-commits] Commit in mplayer/repos/extra-x86_64 (8 files)

2011-08-21 Thread Ionut Biru
Date: Sunday, August 21, 2011 @ 14:06:36
  Author: ibiru
Revision: 136027

archrelease: copy trunk to extra-x86_64

Added:
  mplayer/repos/extra-x86_64/PKGBUILD
(from rev 136026, mplayer/trunk/PKGBUILD)
  mplayer/repos/extra-x86_64/mplayer.desktop
(from rev 136026, mplayer/trunk/mplayer.desktop)
  mplayer/repos/extra-x86_64/mplayer.install
(from rev 136026, mplayer/trunk/mplayer.install)
  mplayer/repos/extra-x86_64/mplayer.png
(from rev 136026, mplayer/trunk/mplayer.png)
Deleted:
  mplayer/repos/extra-x86_64/PKGBUILD
  mplayer/repos/extra-x86_64/mplayer.desktop
  mplayer/repos/extra-x86_64/mplayer.install
  mplayer/repos/extra-x86_64/mplayer.png

-+
 PKGBUILD|  142 +++---
 mplayer.desktop |   42 +++
 mplayer.install |   22 
 3 files changed, 103 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 18:05:39 UTC (rev 136026)
+++ PKGBUILD2011-08-21 18:06:36 UTC (rev 136027)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru 
-# Contributor: Hugo Doria 
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=33805
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 
'mpg123' 'ladspa' 'libass')
-license=('GPL')
-url="http://www.mplayerhq.hu/";
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz 
mplayer.desktop)
-md5sums=('512a0309ba5979a41ae93b740f4592f4'
- 'c0d6ef795cf6de48e3b87ff7c23f0319')
-
-build() {
-cd ${srcdir}/${pkgname}
-
-./configure --prefix=/usr \
---enable-runtime-cpudetection \
---disable-gui \
---disable-arts \
---disable-liblzo \
---disable-speex \
---disable-openal \
---disable-libdv \
---disable-musepack \
---disable-esd \
---disable-mga \
---disable-ass-internal \
---enable-xvmc \
---language=all \
---confdir=/etc/mplayer
-[ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-make
-}
-
-package_mplayer() {
-pkgdesc="A movie player for linux"
-install=mplayer.install
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 
'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  
'libgl'
-'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 
'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
-
-cd ${srcdir}/${pkgbase}
-
-make DESTDIR=${pkgdir} install-mplayer  install-mplayer-man
-install -Dm644 etc/{codecs.conf,input.conf,example.conf} 
${pkgdir}/etc/mplayer/
-install -dm755 ${pkgdir}/usr/share/mplayer/
-ln -s /usr/share/fonts/TTF/DejaVuSans.ttf 
${pkgdir}/usr/share/mplayer/subfont.ttf
-rm -rf ${pkgdir}/usr/share/mplayer/font
-#desktop file  FS#14770
-install -Dm644 ${srcdir}/mplayer.desktop 
${pkgdir}/usr/share/applications/mplayer.desktop
-install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
-}
-
-package_mencoder() {
-pkgdesc="Free command line video decoding, encoding and filtering tool"
-depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 
'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 
'cdparanoia'
-'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 
'mpg123' 'libass')
-
-cd ${srcdir}/${pkgbase}
-make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
-find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" 
"${1/mplayer/mencoder}"' _ {} \;
-}

Copied: mplayer/repos/extra-x86_64/PKGBUILD (from rev 136026, 
mplayer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 18:06:36 UTC (rev 136027)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Hugo Doria 
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=34007
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-

[arch-commits] Commit in mplayer/repos/extra-i686 (8 files)

2011-08-21 Thread Ionut Biru
Date: Sunday, August 21, 2011 @ 14:05:39
  Author: ibiru
Revision: 136026

archrelease: copy trunk to extra-i686

Added:
  mplayer/repos/extra-i686/PKGBUILD
(from rev 136025, mplayer/trunk/PKGBUILD)
  mplayer/repos/extra-i686/mplayer.desktop
(from rev 136025, mplayer/trunk/mplayer.desktop)
  mplayer/repos/extra-i686/mplayer.install
(from rev 136025, mplayer/trunk/mplayer.install)
  mplayer/repos/extra-i686/mplayer.png
(from rev 136025, mplayer/trunk/mplayer.png)
Deleted:
  mplayer/repos/extra-i686/PKGBUILD
  mplayer/repos/extra-i686/mplayer.desktop
  mplayer/repos/extra-i686/mplayer.install
  mplayer/repos/extra-i686/mplayer.png

-+
 PKGBUILD|  142 +++---
 mplayer.desktop |   42 +++
 mplayer.install |   22 
 3 files changed, 103 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 18:03:50 UTC (rev 136025)
+++ PKGBUILD2011-08-21 18:05:39 UTC (rev 136026)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru 
-# Contributor: Hugo Doria 
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=33805
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 
'mpg123' 'ladspa' 'libass')
-license=('GPL')
-url="http://www.mplayerhq.hu/";
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz 
mplayer.desktop)
-md5sums=('512a0309ba5979a41ae93b740f4592f4'
- 'c0d6ef795cf6de48e3b87ff7c23f0319')
-
-build() {
-cd ${srcdir}/${pkgname}
-
-./configure --prefix=/usr \
---enable-runtime-cpudetection \
---disable-gui \
---disable-arts \
---disable-liblzo \
---disable-speex \
---disable-openal \
---disable-libdv \
---disable-musepack \
---disable-esd \
---disable-mga \
---disable-ass-internal \
---enable-xvmc \
---language=all \
---confdir=/etc/mplayer
-[ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-make
-}
-
-package_mplayer() {
-pkgdesc="A movie player for linux"
-install=mplayer.install
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 
'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  
'libgl'
-'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 
'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
-
-cd ${srcdir}/${pkgbase}
-
-make DESTDIR=${pkgdir} install-mplayer  install-mplayer-man
-install -Dm644 etc/{codecs.conf,input.conf,example.conf} 
${pkgdir}/etc/mplayer/
-install -dm755 ${pkgdir}/usr/share/mplayer/
-ln -s /usr/share/fonts/TTF/DejaVuSans.ttf 
${pkgdir}/usr/share/mplayer/subfont.ttf
-rm -rf ${pkgdir}/usr/share/mplayer/font
-#desktop file  FS#14770
-install -Dm644 ${srcdir}/mplayer.desktop 
${pkgdir}/usr/share/applications/mplayer.desktop
-install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
-}
-
-package_mencoder() {
-pkgdesc="Free command line video decoding, encoding and filtering tool"
-depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 
'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 
'cdparanoia'
-'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 
'mpg123' 'libass')
-
-cd ${srcdir}/${pkgbase}
-make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
-find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" 
"${1/mplayer/mencoder}"' _ {} \;
-}

Copied: mplayer/repos/extra-i686/PKGBUILD (from rev 136025, 
mplayer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 18:05:39 UTC (rev 136026)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer : Ionut Biru 
+# Contributor: Hugo Doria 
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=34007
+pkgrel=1
+arch=('i686' 'x86_64')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 

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

2011-08-21 Thread Ionut Biru
Date: Sunday, August 21, 2011 @ 14:03:50
  Author: ibiru
Revision: 136025

update to 34007, fixes FS#25281

Modified:
  mplayer/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 17:34:31 UTC (rev 136024)
+++ PKGBUILD2011-08-21 18:03:50 UTC (rev 136025)
@@ -4,8 +4,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=33805
-pkgrel=2
+pkgver=34007
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 
'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 
'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -14,7 +14,7 @@
 url="http://www.mplayerhq.hu/";
 options=(!buildflags !emptydirs)
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz 
mplayer.desktop)
-md5sums=('512a0309ba5979a41ae93b740f4592f4'
+md5sums=('675b929bab9e3540bb63207ed940fb7f'
  'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
@@ -46,7 +46,7 @@
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 
'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  
'libgl'
 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 
'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass')
+'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 
'libxxf86vm')
 
 cd ${srcdir}/${pkgbase}
 



[arch-commits] Commit in tomcat6/trunk (tomcat6)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 13:34:31
  Author: guillaume
Revision: 136024

Fixed erroneous pid retrieval

Modified:
  tomcat6/trunk/tomcat6

-+
 tomcat6 |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: tomcat6
===
--- tomcat6 2011-08-21 16:23:28 UTC (rev 136023)
+++ tomcat6 2011-08-21 17:34:31 UTC (rev 136024)
@@ -6,15 +6,11 @@
 . /etc/rc.d/functions
 . /etc/conf.d/${daemon_name}
 
-get_pid() {
-   pidof -o %PPID ${daemon_name}
-}
-
 case "$1" in
   start)
 stat_busy "Starting ${daemon_name} daemon"
 
-PID=$(get_pid)
+PID=$(get_pid 'jsvc.exec')
 if [ -z "$PID" ]; then
   [ -f /var/run/${daemon_name}.pid ] && rm -f /var/run/${daemon_name}.pid
   # RUN
@@ -46,7 +42,6 @@
 
   stop)
 stat_busy "Stopping ${daemon_name} daemon"
-PID=$(get_pid)
 # STOP
 /usr/bin/jsvc \
   -pidfile /var/run/${daemon_name}.pid \



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

2011-08-21 Thread andyrtr
Date: Sunday, August 21, 2011 @ 12:23:28
  Author: andyrtr
Revision: 136023

fix spaces; FS#25698

Modified:
  libreoffice/trunk/PKGBUILD
  libreoffice/trunk/libreoffice.install

-+
 PKGBUILD|   20 ++--
 libreoffice.install |   12 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 15:33:03 UTC (rev 136022)
+++ PKGBUILD2011-08-21 16:23:28 UTC (rev 136023)
@@ -438,7 +438,7 @@
 }
 
 package_libreoffice-base() {
- 
pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of
 databases through a GUI."
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. 
Allows creation and management of databases through a GUI."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -460,7 +460,7 @@
 }
 
 package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
+ pkgdesc="Spreadsheet application for LibreOffice."
  depends=('libreoffice-common' 'lpsolve' )
  optdepends=()
  backup=()
@@ -482,7 +482,7 @@
 }
 
 package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
+ pkgdesc="Drawing Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -504,7 +504,7 @@
 }
 
 package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and 
other gtk desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and 
other gtk desktop environment."
  depends=('libreoffice-common' 'dbus-glib')
  optdepends=()
  backup=()
@@ -525,7 +525,7 @@
 }
 
 package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
+ pkgdesc="Presentation Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=('mesa: for the OGLTrans extension')
  backup=()
@@ -547,7 +547,7 @@
 }
 
 package_libreoffice-kde4() {
- 
pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 
desktop environment."
  depends=('libreoffice-common' 'kdelibs')
  optdepends=()
  backup=()
@@ -568,7 +568,7 @@
 }
 
 package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -590,7 +590,7 @@
 }
 
 package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
+ pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 
'java-environment')
  optdepends=()
  backup=()
@@ -625,7 +625,7 @@
 }
 
 package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
+ pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
  optdepends=()
  backup=()
@@ -649,7 +649,7 @@
 }
 
 package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
+ pkgdesc="Word Processor Applicationfor LibreOffice."
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:   library for importing and converting Corel 
WordPerfect(tm) Graphics images')
  backup=()

Modified: libreoffice.install
===
--- libreoffice.install 2011-08-21 15:33:03 UTC (rev 136022)
+++ libreoffice.install 2011-08-21 16:23:28 UTC (rev 136023)
@@ -10,9 +10,9 @@
 echo "- libreoffice-common"
 echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend 
applications"
 echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "  the LibreOffice APIs and for creating"
-echo "  extensions (UNO components)."
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "  the LibreOffice APIs and for creating"
+echo "  extensions (UNO components)."
 echo "---"
 echo " * you need to install at least one libreoffice-langpack"
 echo " * you may want to pacman -Ss libreoffice-extensions"
@@ -33,9 +33,9 @@
 echo "- libreoffice-common"
 echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend 
applications"
 echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "  the LibreOffice APIs and for creating"
-echo "  extensions (UNO components)."
+echo "- libreoffice-{sdk,sdk-doc} - add-on a

[arch-commits] Commit in perl-libwww/repos (testing-any)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:33:03
  Author: juster
Revision: 136022

archrelease: copy trunk to testing-any

Added:
  perl-libwww/repos/testing-any/



[arch-commits] Commit in perl-libwww/repos (testing-any)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:32:53
  Author: juster
Revision: 136021

archrelease: remove testing-any

Deleted:
  perl-libwww/repos/testing-any/



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

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:32:46
  Author: juster
Revision: 136020

Add optdepends upon perl-lwp-protocol-https.

Modified:
  perl-libwww/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 15:30:45 UTC (rev 136019)
+++ PKGBUILD2011-08-21 15:32:46 UTC (rev 136020)
@@ -4,24 +4,21 @@
 
 pkgname=perl-libwww
 pkgver=6.02
-pkgrel=1
+pkgrel=2
 pkgdesc="The World-Wide Web library for Perl"
 arch=(any)
 license=(PerlArtistic GPL)
-options=('!emptydirs')
 depends=('perl>=5.8.8' 'perl-encode-locale' 'perl-file-listing>=6'
-'perl-html-parser' 'perl-http-cookies>=6' 'perl-http-daemon>=6'
-'perl-http-date>=6' 'perl-http-message' 'perl-http-negotiate>=6'
-'perl-lwp-mediatypes>=6' 'perl-net-http>=6' 'perl-uri>=1.10'
-'perl-www-robotrules>=6')
-makedepends=()
-checkdepends=()
-conflicts=()
+ 'perl-html-parser' 'perl-http-cookies>=6' 'perl-http-daemon>=6'
+ 'perl-http-date>=6' 'perl-http-message' 'perl-http-negotiate>=6'
+ 'perl-lwp-mediatypes>=6' 'perl-net-http>=6' 'perl-uri>=1.10'
+ 'perl-www-robotrules>=6')
+optdepends=('perl-lwp-protocol-https: for https:// url schemes')
 url=http://search.cpan.org/dist/libwww-perl
 
source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-6.02.tar.gz)
 md5sums=(4617dbc79a78992a8c8db263c170d8ec)
 
sha512sums=(a5b081f5dcb63010eff583c77b4e57f417ee842ad6e1327cd2df22443238eef795348a4298b3fbc7676240d46ff9a70d68ab2465469579c6a7bef08556aab70c)
-_distdir="${srcdir}/libwww-perl-6.02"
+_distdir="$srcdir/libwww-perl-6.02"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \



[arch-commits] Commit in perl-lwp-protocol-https/repos (testing-any)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:30:45
  Author: juster
Revision: 136019

archrelease: copy trunk to testing-any

Added:
  perl-lwp-protocol-https/repos/testing-any/



[arch-commits] Commit in perl-mozilla-ca/repos (testing-any)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:28:02
  Author: juster
Revision: 136018

archrelease: copy trunk to testing-any

Added:
  perl-mozilla-ca/repos/testing-any/



[arch-commits] Commit in (4 files)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:27:29
  Author: juster
Revision: 136017

Adds perl-mozilla-ca package.

A dependency of perl-lwp-protocol-https.

Added:
  perl-mozilla-ca/
  perl-mozilla-ca/repos/
  perl-mozilla-ca/trunk/
  perl-mozilla-ca/trunk/PKGBUILD

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

Added: perl-mozilla-ca/trunk/PKGBUILD
===
--- perl-mozilla-ca/trunk/PKGBUILD  (rev 0)
+++ perl-mozilla-ca/trunk/PKGBUILD  2011-08-21 15:27:29 UTC (rev 136017)
@@ -0,0 +1,47 @@
+# Maintainer : Justin "juster" Davis 
+# Generator  : pbjam 0.01
+
+pkgname=perl-mozilla-ca
+pkgver=20110409
+pkgrel=1
+pkgdesc="Mozilla's CA cert bundle in PEM format"
+arch=(any)
+license=(GPL2 LGPL2.1)
+depends=('perl>=5.006')
+url=http://search.cpan.org/dist/Mozilla-CA
+source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABH/Mozilla-CA-20110409.tar.gz)
+md5sums=(b68cbbc2a364de8e2c418b46126221d0)
+sha512sums=(73fab34743ae36737a6365aa07d486a033604a4be70216ceccf3c9dd4ade0ddc4bb14c14bf84132364a2eeaad56130a312c6c42463b077d119a1b471a779fe82)
+_distdir="$srcdir/Mozilla-CA-20110409"
+
+build() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \
+  PERL_AUTOINSTALL=--skipdeps\
+  PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
+  PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+  MODULEBUILDRC=/dev/null
+
+cd "$_distdir"
+/usr/bin/perl Makefile.PL
+make
+  )
+}
+
+check() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+cd "$_distdir"
+make test
+  )
+}
+
+package() {
+cd "$_distdir"
+make DESTDIR="$pkgdir" install
+find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+}
+
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
+# vim:set ts=2 sw=2 et:



[arch-commits] Commit in perl-lwp-protocol-https/trunk (PKGBUILD)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 11:16:19
  Author: juster
Revision: 136016

Fix missing $_distdir and $license.

Modified:
  perl-lwp-protocol-https/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 14:52:11 UTC (rev 136015)
+++ PKGBUILD2011-08-21 15:16:19 UTC (rev 136016)
@@ -7,12 +7,14 @@
 pkgrel=1
 pkgdesc="Provide https support for LWP::UserAgent"
 arch=(any)
+license=(PerlArtistic GPL)
 depends=('perl>=5.8.8' 'perl-io-socket-ssl>=1.38' 'perl-libwww'
  'perl-mozilla-ca>=20110101' 'perl-net-http')
 url=http://search.cpan.org/dist/LWP-Protocol-https
 
source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-Protocol-https-6.02.tar.gz)
 md5sums=(a37185492b15ad5ac13da4aef48bd388)
 
sha512sums=(cb65fa49c7a0882344ceefe4374cd50ce2c06fceffcaecc00f309342205a02e729613ed66a9ec5b9c6692f4edbbd04d522c72a2c80fb1718ecc3b8973cb5e10f)
+_distdir="$srcdir/LWP-Protocol-https-6.02"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \



[arch-commits] Commit in (4 files)

2011-08-21 Thread Justin Davis
Date: Sunday, August 21, 2011 @ 10:52:11
  Author: juster
Revision: 136015

Adds perl-lwp-protocol-https package.

Added:
  perl-lwp-protocol-https/
  perl-lwp-protocol-https/repos/
  perl-lwp-protocol-https/trunk/
  perl-lwp-protocol-https/trunk/PKGBUILD

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

Added: perl-lwp-protocol-https/trunk/PKGBUILD
===
--- perl-lwp-protocol-https/trunk/PKGBUILD  (rev 0)
+++ perl-lwp-protocol-https/trunk/PKGBUILD  2011-08-21 14:52:11 UTC (rev 
136015)
@@ -0,0 +1,47 @@
+# Maintainer : Justin "juster" Davis 
+# Generator  : pbjam 0.01
+# $Id$
+
+pkgname=perl-lwp-protocol-https
+pkgver=6.02
+pkgrel=1
+pkgdesc="Provide https support for LWP::UserAgent"
+arch=(any)
+depends=('perl>=5.8.8' 'perl-io-socket-ssl>=1.38' 'perl-libwww'
+ 'perl-mozilla-ca>=20110101' 'perl-net-http')
+url=http://search.cpan.org/dist/LWP-Protocol-https
+source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/LWP-Protocol-https-6.02.tar.gz)
+md5sums=(a37185492b15ad5ac13da4aef48bd388)
+sha512sums=(cb65fa49c7a0882344ceefe4374cd50ce2c06fceffcaecc00f309342205a02e729613ed66a9ec5b9c6692f4edbbd04d522c72a2c80fb1718ecc3b8973cb5e10f)
+
+build() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \
+  PERL_AUTOINSTALL=--skipdeps\
+  PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
+  PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+  MODULEBUILDRC=/dev/null
+
+cd "$_distdir"
+/usr/bin/perl Makefile.PL
+make
+  )
+}
+
+check() {
+  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
+cd "$_distdir"
+make test
+  )
+}
+
+package() {
+cd "$_distdir"
+make DESTDIR="$pkgdir" install
+find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+}
+
+# Local Variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# End:
+# vim:set ts=2 sw=2 et:


Property changes on: perl-lwp-protocol-https/trunk/PKGBUILD
___
Added: svn:keywords
   + Id



[arch-commits] Commit in fam/repos/extra-x86_64 (12 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 10:26:17
  Author: eric
Revision: 136014

archrelease: copy trunk to extra-x86_64

Added:
  fam/repos/extra-x86_64/PKGBUILD
(from rev 136013, fam/trunk/PKGBUILD)
  fam/repos/extra-x86_64/fam
(from rev 136013, fam/trunk/fam)
  fam/repos/extra-x86_64/fam-2.7.0-buildfixes.patch
(from rev 136013, fam/trunk/fam-2.7.0-buildfixes.patch)
  fam/repos/extra-x86_64/fam-2.7.0-dnotify.patch
(from rev 136013, fam/trunk/fam-2.7.0-dnotify.patch)
  fam/repos/extra-x86_64/fam-2.7.0-largefiles.patch
(from rev 136013, fam/trunk/fam-2.7.0-largefiles.patch)
  fam/repos/extra-x86_64/fam-2.7.0-limits.patch
(from rev 136013, fam/trunk/fam-2.7.0-limits.patch)
Deleted:
  fam/repos/extra-x86_64/PKGBUILD
  fam/repos/extra-x86_64/fam
  fam/repos/extra-x86_64/fam-2.7.0-buildfixes.patch
  fam/repos/extra-x86_64/fam-2.7.0-dnotify.patch
  fam/repos/extra-x86_64/fam-2.7.0-largefiles.patch
  fam/repos/extra-x86_64/fam-2.7.0-limits.patch

+
 PKGBUILD   |  104 +-
 fam|   85 -
 fam-2.7.0-buildfixes.patch |  138 +--
 fam-2.7.0-dnotify.patch| 1950 +--
 fam-2.7.0-largefiles.patch |   16 
 fam-2.7.0-limits.patch |   22 
 6 files changed, 1156 insertions(+), 1159 deletions(-)

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


[arch-commits] Commit in fam/repos/extra-i686 (12 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 10:25:34
  Author: eric
Revision: 136013

archrelease: copy trunk to extra-i686

Added:
  fam/repos/extra-i686/PKGBUILD
(from rev 136012, fam/trunk/PKGBUILD)
  fam/repos/extra-i686/fam
(from rev 136012, fam/trunk/fam)
  fam/repos/extra-i686/fam-2.7.0-buildfixes.patch
(from rev 136012, fam/trunk/fam-2.7.0-buildfixes.patch)
  fam/repos/extra-i686/fam-2.7.0-dnotify.patch
(from rev 136012, fam/trunk/fam-2.7.0-dnotify.patch)
  fam/repos/extra-i686/fam-2.7.0-largefiles.patch
(from rev 136012, fam/trunk/fam-2.7.0-largefiles.patch)
  fam/repos/extra-i686/fam-2.7.0-limits.patch
(from rev 136012, fam/trunk/fam-2.7.0-limits.patch)
Deleted:
  fam/repos/extra-i686/PKGBUILD
  fam/repos/extra-i686/fam
  fam/repos/extra-i686/fam-2.7.0-buildfixes.patch
  fam/repos/extra-i686/fam-2.7.0-dnotify.patch
  fam/repos/extra-i686/fam-2.7.0-largefiles.patch
  fam/repos/extra-i686/fam-2.7.0-limits.patch

+
 PKGBUILD   |  104 +-
 fam|   85 -
 fam-2.7.0-buildfixes.patch |  138 +--
 fam-2.7.0-dnotify.patch| 1950 +--
 fam-2.7.0-largefiles.patch |   16 
 fam-2.7.0-limits.patch |   22 
 6 files changed, 1156 insertions(+), 1159 deletions(-)

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


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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 10:24:53
  Author: eric
Revision: 136012

upgpkg: fam 2.7.0-16

Do not start rpcbind daemon (close FS#24846)

Modified:
  fam/trunk/PKGBUILD
  fam/trunk/fam

--+
 PKGBUILD |6 +++---
 fam  |7 ++-
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 12:39:53 UTC (rev 136011)
+++ PKGBUILD2011-08-21 14:24:53 UTC (rev 136012)
@@ -5,14 +5,14 @@
 
 pkgname=fam
 pkgver=2.7.0
-pkgrel=15
+pkgrel=16
 pkgdesc="File Alteration Monitor"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('rpcbind' 'gcc-libs' 'bash')
 url="http://oss.sgi.com/projects/fam/";
 backup=('etc/fam/fam.conf')
-options=('!makeflags') # Don't !libtool
+options=('!makeflags' 'libtool')
 
source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
fam-2.7.0-dnotify.patch
fam-2.7.0-largefiles.patch
@@ -24,7 +24,7 @@
  '47b41e0b0498793af004696a096d7da1'
  '2638b8ffacb9f03b6e438e08ea7b290a'
  'fc0cabc0ac4f819680401eb3090c29c9'
- '92a37f9eb6ad0e60ded9c70e9ad93a88')
+ 'ec50139679bc31508a843cafa47cd298')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}

Modified: fam
===
--- fam 2011-08-21 12:39:53 UTC (rev 136011)
+++ fam 2011-08-21 14:24:53 UTC (rev 136012)
@@ -6,13 +6,10 @@
 PID=`pidof -o %PPID /usr/sbin/famd`
 case "$1" in
   start)
-#Check for running portmap, start when not running
-ck_daemon rpcbind && /etc/rc.d/rpcbind start
 stat_busy "Starting File Alteration Monitor"
 if ck_daemon rpcbind; then
-  stat_fail
-  echo "ERROR: rpcbind is not running"
-  exit 1
+  echo "ERROR: Refusing to start fam without rpcbind running!" >&2
+  stat_die
 fi
 if [ -z "$PID" ]; then
/usr/sbin/famd -T 0 -c /etc/fam/fam.conf



[arch-commits] Commit in net-snmp/repos/extra-x86_64 (7 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:39:53
  Author: eric
Revision: 136011

archrelease: copy trunk to extra-x86_64

Added:
  net-snmp/repos/extra-x86_64/PKGBUILD
(from rev 136010, net-snmp/trunk/PKGBUILD)
  net-snmp/repos/extra-x86_64/libnl-2.patch
(from rev 136010, net-snmp/trunk/libnl-2.patch)
  net-snmp/repos/extra-x86_64/snmpd.confd
(from rev 136010, net-snmp/trunk/snmpd.confd)
  net-snmp/repos/extra-x86_64/snmpd.rc
(from rev 136010, net-snmp/trunk/snmpd.rc)
Deleted:
  net-snmp/repos/extra-x86_64/PKGBUILD
  net-snmp/repos/extra-x86_64/libnl-2.patch
  net-snmp/repos/extra-x86_64/snmpd.rc

---+
 PKGBUILD  |   98 
 libnl-2.patch |  134 
 snmpd.confd   |5 ++
 snmpd.rc  |   78 
 4 files changed, 160 insertions(+), 155 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 12:38:13 UTC (rev 136010)
+++ PKGBUILD2011-08-21 12:39:53 UTC (rev 136011)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: 
-# Contributor: Dale Blount 
-
-pkgname=net-snmp
-pkgver=5.6.1
-pkgrel=4
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/";
-license=('custom')
-depends=('openssl' 'libnl')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-'perl-tk: for snmpcheck and tkmib applications'
-'python2: for the python modules')
-provides=('ucd-snmp')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-snmpd.confd snmpd.rc)
-md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
- '37bc5db8707004fe284c202437c6aa7d'
- 'edab44a12f76045e41340d433a79dcec')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---enable-ucd-snmp-compatibility \
---enable-ipv6 \
---with-python-modules \
---with-default-snmp-version="3" \
---with-sys-contact="root@localhost" \
---with-sys-location="Unknown" \
---with-logfile="/var/log/snmpd.log" \
---with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
---with-persistent-directory="/var/net-snmp"
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: net-snmp/repos/extra-x86_64/PKGBUILD (from rev 136010, 
net-snmp/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 12:39:53 UTC (rev 136011)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: 
+# Contributor: Dale Blount 
+
+pkgname=net-snmp
+pkgver=5.6.1
+pkgrel=4
+pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
+arch=('i686' 'x86_64')
+url="http://www.net-snmp.org/";
+license=('custom')
+depends=('openssl' 'libnl')
+makedepends=('python2-distribute')
+optdepends=('perl-term-readkey: for snmpcheck application' 
+'perl-tk: for snmpcheck and tkmib applications'
+'python2: for the python modules')
+provides=('ucd-snmp')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+snmpd.confd snmpd.rc)
+md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
+ '37bc5db8707004fe284c202437c6aa7d'
+ 'edab44a12f76045e41340d433a79dcec')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--enable-ucd-snmp-compatibility \
+--enable-ipv6 \
+--with-python-modules \
+--with-default-snmp-version="3" \
+--with-sys-contact="root@localhost" \
+--with-sys-location="Unknown" \
+--with-logfile="/var/log/snmpd.log" \
+--with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
+--with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
+  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D 

[arch-commits] Commit in net-snmp/repos/extra-i686 (7 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:38:13
  Author: eric
Revision: 136010

archrelease: copy trunk to extra-i686

Added:
  net-snmp/repos/extra-i686/PKGBUILD
(from rev 136009, net-snmp/trunk/PKGBUILD)
  net-snmp/repos/extra-i686/libnl-2.patch
(from rev 136009, net-snmp/trunk/libnl-2.patch)
  net-snmp/repos/extra-i686/snmpd.confd
(from rev 136009, net-snmp/trunk/snmpd.confd)
  net-snmp/repos/extra-i686/snmpd.rc
(from rev 136009, net-snmp/trunk/snmpd.rc)
Deleted:
  net-snmp/repos/extra-i686/PKGBUILD
  net-snmp/repos/extra-i686/libnl-2.patch
  net-snmp/repos/extra-i686/snmpd.rc

---+
 PKGBUILD  |   98 
 libnl-2.patch |  134 
 snmpd.confd   |5 ++
 snmpd.rc  |   78 
 4 files changed, 160 insertions(+), 155 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 12:35:07 UTC (rev 136009)
+++ PKGBUILD2011-08-21 12:38:13 UTC (rev 136010)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: 
-# Contributor: Dale Blount 
-
-pkgname=net-snmp
-pkgver=5.6.1
-pkgrel=4
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/";
-license=('custom')
-depends=('openssl' 'libnl')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-'perl-tk: for snmpcheck and tkmib applications'
-'python2: for the python modules')
-provides=('ucd-snmp')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-snmpd.confd snmpd.rc)
-md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
- '37bc5db8707004fe284c202437c6aa7d'
- 'edab44a12f76045e41340d433a79dcec')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---enable-ucd-snmp-compatibility \
---enable-ipv6 \
---with-python-modules \
---with-default-snmp-version="3" \
---with-sys-contact="root@localhost" \
---with-sys-location="Unknown" \
---with-logfile="/var/log/snmpd.log" \
---with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
---with-persistent-directory="/var/net-snmp"
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: net-snmp/repos/extra-i686/PKGBUILD (from rev 136009, 
net-snmp/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 12:38:13 UTC (rev 136010)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: 
+# Contributor: Dale Blount 
+
+pkgname=net-snmp
+pkgver=5.6.1
+pkgrel=4
+pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
+arch=('i686' 'x86_64')
+url="http://www.net-snmp.org/";
+license=('custom')
+depends=('openssl' 'libnl')
+makedepends=('python2-distribute')
+optdepends=('perl-term-readkey: for snmpcheck application' 
+'perl-tk: for snmpcheck and tkmib applications'
+'python2: for the python modules')
+provides=('ucd-snmp')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+snmpd.confd snmpd.rc)
+md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
+ '37bc5db8707004fe284c202437c6aa7d'
+ 'edab44a12f76045e41340d433a79dcec')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--enable-ucd-snmp-compatibility \
+--enable-ipv6 \
+--with-python-modules \
+--with-default-snmp-version="3" \
+--with-sys-contact="root@localhost" \
+--with-sys-location="Unknown" \
+--with-logfile="/var/log/snmpd.log" \
+--with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
+--with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
+  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/s

[arch-commits] Commit in net-snmp/repos/extra-x86_64 (6 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:35:07
  Author: eric
Revision: 136009

archrelease: copy trunk to extra-x86_64

Added:
  net-snmp/repos/extra-x86_64/PKGBUILD
(from rev 136008, net-snmp/trunk/PKGBUILD)
  net-snmp/repos/extra-x86_64/libnl-2.patch
(from rev 136008, net-snmp/trunk/libnl-2.patch)
  net-snmp/repos/extra-x86_64/snmpd.rc
(from rev 136008, net-snmp/trunk/snmpd.rc)
Deleted:
  net-snmp/repos/extra-x86_64/PKGBUILD
  net-snmp/repos/extra-x86_64/libnl-2.patch
  net-snmp/repos/extra-x86_64/snmpd.rc

---+
 PKGBUILD  |   97 
 libnl-2.patch |  134 
 snmpd.rc  |   77 
 3 files changed, 155 insertions(+), 153 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 12:34:39 UTC (rev 136008)
+++ PKGBUILD2011-08-21 12:35:07 UTC (rev 136009)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger 
-# Contributor: Dale Blount 
-
-pkgname=net-snmp
-pkgver=5.6.1
-pkgrel=3
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/";
-license=('custom')
-depends=('openssl' 'libnl')
-makedepends=('setuptools')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-'perl-tk: for snmpcheck and tkmib applications'
-'python2: for the python modules')
-provides=('ucd-snmp')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'snmpd.rc')
-md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
- '9f0d13676ba1fae1eb7eb178edd85b43')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---enable-ucd-snmp-compatibility \
---enable-ipv6 \
---with-python-modules \
---with-default-snmp-version="3" \
---with-sys-contact="root@localhost" \
---with-sys-location="Unknown" \
---with-logfile="/var/log/snmpd.log" \
---with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
---with-persistent-directory="/var/net-snmp" \
-PYTHONPROG=/usr/bin/python2
-  make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath 
-Wl,/usr/lib/perl5/core_perl/CORE"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: net-snmp/repos/extra-x86_64/PKGBUILD (from rev 136008, 
net-snmp/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 12:35:07 UTC (rev 136009)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: 
+# Contributor: Dale Blount 
+
+pkgname=net-snmp
+pkgver=5.6.1
+pkgrel=4
+pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
+arch=('i686' 'x86_64')
+url="http://www.net-snmp.org/";
+license=('custom')
+depends=('openssl' 'libnl')
+makedepends=('python2-distribute')
+optdepends=('perl-term-readkey: for snmpcheck application' 
+'perl-tk: for snmpcheck and tkmib applications'
+'python2: for the python modules')
+provides=('ucd-snmp')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+snmpd.confd snmpd.rc)
+md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
+ '37bc5db8707004fe284c202437c6aa7d'
+ 'edab44a12f76045e41340d433a79dcec')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--enable-ucd-snmp-compatibility \
+--enable-ipv6 \
+--with-python-modules \
+--with-default-snmp-version="3" \
+--with-sys-contact="root@localhost" \
+--with-sys-location="Unknown" \
+--with-logfile="/var/log/snmpd.log" \
+--with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
+--with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
+  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: libnl-2.patch

[arch-commits] Commit in net-snmp/repos/extra-i686 (6 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:34:39
  Author: eric
Revision: 136008

archrelease: copy trunk to extra-i686

Added:
  net-snmp/repos/extra-i686/PKGBUILD
(from rev 136007, net-snmp/trunk/PKGBUILD)
  net-snmp/repos/extra-i686/libnl-2.patch
(from rev 136007, net-snmp/trunk/libnl-2.patch)
  net-snmp/repos/extra-i686/snmpd.rc
(from rev 136007, net-snmp/trunk/snmpd.rc)
Deleted:
  net-snmp/repos/extra-i686/PKGBUILD
  net-snmp/repos/extra-i686/libnl-2.patch
  net-snmp/repos/extra-i686/snmpd.rc

---+
 PKGBUILD  |   97 
 libnl-2.patch |  134 
 snmpd.rc  |   77 
 3 files changed, 155 insertions(+), 153 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 12:33:57 UTC (rev 136007)
+++ PKGBUILD2011-08-21 12:34:39 UTC (rev 136008)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger 
-# Contributor: Dale Blount 
-
-pkgname=net-snmp
-pkgver=5.6.1
-pkgrel=3
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/";
-license=('custom')
-depends=('openssl' 'libnl')
-makedepends=('setuptools')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-'perl-tk: for snmpcheck and tkmib applications'
-'python2: for the python modules')
-provides=('ucd-snmp')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'snmpd.rc')
-md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
- '9f0d13676ba1fae1eb7eb178edd85b43')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---mandir=/usr/share/man \
---enable-ucd-snmp-compatibility \
---enable-ipv6 \
---with-python-modules \
---with-default-snmp-version="3" \
---with-sys-contact="root@localhost" \
---with-sys-location="Unknown" \
---with-logfile="/var/log/snmpd.log" \
---with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
---with-persistent-directory="/var/net-snmp" \
-PYTHONPROG=/usr/bin/python2
-  make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath 
-Wl,/usr/lib/perl5/core_perl/CORE"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: net-snmp/repos/extra-i686/PKGBUILD (from rev 136007, 
net-snmp/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 12:34:39 UTC (rev 136008)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: 
+# Contributor: Dale Blount 
+
+pkgname=net-snmp
+pkgver=5.6.1
+pkgrel=4
+pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
+arch=('i686' 'x86_64')
+url="http://www.net-snmp.org/";
+license=('custom')
+depends=('openssl' 'libnl')
+makedepends=('python2-distribute')
+optdepends=('perl-term-readkey: for snmpcheck application' 
+'perl-tk: for snmpcheck and tkmib applications'
+'python2: for the python modules')
+provides=('ucd-snmp')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+snmpd.confd snmpd.rc)
+md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
+ '37bc5db8707004fe284c202437c6aa7d'
+ 'edab44a12f76045e41340d433a79dcec')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--mandir=/usr/share/man \
+--enable-ucd-snmp-compatibility \
+--enable-ipv6 \
+--with-python-modules \
+--with-default-snmp-version="3" \
+--with-sys-contact="root@localhost" \
+--with-sys-location="Unknown" \
+--with-logfile="/var/log/snmpd.log" \
+--with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
+--with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
+  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: libnl-2.patch

[arch-commits] Commit in net-snmp/trunk (PKGBUILD snmpd.confd snmpd.rc)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:33:57
  Author: eric
Revision: 136007

upgpkg: net-snmp 5.6.1-4

Add config file to specify options to daemon (close FS#23095), Update 
setuptools makedepends to python2-distribute

Added:
  net-snmp/trunk/snmpd.confd
Modified:
  net-snmp/trunk/PKGBUILD
  net-snmp/trunk/snmpd.rc

-+
 PKGBUILD|   21 +++--
 snmpd.confd |5 +
 snmpd.rc|3 ++-
 3 files changed, 18 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 12:22:50 UTC (rev 136006)
+++ PKGBUILD2011-08-21 12:33:57 UTC (rev 136007)
@@ -1,30 +1,31 @@
 # $Id$
-# Maintainer: Eric Belanger 
+# Maintainer: 
 # Contributor: Dale Blount 
 
 pkgname=net-snmp
 pkgver=5.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP 
v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64')
 url="http://www.net-snmp.org/";
 license=('custom')
 depends=('openssl' 'libnl')
-makedepends=('setuptools')
+makedepends=('python2-distribute')
 optdepends=('perl-term-readkey: for snmpcheck application' 
 'perl-tk: for snmpcheck and tkmib applications'
 'python2: for the python modules')
 provides=('ucd-snmp')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";
-'snmpd.rc')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+snmpd.confd snmpd.rc)
 md5sums=('b4e30ead5783b0bb1d280172c6095ea4'
- '9f0d13676ba1fae1eb7eb178edd85b43')
+ '37bc5db8707004fe284c202437c6aa7d'
+ 'edab44a12f76045e41340d433a79dcec')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" 
Makefile.in
-  ./configure --prefix=/usr \
+  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --mandir=/usr/share/man \
 --enable-ucd-snmp-compatibility \
@@ -35,14 +36,14 @@
 --with-sys-location="Unknown" \
 --with-logfile="/var/log/snmpd.log" \
 --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel 
ucd-snmp/dlmod" \
---with-persistent-directory="/var/net-snmp" \
-PYTHONPROG=/usr/bin/python2
-  make NETSNMP_DONT_CHECK_VERSION=1 LDFLAGS+="-Wl,-rpath 
-Wl,/usr/lib/perl5/core_perl/CORE"
+--with-persistent-directory="/var/net-snmp"
+  make NETSNMP_DONT_CHECK_VERSION=1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor 
install
   install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
+  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Added: snmpd.confd
===
--- snmpd.confd (rev 0)
+++ snmpd.confd 2011-08-21 12:33:57 UTC (rev 136007)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to snmpd
+#
+SNMPD_ARGS=""
+

Modified: snmpd.rc
===
--- snmpd.rc2011-08-21 12:22:50 UTC (rev 136006)
+++ snmpd.rc2011-08-21 12:33:57 UTC (rev 136007)
@@ -2,12 +2,13 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
+. /etc/conf.d/snmpd
 
 PID=`pidof -o %PPID /usr/sbin/snmpd`
 case "$1" in
   start)
 stat_busy "Starting Net-SNMP"
-[ -z "$PID" ] && /usr/sbin/snmpd
+[ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
 if [ $? -gt 0 ]; then
   stat_fail
 else



[arch-commits] Commit in vim/trunk (PKGBUILD gvim.desktop gvim.install)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 08:22:50
  Author: eric
Revision: 136006

Update gvim.desktop (close FS#25694), Made install script quiet

Modified:
  vim/trunk/PKGBUILD
  vim/trunk/gvim.desktop
  vim/trunk/gvim.install

--+
 PKGBUILD |2 +-
 gvim.desktop |3 +--
 gvim.install |2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
+++ PKGBUILD2011-08-21 12:22:50 UTC (rev 136006)
@@ -20,7 +20,7 @@
 md5sums=('6e7adfbd5d26c1d161030ec203a7f243'
  'e5374891063b9ca48a1fe392ac05'
  '10353a61aadc3f276692d0e17db1478e'
- '63558c0b3509caea0d0f2b9274049c2a')
+ 'd90413bd21f400313a785bb4010120cd')
 
 __hgroot='http://vim.googlecode.com/hg/'
 __hgrepo='vim'

Modified: gvim.desktop
===
--- gvim.desktop2011-08-21 09:41:12 UTC (rev 136005)
+++ gvim.desktop2011-08-21 12:22:50 UTC (rev 136006)
@@ -58,7 +58,6 @@
 Exec=gvim -f %F
 Icon=gvim
 Type=Application
-Terminal=0
+Terminal=false
 X-XClassHintResName=VIM
-MapNotify=false
 Categories=Utility;TextEditor;

Modified: gvim.install
===
--- gvim.install2011-08-21 09:41:12 UTC (rev 136005)
+++ gvim.install2011-08-21 12:22:50 UTC (rev 136006)
@@ -1,7 +1,5 @@
 post_install() {
-  echo -n "Updating desktop and mime database..."
   update-desktop-database -q
-  echo "done."
 }
 
 post_upgrade() {



[arch-commits] Commit in tomcat6/repos/extra-any (8 files)

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 05:41:12
  Author: guillaume
Revision: 136005

archrelease: copy trunk to extra-any

Added:
  tomcat6/repos/extra-any/PKGBUILD
(from rev 136004, tomcat6/trunk/PKGBUILD)
  tomcat6/repos/extra-any/tomcat6
(from rev 136004, tomcat6/trunk/tomcat6)
  tomcat6/repos/extra-any/tomcat6.conf.d
(from rev 136004, tomcat6/trunk/tomcat6.conf.d)
  tomcat6/repos/extra-any/tomcat6.install
(from rev 136004, tomcat6/trunk/tomcat6.install)
Deleted:
  tomcat6/repos/extra-any/PKGBUILD
  tomcat6/repos/extra-any/tomcat6
  tomcat6/repos/extra-any/tomcat6.conf.d
  tomcat6/repos/extra-any/tomcat6.install

-+
 PKGBUILD|  172 +++---
 tomcat6 |  162 +-
 tomcat6.conf.d  |   22 +++---
 tomcat6.install |   54 
 4 files changed, 205 insertions(+), 205 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -1,86 +0,0 @@
-# Maintainer: Guillaume ALAUX 
-pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
-pkgdesc="Servlet-2.5/JSP-2.1 Container"
-arch=('any')
-url='http://tomcat.apache.org/'
-license=('APACHE')
-depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj')
-makedepends=('java-environment>=5' 'apache-ant>=1.6' 'java-commons-daemon')
-optdepends=('tomcat-native: to allow optimal performance in production 
environments')
-backup=(etc/tomcat6/catalina.policy
-etc/tomcat6/catalina.properties
-etc/tomcat6/context.xml
-etc/tomcat6/logging.properties
-etc/tomcat6/server.xml
-etc/tomcat6/tomcat-users.xml
-etc/tomcat6/web.xml
-etc/conf.d/tomcat6)
-install=tomcat6.install
-source=(http://archive.apache.org/dist/tomcat/tomcat-6/v${pkgver}/src/apache-tomcat-${pkgver}-src.tar.gz
-
http://tomcat.apache.org/dev/dist/m2-repository/org/apache/tomcat/dbcp/${pkgver}/dbcp-${pkgver}.jar
-tomcat6.conf.d
-tomcat6
-tomcat6.install)
-
-noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
- '84e819ababbc8e1ac5c325d8af7febf8'
- '50de34665d96f8e12d0a0d3d9a15fc1a'
- '1be39071bd27781c352b2d73b765e29d')
-
-build() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src"
-
-  . /etc/profile.d/apache-ant.sh
-  ant download deploy\
--Dbase.path=${srcdir}/DOWN_LIBS \
--Dcommons-daemon.jar=/usr/share/java/commons-daemon.jar \
--Djdt.jar=/usr/share/java/eclipse-ecj.jar
-}
-
-package() {
-  cd "${srcdir}/apache-tomcat-${pkgver}-src/output/build"
-
-  # Tomcat general files
-  install -dm755 ${pkgdir}/usr/share/{,java/}${pkgname}
-  # commons-daemon and tomcat-natives are packaged on their own
-  rm bin/{*.bat,commons-daemon*,tomcat-native.tar.gz}
-  cp -r bin ${pkgdir}/usr/share/${pkgname}
-
-  # eclipse-ecj is packaged on its own
-  rm lib/eclipse-ecj.jar
-  install lib/* ${pkgdir}/usr/share/java/${pkgname}
-  install "${srcdir}/dbcp-${pkgver}.jar" \
-  ${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp-${pkgver}.jar
-  ln -s tomcat-dbcp-${pkgver}.jar \
-${pkgdir}/usr/share/java/${pkgname}/tomcat-dbcp.jar
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/usr/share/${pkgname}/lib
-
-  # 66=tomcat / 19=log
-  install -dm775 -o 66 -g 19 ${pkgdir}/var/log/${pkgname}
-  ln -s /var/log/${pkgname} ${pkgdir}/usr/share/${pkgname}/logs
-  touch ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-  chgrp 19 ${pkgdir}/var/log/${pkgname}/catalina.{out,err}
-
-  install -dm770 ${pkgdir}/etc/${pkgname}
-  install -m660 conf/* ${pkgdir}/etc/${pkgname}
-  ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/conf
-
-  install -dm775 ${pkgdir}/var/lib/${pkgname}
-  cp -r webapps ${pkgdir}/var/lib/${pkgname}
-  chown -R 66:66 ${pkgdir}/var/lib/${pkgname}
-  ln -s /var/lib/${pkgname}/webapps ${pkgdir}/usr/share/${pkgname}/webapps
-
-  install -dm1777 ${pkgdir}/var/tmp
-  install -dm755 -o 66 -g 66 ${pkgdir}/var/tmp/${pkgname}/{temp,work}
-  ln -s /var/tmp/${pkgname}/temp ${pkgdir}/usr/share/${pkgname}/temp
-  ln -s /var/tmp/${pkgname}/work ${pkgdir}/usr/share/${pkgname}/work
-
-  # Arch scripts
-  install -Dm644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-  install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}
-}
-

Copied: tomcat6/repos/extra-any/PKGBUILD (from rev 136004, 
tomcat6/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:41:12 UTC (rev 136005)
@@ -0,0 +1,86 @@
+# Maintainer: Guillaume ALAUX 
+pkgname=tomcat6
+pkgver=6.0.33
+pkgrel=1
+pkgdesc="Servlet-2.5/JSP-2.1 Container"
+arch=('any')
+url='http://tomcat.apache.org/'
+license=('APACHE')
+depends=('java-runtime>=5' 'java-jsvc' 'eclipse-ecj')
+makedepends=('java-environment>

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

2011-08-21 Thread Guillaume Alaux
Date: Sunday, August 21, 2011 @ 05:40:04
  Author: guillaume
Revision: 136004

upgpkg: tomcat6 6.0.33-1

Upstream release

Modified:
  tomcat6/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 09:18:58 UTC (rev 136003)
+++ PKGBUILD2011-08-21 09:40:04 UTC (rev 136004)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX 
 pkgname=tomcat6
-pkgver=6.0.32
-pkgrel=2
+pkgver=6.0.33
+pkgrel=1
 pkgdesc="Servlet-2.5/JSP-2.1 Container"
 arch=('any')
 url='http://tomcat.apache.org/'
@@ -25,8 +25,8 @@
 tomcat6.install)
 
 noextract=(dbcp-${pkgver}.jar)
-md5sums=('19a1eaa9c9938b520d3c360d8cf4af22'
- 'c5b7101dbe6ed66624db6eca70d7873a'
+md5sums=('84b314ba89a77baca7bd7f2c9e2f86a1'
+ 'a6ff671562c9ac91e8cc2812760df49d'
  '84e819ababbc8e1ac5c325d8af7febf8'
  '50de34665d96f8e12d0a0d3d9a15fc1a'
  '1be39071bd27781c352b2d73b765e29d')



[arch-commits] Commit in gnome-alsamixer/repos/extra-x86_64 (5 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:18:58
  Author: eric
Revision: 136003

archrelease: copy trunk to extra-x86_64

Added:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
(from rev 136002, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 136002, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer.desktop
(from rev 136002, gnome-alsamixer/trunk/gnome-alsamixer.desktop)
Deleted:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   66 ++--
 gnome-alsamixer-0.9.6-gtk24.patch |   30 
 gnome-alsamixer.desktop   |   11 ++
 3 files changed, 59 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:17:29 UTC (rev 136002)
+++ PKGBUILD2011-08-21 09:18:58 UTC (rev 136003)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=4
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-alsamixer";
-license=('GPL')
-depends=('libgnomeui')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0'
- 'c7dbc44207bede96e4fafc24a7c7beb3')
-sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
-  'b4e3b871676025600170ba54f59db4977b853c08'
-  '31639f7932d088ca76a18c79839682be811f23d0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
-"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
-}

Copied: gnome-alsamixer/repos/extra-x86_64/PKGBUILD (from rev 136002, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:18:58 UTC (rev 136003)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:17:29 UTC (rev 136002)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:18:58 UTC (rev 136003)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 136002, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch  

[arch-commits] Commit in gnome-alsamixer/repos/extra-i686 (5 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:17:29
  Author: eric
Revision: 136002

archrelease: copy trunk to extra-i686

Added:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
(from rev 136001, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 136001, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer.desktop
(from rev 136001, gnome-alsamixer/trunk/gnome-alsamixer.desktop)
Deleted:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   66 ++--
 gnome-alsamixer-0.9.6-gtk24.patch |   30 
 gnome-alsamixer.desktop   |   11 ++
 3 files changed, 59 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:15:31 UTC (rev 136001)
+++ PKGBUILD2011-08-21 09:17:29 UTC (rev 136002)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=4
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-alsamixer";
-license=('GPL')
-depends=('libgnomeui')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0'
- 'c7dbc44207bede96e4fafc24a7c7beb3')
-sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
-  'b4e3b871676025600170ba54f59db4977b853c08'
-  '31639f7932d088ca76a18c79839682be811f23d0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
-"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
-}

Copied: gnome-alsamixer/repos/extra-i686/PKGBUILD (from rev 136001, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:17:29 UTC (rev 136002)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:15:31 UTC (rev 136001)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:17:29 UTC (rev 136002)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 136001, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch   (rev 0)
+++ gno

[arch-commits] Commit in gnome-alsamixer/repos/extra-x86_64 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:15:31
  Author: eric
Revision: 136001

archrelease: copy trunk to extra-x86_64

Added:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
(from rev 136000, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 136000, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
Deleted:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   66 ++--
 gnome-alsamixer-0.9.6-gtk24.patch |   30 
 2 files changed, 48 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:14:57 UTC (rev 136000)
+++ PKGBUILD2011-08-21 09:15:31 UTC (rev 136001)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=4
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-alsamixer";
-license=('GPL')
-depends=('libgnomeui')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0'
- 'c7dbc44207bede96e4fafc24a7c7beb3')
-sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
-  'b4e3b871676025600170ba54f59db4977b853c08'
-  '31639f7932d088ca76a18c79839682be811f23d0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
-"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
-}

Copied: gnome-alsamixer/repos/extra-x86_64/PKGBUILD (from rev 136000, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:15:31 UTC (rev 136001)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:14:57 UTC (rev 136000)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:15:31 UTC (rev 136001)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 136000, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch   (rev 0)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:15:31 UTC (rev 136001)
@@ -0,0 +1,15 @@
+diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/s

[arch-commits] Commit in gnome-alsamixer/repos/extra-i686 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:14:57
  Author: eric
Revision: 136000

archrelease: copy trunk to extra-i686

Added:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
(from rev 135999, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 135999, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
Deleted:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   66 ++--
 gnome-alsamixer-0.9.6-gtk24.patch |   30 
 2 files changed, 48 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:13:54 UTC (rev 135999)
+++ PKGBUILD2011-08-21 09:14:57 UTC (rev 136000)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=4
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/gnome-alsamixer";
-license=('GPL')
-depends=('libgnomeui')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0'
- 'c7dbc44207bede96e4fafc24a7c7beb3')
-sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
-  'b4e3b871676025600170ba54f59db4977b853c08'
-  '31639f7932d088ca76a18c79839682be811f23d0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
-"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
-}

Copied: gnome-alsamixer/repos/extra-i686/PKGBUILD (from rev 135999, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:14:57 UTC (rev 136000)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:54 UTC (rev 135999)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:14:57 UTC (rev 136000)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 135999, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch   (rev 0)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:14:57 UTC (rev 136000)
@@ -0,0 +1,15 @@
+diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in

[arch-commits] Commit in gnome-alsamixer/repos/extra-x86_64 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:13:54
  Author: eric
Revision: 135999

archrelease: copy trunk to extra-x86_64

Added:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
(from rev 135998, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 135998, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
Deleted:
  gnome-alsamixer/repos/extra-x86_64/PKGBUILD
  gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   57 
 gnome-alsamixer-0.9.6-gtk24.patch |   30 +-
 2 files changed, 48 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:13:31 UTC (rev 135998)
+++ PKGBUILD2011-08-21 09:13:54 UTC (rev 135999)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: damir 
-# Contributor: Ben 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=3
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="http://www.paw.za.org";
-license=('GPL')
-depends=('libgnomeui>=2.24.1')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}

Copied: gnome-alsamixer/repos/extra-x86_64/PKGBUILD (from rev 135998, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:13:54 UTC (rev 135999)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:31 UTC (rev 135998)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:54 UTC (rev 135999)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-x86_64/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 135998, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch   (rev 0)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:54 UTC (rev 135999)
@@ -0,0 +1,15 @@
+diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
+--- gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
 gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
+@@ -86,10 +86,6 @@
+   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
+   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
+   -DPAC

[arch-commits] Commit in gnome-alsamixer/repos/extra-i686 (4 files)

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:13:31
  Author: eric
Revision: 135998

archrelease: copy trunk to extra-i686

Added:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
(from rev 135997, gnome-alsamixer/trunk/PKGBUILD)
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch
(from rev 135997, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
Deleted:
  gnome-alsamixer/repos/extra-i686/PKGBUILD
  gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch

---+
 PKGBUILD  |   57 
 gnome-alsamixer-0.9.6-gtk24.patch |   30 +-
 2 files changed, 48 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 09:12:58 UTC (rev 135997)
+++ PKGBUILD2011-08-21 09:13:31 UTC (rev 135998)
@@ -1,24 +0,0 @@
-# $Id$
-# Maintainer: damir 
-# Contributor: Ben 
-
-pkgname=gnome-alsamixer
-pkgver=0.9.6
-pkgrel=3
-pkgdesc="Gnome ALSA mixer"
-arch=('i686' 'x86_64')
-url="http://www.paw.za.org";
-license=('GPL')
-depends=('libgnomeui>=2.24.1')
-source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch)
-md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}

Copied: gnome-alsamixer/repos/extra-i686/PKGBUILD (from rev 135997, 
gnome-alsamixer/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 09:13:31 UTC (rev 135998)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Eric Bélanger 
+
+pkgname=gnome-alsamixer
+pkgver=0.9.6
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/gnome-alsamixer";
+license=('GPL')
+depends=('libgnomeui')
+source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
+md5sums=('387623cfeb079d78325eed2d6bc94251'
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Deleted: gnome-alsamixer-0.9.6-gtk24.patch
===
--- gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:12:58 UTC (rev 135997)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:31 UTC (rev 135998)
@@ -1,15 +0,0 @@
-diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
 gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
-+++ gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
-@@ -86,10 +86,6 @@
-   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
-   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
-   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--  -DG_DISABLE_DEPRECATED \
--  -DGDK_DISABLE_DEPRECATED   \
--  -DGTK_DISABLE_DEPRECATED   \
--  -DGNOME_DISABLE_DEPRECATED \
-   @PACKAGE_CFLAGS@
- 
- 
-Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~

Copied: gnome-alsamixer/repos/extra-i686/gnome-alsamixer-0.9.6-gtk24.patch 
(from rev 135997, gnome-alsamixer/trunk/gnome-alsamixer-0.9.6-gtk24.patch)
===
--- gnome-alsamixer-0.9.6-gtk24.patch   (rev 0)
+++ gnome-alsamixer-0.9.6-gtk24.patch   2011-08-21 09:13:31 UTC (rev 135998)
@@ -0,0 +1,15 @@
+diff -ur gnome-alsamixer-0.9.6/src/Makefile.in 
gnome-alsamixer-0.9.6.new/src/Makefile.in
+--- gnome-alsamixer-0.9.6/src/Makefile.in  2003-09-09 12:44:25.0 
+0100
 gnome-alsamixer-0.9.6.new/src/Makefile.in  2004-04-04 18:51:36.0 
+0100
+@@ -86,10 +86,6 @@
+   -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\"\
+   -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\"  \
+   -DPACKAGE_LOCALE_DI

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

2011-08-21 Thread Eric Bélanger
Date: Sunday, August 21, 2011 @ 05:12:58
  Author: eric
Revision: 135997

upgpkg: gnome-alsamixer 0.9.6-4

Update url, Add desktop file

Added:
  gnome-alsamixer/trunk/gnome-alsamixer.desktop
Modified:
  gnome-alsamixer/trunk/PKGBUILD

-+
 PKGBUILD|   31 ---
 gnome-alsamixer.desktop |   11 +++
 2 files changed, 31 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 08:10:46 UTC (rev 135996)
+++ PKGBUILD2011-08-21 09:12:58 UTC (rev 135997)
@@ -1,24 +1,33 @@
 # $Id$
-# Maintainer: damir 
-# Contributor: Ben 
+# Maintainer: Eric Bélanger 
 
 pkgname=gnome-alsamixer
 pkgver=0.9.6
-pkgrel=3
+pkgrel=4
 pkgdesc="Gnome ALSA mixer"
 arch=('i686' 'x86_64')
-url="http://www.paw.za.org";
+url="https://launchpad.net/gnome-alsamixer";
 license=('GPL')
-depends=('libgnomeui>=2.24.1')
+depends=('libgnomeui')
 
source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz
-gnome-alsamixer-0.9.6-gtk24.patch)
+gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop)
 md5sums=('387623cfeb079d78325eed2d6bc94251'
- '82b95a0df43429da5098b4da883f6bd0')
+ '82b95a0df43429da5098b4da883f6bd0'
+ 'c7dbc44207bede96e4fafc24a7c7beb3')
+sha1sums=('faece601a4329d2b01b9efe65200021538fc066d'
+  'b4e3b871676025600170ba54f59db4977b853c08'
+  '31639f7932d088ca76a18c79839682be811f23d0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \
+"${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}

Added: gnome-alsamixer.desktop
===
--- gnome-alsamixer.desktop (rev 0)
+++ gnome-alsamixer.desktop 2011-08-21 09:12:58 UTC (rev 135997)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=GNOME ALSA Mixer
+Comment=ALSA sound mixer for GNOME
+Comment[es]=Mezclador de sonido ALSA para GNOME
+Comment[fr]=Mélangeur de son ALSA pour GNOME
+Exec=gnome-alsamixer
+Icon=/usr/share/pixmaps/gnome-alsamixer/gnome-alsamixer-icon.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+StartupNotify=true



[arch-commits] Commit in gnutls/repos/extra-x86_64 (5 files)

2011-08-21 Thread andyrtr
Date: Sunday, August 21, 2011 @ 04:10:46
  Author: andyrtr
Revision: 135996

archrelease: copy trunk to extra-x86_64

Added:
  gnutls/repos/extra-x86_64/PKGBUILD
(from rev 135995, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-x86_64/gnutls.install
(from rev 135995, gnutls/trunk/gnutls.install)
Deleted:
  gnutls/repos/extra-x86_64/PKGBUILD
  gnutls/repos/extra-x86_64/align.patch
  gnutls/repos/extra-x86_64/gnutls.install

+
 PKGBUILD   |   84 ++-
 align.patch|   64 -
 gnutls.install |   40 +-
 3 files changed, 61 insertions(+), 127 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 08:10:10 UTC (rev 135995)
+++ PKGBUILD2011-08-21 08:10:46 UTC (rev 135996)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A library which provides a secure layer over a reliable transport 
layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/";
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-   align.patch)
-md5sums=('0677a7f48810ff8df8335a9a9f9b'
- 'bce979498addb45d0fa8d6951f93fab3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix AES-NI for i686
-  patch -Np1 -i ${srcdir}/align.patch
-  ./configure --prefix=/usr \
-   --with-zlib \
-   --disable-static \
-   --disable-guile \
-   --without-p11-kit
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # lots of .png files are put into infodir and are gzipped by makepkg! this 
may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-x86_64/PKGBUILD (from rev 135995, 
gnutls/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 08:10:46 UTC (rev 135996)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=gnutls
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport 
layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/";
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+   --with-zlib \
+   --disable-static \
+   --disable-guile \
+   --without-p11-kit \
+   --disable-valgrind-tests # breaks make check. errors have been reported 
upstream
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check # passes all  || /bin/true
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this 
may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: align.patch
===
--- align.patch 2011-08-21 08:10:10 UTC (rev 135995)
+++ align.patch 2011-08-21 08:10:46 UTC (rev 135996)
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
 a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
-   uint8_t iv[16];
- };
- 
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t 
keysize)
-   struct aes_ctx *ctx = _ctx;
-   int ret;
- 
--  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+  ret = aesni_set_encrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_key));
-   if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
--  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+  ret = aesni_set_decrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_

[arch-commits] Commit in gnutls/repos/extra-i686 (5 files)

2011-08-21 Thread andyrtr
Date: Sunday, August 21, 2011 @ 04:10:10
  Author: andyrtr
Revision: 135995

archrelease: copy trunk to extra-i686

Added:
  gnutls/repos/extra-i686/PKGBUILD
(from rev 135994, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-i686/gnutls.install
(from rev 135994, gnutls/trunk/gnutls.install)
Deleted:
  gnutls/repos/extra-i686/PKGBUILD
  gnutls/repos/extra-i686/align.patch
  gnutls/repos/extra-i686/gnutls.install

+
 PKGBUILD   |   84 ++-
 align.patch|   64 -
 gnutls.install |   40 +-
 3 files changed, 61 insertions(+), 127 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2011-08-21 08:09:30 UTC (rev 135994)
+++ PKGBUILD2011-08-21 08:10:10 UTC (rev 135995)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot 
-
-pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="A library which provides a secure layer over a reliable transport 
layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/";
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-   align.patch)
-md5sums=('0677a7f48810ff8df8335a9a9f9b'
- 'bce979498addb45d0fa8d6951f93fab3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix AES-NI for i686
-  patch -Np1 -i ${srcdir}/align.patch
-  ./configure --prefix=/usr \
-   --with-zlib \
-   --disable-static \
-   --disable-guile \
-   --without-p11-kit
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # lots of .png files are put into infodir and are gzipped by makepkg! this 
may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-i686/PKGBUILD (from rev 135994, 
gnutls/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-08-21 08:10:10 UTC (rev 135995)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jan de Groot 
+
+pkgname=gnutls
+pkgver=3.0.1
+pkgrel=1
+pkgdesc="A library which provides a secure layer over a reliable transport 
layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/";
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+   --with-zlib \
+   --disable-static \
+   --disable-guile \
+   --without-p11-kit \
+   --disable-valgrind-tests # breaks make check. errors have been reported 
upstream
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check # passes all  || /bin/true
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this 
may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: align.patch
===
--- align.patch 2011-08-21 08:09:30 UTC (rev 135994)
+++ align.patch 2011-08-21 08:10:10 UTC (rev 135995)
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
 a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
-   uint8_t iv[16];
- };
- 
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t 
keysize)
-   struct aes_ctx *ctx = _ctx;
-   int ret;
- 
--  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+  ret = aesni_set_encrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_key));
-   if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
--  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+  ret = aesni_set_decrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_key_dec));
-  

[arch-commits] Commit in gnutls/trunk (PKGBUILD align.patch)

2011-08-21 Thread andyrtr
Date: Sunday, August 21, 2011 @ 04:09:30
  Author: andyrtr
Revision: 135994

upgpkg: gnutls 3.0.1-1

upstream update 3.0.1; remove AES-NI patch that has gone upstream; 
prepare valgrind checks-currently broken

Modified:
  gnutls/trunk/PKGBUILD
Deleted:
  gnutls/trunk/align.patch

-+
 PKGBUILD|   16 ++
 align.patch |   64 --
 2 files changed, 7 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-21 06:02:11 UTC (rev 135993)
+++ PKGBUILD2011-08-21 08:09:30 UTC (rev 135994)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot 
 
 pkgname=gnutls
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport 
layer"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -11,20 +11,18 @@
 install=gnutls.install
 options=('!libtool' '!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
-   align.patch)
-md5sums=('0677a7f48810ff8df8335a9a9f9b'
- 'bce979498addb45d0fa8d6951f93fab3')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
+md5sums=('23d86dbb3ef9985ce7d2b8dc37fa17a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix AES-NI for i686
-  patch -Np1 -i ${srcdir}/align.patch
   ./configure --prefix=/usr \
--with-zlib \
--disable-static \
--disable-guile \
-   --without-p11-kit
+   --without-p11-kit \
+   --disable-valgrind-tests # breaks make check. errors have been reported 
upstream
   make
 }
 

Deleted: align.patch
===
--- align.patch 2011-08-21 06:02:11 UTC (rev 135993)
+++ align.patch 2011-08-21 08:09:30 UTC (rev 135994)
@@ -1,64 +0,0 @@
-diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c
-index 6801e7e..ff5b714 100644
 a/lib/accelerated/intel/aes-x86.c
-+++ b/lib/accelerated/intel/aes-x86.c
-@@ -40,6 +40,10 @@ struct aes_ctx
-   uint8_t iv[16];
- };
- 
-+#define AESNI_MIN_ALIGN 16
-+#define AESNI_ALIGN(x) \
-+((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1)))
-+
- static int
- aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx)
- {
-@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t 
keysize)
-   struct aes_ctx *ctx = _ctx;
-   int ret;
- 
--  ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key);
-+  ret = aesni_set_encrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_key));
-   if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
--  ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec);
-+  ret = aesni_set_decrypt_key (userkey, keysize * 8, 
AESNI_ALIGN(&ctx->expanded_key_dec));
-   if (ret != 0)
- return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED);
- 
-@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), 
ctx->iv, 1);
-   return 0;
- }
- 
-@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size,
- {
-   struct aes_ctx *ctx = _ctx;
- 
--  aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0);
-+  aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), 
ctx->iv, 0);
- 
-   return 0;
- }
-diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h
-index 8f49ff3..20a169e 100644
 a/lib/accelerated/intel/aes-x86.h
-+++ b/lib/accelerated/intel/aes-x86.h
-@@ -11,10 +11,11 @@ void register_x86_crypto (void);
- # define ALIGN16
- #endif
- 
-+#define AES_KEY_ALIGN_SIZE 8
- #define AES_MAXNR 14
- typedef struct
- {
--  uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)];
-+  uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE];
-   int rounds;
- } AES_KEY;
-