Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

3 files changed, 37 insertions, 39 deletions

diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD
index d0b4d7bb1..dee3f8daa 100644
--- a/social/bitcoin-daemon/PKGBUILD
+++ b/social/bitcoin-daemon/PKGBUILD
@@ -1,62 +1,62 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Artefact2 <artefact2@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
+# Based on bitcoin by
+# Maintainer : shahid <helllamer@gmail.com>
 
 pkgname=bitcoin-daemon
 _pkgname=bitcoin
-pkgver=0.3.24
-_bcver=0.3.24
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Bitcoin is a peer-to-peer network based digital currency (daemon with JSON-RPC interface)."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bitcoin.org/"
-depends=('expat' 'boost-libs>=1.43' 'miniupnpc')
-makedepends=('boost' 'openssl')
+depends=('expat' 'boost-libs>=1.46' 'miniupnpc>=1.6')
+makedepends=('boost')
 conflicts=('bitcoin')
 license=('MIT')
 install="bitcoin-daemon.install"
-source=(http://ufpr.dl.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-$_bcver/bitcoin-$pkgver-linux.tar.gz
+source=("http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}-linux.tar.gz"
         makefile.parabola
         bitcoin-daemon.install
         rc.bitcoind)
+md5sums=('cb085fef9d49d25e7f3dd263950b1ed2'
+         '8d40b6a332721bf7354cca4070e082df'
+         '0375ba4d6c3425eee350dc8b7575403d'
+         '7faa439885f3adbba5847ae75aac5484')
+
+s1=$srcdir/${_pkgname}-${pkgver}-linux
+src=$s1/src/src/
+makefile_unix=makefile.unix
 
 build() {
-	cd $srcdir/$_pkgname-$_bcver/src/src
-	
-	# copy correct makefile to src dir
-	cp $srcdir/makefile.parabola Makefile
+	cd $src
 
-    # fixes...
-    mkdir -p obj/nogui 2>/dev/null
-    rm -f cryptopp/obj/*
+	msg "Patching $makefile_unix..."
+	sed -i $makefile_unix \
+		-e 's/\(-DNOPCH\)/\1 -DBOOST_FILESYSTEM_VERSION=2/' \
+		-e 's/-Bstatic/--as-needed ${LDFLAGS}/g' \
+		-e 's/\(USE_UPNP:=\)0/\11/' \
+		-e 's/$(DEBUGFLAGS)//g' \
+		-e 's/CXXFLAGS/CPPFLAGS/g' \
+		-e 's/-O[0-3]/${CXXFLAGS}/g' 
 
-	# to build (single-threaded make due to OOM issues)
-	make bitcoind
+	# single-threaded build due to OOM issues reported
+	make -j1 -f $makefile_unix bitcoind
 }
 
 package() {
-    cd $srcdir/$_pkgname-$_bcver/src/src
+	# get compiled binaries
+	mkdir -p $pkgdir/{usr/{bin,share/licenses/$pkgname},var/lib/$pkgname}
+	install -D -m755 $src/bitcoind $pkgdir/usr/bin/
 
-	mkdir -p $pkgdir/{usr/bin,usr/share/licenses/$pkgname,etc/rc.d,var/lib/$pkgname}
+	# install locales (FIXME bicycle with find|xargs)
+	mkdir -p $pkgdir/usr/share/locale
+	cd $s1/locale/
+	find -name *.mo | xargs -I{} install -D -m644 {} $pkgdir/usr/share/locale/{}
 	
-	install -D -m755 ./bitcoind $pkgdir/usr/bin/
-	install -D -m755 $srcdir/rc.bitcoind $pkgdir/etc/rc.d/bitcoind
 
-    install -D -m 644 $srcdir/$_pkgname-$_bcver/COPYING \
+    install -D -m 644 $s1/COPYING \
                       $pkgdir/usr/share/licenses/$pkgname/
-	
-	# strip shit from executables
-	find $pkgdir/usr/bin/ -type f | xargs -L1 strip
-	
-	# the bitcoin data directory should not readable by others (wallet is sensitive data)
-	chown -R 8333:8333 $pkgdir/var/lib/$pkgname
-	chmod -R 700 $pkgdir/var/lib/$pkgname
+
 }
-md5sums=('7a9e5d45cccd21ef88b8cbbe20946599'
-         'dc3d207309d11e285ece6b3bdf61d90b'
-         'a388684057de2bb543cb7f795dc693cf'
-         '7faa439885f3adbba5847ae75aac5484')
-md5sums=('7a9e5d45cccd21ef88b8cbbe20946599'
-         '3172bdbc0096cb277971a26e0ca9adb6'
-         'a388684057de2bb543cb7f795dc693cf'
-         '7faa439885f3adbba5847ae75aac5484')
diff --git a/social/bitcoin-daemon/bitcoin-daemon.install b/social/bitcoin-daemon/bitcoin-daemon.install
index 2eea98e2c..5b2ffec92 100644
--- a/social/bitcoin-daemon/bitcoin-daemon.install
+++ b/social/bitcoin-daemon/bitcoin-daemon.install
@@ -2,9 +2,11 @@ post_install() {
 	echo "==> Creating the bitcoin user…"
 	groupadd -g 8333 bitcoin
 	useradd -d /var/lib/bitcoin-daemon -g 8333 -u 8333 -s /bin/false -N bitcoin
+
 	pw="$RANDOM$RANDOM$RANDOM"
 	echo "==> Setting the default RPC password to $pw"
 	echo "rpcpassword=$pw" >> /var/lib/bitcoin-daemon/bitcoin.conf
+
 	chown 8333:8333 /var/lib/bitcoin-daemon/bitcoin.conf
 	chmod 400 /var/lib/bitcoin-daemon/bitcoin.conf
 	echo "==> You can add bitcoind to your DAEMONS array in rc.conf."
diff --git a/social/bitcoin-daemon/makefile.parabola b/social/bitcoin-daemon/makefile.parabola
index 9d7d5cffe..984750982 100644
--- a/social/bitcoin-daemon/makefile.parabola
+++ b/social/bitcoin-daemon/makefile.parabola
@@ -53,10 +53,8 @@ OBJS= \
     obj/main.o \
     obj/rpc.o \
     obj/init.o \
-    obj/wallet.o \
-    obj/keystore.o \
     cryptopp/obj/sha.o \
-    cryptopp/obj/cpu.o 
+    cryptopp/obj/cpu.o
 
 
 all: bitcoin
@@ -86,5 +84,3 @@ clean:
 	-rm -f obj/nogui/*.o
 	-rm -f cryptopp/obj/*.o
 	-rm -f headers.h.gch
-	-rm -f bitcoin
-	-rm -f bitcoind