blueness    15/02/23 21:31:45

  Modified:             bitcoind-9999.ebuild metadata.xml ChangeLog
  Added:                bitcoind-0.10.0.ebuild bitcoind-0.9.4.ebuild
  Log:
  Version bumps using bitcoincore.eclass
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
0xF52D4BBA)

Revision  Changes    Path
1.3                  net-p2p/bitcoind/bitcoind-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild?r1=1.2&r2=1.3

Index: bitcoind-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bitcoind-9999.ebuild        21 Nov 2014 12:14:47 -0000      1.2
+++ bitcoind-9999.ebuild        23 Feb 2015 21:31:45 -0000      1.3
@@ -1,48 +1,24 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v 1.2 
2014/11/21 12:14:47 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v 1.3 
2015/02/23 21:31:45 blueness Exp $
 
-EAPI=4
+EAPI=5
 
-DB_VER="4.8"
-
-inherit autotools bash-completion-r1 db-use eutils git-2 user versionator 
systemd
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
+BITCOINCORE_IUSE="examples logrotate test upnp +wallet"
+inherit bash-completion-r1 bitcoincore user systemd
 
 DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="http://bitcoin.org/";
-SRC_URI="
-"
-EGIT_PROJECT='bitcoin'
-EGIT_REPO_URI="git://github.com/bitcoin/bitcoin.git 
https://github.com/bitcoin/bitcoin.git";
-
-LICENSE="MIT ISC GPL-2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples logrotate test upnp +wallet"
 
 RDEPEND="
-       >=dev-libs/boost-1.52.0[threads(+)]
-       dev-libs/openssl:0[-bindist]
+       virtual/bitcoin-leveldb
        logrotate? (
                app-admin/logrotate
        )
-       upnp? (
-               net-libs/miniupnpc
-       )
-       wallet? (
-               sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-       )
-       virtual/bitcoin-leveldb
-       dev-libs/libsecp256k1
-"
-DEPEND="${RDEPEND}
-       >=app-shells/bash-4.1
-       sys-apps/sed
 "
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
        local UG='bitcoin'
@@ -50,33 +26,14 @@
        enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
 }
 
-src_prepare() {
-       epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-       epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch"
-       rm -r src/leveldb src/secp256k1
-       eautoreconf
-}
-
 src_configure() {
-       econf \
-               --disable-ccache \
-               $(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
-               $(use_enable test tests)  \
-               $(use_enable wallet)  \
-               --with-system-leveldb  \
-               --without-libs \
-               --without-utils  \
-               --without-gui
-}
-
-src_test() {
-       emake check
+       # NOTE: --enable-zmq actually disables it
+       bitcoincore_conf \
+               --with-daemon
 }
 
 src_install() {
-       emake DESTDIR="${D}" install
-
-       rm "${D}/usr/bin/test_bitcoin"
+       bitcoincore_src_install
 
        insinto /etc/bitcoin
        newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
@@ -93,7 +50,6 @@
        fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
        dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
 
-       dodoc doc/README.md doc/release-notes.md
        dodoc doc/assets-attribution.md doc/tor.md
        doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
 



1.13                 net-p2p/bitcoind/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/metadata.xml?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/metadata.xml?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/metadata.xml?r1=1.12&r2=1.13

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/metadata.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- metadata.xml        10 Oct 2014 11:37:31 -0000      1.12
+++ metadata.xml        23 Feb 2015 21:31:45 -0000      1.13
@@ -11,10 +11,16 @@
                <name>Luke Dashjr</name>
        </maintainer>
        <use>
+               <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='logrotate'>Use app-admin/logrotate for rotating 
logs</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>



1.97                 net-p2p/bitcoind/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/ChangeLog?rev=1.97&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/ChangeLog?rev=1.97&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/ChangeLog?r1=1.96&r2=1.97

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog   17 Jan 2015 18:30:30 -0000      1.96
+++ ChangeLog   23 Feb 2015 21:31:45 -0000      1.97
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/bitcoind
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.96 
2015/01/17 18:30:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.97 
2015/02/23 21:31:45 blueness Exp $
+
+*bitcoind-0.9.4 (23 Feb 2015)
+*bitcoind-0.10.0 (23 Feb 2015)
+
+  23 Feb 2015; Anthony G. Basile <[email protected]> +bitcoind-0.10.0.ebuild,
+  +bitcoind-0.9.4.ebuild, bitcoind-9999.ebuild, metadata.xml:
+  Version bumps using bitcoincore.eclass
 
   17 Jan 2015; Anthony G. Basile <[email protected]> -bitcoind-0.8.5.ebuild:
   Remove older broken stable, bug #536228



1.1                  net-p2p/bitcoind/bitcoind-0.10.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-0.10.0.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-0.10.0.ebuild?rev=1.1&content-type=text/plain

Index: bitcoind-0.10.0.ebuild
===================================================================
# Copyright 2010-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.10.0.ebuild,v 
1.1 2015/02/23 21:31:45 blueness Exp $

EAPI=5

BITCOINCORE_COMMITHASH="047a89831760ff124740fe9f58411d57ee087078"
BITCOINCORE_LJR_DATE="20150220"
BITCOINCORE_IUSE="examples +ljr logrotate test upnp +wallet xt zeromq"
BITCOINCORE_POLICY_PATCHES="+cpfp +dcmp rbf +spamfilter"
inherit bash-completion-r1 bitcoincore user systemd

DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"

RDEPEND="
        virtual/bitcoin-leveldb
        logrotate? (
                app-admin/logrotate
        )
"
DEPEND="${RDEPEND}"

pkg_setup() {
        local UG='bitcoin'
        enewgroup "${UG}"
        enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
}

src_configure() {
        # NOTE: --enable-zmq actually disables it
        bitcoincore_conf \
                --with-daemon
}

src_install() {
        bitcoincore_src_install

        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-r1" ${PN}
        systemd_dounit "${FILESDIR}/bitcoind.service"

        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/assets-attribution.md doc/tor.md
        doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}

        newbashcomp contrib/${PN}.bash-completion ${PN}

        if use examples; then
                docinto examples
                dodoc -r contrib/{bitrpc,pyminer,qos,spendfrom,tidy_datadir.sh}
        fi

        if use logrotate; then
                insinto /etc/logrotate.d
                newins "${FILESDIR}/bitcoind.logrotate" bitcoind
        fi
}



1.1                  net-p2p/bitcoind/bitcoind-0.9.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.4.ebuild?rev=1.1&content-type=text/plain

Index: bitcoind-0.9.4.ebuild
===================================================================
# Copyright 2010-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.4.ebuild,v 1.1 
2015/02/23 21:31:45 blueness Exp $

EAPI=4

DB_VER="4.8"

inherit autotools bash-completion-r1 db-use eutils user versionator systemd

MyPV="${PV/_/}"
MyPN="bitcoin"
MyP="${MyPN}-${MyPV}"
LJR_PV="0.9.3.ljr20141002"
LJR_PATCH="bitcoin-${LJR_PV}.patch"

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
        ljr? ( 
http://luke.dashjr.org/programs/bitcoin/files/bitcoind/luke-jr/0.9.x/${LJR_PV}/${LJR_PATCH}.xz
 )
"

LICENSE="MIT ISC GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="examples ljr ljr-antispam logrotate test upnp +wallet"

REQUIRED_USE="
        ljr-antispam? ( ljr )
"
RDEPEND="
        >=dev-libs/boost-1.41.0[threads(+)]
        dev-libs/openssl:0[-bindist]
        logrotate? (
                app-admin/logrotate
        )
        upnp? (
                net-libs/miniupnpc
        )
        wallet? (
                sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
        )
        virtual/bitcoin-leveldb
"
DEPEND="${RDEPEND}
        >=app-shells/bash-4.1
        sys-apps/sed
"

S="${WORKDIR}/${MyP}"

pkg_setup() {
        local UG='bitcoin'
        enewgroup "${UG}"
        enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
}

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
        eautoreconf
}

src_configure() {
        econf \
                --disable-ccache \
                $(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
                $(use_enable test tests)  \
                $(use_enable wallet)  \
                --with-system-leveldb  \
                --without-cli  \
                --without-gui
}

src_test() {
        emake check
}

src_install() {
        emake DESTDIR="${D}" install

        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-r1" ${PN}
        systemd_dounit "${FILESDIR}/bitcoind.service"

        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.md doc/release-notes.md
        dodoc doc/tor.md
        doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}

        newbashcomp contrib/${PN}.bash-completion ${PN}

        if use examples; then
                docinto examples
                dodoc -r contrib/{bitrpc,pyminer,qos,spendfrom,tidy_datadir.sh}
        fi

        if use logrotate; then
                insinto /etc/logrotate.d
                newins "${FILESDIR}/bitcoind.logrotate" bitcoind
        fi
}




Reply via email to