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

3 files changed, 60 insertions, 18 deletions

diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD
index d274631eb..f83e05741 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -4,15 +4,27 @@
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
 pkgver=0.35
-pkgrel=4
+pkgrel=5
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
 license=('GPL3')
 depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1')
-source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz
+        binmerge.patch)
 install=monkeysphere.install
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Ni "${srcdir}/binmerge.patch"
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make test
+}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,3 +32,5 @@ package() {
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
 } 
+md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
+         'a8bd35dc7dd58b5952beeecafe5045a7')
diff --git a/pcr/monkeysphere/binmerge.patch b/pcr/monkeysphere/binmerge.patch
new file mode 100644
index 000000000..48d945511
--- /dev/null
+++ b/pcr/monkeysphere/binmerge.patch
@@ -0,0 +1,25 @@
+--- Makefile.orig	2013-06-07 13:02:23.123944233 -0300
++++ Makefile	2013-06-07 13:02:43.351065809 -0300
+@@ -36,17 +36,17 @@
+ # this target is to be called from the tarball, not from the git
+ # working dir!
+ install: all installman
+-	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin
++	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/monkeysphere/m $(DESTDIR)$(PREFIX)/share/monkeysphere/mh $(DESTDIR)$(PREFIX)/share/monkeysphere/ma $(DESTDIR)$(PREFIX)/share/monkeysphere/transitions
+ 	mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+ 	printf "Monkeysphere %s\n" $(MONKEYSPHERE_VERSION) > $(DESTDIR)$(PREFIX)/share/monkeysphere/VERSION
+ 	install src/monkeysphere $(DESTDIR)$(PREFIX)/bin
+ 	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere
+-	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-host
+-	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
+-	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/sbin/monkeysphere-authentication
++	install src/monkeysphere-host $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-host
++	install src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/bin
++	sed -i 's:__SYSSHAREDIR_PREFIX__:$(PREFIX):' $(DESTDIR)$(PREFIX)/bin/monkeysphere-authentication
+ 	install src/monkeysphere-authentication-keys-for-user $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+ 	install -m 0644 src/share/defaultenv $(DESTDIR)$(PREFIX)/share/monkeysphere
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 88f951d03..6fe28cc7c 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -3,19 +3,22 @@
 
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
-pkgname=pandoc
+pkgname=pandoc-static
+_pkgname=pandoc
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 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}
+#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
 #        citeproc-hs-pre-0.3.7.patch)
-conflicts=('haskell-pandoc')
+replaces=('pandoc')
+provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
@@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
+    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+    cd ${srcdir}/${_pkgname}-${pkgver}
 
 # 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
+#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
 #   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
 #   popd
 
@@ -37,29 +40,29 @@ build() {
 # Skip already built
        [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
 
-       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
 
        case $_hkpkg in
-        $pkgname-$pkgver)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+        $_pkgname-$pkgver)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
          ;;
 
         citeproc-hs-*)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --flags='embed_data_files' \
                        --prefix=${srcdir}/build/usr -v
          ;;
 
         *)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --prefix=${srcdir}/build/usr
          ;;
        esac
@@ -70,7 +73,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
@@ -81,7 +84,7 @@ package() {
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;