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

2 files changed, 25 insertions, 75 deletions

diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog
deleted file mode 100644
index 0a357d3db..000000000
--- a/pcr/python2-renpy/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2012-28-07 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.14.1-1 :
-	new upstream release.
-	added renpy.diff.
-
-2012-22-07 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.13.12-3 :
-	fixed build with latest ffmpeg at cost of sound.
-
-2012-26-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-2 :
-        moved python-pygame from makedepends to depends.
-
-2012-20-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-1 :
-        new upstream release.
-
-2012-07-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.11-1 :
-        new upstream release.
-	moved python-pygame dependency form renpy to python-renpy.
-
-2011-22-03 AlexanderR <alexanderr at gmx dot com>
-
-	* 16.13.9-2 :
-	added ChangeLog.
-	fixed corrupted images, caused by gcc optimization.
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..a7ff17837 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,66 +1,48 @@
-# Maintainer: AlexanderR <rvacheva at nxt dot ru>
-# Contributor: zhn <zhangn1985 AT gmail com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
+_pkgname=renpy
 pkgname=python2-renpy
-pkgflag=renpy
-pkgver=6.15.0
-pkgrel=1
+pkgver=6.15.7
+pkgrel=2
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 license=MIT
-url="http://www.$pkgflag.org/"
+url=http://www.$_pkgname.org/
 depends=(
+  ffmpeg
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
-# python-argparse is part of distribution since 2.7
-makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
-  'python2>=2.7'
-)
-options=!buildflags
-provides="python-$pkgflag=$pkgver"
+makedepends='python2>=2.7'
+provides="python-$_pkgname=$pkgver"
 conflicts=(
-  python-$pkgflag
-  "$pkgflag<$pkgver"
-  $pkgflag64
-  $pkgflag-bin
-)
-renplaces=python-$pkgflag
-changelog=ChangeLog
-source=(
-  "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2"
-)
-
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  python-$_pkgname
+  "$_pkgname<$pkgver"
+  ${_pkgname}64
+  $_pkgname-bin
 )
+renplaces=python-$_pkgname
+source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2
+sha512sums=d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
 
 build() {
-  cd $srcdir/$pkgflag-$pkgver-source
+  cd $srcdir/$_pkgname-$pkgver-source
 
-  sed -i -e '
-    s#!/usr/bin/env python#!/usr/bin/env python2#;
-    ' module/setup.py
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|;' module/setup.py
 
-  CFLAGS=-Os setarch $CARCH python2 module/setup.py build
+  python2 module/setup.py build
 }
 
 package(){
-  cd $srcdir/$pkgflag-$pkgver-source
+  cd $srcdir/$_pkgname-$pkgver-source
 
-  # install python2-$pkgflag
-  CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1
+  msg "install $pkgname"
+  python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1
   install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }