Merge ssh://parabolagnulinux.org:1863/abslibre

7 files changed, 98 insertions, 41 deletions

diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index fd3ebc7c1..914c939d2 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -15,7 +15,7 @@ source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
-md5sums=('e070f8d2639fdb742d0bfb21d27820d1')
+md5sums=('3c7958c93c36a41ad18f8d09fd1803ff')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
diff --git a/libre/pacman-mirrorlist-libre/mirrorlist b/libre/pacman-mirrorlist-libre/mirrorlist
deleted file mode 100644
index f353d0bd0..000000000
--- a/libre/pacman-mirrorlist-libre/mirrorlist
+++ /dev/null
@@ -1,4 +0,0 @@
-# Parabola GNU/Linux
-Server = http://repo.parabolagnulinux.org/$repo/os/$arch
-Server = ftp://ftp.inf.utfsm.cl/pub/parabola/$repo/os/$arch
-
diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index 29e68d0f3..ddc5ac0ab 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.5.1
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)."
 arch=('i686' 'x86_64')
@@ -23,6 +23,9 @@ source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${
 s1=$srcdir/${_pkgname}-${pkgver}-linux
 src=$s1/src/src
 makefile_unix=makefile.unix
+md5sums=('6d40f645ddc042de26d64e83656f38e0'
+         '0375ba4d6c3425eee350dc8b7575403d'
+         '7faa439885f3adbba5847ae75aac5484')
 
 build() {
 	cd $src
@@ -42,7 +45,7 @@ build() {
 
 package() {
 	# get compiled binaries
-	install -d ${pkgdir}/{var/lib/${pkgname},usr/{share/licenses,bin},etc/rc.d}
+	mkdir -p ${pkgdir}/{var/lib/${pkgname},usr/{share/licenses/${pkgname},bin},etc/rc.d}
 
 	install -D -m755 ${src}/bitcoind ${pkgdir}/usr/bin/
 
@@ -51,6 +54,3 @@ package() {
     install -D -m 644 ${s1}/COPYING \
                       ${pkgdir}/usr/share/licenses/${pkgname}/
 }
-md5sums=('1edeb3082d41741b8d0e5f850818328f'
-         '0375ba4d6c3425eee350dc8b7575403d'
-         '7faa439885f3adbba5847ae75aac5484')
diff --git a/social/python2-cheetah/Changelog b/social/python2-cheetah/Changelog
new file mode 100644
index 000000000..9acc7834a
--- /dev/null
+++ b/social/python2-cheetah/Changelog
@@ -0,0 +1,6 @@
+2012-01-31 Julien Nicoulaud <julien.nicoulaud@gmail.com>
+
+	* 2.4.4-4 :
+	Add changelog.
+	Remove unneeded shebang modification.
+
diff --git a/social/python2-cheetah/PKGBUILD b/social/python2-cheetah/PKGBUILD
new file mode 100644
index 000000000..34ce863a8
--- /dev/null
+++ b/social/python2-cheetah/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Julien Nicoulaud <julien.nicoulaud@gmail.com>
+# Contributor: James Rayner <james@archlinux.org>
+# Contributor: Todd Maynard <arch@toddmaynard.com>
+# Source: https://github.com/nicoulaj/archlinux-packages
+pkgname=python2-cheetah
+pkgver=2.4.4
+pkgrel=4
+pkgdesc="A Python-powered template engine and code generator"
+arch=(i686 x86_64)
+url="http://www.cheetahtemplate.org"
+license=(custom)
+depends=(python2 python-markdown)
+makedepends=(python2-distribute)
+optdepends=('python2-pygments: for the CodeHighlighter filter')
+provides=(cheetah python-cheetah)
+conflicts=(cheetah python-cheetah)
+changelog=Changelog
+source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
+md5sums=('853917116e731afbc8c8a43c37e6ddba')
+
+build() {
+  cd "${srcdir}/Cheetah-${pkgver}"
+  python2 setup.py build
+}
+
+package() {
+  msg "Install..."
+  cd "${srcdir}/Cheetah-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" || return 1
+
+  msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..."
+  install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 4d9a12809..d5ecf698c 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -6,48 +6,37 @@ _licensefile=COPYING
 
 # PKGBUILD options/directives
 pkgname=pandoc
-pkgver=1.8.2.1
-pkgrel=2
+pkgver=1.9.1.2
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
-url='http://johnmacfarlane.net/pandoc'
+url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'sh' 'haskell-http' 'haskell-base64-bytestring'
-'haskell-bytestring' 'haskell-citeproc-hs' 'haskell-containers'
-'haskell-directory' 'haskell-dlist' 'haskell-extensible-exceptions'
-'haskell-filepath' 'haskell-json' 'haskell-mtl' 'haskell-network'
-'haskell-old-time' 'haskell-pandoc-types' 'haskell-parsec' 'haskell-process'
-'haskell-random' 'haskell-syb' 'haskell-tagsoup' 'haskell-texmath'
-'haskell-utf8-string' 'haskell-xhtml' 'haskell-xml' 'haskell-zip-archive')
+makedepends=('ghc' 'sh' 'cabal-install')
 options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha256sums=('f1025377b2c78043b06d7963eb61ce66c2290d2580f2488a8186c82c24f09433')
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig})
 conflicts=('haskell-pandoc')
+md5sums=('8b71e4a113f5b3bf456cf335d4f365f1'
+         '01f99b7d67d0726fe6b80396ead780d1')
 
 # PKGBUILD functions
 build() {
+    mkdir -p ${srcdir}/{build,${_hkgname}-${pkgver}}
     cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} \
+    cabal install --prefix=${srcdir}/build/usr \
+                  --enable-shared \
+                  ${_hkgname}-${pkgver}
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
+# Copy everything, but remove docs and haskell-libs
+    cp -a ${srcdir}/build/usr ${pkgdir}/
+    rm -r ${pkgdir}/usr/{lib,share/*}
 
-    msg2 "Removing Haskell libs"
-    rm -rvf ${pkgdir}/usr/lib
+    cp -a ${srcdir}/build/usr/share/man ${pkgdir}/usr/share/
+    cp -a ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+    find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
+    find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
new file mode 100644
index 000000000..fd2172ffc
--- /dev/null
+++ b/~fauno/pandoc/SRCBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Based on haskell-pandoc
+# custom variables
+_hkgname=pandoc
+_licensefile=COPYING
+
+# PKGBUILD options/directives
+pkgname=pandoc
+pkgver=1.9.1.2
+pkgrel=1
+pkgdesc='Conversion between markup formats (no Haskell libs)'
+url='http://johnmacfarlane.net/pandoc/'
+license=('GPL')
+arch=('any')
+makedepends=('ghc' 'sh' 'cabal-install')
+source=()
+
+# PKGBUILD functions
+build() {
+    mkdir -p ${srcdir}/{build,${_hkgname}-${pkgver}}
+    cd ${srcdir}/${_hkgname}-${pkgver}
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 update
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 fetch ${_hkgname}-${pkgver}
+}
+
+package() {
+  export PKGEXT=.src.tar.xz
+  export PKGDEST=${startdir}
+
+  mv ${srcdir}/${_hkgname}-${pkgver} ${pkgdir}/
+}