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

6 files changed, 73 insertions, 158 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 e9f039431..a7ff17837 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,61 +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.5
-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
   python2-pygame=1.9.1
 )
-# python-argparse is part of distribution since 2.7
-makedepends=(
-  'python2>=2.7'
-  'ffmpeg'
-)
-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=(
-  fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e
+  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
 }
diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog
deleted file mode 100644
index 2609ed18f..000000000
--- a/pcr/renpy/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-2013-14-06 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.15.5-1 :
-        new upstream release.
-
-2012-28-07 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.14.1-1 :
-        new upstream release.
-	removed optdepends.
-	removed jedit-external.diff (does not work anymore).
-
-2012-23-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-1 :
-        Added notice abot RENPY_BASE usage to renpy.install.
-
-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.
-
-2012-16-03 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.13.9-1 :
-	re-split package python-renpy into two. added ChangeLog.
-	added jedit-external.diff to split jedit into optdepends.
-	added profile.d scripts to export RENPY_BASE.
-	added icon, launcher script and .desktop file.
-	creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy.
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}
 }
diff --git a/pcr/renpy/python2.diff b/pcr/renpy/python2.diff
deleted file mode 100644
index 9153659a2..000000000
--- a/pcr/renpy/python2.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- renpy-6.13.9/renpy.py       2012-01-16 01:48:05.000000000 +1100
-+++ renpy-6.13.9.new/renpy.py   2012-03-16 05:36:41.406170787 +1100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #@PydevCodeAnalysisIgnore
- # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
- #
diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install
index 9630a255f..bfe161cdb 100644
--- a/pcr/renpy/renpy.install
+++ b/pcr/renpy/renpy.install
@@ -1,5 +1,5 @@
 post_install() {
-  ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc"
+  ln -vsf /usr/share/doc/renpy /usr/share/renpy/doc
 
   cat << EOF
 This package sets global environment variable RENPY_BASE, forcing all RenPy
@@ -17,5 +17,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-  rm "/usr/share/renpy/doc"
+  rm -v /usr/share/renpy/doc
 }