Version bump

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

3 files changed, 313 insertions, 1 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index 969f84d0f3c1..02999d0b57a5 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.55 2013/01/13 22:34:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.56 2013/02/19 12:20:02 blueness Exp $
+
+*bitcoind-0.8.0 (19 Feb 2013)
+
+  19 Feb 2013; Anthony G. Basile <blueness@gentoo.org> +bitcoind-0.8.0.ebuild,
+  +files/0.8.0-sys_leveldb.patch:
+  Version bump
 
   13 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
   bitcoind-0.4.8_rc3.ebuild, bitcoind-0.4.8_rc4.ebuild,
diff --git a/net-p2p/bitcoind/bitcoind-0.8.0.ebuild b/net-p2p/bitcoind/bitcoind-0.8.0.ebuild
new file mode 100644
index 000000000000..9ad3bb3a0356
--- /dev/null
+++ b/net-p2p/bitcoind/bitcoind-0.8.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2010-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.8.0.ebuild,v 1.1 2013/02/19 12:20:02 blueness Exp $
+
+EAPI="4"
+
+DB_VER="4.8"
+
+inherit db-use eutils versionator toolchain-funcs
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+
+DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz
+"
+
+LICENSE="MIT ISC GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples ipv6 logrotate upnp"
+
+RDEPEND="
+	>=dev-libs/boost-1.41.0[threads(+)]
+	dev-libs/openssl[-bindist]
+	logrotate? (
+		app-admin/logrotate
+	)
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+	=dev-libs/leveldb-1.9.0*
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/${MyP}"
+
+pkg_setup() {
+	local UG='bitcoin'
+	enewgroup "${UG}"
+	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-sys_leveldb.patch"
+	rm -r src/leveldb
+}
+
+src_compile() {
+	OPTS=()
+
+	OPTS+=("DEBUGFLAGS=")
+	OPTS+=("CXXFLAGS=${CXXFLAGS}")
+	OPTS+=("LDFLAGS=${LDFLAGS}")
+
+	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
+	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
+
+	if use upnp; then
+		OPTS+=(USE_UPNP=1)
+	else
+		OPTS+=(USE_UPNP=)
+	fi
+	use ipv6 || OPTS+=("USE_IPV6=-")
+
+	OPTS+=("USE_SYSTEM_LEVELDB=1")
+
+	cd src || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${PN}
+}
+
+src_test() {
+	cd src || die
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_bitcoin
+	./test_bitcoin || die 'Tests failed'
+}
+
+src_install() {
+	dobin src/${PN}
+
+	insinto /etc/bitcoin
+	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
+	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
+	fperms 600 /etc/bitcoin/bitcoin.conf
+
+	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
+	newinitd "${FILESDIR}/bitcoin.initd" ${PN}
+
+	keepdir /var/lib/bitcoin/.bitcoin
+	fperms 700 /var/lib/bitcoin
+	fowners bitcoin:bitcoin /var/lib/bitcoin/
+	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
+	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
+
+	dodoc doc/README
+
+	if use examples; then
+		docinto examples
+		dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools}
+	fi
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
+	fi
+}
diff --git a/net-p2p/bitcoind/files/0.8.0-sys_leveldb.patch b/net-p2p/bitcoind/files/0.8.0-sys_leveldb.patch
new file mode 100644
index 000000000000..5b540c358f70
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.8.0-sys_leveldb.patch
@@ -0,0 +1,195 @@
+diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
+index 1c6bc0a..db431de 100644
+--- a/bitcoin-qt.pro
++++ b/bitcoin-qt.pro
+@@ -2,7 +2,7 @@ TEMPLATE = app
+ TARGET = bitcoin-qt
+ VERSION = 0.8.0
+ INCLUDEPATH += src src/json src/qt
+-DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
++DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV
+ CONFIG += no_include_pwd
+ CONFIG += thread
+ 
+@@ -96,24 +96,28 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
+     QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
+ }
+ 
++contains(USE_SYSTEM_LEVELDB, 1) {
++    LIBS += -lleveldb
++} else {
+ INCLUDEPATH += src/leveldb/include src/leveldb/helpers
+-LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
++LIBS += $$PWD/src/leveldb/libleveldb.a
+ !win32 {
+-    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a
++    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a
+ } else {
+     # make an educated guess about what the ranlib command is called
+     isEmpty(QMAKE_RANLIB) {
+         QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
+     }
+     LIBS += -lshlwapi
+-    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
++    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a
+ }
+ genleveldb.target = $$PWD/src/leveldb/libleveldb.a
+ genleveldb.depends = FORCE
+ PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
+ QMAKE_EXTRA_TARGETS += genleveldb
++}
+ # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
+-QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
++QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true
+ 
+ # regenerate src/build.h
+ !win32|contains(USE_BUILD_INFO, 1) {
+diff --git a/src/leveldb.cpp b/src/leveldb.cpp
+index b41764f..f71e801 100644
+--- a/src/leveldb.cpp
++++ b/src/leveldb.cpp
+@@ -8,7 +8,9 @@
+ #include <leveldb/env.h>
+ #include <leveldb/cache.h>
+ #include <leveldb/filter_policy.h>
++#ifndef LEVELDB_WITHOUT_MEMENV
+ #include <memenv/memenv.h>
++#endif
+ 
+ #include <boost/filesystem.hpp>
+ 
+@@ -42,8 +44,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool
+     options = GetOptions(nCacheSize);
+     options.create_if_missing = true;
+     if (fMemory) {
++#ifndef LEVELDB_WITHOUT_MEMENV
+         penv = leveldb::NewMemEnv(leveldb::Env::Default());
+         options.env = penv;
++#else
++        throw std::runtime_error("CLevelDB(): compiled without memenv support");
++#endif
+     } else {
+         if (fWipe) {
+             printf("Wiping LevelDB in %s\n", path.string().c_str());
+diff --git a/src/makefile.unix b/src/makefile.unix
+index ece2f59..4cbeaba 100644
+--- a/src/makefile.unix
++++ b/src/makefile.unix
+@@ -36,6 +36,10 @@ LIBS += \
+    -l ssl \
+    -l crypto
+ 
++TESTLIBS += \
++ -Wl,-B$(LMODE) \
++   -l boost_unit_test_framework$(BOOST_LIB_SUFFIX)
++
+ ifndef USE_UPNP
+ 	override USE_UPNP = -
+ endif
+@@ -100,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para
+ # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
+ xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
+ 
+-OBJS= \
+-    leveldb/libleveldb.a \
++BASEOBJS := \
+     obj/alert.o \
+     obj/version.o \
+     obj/checkpoints.o \
+@@ -110,7 +113,6 @@ OBJS= \
+     obj/crypter.o \
+     obj/key.o \
+     obj/db.o \
+-    obj/init.o \
+     obj/irc.o \
+     obj/keystore.o \
+     obj/main.o \
+@@ -131,24 +133,43 @@ OBJS= \
+     obj/hash.o \
+     obj/bloom.o \
+     obj/noui.o \
+-    obj/leveldb.o \
+     obj/txdb.o
+ 
++OBJS := \
++    obj/leveldb.o \
++    obj/init.o \
++    $(BASEOBJS)
++
++TESTOBJS := \
++    obj-test/leveldb.o \
++    $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \
++    $(BASEOBJS)
++
+ 
+ all: bitcoind
+ 
+ test check: test_bitcoin FORCE
+ 	./test_bitcoin
+ 
++ifdef USE_SYSTEM_LEVELDB
++    LIBS += -lleveldb
++    TESTLIBS += -lmemenv
++else
+ #
+ # LevelDB support
+ #
+ MAKEOVERRIDES =
+-LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
++LIBS += $(CURDIR)/leveldb/libleveldb.a
++TESTLIBS += $(CURDIR)/leveldb/libmemenv.a
+ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
+ DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
+ leveldb/libleveldb.a:
+-	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
++	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd ..
++leveldb/libmemenv.a:
++	@echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd ..
++OBJS += leveldb/libleveldb.a
++TESTOBJS += leveldb/libmemenv.a
++endif
+ 
+ # auto-generated dependencies:
+ -include obj/*.P
+@@ -159,27 +180,29 @@ obj/build.h: FORCE
+ version.cpp: obj/build.h
+ DEFS += -DHAVE_BUILD_INFO
+ 
+-obj/%.o: %.cpp
+-	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
++P_TO_D = \
+ 	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
++	  sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+ 	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+ 	  rm -f $(@:%.o=%.d)
+ 
+-bitcoind: $(OBJS:obj/%=obj/%)
+-	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
++obj/%.o: %.cpp
++	$(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
++	$(P_TO_D)
+ 
+-TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
++bitcoind: $(OBJS)
++	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
+ 
+ obj-test/%.o: test/%.cpp
+ 	$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
+-	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
+-	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
+-	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
+-	  rm -f $(@:%.o=%.d)
++	$(P_TO_D)
++
++obj-test/leveldb.o: leveldb.cpp
++	$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
++	$(P_TO_D)
+ 
+-test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+-	$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS)
++test_bitcoin: $(TESTOBJS)
++	$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
+ 
+ clean:
+ 	-rm -f bitcoind test_bitcoin