Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bsdiff/PKGBUILD
	community/drivel/PKGBUILD
	community/dvdbackup/PKGBUILD
	community/gdlmm/PKGBUILD
	community/gnome-phone-manager/PKGBUILD
	community/highlight/PKGBUILD
	community/i3-wm/PKGBUILD
	community/linux-tools/PKGBUILD
	community/obconf/PKGBUILD
	community/perl-class-factory-util/PKGBUILD
	community/python-mpi4py/PKGBUILD
	community/qupzilla/PKGBUILD
	community/subtitleeditor/PKGBUILD
	community/synce-librapi/PKGBUILD
	community/synce-libsynce/PKGBUILD
	community/tilda/PKGBUILD
	core/glibc/PKGBUILD
	core/iputils/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/calligra/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/kobodeluxe/PKGBUILD
	extra/libburn/PKGBUILD
	extra/libisoburn/PKGBUILD
	extra/libisofs/PKGBUILD
	extra/libsamplerate/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nasm/PKGBUILD
	extra/perl-netaddr-ip/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/putty/PKGBUILD
	extra/samba/PKGBUILD
	extra/tk/PKGBUILD
	extra/vim/PKGBUILD
	extra/xorg-xprop/PKGBUILD
	extra/xorg-xwd/PKGBUILD
	pcr/ams/PKGBUILD
	pcr/clalsadrv/PKGBUILD

1 files changed, 47 insertions, 44 deletions

diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 1ed569477..a9f2475db 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,58 +2,61 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.5
+pkgver=6.15.7
 pkgrel=1
 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools."
-arch=('any')
-license=('MIT')
-url='http://www.renpy.org/'
-# is ttf-dejavu required by renpy or games itself?
-depends=("python-renpy=$pkgver" 'ttf-dejavu')
-options=(!strip !zipman)
-conflicts=('renpy-bin' 'renpy64')
-replaces=('renpy64')
-install=renpy.install
-changelog=ChangeLog
-source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
-	"${pkgname}.desktop"
-	"${pkgname}."{sh,csh}
-	'python2.diff'
-	'renpy-launcher.sh')
-
-md5sums=('45e7c28a426c8d9ef470d09e7a689568'
-         'a9beb35fa6c6d8af7ba5d2a764c33158'
-         'd206d24b78e207a2c3b603fef14ac47f'
-         '8b9922e26e567248a2a5adc1d0cdfdd4'
-         '0476b16220e6faeb031e1dbfe45249b4'
-         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
-
-build() {
-  cd "$srcdir/renpy-$pkgver-source"
-
-  patch -p1 < ../python2.diff
-
-  # fonts are provided by ttf-dejavu
+arch=any
+license=MIT
+url=http://www.$pkgname.org/
+depends=(
+  python2-$pkgname=$pkgver
+  ttf-dejavu
+)
+conflicts=(
+  $pkgname-bin
+  ${pkgname}64
+)
+replaces=${pkgname}64
+install=$pkgname.install
+source=(
+  http://www.$pkgname.org/dl/$pkgver/$pkgname-$pkgver-source.tar.bz2
+  $pkgname.desktop
+  $pkgname.{sh,csh}
+  $pkgname-launcher.sh
+)
+sha512sums=(
+  d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
+  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
+  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
+  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
+  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
+)
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-source"
+
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgname.py
+
+  msg 'fonts are provided by ttf-dejavu'
   cd $pkgname
-  rm common/DejaVuSans.ttf common/DejaVuSans.txt
+  rm -v common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
-  mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d}
+  cd $pkgname-$pkgver-source
 
-  cd "$srcdir"
+  install -vd $pkgdir/{usr/share/{$pkgname,doc/$pkgname},etc/profile.d}
+  install -vm755 $srcdir/$pkgname.{sh,csh} $pkgdir/etc/profile.d
+  install -vDm755 $srcdir/$pkgname-launcher.sh $pkgdir/usr/bin/$pkgname
+  install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 
-  install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d"
-  install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  cp -va launcher $pkgname{,.py} template the_question tutorial $pkgdir/usr/share/$pkgname
+  ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common
+  cp -va doc/* $pkgdir/usr/share/doc/$pkgname
 
-  cd renpy-$pkgver-source
+  install -vDm644 launcher/game/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -vDm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
-  cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname"
-  cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
-  install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial}
-  chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial}
+  chgrp -vR games $pkgdir/usr/share/$pkgname/{the_question,tutorial}
+  chmod -vR g+w $pkgdir/usr/share/$pkgname/{the_question,tutorial}
 }