From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB67A1584AD for ; Wed, 30 Apr 2025 12:02:56 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B1F2934305E for ; Wed, 30 Apr 2025 12:02:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B8796110328; Wed, 30 Apr 2025 12:02:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A9106110328 for ; Wed, 30 Apr 2025 12:02:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63782342FEC for ; Wed, 30 Apr 2025 12:02:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5F272529 for ; Wed, 30 Apr 2025 12:02:51 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1745944240.9aef18c246890cd50d8827a46be3dd2c83e693b6.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-p2p/feather/feather-2.8.0.ebuild net-p2p/feather/feather-2.8.1.ebuild X-VCS-Directories: net-p2p/feather/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 9aef18c246890cd50d8827a46be3dd2c83e693b6 X-VCS-Branch: master Date: Wed, 30 Apr 2025 12:02:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4cd7749e-2346-4bba-9f06-494c15a6f129 X-Archives-Hash: 5bc3ed6458b743332420e3aec43993b7 commit: 9aef18c246890cd50d8827a46be3dd2c83e693b6 Author: Takuya Wakazono gmail com> AuthorDate: Tue Apr 29 16:11:37 2025 +0000 Commit: David Roman gmail 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 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