[gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/

["Takuya Wakazono" <pastalian46@gmail.com>]

commit:     9aef18c246890cd50d8827a46be3dd2c83e693b6
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 29 16:11:37 2025 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue Apr 29 16:30:40 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9aef18c2

Revert "net-p2p/feather: version bump"

This reverts commit ba06937fe473bc5652af41900eda68b80b7845a2, which
included unresolved merge conflicts. I'll notify the author.

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

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

diff --git a/net-p2p/feather/feather-2.8.0.ebuild b/net-p2p/feather/feather-2.8.0.ebuild
index 37bc96d1a..f1e6d8384 100644
--- a/net-p2p/feather/feather-2.8.0.ebuild
+++ b/net-p2p/feather/feather-2.8.0.ebuild
@@ -1,11 +1,6 @@
-<<<<<<< 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
 
@@ -23,11 +18,7 @@ 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:=
@@ -77,16 +68,8 @@ 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 37bc96d1a..f1e6d8384 100644
--- a/net-p2p/feather/feather-2.8.1.ebuild
+++ b/net-p2p/feather/feather-2.8.1.ebuild
@@ -1,11 +1,6 @@
-<<<<<<< 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
 
@@ -23,11 +18,7 @@ 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:=
@@ -77,16 +68,8 @@ 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