Thu Apr 18 00:06:59 PDT 2013

6 files changed, 68 insertions, 109 deletions

diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index c7db21793..0a02eba94 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=gnuhealth
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc="A free Health and Hospital Information System"
 arch=(any)
@@ -10,7 +10,7 @@ url="http://health.gnu.org/"
 license=('GPL3')
 depends=('trytond')
 source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz")
-md5sums=('2273870ccd77a24ac21b398d095a29b5')
+md5sums=('d3837242011df1d39ce7a0f1d6e6a46a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/mediastreamer/PKGBUILD b/pcr/mediastreamer/PKGBUILD
deleted file mode 100644
index e55ace473..000000000
--- a/pcr/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=4.1
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg=1:1.2' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         '553d5d47ea4a8c8dfeabdc0281849d5f')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/pcr/mediastreamer/mediastreamer-ffmpeg.patch b/pcr/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 3304e9f56..000000000
--- a/pcr/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit f586917ea4d66f9ba8910f0967a8830e54d50784
-Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
-Date:   Tue Jun 5 11:07:48 2012 +0200
-
-    Fixes for new versions of ffmpeg
-
-diff --git a/src/h264dec.c b/src/h264dec.c
-index c4a84ee..5229b5e 100644
---- a/src/h264dec.c
-+++ b/src/h264dec.c
-@@ -45,7 +45,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..fb35760 100644
---- a/src/videoenc.c
-+++ b/src/videoenc.c
-@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- static bool_t avcodec_initialized=FALSE;
- 
-+#ifndef FF_I_TYPE
-+#define FF_I_TYPE AV_PICTURE_TYPE_I
-+#endif
-+
- #ifdef ENABLE_LOG_FFMPEG
- 
- void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
-@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
-+#ifdef FF_API_AVCODEC_INIT
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		avcodec_initialized=TRUE;
- #ifdef ENABLE_LOG_FFMPEG
-@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+		/*
- 		c->flags|=CODEC_FLAG_H263P_UMV;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
--		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
- 		*/
diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD
new file mode 100644
index 000000000..4c9cf4ea4
--- /dev/null
+++ b/pcr/python2-pycha/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+pkgname=python2-pycha
+pkgver=279
+pkgrel=1
+pkgdesc="Pycha is a very simple Python package for drawing charts using the great Cairo library."
+arch=('any')
+url="http://bitbucket.org/lgs/pycha/"
+license=('LGPL')
+depends=('pycairo')
+makedepends=('mercurial' 'python2-distribute')
+
+_hgroot="https://bitbucket.org/lgs/pycha"
+_hgrepo="pycha"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
+  else
+    hg clone "$_hgroot" "$_hgrepo"
+  fi
+
+  msg "Mercurial checkout done or server timeout"
+}
+
+package() {
+  cd "$srcdir/$_hgrepo"
+  msg "Starting build..."
+  python2 setup.py install --root=$pkgdir
+}
diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD
index 497a50920..fcaae5c7a 100644
--- a/pcr/python2-relatorio/PKGBUILD
+++ b/pcr/python2-relatorio/PKGBUILD
@@ -1,21 +1,35 @@
-# Contributor: Florian Walch <florian.walch@gmx.at>
-# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
+# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=python2-relatorio
-pkgver=0.5.6
-pkgrel=2
-pkgdesc="A templating library able to output odt and pdf files"
-arch=('i686' 'x86_64' 'mips64el')
+pkgver=183
+pkgrel=1
+pkgdesc="Relatorio is an OpenHex and B2CK project to easily create reports in a variety of formats (openoffice text, PDF, XHTML) from python objects."
+arch=('any')
 url="http://relatorio.openhex.org"
 license=('GPL')
-depends=('python2-genshi>=0.5' 'python2-lxml>=1.3.6')
-makedepends=('python2-distribute')
-source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
+depends=('python2-genshi' 'python2-lxml' 'python2-yaml' 'python2-pycha')
+makedepends=('mercurial' 'python2-distribute')
+
+_hgroot="http://hg.openhex.org/hgwebdir.cgi/relatorio"
+_hgrepo="relatorio"
 
 build() {
-  cd $srcdir/relatorio-$pkgver
-  chmod 644 relatorio.egg-info/*
-  python2 setup.py install --root=$pkgdir
-}
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
 
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
+  else
+    hg clone "$_hgroot" "$_hgrepo"
+  fi
 
-md5sums=('944fb60fadaff451ab6ee8818de516ad')
+  msg "Mercurial checkout done or server timeout"
+}
+
+package() {
+    cd "$srcdir/$_hgrepo"
+    msg "Starting build..."
+    python2 setup.py install --root=$pkgdir
+}
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index b270df368..a34a8890f 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=trytond
 pkgver=2.6.3
 _pkgdir=2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A three-tiers high-level general purpose application platform (server application)"
 arch=('any')
 url="http://www.tryton.org/"
 license=('GPL3')
-depends=('python2>=2.4' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=0.2.0' 'python2-genshi>=0.5' 'python2-polib')
+depends=('python2>=2.7' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=183' 'python2-genshi>=0.6' 'python2-polib')
 optdepends=('python-psycopg2: support for PostgreSQL database'
   'python-pywebdav: support for WebDAV feature'
   'pydot: support for displaying workflow graphs'
@@ -23,7 +23,7 @@ md5sums=('0dd81769fc18fe2d20e83de4f17cb10d'
          '768e68c01cb5913e36ea89c67fc98038'
          'b1535a8528dfd8f655624bf6faea6985')
 
-build() {
+package() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir
   install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf