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

1 files changed, 39 insertions, 37 deletions

diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..a9f2475db 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,59 +2,61 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+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')
-
+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=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
   1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
   2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
   bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
   727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
 )
 
-build() {
-  cd "$srcdir/renpy-$pkgver-source"
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-source"
 
-  patch -p1 < ../python2.diff
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgname.py
 
-  # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  msg 'fonts are provided by ttf-dejavu'
+  cd $pkgname
+  rm -v common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
-  mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d}
-
-  cd "$srcdir"
+  cd $pkgname-$pkgver-source
 
-  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"
+  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
 
-  cd renpy-$pkgver-source
+  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
 
-  cp -r launcher $pkgname{,.py}  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"
+  install -vDm644 launcher/game/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -vDm644 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}
 }