commit:     f6c9c638299a54830e35a8dca10ea598e60cdd80
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Wed Jan  3 03:54:56 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jan  3 03:54:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f6c9c638

net-p2p/feather: fix live ebuild

Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>

 net-p2p/feather/Manifest             |   8 --
 net-p2p/feather/feather-2.6.0.ebuild | 142 -----------------------------------
 net-p2p/feather/feather-9999.ebuild  |  27 +++++--
 3 files changed, 21 insertions(+), 156 deletions(-)

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 393a24e3e1..6f23a9fba3 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -22,14 +22,6 @@ DIST feather-2.5.2-monero-trezorcommon.tar.gz 1327782 
BLAKE2B 738f2833317d5b5f52
 DIST feather-2.5.2-monero.tar.gz 14014516 BLAKE2B 
0f5f74b1e9c72e0671d010910730e21b0990be09f5fffc472e7493004c2d3583b60f4eab90ba396be359cf22771b5d21c66e6d7a46b2094d94f0b81f4375260e
 SHA512 
ab9466d9d93632fea476d9aa9de5fb4298a8b74a340d144c061ce438e36f2bee056a30d66d37c1cc3128576539f45b135e8d336c66c6961651e1846370f205e2
 DIST feather-2.5.2-singleapplication.tar.gz 21630 BLAKE2B 
403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f
 SHA512 
d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
 DIST feather-2.5.2.tar.gz 1322312 BLAKE2B 
8c5ad7353dc0a2e52f7fb045aea0f110c45f0eca1fbab9cbddbb4a9da6ebe8c9983fff56783a5df5864a6a8483bfd9102f09adb87974766f3d4eab340dfc8568
 SHA512 
5cfb4710784046d0d960f715dc9c67e2fd32a36d055a810aedead13e3d1056b7d681db1a2f64905961ac947d54385e1f9dafec5ebfc6daff6a16442e4aa49f46
-DIST feather-2.6.0-monero-miniupnp.tar.gz 446961 BLAKE2B 
802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4
 SHA512 
c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.6.0-monero-randomx.tar.gz 164390 BLAKE2B 
704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801
 SHA512 
959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.6.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 
5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610
 SHA512 
dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.6.0-monero-supercop.tar.gz 346604 BLAKE2B 
10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93
 SHA512 
06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.6.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 
738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5
 SHA512 
9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.6.0-monero.tar.gz 14007104 BLAKE2B 
e14c36698dfce91e430960166a3d6012139c12c6eda4bbf5cd1372054e80c7f762612a477a41bb5193cb7e01330edd138770fad03230b93ed7325ecff1a28943
 SHA512 
d1597e76bb51d3b56cb44c0b16b8e9e5329221e61364c4053319319736cd392ba354056fc2e911dda281d0f456b2a7da2393991b2e1d002ee23ae051351a2c58
-DIST feather-2.6.0-singleapplication.tar.gz 21630 BLAKE2B 
403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f
 SHA512 
d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.6.0.tar.gz 1364312 BLAKE2B 
3127a8c71df76ca857a4979f7395e1d0124c938054ee3a47ce73c33b9ad018481ad209e93edd9c5f71dd501253b18fad8ce3706a1ec37cc9ef9ee1a87c1ce6d1
 SHA512 
16e24ccb0e7699dc197e655004eaa663059ac44f7a42683d81749aaa99a91c235dd67bfdd096d4484cbe4db3bf44045d845e167e920ae2a8d11e68fd237e7451
 DIST feather-2.6.1-monero-miniupnp.tar.gz 446961 BLAKE2B 
802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4
 SHA512 
c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
 DIST feather-2.6.1-monero-randomx.tar.gz 164390 BLAKE2B 
704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801
 SHA512 
959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
 DIST feather-2.6.1-monero-rapidjson.tar.gz 1054330 BLAKE2B 
5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610
 SHA512 
dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7

diff --git a/net-p2p/feather/feather-2.6.0.ebuild 
b/net-p2p/feather/feather-2.6.0.ebuild
deleted file mode 100644
index cdc7cfa889..0000000000
--- a/net-p2p/feather/feather-2.6.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-#Verify feather-${PV}.tar.gz with  
https://github.com/feather-wallet/feather-sigs
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="34aacb1b49553f17b9bb7ca1ee6dfb6524aada55"
-       MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-       RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-       RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-       SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-       TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-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
 -> \
-${PF}.tar.gz
-       
https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz
 -> \
-${PF}-singleapplication.tar.gz
-       
https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> 
\
-${PF}-monero.tar.gz
-       
https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${PF}-monero-miniupnp.tar.gz
-       https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz 
-> \
-${PF}-monero-randomx.tar.gz
-       
https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${PF}-monero-rapidjson.tar.gz
-       
https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz
 -> \
-${PF}-monero-supercop.tar.gz
-       
https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz
 -> \
-${PF}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
-       dev-libs/libsodium:=
-       media-gfx/qrencode:=
-       media-gfx/zbar:=[v4l]
-       ~dev-libs/polyseed-1.0.0
-       dev-libs/libzip:=
-       dev-libs/boost:=[nls]
-       >=dev-qt/qtbase-6.5.2:6
-       >=dev-qt/qtsvg-6.5.2:6
-       >=dev-qt/qtmultimedia-6.5.2:6
-       >=dev-qt/qtwebsockets-6.5.2:6
-       dev-libs/libgcrypt:=
-       sys-libs/zlib
-       dev-libs/openssl:=
-       net-dns/unbound:=[threads]
-       net-libs/czmq:=
-       dev-util/bc-ur:=
-"
-RDEPEND="
-       ${DEPEND}
-       net-vpn/tor
-       xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-       unpack ${PF}.tar.gz \
-               ${PF}-singleapplication.tar.gz \
-               ${PF}-monero.tar.gz \
-               ${PF}-monero-miniupnp.tar.gz \
-               ${PF}-monero-randomx.tar.gz \
-               ${PF}-monero-rapidjson.tar.gz \
-               ${PF}-monero-supercop.tar.gz \
-               ${PF}-monero-trezorcommon.tar.gz
-       mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-               "${WORKDIR}"/${P}/src/third-party/singleapplication || die
-       mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero || die
-       mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero/external/miniupnp || die
-       mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero/external/randomx || die
-       mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero/external/rapidjson || die
-       mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero/external/supercop || die
-       mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-               "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
-       default
-       echo "#define FEATHER_VERSION \"${PV}\"" > 
"${WORKDIR}"/${P}/src/config-feather.h || die
-       echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> 
"${WORKDIR}"/${P}/src/config-feather.h || die
-       cmake_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCMAKE_BUILD_TYPE=Release
-               -DBUILD_SHARED_LIBS=OFF
-               -DARCH=x86-64
-               -DBUILD_TAG="linux-x64"
-               -DBUILD_64=ON
-               -DSELF_CONTAINED=OFF
-               #-DLOCALMONERO=$(usex localmonero)
-               #-DXMRIG=$(usex xmrig)
-               -DCHECK_UPDATES=OFF
-               -DPLATFORM_INSTALLER=OFF
-               -DUSE_DEVICE_TREZOR=OFF
-               -DDONATE_BEG=OFF
-               -DWITH_SCANNER=$(usex qrcode)
-       )
-
-       cmake_src_configure
-}
-
-src_compile() {
-       cmake_build feather
-}
-
-src_install() {
-       dobin "${BUILD_DIR}/bin/feather"
-
-       newicon -s 256 "${WORKDIR}"/${P}/src/assets/images/appicons/256x256.png 
feather.png
-       newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png 
feather.png
-       newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png 
feather.png
-       newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png 
feather.png
-       newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png 
feather.png
-       newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png 
feather.png
-       domenu "${WORKDIR}"/${P}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
-       xdg_pkg_postinst
-
-       einfo "Ensure that Tor is running with 'rc-service tor start' before"
-       einfo "using Feather."
-}

diff --git a/net-p2p/feather/feather-9999.ebuild 
b/net-p2p/feather/feather-9999.ebuild
index 383592e2ea..ee39f229f1 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/feather-wallet/feather.git";
 # code from Monero and Tor too.
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="qrcode xmrig localmonero"
+IUSE="qrcode home tickers crowdfunding bounties reddit revuo calc exchange 
xmrig localmonero"
 
 DEPEND="
        dev-libs/libsodium:=
@@ -37,7 +37,9 @@ RDEPEND="
        net-vpn/tor
        xmrig? ( net-misc/xmrig )
 "
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+       virtual/pkgconfig
+"
 
 src_configure() {
        local mycmakeargs=(
@@ -47,8 +49,16 @@ src_configure() {
                -DBUILD_TAG="linux-x64"
                -DBUILD_64=ON
                -DSELF_CONTAINED=OFF
-               -DLOCALMONERO=$(usex localmonero)
-               -DXMRIG=$(usex xmrig)
+               -DWITH_PLUGIN_HOME=$(usex home)
+               -DWITH_PLUGIN_TICKERS=$(usex tickers)
+               -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding)
+               -DWITH_PLUGIN_BOUNTIES=$(usex bounties)
+               -DWITH_PLUGIN_REDDIT=$(usex reddit)
+               -DWITH_PLUGIN_REVUO=$(usex revuo)
+               -DWITH_PLUGIN_CALC=$(usex calc)
+               -DWITH_PLUGIN_EXCHANGE=$(usex exchange)
+               -DWITH_PLUGIN_LOCALMONERO=$(usex localmonero)
+               -DWITH_PLUGIN_XMRIG=$(usex xmrig)
                -DCHECK_UPDATES=OFF
                -DPLATFORM_INSTALLER=OFF
                -DUSE_DEVICE_TREZOR=OFF
@@ -66,8 +76,13 @@ src_compile() {
 src_install() {
        dobin "${BUILD_DIR}/bin/feather"
 
-       doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-       domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
+       newicon -s 256 "${WORKDIR}"/${P}/src/assets/images/appicons/256x256.png 
feather.png
+       newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png 
feather.png
+       newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png 
feather.png
+       newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png 
feather.png
+       newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png 
feather.png
+       newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png 
feather.png
+       domenu "${WORKDIR}"/${P}/src/assets/feather.desktop
 }
 
 pkg_postinst() {

Reply via email to