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

Conflicts:
	community/chntpw/PKGBUILD
	community/hardinfo/PKGBUILD
	community/obconf/obconf.install
	community/xplc/PKGBUILD
	community/zziplib/PKGBUILD
	core/rp-pppoe/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/icon-naming-utils/PKGBUILD
	extra/lxmenu-data/PKGBUILD
	extra/openbox/PKGBUILD
	extra/phonon-xine/PKGBUILD
	extra/qt/PKGBUILD
	extra/zope-interface/PKGBUILD
	libre/pacman/PKGBUILD
	libre/pacman/pacman.conf.mips64el
	libre/pacman/rePKGBUILD
	testing/coreutils/PKGBUILD
	testing/net-tools/PKGBUILD

1 files changed, 0 insertions, 72 deletions

diff --git a/social/bitcoin-daemon/makefile.archlinux b/social/bitcoin-daemon/makefile.archlinux
deleted file mode 100644
index 062a29d82..000000000
--- a/social/bitcoin-daemon/makefile.archlinux
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto
-# Rewritten for Archlinux by shahid
-# Distributed under the MIT/X11 software license, see the accompanying
-# file license.txt or http://www.opensource.org/licenses/mit-license.php.
-
-
-INCLUDEPATHS= \
- -I"/usr/include" \
-
-LIBPATHS= \
- -L"/usr/lib" \
- -L"/usr/local/lib"
-
-LIBS= \
- -Wl,-Bstatic \
-   -l boost_system \
-   -l boost_filesystem \
-   -l boost_program_options \
-   -l boost_thread \
-   -l db_cxx \
-   -l crypto \
- -Wl,-Bdynamic \
-   -l gthread-2.0 \
- ${LDFLAGS}
-
-DEBUGFLAGS=-g -D__WXDEBUG__
-CCFLAGS=${CXXFLAGS} -Wno-invalid-offsetof -Wformat $(WXDEFS) $(INCLUDEPATHS)
-HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
-    script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
-
-OBJS= \
-    obj/util.o \
-    obj/script.o \
-    obj/db.o \
-    obj/net.o \
-    obj/irc.o \
-    obj/main.o \
-    obj/rpc.o \
-    obj/init.o \
-    cryptopp/obj/sha.o \
-    cryptopp/obj/cpu.o
-
-
-all: bitcoin
-
-
-headers.h.gch: headers.h $(HEADERS)
-	g++ -c $(CCFLAGS) -DGUI -o $@ $<
-
-obj/%.o: %.cpp $(HEADERS) headers.h.gch
-	g++ -c $(CCFLAGS) -DGUI -o $@ $<
-
-# -DCRYPTOPP_DISABLE_SSE2
-cryptopp/obj/%.o: cryptopp/%.cpp
-	g++ -c $(CCFLAGS) -O3 -o $@ $<
-
-bitcoin: $(OBJS) obj/ui.o obj/uibase.o
-	g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
-
-
-obj/nogui/%.o: %.cpp $(HEADERS)
-	g++ -c $(CCFLAGS) -o $@ $<
-
-bitcoind: $(OBJS:obj/%=obj/nogui/%)
-	g++ $(CCFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) -ldl -lz
-
-
-clean:
-	-rm -f obj/*.o
-	-rm -f obj/nogui/*.o
-	-rm -f cryptopp/obj/*.o
-	-rm -f headers.h.gch