Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/luajit/PKGBUILD
	community/mplayer2/PKGBUILD
	extra/freeciv/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/transmission/PKGBUILD

3 files changed, 27 insertions, 54 deletions

diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index 7ffbf42ff..f23409572 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81287 2012-12-16 08:30:34Z bpiotrowski $
+# $Id: PKGBUILD 84580 2013-02-20 05:11:56Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
 
 pkgname=haveged
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,23 +12,27 @@ url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
 source=($url/$pkgname-$pkgver.tar.gz
-        rc.d service)
-md5sums=('5a386a530e89bfbc6c8d22717b16e2a8'
-         '264b725be5271288b40f363d7cfc6b68'
-         'fc62a480f520377364503aca9efff0b0')
+        service
+        haveged-1.7-build.patch)
+sha256sums=('9ec85438386a46d5c3fe7b5b121cafd89c34bae68cbbfb4cecb1ff5622111013'
+            '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a'
+            '94c77b1d2d80eb5fb30bab4aeb560e6dfe9957654cd3ed915478d2ce67ac37b7')
 
 build() {
-  cd $srcdir/$pkgname-${pkgver/a/}
+  cd $srcdir/$pkgname-$pkgver
+
+  patch -Np1 -i $srcdir/haveged-1.7-build.patch
+  aclocal && libtoolize --force && automake --add-missing && autoreconf
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-${pkgver/a/}
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/etc/init.d
 
-  install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/haveged
+  rm -rf $pkgdir/etc/init.d
   install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/haveged.service
 }
 md5sums=('c1f34be00c3f438ec83862e90e192e4b'
diff --git a/community/haveged/haveged-1.7-build.patch b/community/haveged/haveged-1.7-build.patch
new file mode 100644
index 000000000..c32d1927e
--- /dev/null
+++ b/community/haveged/haveged-1.7-build.patch
@@ -0,0 +1,13 @@
+Index: haveged-1.7/src/Makefile.am
+===================================================================
+--- haveged-1.7.orig/src/Makefile.am
++++ haveged-1.7/src/Makefile.am
+@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h
+ 
+ haveged_SOURCES = haveged.c haveged.h
+ 
+-haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
++haveged_LDADD = @HA_LDFLAGS@ libhavege.la
+ ##libtool_end##
+ 
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/community/haveged/rc.d b/community/haveged/rc.d
deleted file mode 100644
index c0e13b40d..000000000
--- a/community/haveged/rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-##
-# chkconfig: 2345 75 25
-# description: havege entropy daemon
-#
-# source function library
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-RETVAL=0
-prog="haveged"
-
-case "$1" in
-start)
-  stat_busy $"Starting $prog"
-  /usr/sbin/$prog -w 1024 -v 1
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon $prog
-    stat_done
-  fi
-  ;;
-
-stop)
-  stat_busy $"Stopping $prog"
-  kill `cat /var/run/$prog.pid`
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm_daemon $prog
-    stat_done
-    rm -f /var/lock/$prog
-  fi
-  ;;
-  
-restart)
-  $0 stop
-  $0 start
-  ;;
-
-*)
-  echo "usage: $prog [start|stop|restart]"
-esac