Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ccrypt/PKGBUILD
	community/mathomatic/PKGBUILD
	community/tuxpaint/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-applets/PKGBUILD
	extra/gnome-shell/PKGBUILD
	extra/xdg-user-dirs-gtk/PKGBUILD

1 files changed, 42 insertions, 28 deletions

diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 6922a5706..3b51c3188 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,39 +1,53 @@
-# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
+# $Id: PKGBUILD 79380 2012-11-03 21:29:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
-# Adopted: royrocks <royrocks13@gmail.com>
+# Contributor: royrocks <royrocks13@gmail.com>
+
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=5
-pkgdesc="Tux Paint is a free drawing program designed for young children."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.tuxpaint.org"
+pkgrel=7
+pkgdesc='Drawing program designed for young children'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.tuxpaint.org/'
 license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
-depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg')
-source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch)
-md5sums=('a88401d1860648098eeed819cff038fa'
-         '11d11119b3316c13f7b7a77048317bce')
-sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4'
-          '5595a65ebabc46bebd2d0670589effc8dbdd4e0c')
+depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango'
+         'libpaper' 'librsvg')
+makedepends=('setconf')
+optdepends=('tuxpaint-stamps: more stamps'
+            'tuxpaint-conf: configuration manager')
+source=("http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz"
+        'tuxpaint-0.9.21-libpng1.5.patch')
+sha256sums=('6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9'
+            '6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20')
 
 build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # python2 fix
- for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
- sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile
- echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop
- make PREFIX=/usr
+  cd "$srcdir/$pkgname-$pkgver"
+  
+  # python2 fix
+  for f in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
+    sed -i '0,/on/s//on2/' $f
+  done
+  
+  patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
+  sed -i 's:$(ARCH_LINKS):$(ARCH_LINKS) -lpng:' Makefile
+  setconf src/tuxpaint.desktop Categories 'Game;KidsGame;Graphics;RasterGraphics;'
+  sed -i 's:# fu:fu:' src/tuxpaint.conf
+  make PREFIX=/usr
 }
 
 package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install
- chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/*
- chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make \
+    PREFIX=/usr \
+    DESTDIR="$pkgdir" \
+    GNOME_PREFIX=/usr \
+    X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" \
+    install
+  chmod -R 644 "$pkgdir/usr/share/doc/tuxpaint-dev/"*
+  chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
 }
+
+# vim:set ts=2 sw=2 et: