Version bumps using bitcoincore.eclass

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

5 files changed, 271 insertions, 48 deletions

diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog
index bec4fae7e097..0c8ebc4dabd8 100644
--- a/net-p2p/bitcoin-qt/ChangeLog
+++ b/net-p2p/bitcoin-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/bitcoin-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.93 2015/01/28 18:46:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.94 2015/02/23 21:28:13 blueness Exp $
+
+*bitcoin-qt-0.9.4 (23 Feb 2015)
+*bitcoin-qt-0.10.0 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoin-qt-0.10.0.ebuild, +bitcoin-qt-0.9.4.ebuild, bitcoin-qt-9999.ebuild,
+  metadata.xml:
+  Version bumps using bitcoincore.eclass
 
   28 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
   bitcoin-qt-0.8.6-r1.ebuild, bitcoin-qt-0.9.3-r1.ebuild,
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild
new file mode 100644
index 000000000000..0da1c06e6e31
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2010-2015 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.10.0.ebuild,v 1.1 2015/02/23 21:28:13 blueness Exp $
+
+EAPI=5
+
+BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
+BITCOINCORE_LJR_DATE="20150220"
+BITCOINCORE_IUSE="1stclassmsg dbus kde +ljr +qrcode qt4 qt5 test upnp +wallet xt zeromq"
+BITCOINCORE_POLICY_PATCHES="+cpfp +dcmp rbf +spamfilter"
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2
+
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	virtual/bitcoin-leveldb
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	qt4? ( dev-qt/qtgui:4 )
+	qt5? ( dev-qt/qtgui:5 )
+	dbus? (
+		qt4? ( dev-qt/qtdbus:4 )
+		qt5? ( dev-qt/qtdbus:5 )
+	)
+"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
+
+src_prepare() {
+	bitcoincore_prepare
+
+	local filt= yeslang= nolang=
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			ewarn "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in $(ls src/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\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	bitcoincore_autoreconf
+}
+
+src_configure() {
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
+		$(use_with dbus qtdbus)  \
+		$(use_with qrcode qrencode)  \
+		$(usex 1stclassmsg --enable-first-class-messaging)  \
+		--with-gui=$(usex qt5 qt5 qt4)
+}
+
+src_install() {
+	bitcoincore_src_install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild
new file mode 100644
index 000000000000..05941b83263d
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2010-2015 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.9.4.ebuild,v 1.1 2015/02/23 21:28:13 blueness Exp $
+
+EAPI=4
+
+DB_VER="4.8"
+
+LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
+inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 user versionator
+
+MyPV="${PV/_/}"
+MyPN="bitcoin"
+MyP="${MyPN}-${MyPV}"
+LJR_PV="0.9.3.ljr20141002"
+LJR_PATCH="bitcoin-${LJR_PV}.patch"
+
+DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
+HOMEPAGE="http://bitcoin.org/"
+SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz
+	ljr? ( http://luke.dashjr.org/programs/bitcoin/files/bitcoind/luke-jr/0.9.x/${LJR_PV}/${LJR_PATCH}.xz )
+"
+
+LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="$IUSE 1stclassmsg dbus kde ljr ljr-antispam +qrcode test upnp"
+
+REQUIRED_USE="
+	1stclassmsg? ( ljr )
+	ljr-antispam? ( ljr )
+"
+RDEPEND="
+	>=dev-libs/boost-1.41.0[threads(+)]
+	dev-libs/openssl:0[-bindist]
+	dev-libs/protobuf
+	qrcode? (
+		media-gfx/qrencode
+	)
+	upnp? (
+		net-libs/miniupnpc
+	)
+	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
+	virtual/bitcoin-leveldb
+	dev-qt/qtgui:4
+	dbus? (
+		dev-qt/qtdbus:4
+	)
+"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-4.1
+"
+
+S="${WORKDIR}/${MyP}"
+
+src_prepare() {
+	if use ljr; then
+		epatch "${WORKDIR}/${LJR_PATCH}"
+		use ljr-antispam || epatch "${FILESDIR}/0.9.x-ljr_noblacklist.patch"
+	else
+		epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
+	fi
+	rm -r src/leveldb
+
+	local filt= yeslang= nolang=
+
+	for lan in $LANGS; do
+		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
+			ewarn "Language '$lan' no longer supported. Ebuild needs update."
+		fi
+	done
+
+	for ts in $(ls src/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\|ts\)"
+	sed "/${filt}/d" -i 'src/qt/bitcoin.qrc'
+	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/qt/Makefile.am'
+	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-ccache \
+		$(use_with dbus qtdbus)  \
+		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
+		$(use_with qrcode qrencode)  \
+		$(use_enable test tests)  \
+		$(usex ljr $(use_enable 1stclassmsg first-class-messaging))  \
+		--with-system-leveldb  \
+		--without-cli --without-daemon \
+		--with-gui
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /usr/share/pixmaps
+	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
+	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
+
+	dodoc doc/README.md doc/release-notes.md
+	dodoc doc/assets-attribution.md doc/tor.md
+	doman contrib/debian/manpages/bitcoin-qt.1
+
+	if use kde; then
+		insinto /usr/share/kde4/services
+		doins contrib/debian/bitcoin-qt.protocol
+	fi
+}
+
+update_caches() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	buildsycoca
+}
+
+pkg_postinst() {
+	update_caches
+}
+
+pkg_postrm() {
+	update_caches
+}
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
index e2749533c1ee..2fd70a24e485 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild
@@ -1,56 +1,33 @@
 # Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.3 2015/01/28 18:46:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-9999.ebuild,v 1.4 2015/02/23 21:28:13 blueness Exp $
 
 EAPI=5
 
-DB_VER="4.8"
-
 LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW"
-inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 git-2 user versionator
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="
-"
-EGIT_PROJECT='bitcoin'
-EGIT_REPO_URI="git://github.com/bitcoin/bitcoin.git https://github.com/bitcoin/bitcoin.git"
+BITCOINCORE_IUSE="dbus kde +qrcode test upnp +wallet"
+inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2 git-2
 
-LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )"
+DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
+LICENSE="MIT GPL-3 LGPL-2.1 || ( CC-BY-SA-3.0 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="$IUSE dbus kde +qrcode test upnp"
 
 RDEPEND="
-	>=dev-libs/boost-1.52.0[threads(+)]
-	dev-libs/openssl:0[-bindist]
+	virtual/bitcoin-leveldb
 	dev-libs/protobuf
 	qrcode? (
 		media-gfx/qrencode
 	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	virtual/bitcoin-leveldb
-	dev-libs/libsecp256k1
 	dev-qt/qtgui:4
 	dbus? (
 		dev-qt/qtdbus:4
 	)
 "
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-	epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch"
-	rm -r src/leveldb src/secp256k1
+	bitcoincore_prepare
 
 	local filt= yeslang= nolang=
 
@@ -77,36 +54,24 @@ src_prepare() {
 	sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
 	einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
-	eautoreconf
+	bitcoincore_autoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-ccache \
+	# NOTE: --enable-zmq actually disables it
+	bitcoincore_conf \
 		$(use_with dbus qtdbus)  \
-		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
 		$(use_with qrcode qrencode)  \
-		$(use_enable test tests)  \
-		--with-system-leveldb  \
-		--without-utils --without-daemon \
-		--without-libs \
 		--with-gui
 }
 
-src_test() {
-	emake check
-}
-
 src_install() {
-	emake DESTDIR="${D}" install
-
-	rm "${D}/usr/bin/test_bitcoin"
+	bitcoincore_src_install
 
 	insinto /usr/share/pixmaps
 	newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
 	make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false"
 
-	dodoc doc/README.md doc/release-notes.md
 	dodoc doc/assets-attribution.md doc/tor.md
 	doman contrib/debian/manpages/bitcoin-qt.1
 
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index cb53a2afe7c9..3e1470a5ba0d 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -12,8 +12,16 @@
 	</maintainer>
 	<use>
 		<flag name='1stclassmsg'>Enable first-class Bitcoin message tools</flag>
+		<flag name='bitcoin_policy_cpfp'>Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag>
+		<flag name='bitcoin_policy_dcmp'>Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
+		<flag name='bitcoin_policy_rbf'>Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
+		<flag name='bitcoin_policy_spamfilter'>Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
 		<flag name='ljr'>Enable Luke Dashjr's patches</flag>
 		<flag name='ljr-antispam'>Enable Luke Dashjr's address-based spam filter</flag>
 		<flag name='qrcode'>Enable generation of QR Codes for receiving payments</flag>
+		<flag name='upnp'>Enable Universal Plug and Play</flag>
+		<flag name='wallet'>Enable wallet support</flag>
+		<flag name='xt'>Enable Mike Hearn's Bitcoin XT patches</flag>
+		<flag name='zeromq'>Report blocks and transactions via zeromq</flag>
 	</use>
 </pkgmetadata>