Version bumps to address bug #435216

(Portage version: 2.1.11.9/cvs/Linux x86_64)

11 files changed, 25 insertions, 717 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index 4a982246bb2f..f51394a19cac 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.41 2012/09/18 20:46:58 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.42 2012/10/08 18:26:45 blueness Exp $
+
+*bitcoin-qt-0.7.0 (08 Oct 2012)
+*bitcoin-qt-0.6.4_rc3 (08 Oct 2012)
+*bitcoin-qt-0.6.0.10_rc3 (08 Oct 2012)
+*bitcoin-qt-0.5.7_rc3 (08 Oct 2012)
+
+  08 Oct 2012; Anthony G. Basile <blueness@gentoo.org>
+  -bitcoin-qt-0.5.6.ebuild, -bitcoin-qt-0.5.7_rc1.ebuild,
+  -bitcoin-qt-0.5.7_rc2.ebuild, +bitcoin-qt-0.5.7_rc3.ebuild,
+  -bitcoin-qt-0.6.0.9.ebuild, -bitcoin-qt-0.6.0.10_rc1.ebuild,
+  -bitcoin-qt-0.6.0.10_rc2.ebuild, +bitcoin-qt-0.6.0.10_rc3.ebuild,
+  -bitcoin-qt-0.6.4_rc1.ebuild, -bitcoin-qt-0.6.4_rc2.ebuild,
+  +bitcoin-qt-0.6.4_rc3.ebuild, -bitcoin-qt-0.7.0_rc1.ebuild,
+  -bitcoin-qt-0.7.0_rc2.ebuild, +bitcoin-qt-0.7.0.ebuild:
+  Version bumps to address bug #435216
 
   18 Sep 2012; Johannes Huber <johu@gentoo.org> bitcoin-qt-0.6.3.ebuild:
   Stable for x86, wrt bug #429188
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc1.ebuild
deleted file mode 100644
index 66b5e48d9f6c..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc1.ebuild,v 1.1 2012/08/30 21:59:54 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="da de en es es_CL hu it nb nl pt_BR ru uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
-	eligius? (
-		!bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz )
-	)
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE +bip16 dbus +eligius ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoind-stable"
-
-src_prepare() {
-	cd src || die
-	if use bip16; then
-		epatch "${WORKDIR}/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
-		use eligius && epatch "${FILESDIR}/0.5.0.5+bip16-eligius_sendfee.patch"
-	else
-		use eligius && epatch "${WORKDIR}/0.5.0.6rc1-eligius_sendfee.patch"
-	fi
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	use ssl  && OPTS+=("DEFINES+=USE_SSL")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc2.ebuild
deleted file mode 100644
index 120b6acd2362..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc2.ebuild,v 1.1 2012/09/16 12:48:57 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="da de en es es_CL hu it nb nl pt_BR ru uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	bip16? ( http://luke.dashjr.org/programs/bitcoin/files/bip16/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
-	eligius? (
-		!bip16? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.5.0.6rc1-eligius_sendfee.patch.xz )
-	)
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE +bip16 dbus +eligius ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoind-stable"
-
-src_prepare() {
-	cd src || die
-	if use bip16; then
-		epatch "${WORKDIR}/0.5.6-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
-		use eligius && epatch "${FILESDIR}/0.5.0.5+bip16-eligius_sendfee.patch"
-	else
-		use eligius && epatch "${WORKDIR}/0.5.0.6rc1-eligius_sendfee.patch"
-	fi
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	use ssl  && OPTS+=("DEFINES+=USE_SSL")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc3.ebuild
index de4982818b14..5045754be485 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6.ebuild,v 1.1 2012/07/31 02:21:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.7_rc3.ebuild,v 1.1 2012/10/08 18:26:45 blueness Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
 	)
 "
 
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE +bip16 dbus +eligius ssl upnp"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc1.ebuild
deleted file mode 100644
index 65a031905bf2..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc1.ebuild,v 1.1 2012/08/30 21:59:54 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR he hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	qrcode? (
-		media-gfx/qrencode
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoind-stable"
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch"
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	use ssl  && OPTS+=("DEFINES+=USE_SSL")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-	use qrcode && OPTS+=("USE_QRCODE=1")
-	use 1stclassmsg && OPTS+=("FIRST_CLASS_MESSAGING=1")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc2.ebuild
deleted file mode 100644
index eee9a39fb4d0..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc2.ebuild,v 1.1 2012/09/16 12:48:57 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR he hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode ssl upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	qrcode? (
-		media-gfx/qrencode
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoind-stable"
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch"
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	use ssl  && OPTS+=("DEFINES+=USE_SSL")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-	use qrcode && OPTS+=("USE_QRCODE=1")
-	use 1stclassmsg && OPTS+=("FIRST_CLASS_MESSAGING=1")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.9.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc3.ebuild
index 460eb0548860..b188d60f789c 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.9.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.9.ebuild,v 1.4 2012/09/16 12:48:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.10_rc3.ebuild,v 1.1 2012/10/08 18:26:45 blueness Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v${PV/_/}
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz )
 "
 
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode ssl upnp"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc2.ebuild
deleted file mode 100644
index 32ebe5d8cf4f..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc2.ebuild,v 1.1 2012/09/16 12:48:57 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR he hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/392d30f0 -> bitcoin-v${PV}.tgz
-	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz )
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	qrcode? (
-		media-gfx/qrencode
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoind-stable"
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.6.1-eligius_sendfee.patch"
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-	use qrcode && OPTS+=("USE_QRCODE=1")
-	use 1stclassmsg && OPTS+=("FIRST_CLASS_MESSAGING=1")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc3.ebuild
index afee8c5b7b06..989c9fb974b9 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc1.ebuild,v 1.1 2012/08/30 21:59:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.4_rc3.ebuild,v 1.1 2012/10/08 18:26:45 blueness Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/392d30f0 -
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.6.1-eligius_sendfee.patch.xz )
 "
 
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode upnp"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild
index 33e88fbe6772..f6feeb6d6821 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc1.ebuild,v 1.1 2012/08/30 21:59:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0.ebuild,v 1.1 2012/10/08 18:26:45 blueness Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoi
 	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.7.0-eligius_sendfee.patch.xz )
 "
 
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CCPL-Attribution-ShareAlike-3.0 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="$IUSE 1stclassmsg dbus +eligius ipv6 +qrcode upnp"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 
 DOCS="doc/README"
 
-S="${WORKDIR}/bitcoin-bitcoin-2c124cf"
+S="${WORKDIR}/bitcoin-bitcoin-a76c22e"
 
 src_prepare() {
 	cd src || die
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc2.ebuild
deleted file mode 100644
index 2ec59dbcf77c..000000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.7.0_rc2.ebuild,v 1.1 2012/09/16 12:48:57 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-LANGS="bg ca_ES cs da de el_GR en es es_CL et eu_ES fa fa_IR fi fr fr_CA he hr hu it lt nb nl pl pt_BR pt_PT ro_RO ru sk sr sv tr uk zh_CN zh_TW"
-inherit db-use eutils qt4-r2 versionator
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoin-v${PV}.tgz
-	eligius? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/eligius/sendfee/0.7.0-eligius_sendfee.patch.xz )
-"
-
-LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="$IUSE 1stclassmsg dbus +eligius ipv6 +qrcode upnp"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0
-	dev-libs/openssl[-bindist]
-	qrcode? (
-		media-gfx/qrencode
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	x11-libs/qt-gui:4
-	dbus? (
-		x11-libs/qt-dbus:4
-	)
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
-
-DOCS="doc/README"
-
-S="${WORKDIR}/bitcoin-bitcoin-605e387"
-
-src_prepare() {
-	cd src || die
-	use eligius && epatch "${WORKDIR}/0.7.0-eligius_sendfee.patch"
-
-	local filt= yeslang= nolang=
-
-	for lan in $LANGS; do
-		if [ ! -e qt/locale/bitcoin_$lan.ts ]; then
-			ewarn "Language '$lan' no longer supported. Ebuild needs update."
-		fi
-	done
-
-	for ts in $(ls qt/locale/*.ts)
-	do
-		x="${ts/*bitcoin_/}"
-		x="${x/.ts/}"
-		if ! use "linguas_$x"; then
-			nolang="$nolang $x"
-			rm "$ts"
-			filt="$filt\\|$x"
-		else
-			yeslang="$yeslang $x"
-		fi
-	done
-	filt="bitcoin_\\(${filt:2}\\)\\.qm"
-	sed "/${filt}/d" -i 'qt/bitcoin.qrc'
-	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
-}
-
-src_configure() {
-	OPTS=()
-	local BOOST_PKG BOOST_VER
-
-	use dbus && OPTS+=("USE_DBUS=1")
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=-")
-	fi
-	use qrcode && OPTS+=("USE_QRCODE=1")
-	use 1stclassmsg && OPTS+=("FIRST_CLASS_MESSAGING=1")
-	use ipv6 || OPTS+=("USE_IPV6=-")
-
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	BOOST_PKG="$(best_version 'dev-libs/boost')"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	OPTS+=("BOOST_INCLUDE_PATH=/usr/include/boost-${BOOST_VER}")
-	OPTS+=("BOOST_LIB_SUFFIX=-${BOOST_VER}")
-
-	eqmake4 "${PN}.pro" "${OPTS[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_test() {
-	cd src || die
-	emake -f makefile.unix "${OPTS[@]}" test_bitcoin
-	./test_bitcoin || die 'Tests failed'
-}
-
-src_install() {
-	qt4-r2_src_install
-	dobin ${PN}
-	insinto /usr/share/pixmaps
-	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	make_desktop_entry ${PN} "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Network;P2P"
-}