commit:     ba06937fe473bc5652af41900eda68b80b7845a2
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Tue Apr 29 11:20:36 2025 +0000
Commit:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Tue Apr 29 11:20:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ba06937f

net-p2p/feather: version bump

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

 net-p2p/feather/feather-2.8.0.ebuild | 17 +++++++++++++++++
 net-p2p/feather/feather-2.8.1.ebuild | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/net-p2p/feather/feather-2.8.0.ebuild 
b/net-p2p/feather/feather-2.8.0.ebuild
index f1e6d8384..37bc96d1a 100644
--- a/net-p2p/feather/feather-2.8.0.ebuild
+++ b/net-p2p/feather/feather-2.8.0.ebuild
@@ -1,6 +1,11 @@
+<<<<<<< Updated upstream
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # RavFX (2025) Bump version and remove deprecated plugins
+=======
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+>>>>>>> Stashed changes
 
 EAPI=8
 
@@ -18,7 +23,11 @@ SRC_URI="
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+<<<<<<< Updated upstream
 IUSE="bounties calc crowdfunding home qrcode revuo tickers xmrig"
+=======
+IUSE="bounties calc crowdfunding exchange home localmonero qrcode reddit revuo 
tickers xmrig"
+>>>>>>> Stashed changes
 DEPEND="
        dev-libs/libsodium:=
        media-gfx/qrencode:=
@@ -68,8 +77,16 @@ src_configure() {
                -DWITH_PLUGIN_TICKERS=$(usex tickers)
                -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding)
                -DWITH_PLUGIN_BOUNTIES=$(usex bounties)
+<<<<<<< Updated upstream
+               -DWITH_PLUGIN_REVUO=$(usex revuo)
+               -DWITH_PLUGIN_CALC=$(usex calc)
+=======
+               -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)
+>>>>>>> Stashed changes
                -DWITH_PLUGIN_XMRIG=$(usex xmrig)
                -DCHECK_UPDATES=OFF
                -DPLATFORM_INSTALLER=OFF

diff --git a/net-p2p/feather/feather-2.8.1.ebuild 
b/net-p2p/feather/feather-2.8.1.ebuild
index f1e6d8384..37bc96d1a 100644
--- a/net-p2p/feather/feather-2.8.1.ebuild
+++ b/net-p2p/feather/feather-2.8.1.ebuild
@@ -1,6 +1,11 @@
+<<<<<<< Updated upstream
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 # RavFX (2025) Bump version and remove deprecated plugins
+=======
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+>>>>>>> Stashed changes
 
 EAPI=8
 
@@ -18,7 +23,11 @@ SRC_URI="
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+<<<<<<< Updated upstream
 IUSE="bounties calc crowdfunding home qrcode revuo tickers xmrig"
+=======
+IUSE="bounties calc crowdfunding exchange home localmonero qrcode reddit revuo 
tickers xmrig"
+>>>>>>> Stashed changes
 DEPEND="
        dev-libs/libsodium:=
        media-gfx/qrencode:=
@@ -68,8 +77,16 @@ src_configure() {
                -DWITH_PLUGIN_TICKERS=$(usex tickers)
                -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding)
                -DWITH_PLUGIN_BOUNTIES=$(usex bounties)
+<<<<<<< Updated upstream
+               -DWITH_PLUGIN_REVUO=$(usex revuo)
+               -DWITH_PLUGIN_CALC=$(usex calc)
+=======
+               -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)
+>>>>>>> Stashed changes
                -DWITH_PLUGIN_XMRIG=$(usex xmrig)
                -DCHECK_UPDATES=OFF
                -DPLATFORM_INSTALLER=OFF

Reply via email to