Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 98 insertions, 79 deletions

diff --git a/artistic/gimp-art/PKGBUILD b/artistic/gimp-art/PKGBUILD
index 4236ce271..11c3b191b 100644
--- a/artistic/gimp-art/PKGBUILD
+++ b/artistic/gimp-art/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-_pkgname=gimp
 pkgname=gimp-art
 pkgver=2.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc='GNU Image Manipulation Program (changed splash artwork)'
 arch=(
   i686
   x86_64
   mips64el
 )
-url=http://www.$_pkgname.org/
+url=http://www.${pkgname%-art}.org/
 license=(
   GPL
   LGPL
@@ -50,18 +48,21 @@ optdepends=(
   'poppler-glib: for pdf support'
 )
 options=(
-  '!libtool'
-  '!makeflags'
+  !libtool
+  !makeflags
 )
 conflicts=(
-  $_pkgname
-  $_pkgname-devel
+  ${pkgname%-art}
+  ${pkgname%-art}-devel
 )
-install=$_pkgname.install
+provides=(
+  ${pkgname%-art}=$pkgver
+)
+install=${pkgname%-art}.install
 source=(
-  ftp://ftp.$_pkgname.org/pub/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2
-  $_pkgname-splash-artwork.png
-  $_pkgname-splash-artwork.license
+  ftp://ftp.${pkgname%-art}.org/pub/${pkgname%-art}/v${pkgver%.*}/${pkgname%-art}-$pkgver.tar.bz2
+  ${pkgname%-art}-splash-artwork.png
+  ${pkgname%-art}-splash-artwork.license
 )
 sha512sums=(
   82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111
@@ -70,29 +71,35 @@ sha512sums=(
 )
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/${pkgname%-art}-$pkgver
 
   ## Add artwork splash image ##
-  install -Dm644 $srcdir/$_pkgname-splash-artwork.png \
-    $srcdir/$_pkgname-$pkgver/data/images/$_pkgname-splash.png
+  install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.png \
+    $srcdir/${pkgname%-art}-$pkgver/data/images/${pkgname%-art}-splash.png
 
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-$_pkgname-console --enable-python --without-aa \
-    --with-gif-compression=lzw --with-libcurl --without-gvfs
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --enable-${pkgname%-art}-console \
+    --enable-mp \
+    --enable-python \
+    --sysconfdir=/etc \
+    --with-gif-compression=lzw \
+    --with-libcurl \
+    --without-aa \
+    --without-gvfs
   make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $srcdir/${pkgname%-art}-$pkgver
   make DESTDIR=$pkgdir install
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgdir/usr/lib/$_pkgname/${pkgver::2}0/plug-ins/*.py
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgdir/usr/lib/${pkgname%-art}/${pkgver::2}0/plug-ins/*.py
 
   ## Add artwork splash license ##
-  install -Dm644 $srcdir/$_pkgname-splash-artwork.license \
-    $pkgdir/usr/share/licenses/$_pkgname/$_pkgname-splash-artwork.license
+  install -Dm644 $srcdir/${pkgname%-art}-splash-artwork.license \
+    $pkgdir/usr/share/licenses/${pkgname%-art}/${pkgname%-art}-splash-artwork.license
 
   rm $pkgdir/usr/share/man/man1/$_pkgname-console.1
-  ln -s $_pkgname-console-${pkgver%.*}.1.gz $pkgdir/usr/share/man/man1/$_pkgname-console.1.gz
-  ln -s ${_pkgname}tool-${pkgver::2}0      $pkgdir/usr/bin/${_pkgname}tool
-  ln -sf ${_pkgname}tool-${pkgver::2}0.1.gz           $pkgdir/usr/share/man/man1/${_pkgname}tool.1.gz
+  ln -s  ${pkgname%-art}-console-${pkgver%.*}.1.gz $pkgdir/usr/share/man/man1/${pkgname%-art}-console.1.gz
+  ln -s  ${pkgname%-art}tool-${pkgver::2}0         $pkgdir/usr/bin/${pkgname%-art}tool
+  ln -sf ${pkgname%-art}tool-${pkgver::2}0.1.gz    $pkgdir/usr/share/man/man1/${pkgname%-art}tool.1.gz
 }
diff --git a/pcr/libdrm-git/PKGBUILD b/pcr/libdrm-git/PKGBUILD
index 6ea5c34df..823631073 100644
--- a/pcr/libdrm-git/PKGBUILD
+++ b/pcr/libdrm-git/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=libdrm-git
 pkgver=20120905
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace interface to kernel DRM services'
 arch=(
   i686
@@ -26,14 +26,16 @@ makedepends=(
   valgrind
 )
 options=(
-  '!libtool'
+  !libtool
 )
 url=http://dri.freedesktop.org/
 provides=(
-  libdrm=2.4.39
+  ${pkgname%-git}
+  ${pkgname%-git}-nouveau1
 )
 conflicts=(
   ${pkgname%-git}
+  ${pkgname%-git}-nouveau1
 )
 
 _gitroot=git://git.freedesktop.org/git/mesa/drm
diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
index 8f1d33afa..6ca8a419a 100644
--- a/pcr/mesa-git/PKGBUILD
+++ b/pcr/mesa-git/PKGBUILD
@@ -24,7 +24,7 @@ true && pkgname=(
   soft-xvmc-git
   mesa-git
 )
-true && pkgver=9.0.0.git20120904
+true && pkgver=9.0.0.git20120905
 true && pkgrel=1
 _mesaver=9.0
 arch=(
@@ -53,6 +53,12 @@ license=(
   LGPL
 )
 url=http://mesa3d.sourceforge.net
+#source=(
+#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
+#)
+#sha512sums=(
+#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
+#)
 
 _gitroot=git://anongit.freedesktop.org/git/mesa/mesa
 _gitname=${pkgbase%-git}
@@ -74,6 +80,8 @@ build() {
   cp -r $_gitname build
   cd build
 
+  #cd $srcdir/Mesa-$pkgver
+
   autoreconf -vfi
   ./autogen.sh --prefix=/usr \
     --enable-dri \
@@ -170,21 +178,21 @@ package_libegl-git() {
   )
   pkgdesc='Mesa EGL libraries and headers'
 
-  #make -C $srcdir/build/src/egl                      DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/egl                        DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install
 
   cd $srcdir/build
   install -m755 -d $pkgdir/usr/include/EGL
-  #install -m755 -d $pkgdir/usr/lib/egl
+  install -m755 -d $pkgdir/usr/lib/egl
   install -m755 -d $pkgdir/usr/lib/pkgconfig
-  #install -m755 -d $pkgdir/usr/share/doc/libegl
+  install -m755 -d $pkgdir/usr/share/doc/libegl
   install -m755 -d $pkgdir/usr/share/licenses/libegl
   bin/minstall include/EGL/*          $pkgdir/usr/include/EGL
   bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib
   bin/minstall lib/libEGL.so*         $pkgdir/usr/lib
-  #bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl
+  bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl
   bin/minstall src/egl/main/egl.pc    $pkgdir/usr/lib/pkgconfig
-  #bin/minstall docs/egl.html          $pkgdir/usr/share/doc/libegl
+  bin/minstall docs/egl.html          $pkgdir/usr/share/doc/libegl
   bin/minstall docs/COPYING           $pkgdir/usr/share/licenses/libegl
   bin/minstall docs/license.html      $pkgdir/usr/share/licenses/libegl
 }
@@ -206,20 +214,20 @@ package_libgbm-git() {
   )
   pkgdesc='Mesa GBM libraries and header'
 
-  make -C $srcdir/build/src/gbm                 DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/gbm                 DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/include
-  #install -m755 -d $pkgdir/usr/lib/gbm
-  #install -m755 -d $pkgdir/usr/lib/pkgconfig
+  install -m755 -d $pkgdir/usr/lib/include
+  install -m755 -d $pkgdir/usr/lib/gbm
+  install -m755 -d $pkgdir/usr/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/licenses/libgbm
-  #bin/minstall src/gbm/main/gbm.h                         $pkgdir/usr/include
-  #bin/minstall src/gbm/libgbm.la                          $pkgdir/usr/lib
-  #bin/minstall lib/libgbm.so*                             $pkgdir/usr/lib
-  #bin/minstall src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm
-  bin/minstall src/gallium/targets/pipe-loader/*.so        $pkgdir/usr/lib/gbm
-  #bin/minstall src/gbm/main/gbm.pc                        $pkgdir/usr/lib/pkgconfig
+  bin/minstall src/gbm/main/gbm.h                         $pkgdir/usr/include
+  bin/minstall src/gbm/libgbm.la                          $pkgdir/usr/lib
+  bin/minstall lib/libgbm.so*                             $pkgdir/usr/lib
+  bin/minstall src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm
+  bin/minstall src/gallium/targets/pipe-loader/*.so       $pkgdir/usr/lib/gbm
+  bin/minstall src/gbm/main/gbm.pc                        $pkgdir/usr/lib/pkgconfig
   bin/minstall docs/COPYING                               $pkgdir/usr/share/licenses/libgbm
   bin/minstall docs/license.html                          $pkgdir/usr/share/licenses/libgbm
 }
@@ -241,19 +249,20 @@ package_libgl-gallium-git() {
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer'
 
-  make -C $srcdir/build/src/glx                        DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/mesa/libdricore            DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/glx                        DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/mesa/libdricore            DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
-  #bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
-  #bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
-  #bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
-  #bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
-  #bin/minstall lib/gallium/swrast_dri.so                 $pkgdir/usr/lib/xorg/modules/dri
-  #bin/minstall docs/openGL.txt                           $pkgdir/usr/share/doc/libgl
+  bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
+  bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
+  bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
+  bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
+  bin/minstall lib/gallium/swrast_dri.so                 $pkgdir/usr/lib/xorg/modules/dri
+  bin/minstall docs/libGL.txt                            $pkgdir/usr/share/doc/libgl
   bin/minstall docs/COPYING                              $pkgdir/usr/share/licenses/libgl
   bin/minstall docs/license.html                         $pkgdir/usr/share/licenses/libgl
 }
@@ -275,20 +284,21 @@ package_libgl-git() {
   )
   pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer'
 
-  make -C $srcdir/build/src/glx                     DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/mesa/libdricore         DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/glx                     DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/mesa/libdricore         DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/lib/xorg/modules/dri
+  install -m755 -d $pkgdir/usr/share/doc/libgl
   install -m755 -d $pkgdir/usr/share/licenses/libgl
-  #bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
-  #bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
-  #bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
-  #bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
-  #bin/minstall src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri
-  #bin/minstall lib/swrast_dri.so                         $pkgdir/usr/lib/xorg/modules/dri
-  #bin/minstall docs/openGL.txt                           $pkgdir/usr/share/doc/libgl
+  bin/minstall src/glx/libGL.la                          $pkgdir/usr/lib
+  bin/minstall lib/libGL.so*                             $pkgdir/usr/lib
+  bin/minstall src/mesa/libdricore/libdricore*.la        $pkgdir/usr/lib
+  bin/minstall lib/libdricore*.so*                       $pkgdir/usr/lib
+  bin/minstall src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri
+  bin/minstall lib/swrast_dri.so                         $pkgdir/usr/lib/xorg/modules/dri
+  bin/minstall docs/libGL.txt                            $pkgdir/usr/share/doc/libgl
   bin/minstall docs/COPYING                              $pkgdir/usr/share/licenses/libgl
   bin/minstall docs/license.html                         $pkgdir/usr/share/licenses/libgl
 }
@@ -330,21 +340,21 @@ package_libgles-git() {
   )
   pkgdesc='Mesa GLES libraries and headers'
 
-  make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install
-  make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install
+  #make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install
 
   cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/include/GLES
-  #install -m755 -d $pkgdir/usr/include/GLES2
-  #install -m755 -d $pkgdir/usr/lib/pkgconfig
+  install -m755 -d $pkgdir/usr/include/GLES
+  install -m755 -d $pkgdir/usr/include/GLES2
+  install -m755 -d $pkgdir/usr/lib/pkgconfig
   install -m755 -d $pkgdir/usr/share/licenses/libgles
-  #bin/minstall include/GLES/*                  $pkgdir/usr/include/GLES
-  #bin/minstall include/GLES2/*                 $pkgdir/usr/include/GLES2
-  #bin/minstall src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib
-  #bin/minstall src/mapi/es2api/libGLESv2.la    $pkgdir/usr/lib
-  #bin/minstall lib/libGLESv*.so*               $pkgdir/usr/lib
-  #bin/minstall src/mapi/es1api/glesv1_cm.pc    $pkgdir/usr/lib/pkgconfig
-  #bin/minstall src/mapi/es2api/glesv2.pc       $pkgdir/usr/lib/pkgconfig
+  bin/minstall include/GLES/*                  $pkgdir/usr/include/GLES
+  bin/minstall include/GLES2/*                 $pkgdir/usr/include/GLES2
+  bin/minstall src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib
+  bin/minstall src/mapi/es2api/libGLESv2.la    $pkgdir/usr/lib
+  bin/minstall lib/libGLESv*.so*               $pkgdir/usr/lib
+  bin/minstall src/mapi/es1api/glesv1_cm.pc    $pkgdir/usr/lib/pkgconfig
+  bin/minstall src/mapi/es2api/glesv2.pc       $pkgdir/usr/lib/pkgconfig
   bin/minstall docs/COPYING                    $pkgdir/usr/share/licenses/libgles
   bin/minstall docs/license.html               $pkgdir/usr/share/licenses/libgles
 }