commit:     b8c33d3915f7eabf7af032981de4128ea4e55570
Author:     Victor Skovorodnikov <victor3.14 <AT> yandex <DOT> com>
AuthorDate: Wed Aug  9 20:28:23 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 20:28:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8c33d39

net-p2p/dogecoin-qt: keyword 1.14.6 for ~arm64

- Tested arm64 installation on Raspberry pi 400 in systemd and openrc
- Updated symlink setup for condition using dogecoind and dogecoin-cli selection
- Made generic name for some patches to work with next version

Signed-off-by: Victor Skovorodnikov <victor3.14 <AT> yandex.com>

 net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild      | 23 +++++++++++++++-------
 net-p2p/dogecoin-qt/files/gcc13.patch              | 13 ++++++++++++
 ....14.6-hardened-all.patch => hardened-all.patch} |  0
 ...rdened-minimal.patch => hardened-minimal.patch} |  0
 ...hardened-no-pie.patch => hardened-no-pie.patch} |  0
 ...hardened-no-ssp.patch => hardened-no-ssp.patch} |  0
 6 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild 
b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
index bd1c090298..66e117a8a2 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
@@ -11,8 +11,7 @@ 
SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz ->
 LICENSE="MIT"
 SLOT="0"
 DB_VER="5.3"
-KEYWORDS="~amd64"
-# Please see Bug 910673        Comment 10
+KEYWORDS="~amd64 ~arm64"
 IUSE="cpu_flags_x86_avx2 dogecoind +pie +prune +ssp tests utils +wallet zmq"
 REQUIRED_USE="dogecoind? ( utils )"
 DOGEDIR="/opt/${PN}"
@@ -46,7 +45,7 @@ PATCHES=(
        "${FILESDIR}"/"${PV}"-paymentserver.patch
        "${FILESDIR}"/"${PV}"-transactiondesc.patch
        "${FILESDIR}"/"${PV}"-deque.patch
-       "${FILESDIR}"/"${PV}"-gcc13.patch
+       "${FILESDIR}"/gcc13.patch
 )
 
 WORKDIR_="${WORKDIR}/dogecoin-${PV}"
@@ -55,13 +54,13 @@ S=${WORKDIR_}
 src_prepare() {
 
        if use pie && use ssp ; then
-               PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-all.patch )
+               PATCHES+=( "${FILESDIR}"/hardened-all.patch )
        elif use pie && ! use ssp ; then
-               PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-no-ssp.patch )
+               PATCHES+=( "${FILESDIR}"/hardened-no-ssp.patch )
        elif use ssp && ! use pie ; then
-               PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-no-pie.patch )
+               PATCHES+=( "${FILESDIR}"/hardened-no-pie.patch )
        else
-               PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-minimal.patch )
+               PATCHES+=( "${FILESDIR}"/hardened-minimal.patch )
        fi
 
        default
@@ -96,6 +95,11 @@ src_install() {
        doins src/qt/res/icons/dogecoin.png
        dosym "${DOGEDIR}/bin/${PN}" "/usr/bin/${PN}"
 
+       if use dogecoind ; then
+               dosym "${DOGEDIR}/bin/dogecoind" "/usr/bin/dogecoind"
+               dosym "${DOGEDIR}/bin/dogecoin-cli" "/usr/bin/dogecoin-cli"
+       fi
+
        if use prune ; then
                domenu "${FILESDIR}"/"${PN}-prune.desktop"
        else
@@ -111,6 +115,11 @@ pkg_postinst() {
        elog "Dogecoin Core Qt ${PV} has been installed."
        elog "Dogecoin Core Qt binaries have been placed in ${DOGEDIR}/bin."
        elog "${PN} has been symlinked with /usr/bin/${PN}."
+
+       if use dogecoind ; then
+               elog "dogecoin daemon has been symlinked with 
/usr/bin/dogecoind."
+               elog "dogecoin client utils have been symlinked with 
/usr/bin/dogecoin-cli."
+       fi
 }
 
 pkg_postrm() {

diff --git a/net-p2p/dogecoin-qt/files/gcc13.patch 
b/net-p2p/dogecoin-qt/files/gcc13.patch
new file mode 100644
index 0000000000..0e4852815b
--- /dev/null
+++ b/net-p2p/dogecoin-qt/files/gcc13.patch
@@ -0,0 +1,13 @@
+# Fixes error when building with gcc13
+diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
+index ccebbe8..9d57846 100644
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -5,6 +5,7 @@
+ 
+ #include "support/lockedpool.h"
+ #include "support/cleanse.h"
++#include <stdexcept>
+ 
+ #if defined(HAVE_CONFIG_H)
+ #include "config/bitcoin-config.h"

diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-all.patch 
b/net-p2p/dogecoin-qt/files/hardened-all.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-all.patch
rename to net-p2p/dogecoin-qt/files/hardened-all.patch

diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-minimal.patch 
b/net-p2p/dogecoin-qt/files/hardened-minimal.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-minimal.patch
rename to net-p2p/dogecoin-qt/files/hardened-minimal.patch

diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-no-pie.patch 
b/net-p2p/dogecoin-qt/files/hardened-no-pie.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-no-pie.patch
rename to net-p2p/dogecoin-qt/files/hardened-no-pie.patch

diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-no-ssp.patch 
b/net-p2p/dogecoin-qt/files/hardened-no-ssp.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-no-ssp.patch
rename to net-p2p/dogecoin-qt/files/hardened-no-ssp.patch

Reply via email to