commit: 65f4f9c0f9f35bf766007fedf4e7739e56ba206d Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> AuthorDate: Tue Dec 20 01:44:15 2022 +0000 Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> CommitDate: Tue Dec 20 01:44:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65f4f9c0
net-p2p/feather: use polyseed package Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com> dev-libs/polyseed/polyseed-1.0.0.ebuild | 3 ++- dev-libs/polyseed/polyseed-9999.ebuild | 3 ++- net-p2p/feather/Manifest | 1 - net-p2p/feather/feather-2.1.0.ebuild | 40 ++++++++++++++------------------- net-p2p/feather/feather-9999.ebuild | 32 +++++++++++++------------- net-p2p/feather/metadata.xml | 3 +++ 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dev-libs/polyseed/polyseed-1.0.0.ebuild b/dev-libs/polyseed/polyseed-1.0.0.ebuild index 3b7417601..34fd63397 100644 --- a/dev-libs/polyseed/polyseed-1.0.0.ebuild +++ b/dev-libs/polyseed/polyseed-1.0.0.ebuild @@ -12,4 +12,5 @@ SRC_URI="https://github.com/tevador/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" #todo: make test executible a USE flag +IUSE="" #todo: make test executible an optiona; USE flag +BDEPEND="virtual/pkgconfig" diff --git a/dev-libs/polyseed/polyseed-9999.ebuild b/dev-libs/polyseed/polyseed-9999.ebuild index 4411e43d9..beec61264 100644 --- a/dev-libs/polyseed/polyseed-9999.ebuild +++ b/dev-libs/polyseed/polyseed-9999.ebuild @@ -13,4 +13,5 @@ EGIT_REPO_URI="https://github.com/tevador/polyseed.git"; LICENSE="LGPL-3" SLOT="0" KEYWORDS="" -IUSE="" #todo: make test executible a USE flag +IUSE="" #todo: make test executible an optional USE flag +BDEPEND="virtual/pkgconfig" diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest index 61e6b8cc9..0bf1725e7 100644 --- a/net-p2p/feather/Manifest +++ b/net-p2p/feather/Manifest @@ -4,6 +4,5 @@ DIST feather-2.1.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e4244 DIST feather-2.1.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 DIST feather-2.1.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf DIST feather-2.1.0-monero.tar.gz 11616189 BLAKE2B 704c7455d4ff1483d9b58078997d4371a9736bfacc63bc976ce65fdd966f51727f0cd656223c62f9f7baf95b475af34ac9d9e174fdf32a17d32872c46b7ad4d2 SHA512 44dfe24f4b844d9f1a14160fcf34007e735321f7beb9f6ae94ace46d67ced3e26efdfde82723ab2407c09a38da4a9aef2d52778620317051a3e780f0c0795edf -DIST feather-2.1.0-polyseed.tar.gz 105576 BLAKE2B 445a3e5d04e53dad2c2add37af13b2d1a1a8eb4d2204fcdfea77f9909dd5939d828e6f759269ebee1ec9a550f4f46768c54b234a836a22b0eaaa230791925cef SHA512 40e0ec78690ec9955d5ac70ccfc68c5bc7f56f11adafaec0d7a13fd02a02c50189f329e346c668e3737b856c916b322a5e4a97c483bfe0ce1b9f033c3857285b DIST feather-2.1.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4 DIST feather-2.1.0.tar.gz 2005604 BLAKE2B 3e3cbd8334dd0b1b1d233b30f9fbe815a51f3f773ed73873fab316e9e22e616baa0e42112fc9b2450988915d16d7755cf79fa1e1672cb1001b8a50aeca96e102 SHA512 32697bfe80fb2e6fca00d29e78cfb9dae342f47fd47e0d49e03bc2baa18dff8d33f8b69f8658bb5bf5359ffa520a509af2c4e3e72aa80eb08d6967b26cc1870b diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild index 9123980e8..85f844d38 100644 --- a/net-p2p/feather/feather-2.1.0.ebuild +++ b/net-p2p/feather/feather-2.1.0.ebuild @@ -8,7 +8,6 @@ inherit cmake desktop xdg #Note: this is like a tree, with dependencies-of-dependencies #You need to update all of these recursively every version bump. #But at least they are distfiles if github goes down. ¯\_(ツ)_/¯ -POLYSEED_DIST_COMIT="e38516561c647522e2e2608f13eabdeab61d9a5d" SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b" MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450" MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0" @@ -21,8 +20,6 @@ DESCRIPTION="A free, open-source Monero wallet" HOMEPAGE="https://featherwallet.org"; SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \ ${P}.tar.gz - https://github.com/tevador/polyseed/archive/${POLYSEED_DIST_COMIT}.tar.gz -> \ -${P}-polyseed.tar.gz https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \ ${P}-singleapplication.tar.gz https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \ @@ -44,27 +41,29 @@ ${P}-monero-trezorcommon.tar.gz LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="qrcode xmrig" +IUSE="qrcode xmrig localmonero" DEPEND=" - dev-libs/boost:=[nls] - dev-libs/libgcrypt:= dev-libs/libsodium:= + media-gfx/qrencode:= + media-gfx/zbar:=[v4l] + >=dev-libs/polyseed-1.0.0 dev-libs/libzip:= - dev-libs/openssl:= + dev-libs/boost:=[nls] >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtmultimedia-5.15:5[widgets] >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtxml-5.15:5 >=dev-qt/qtwebsockets-5.15:5 - >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtmultimedia-5.15:5[widgets] >=dev-qt/qtconcurrent-5.15:5 - >=dev-qt/qtxml-5.15:5 - media-gfx/qrencode:= + dev-libs/libgcrypt:= + sys-libs/zlib + dev-libs/openssl:= net-dns/unbound:=[threads] net-libs/czmq:= - media-gfx/zbar:=[v4l] " RDEPEND=" ${DEPEND} @@ -75,7 +74,6 @@ BDEPEND="virtual/pkgconfig" src_unpack() { unpack ${P}.tar.gz \ - ${P}-polyseed.tar.gz \ ${P}-singleapplication.tar.gz \ ${P}-monero.tar.gz \ ${P}-monero-miniupnp.tar.gz \ @@ -83,8 +81,6 @@ src_unpack() { ${P}-monero-rapidjson.tar.gz \ ${P}-monero-supercop.tar.gz \ ${P}-monero-trezorcommon.tar.gz - mv -T "${WORKDIR}"/polyseed-${POLYSEED_DIST_COMIT} \ - "${WORKDIR}"/${P}/src/third-party/polyseed || die mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \ "${WORKDIR}"/${P}/src/third-party/singleapplication || die mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \ @@ -111,17 +107,16 @@ src_prepare() { src_configure() { local mycmakeargs=( -DARCH=x86-64 - -DBUILD_64=ON -DBUILD_TAG="linux-x64" - -DDONATE_BEG=OFF - -DMANUAL_SUBMODULES=1 - -DSTATIC=OFF -DSELF_CONTAINED=OFF - -DUSE_DEVICE_TREZOR=OFF + -DLOCALMONERO=$(usex localmonero) -DXMRIG=$(usex xmrig) + -DCHECK_UPDATES=OFF + -DPLATFORM_INSTALLER=OFF + -DUSE_DEVICE_TREZOR=OFF + -DDONATE_BEG=OFF -DWITH_SCANNER=$(usex qrcode) - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON #disables fetching/checking git submodules - -DVERSION_IS_RELEASE=true + -DVERSION_IS_RELEASE=ON ) cmake_src_configure @@ -136,7 +131,6 @@ src_install() { doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop - die } pkg_postinst() { diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild index c80cafa5e..c06973de0 100644 --- a/net-p2p/feather/feather-9999.ebuild +++ b/net-p2p/feather/feather-9999.ebuild @@ -15,27 +15,29 @@ EGIT_REPO_URI="https://github.com/feather-wallet/feather.git"; LICENSE="BSD MIT" SLOT="0" KEYWORDS="" -IUSE="qrcode xmrig" +IUSE="qrcode xmrig localmonero" DEPEND=" - dev-libs/boost:=[nls] - dev-libs/libgcrypt:= dev-libs/libsodium:= + media-gfx/qrencode:= + media-gfx/zbar:=[v4l] + >=dev-libs/polyseed-1.0.0 dev-libs/libzip:= - dev-libs/openssl:= + dev-libs/boost:=[nls] >=dev-qt/qtcore-5.15:5 + >=dev-qt/qtwidgets-5.15:5 >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtmultimedia-5.15:5[widgets] >=dev-qt/qtnetwork-5.15:5 >=dev-qt/qtsvg-5.15:5 + >=dev-qt/qtxml-5.15:5 >=dev-qt/qtwebsockets-5.15:5 - >=dev-qt/qtwidgets-5.15:5 + >=dev-qt/qtmultimedia-5.15:5[widgets] >=dev-qt/qtconcurrent-5.15:5 - >=dev-qt/qtxml-5.15:5 - media-gfx/qrencode:= + dev-libs/libgcrypt:= + sys-libs/zlib + dev-libs/openssl:= net-dns/unbound:=[threads] net-libs/czmq:= - media-gfx/zbar:=[v4l] " RDEPEND=" ${DEPEND} @@ -47,16 +49,16 @@ BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( -DARCH=x86-64 - -DBUILD_64=ON -DBUILD_TAG="linux-x64" - -DDONATE_BEG=OFF - -DMANUAL_SUBMODULES=1 - -DSTATIC=ON -DSELF_CONTAINED=OFF - -DUSE_DEVICE_TREZOR=OFF + -DLOCALMONERO=$(usex localmonero) -DXMRIG=$(usex xmrig) + -DCHECK_UPDATES=OFF + -DPLATFORM_INSTALLER=OFF + -DUSE_DEVICE_TREZOR=OFF + -DDONATE_BEG=OFF -DWITH_SCANNER=$(usex qrcode) - -DVERSION_IS_RELEASE=true + -DVERSION_IS_RELEASE=OFF ) cmake_src_configure diff --git a/net-p2p/feather/metadata.xml b/net-p2p/feather/metadata.xml index 916a96588..97b712586 100644 --- a/net-p2p/feather/metadata.xml +++ b/net-p2p/feather/metadata.xml @@ -21,5 +21,8 @@ <flag name="xmrig"> Enable mining support using a user specified xmrig binary </flag> + <flag name="localmonero"> + Enable LocalMonero.com support + </flag> </use> </pkgmetadata>
