Removed broken 0.5.x, add fixes

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 130 insertions, 4 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index bef908db378f..c61190ff43cb 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,15 @@
 # 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.28 2012/05/21 22:51:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.29 2012/06/16 22:46:48 blueness Exp $
+
+*bitcoin-qt-0.6.0.8_rc2 (16 Jun 2012)
+*bitcoin-qt-0.5.6_rc2 (16 Jun 2012)
+
+  16 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -bitcoin-qt-0.5.6_rc1.ebuild, +bitcoin-qt-0.5.6_rc2.ebuild,
+  +bitcoin-qt-0.6.0.8_rc2.ebuild:
+  Removed broken 0.5.x, add fixes
+  See: https://bitcointalk.org/?topic=87660
 
   21 May 2012; Johannes Huber <johu@gentoo.org> bitcoin-qt-0.5.5.ebuild:
   Stable for x86, wrt bug #415973
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6_rc2.ebuild
index deaa300c0006..dd929569db39 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6_rc1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6_rc2.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_rc1.ebuild,v 1.1 2012/05/15 00:03:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.6_rc2.ebuild,v 1.1 2012/06/16 22:46:48 blueness Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ 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.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz )
+	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 )
 	)
@@ -46,7 +46,7 @@ S="${WORKDIR}/bitcoin-bitcoind-stable"
 src_prepare() {
 	cd src || die
 	if use bip16; then
-		epatch "${WORKDIR}/0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch"
+		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"
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.8_rc2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.8_rc2.ebuild
new file mode 100644
index 000000000000..78b3361e72a7
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.8_rc2.ebuild
@@ -0,0 +1,117 @@
+# 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.8_rc2.ebuild,v 1.1 2012/06/16 22:46:48 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
+	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
+	dbus? (
+		x11-libs/qt-dbus
+	)
+"
+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"
+}