Merge branch 'master' of git+ssh://parabola-git/srv/git/abslibre

6 files changed, 34 insertions, 30 deletions

diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD
index 372243b2a..5f7168f86 100644
--- a/pcr/libav-builder/PKGBUILD
+++ b/pcr/libav-builder/PKGBUILD
@@ -8,7 +8,7 @@ elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; t
   pkgname=libav-builder
 fi
 pkgflag=builder
-pkgver=0.8.4
+pkgver=9.3
 pkgrel=1
 pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)"
 arch=any
diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD
index 0fa0ff469..f3306e87d 100644
--- a/pcr/libnatpmp/PKGBUILD
+++ b/pcr/libnatpmp/PKGBUILD
@@ -3,14 +3,15 @@
 
 pkgname=libnatpmp
 pkgver=20120821
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr/libnatpmp.html"
 license=('custom:BSD')
 depends=('glibc')
 makedepends=()
 source=(http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz)
+md5sums=('d2b9c2dedba3a00deb0e7589982ceced')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
@@ -24,5 +25,6 @@ package() {
 
     # Needed by some packages
     install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp"
+
+    install -Dm 644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
-md5sums=('22a1225b890471a7750a9bf26eb863f7')
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 47c9788c9..74b1c77d9 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -4,7 +4,7 @@
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.10.0.4
+pkgver=1.10.1
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -13,10 +13,13 @@ arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
 options=(strip !makeflags !distcc !emptydirs)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
-        SRCBUILD
-        citeproc-hs-pre-0.3.7.patch)
+        SRCBUILD)
+#        citeproc-hs-pre-0.3.7.patch)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
+md5sums=('bca5fa27ac593f24d18cd434289d4673'
+         '87a6a5fd1abfbe3199c5ff42742ff5f1'
+         '0d5b6d7adf6fdcea52dcbb7b62368b19')
 
 # PKGBUILD functions
 build() {
@@ -26,9 +29,9 @@ build() {
 # Patches from the next citeproc-hs release
 # These are needed because 0.3.6 with embed_data_files is broken
 # darcs diff --from-tag=0.3.6
-   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
-   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
-   popd
+#   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+#   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
+#   popd
 
    while read _hkpkg; do
 # Skip already built
@@ -41,7 +44,7 @@ build() {
        case $_hkpkg in
         $pkgname-$pkgver)
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal configure --flags='-library' \
+         cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
@@ -87,7 +90,3 @@ package() {
   install -d ${pkgdir}/usr/share
   cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
 }
-md5sums=('94c36d52ee6d7e33b16d75048f6617d3'
-         '2958854a387ea0845720e9456f814845'
-         'd159a34656b7a1e13df5e6149b2f898b'
-         'd389fc323eeaced767cea53edcfc0127')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index c1cfbfa5c..4c7f5de8d 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.10.0.4
+pkgver=1.10.1
 # 0.4 doesn't work with ghc 7.6 
 # Use blaze_html_0_5 flag in the future
 _blaze_html=0.5.1.3
@@ -29,7 +29,7 @@ build() {
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --flags="blaze_html_0_5" --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index 4d6611548..b5891747d 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=python2-renpy
 pkgflag=renpy
-pkgver=6.14.1
-pkgrel=3
+pkgver=6.15.0
+pkgrel=1
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
   i686
@@ -43,8 +43,8 @@ source=(
   "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2"
 )
 
-md5sums=(
-  16814530ba9ce1f2968bb8c8c785651b
+sha512sums=(
+  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
 )
 
 build() {
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 89c07a433..0baad307c 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: AlexanderR <rvacheva at nxt dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.14.1
+pkgver=6.15.0
 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')
@@ -20,12 +21,14 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
 	'python2.diff'
 	'renpy-launcher.sh')
 
-md5sums=('16814530ba9ce1f2968bb8c8c785651b'
-         'a9beb35fa6c6d8af7ba5d2a764c33158'
-         'd206d24b78e207a2c3b603fef14ac47f'
-         '8b9922e26e567248a2a5adc1d0cdfdd4'
-         '0476b16220e6faeb031e1dbfe45249b4'
-         'dfa92cdecc15e5c1ddee387fbbbb2d9c')
+sha512sums=(
+  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
+  2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
+  bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
+  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
+  727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
+)
 
 build() {
   cd "$srcdir/renpy-$pkgver-source"
@@ -33,7 +36,7 @@ build() {
   patch -p1 < ../python2.diff
 
   # fonts are provided by ttf-dejavu
-  rm common/DejaVuSans.ttf common/DejaVuSans.txt
+  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
 }
 
 package(){
@@ -47,7 +50,7 @@ package(){
 
   cd renpy-$pkgver-source
 
-  cp -r launcher renpy common renpy.py  template the_question tutorial "$pkgdir/usr/share/$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"