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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2022-12-25 21:02 Adam Pimentel
  0 siblings, 0 replies; 6+ messages in thread
From: Adam Pimentel @ 2022-12-25 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     58e53411880115ea269c4b017b97be7c8ba1df5f
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sun Dec 25 20:59:37 2022 +0000
Commit:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Sun Dec 25 20:59:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=58e53411

net-p2p/feather: add some extra includes for monero

Closes: https://bugs.gentoo.org/887871
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>

 net-p2p/feather/feather-2.1.0.ebuild               |  3 +++
 .../feather/files/monero_add_some_includes.patch   | 25 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index fab406b81..697aca1eb 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -98,6 +98,9 @@ src_prepare() {
 	default
 	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
 	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+	pushd monero
+		eapply "${FILESDIR}"/monero_add_some_includes.patch
+	popd
 	cmake_src_prepare
 }
 

diff --git a/net-p2p/feather/files/monero_add_some_includes.patch b/net-p2p/feather/files/monero_add_some_includes.patch
new file mode 100644
index 000000000..d048d13de
--- /dev/null
+++ b/net-p2p/feather/files/monero_add_some_includes.patch
@@ -0,0 +1,25 @@
+diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
+index e00421f873e..da144aca403 100644
+--- a/src/common/dns_utils.cpp
++++ b/src/common/dns_utils.cpp
+@@ -30,6 +30,8 @@
+ // check local first (in the event of static or in-source compilation of libunbound)
+ #include "unbound.h"
+ 
++#include <deque>
++#include <set>
+ #include <stdlib.h>
+ #include "include_base_utils.h"
+ #include "common/threadpool.h"
+diff --git a/src/common/threadpool.h b/src/common/threadpool.h
+index 53421e18b30..fcf8ca9455a 100644
+--- a/src/common/threadpool.h
++++ b/src/common/threadpool.h
+@@ -31,6 +31,7 @@
+ #include <boost/thread/mutex.hpp>
+ #include <boost/thread/thread.hpp>
+ #include <cstddef>
++#include <deque>
+ #include <functional>
+ #include <utility>
+ #include <vector>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2023-02-04  9:22 Adam Pimentel
  0 siblings, 0 replies; 6+ messages in thread
From: Adam Pimentel @ 2023-02-04  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     74ea05a214c27e2efe5d0036b0ad0a7f121bfa60
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Feb  4 09:01:51 2023 +0000
Commit:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Sat Feb  4 09:20:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=74ea05a2

net-p2p/feather: version bump to 2.3.0

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

 net-p2p/feather/Manifest                           |   8 ++
 net-p2p/feather/feather-2.3.0.ebuild               | 144 +++++++++++++++++++++
 .../files/feather_remove_cflags-2.3.0.patch        |  18 +++
 .../feather/files/monero_remove_cflags-2.3.0.patch |  25 ++++
 4 files changed, 195 insertions(+)

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 69f9a5353..e1be7e09d 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -6,3 +6,11 @@ DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
 DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
 DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
 DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
+DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
+DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0

diff --git a/net-p2p/feather/feather-2.3.0.ebuild b/net-p2p/feather/feather-2.3.0.ebuild
new file mode 100644
index 000000000..02e20aa06
--- /dev/null
+++ b/net-p2p/feather/feather-2.3.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
+	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 -> \
+${P}.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 -> \
+${P}-monero.tar.gz
+	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-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/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=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/qtmultimedia-5.15:5[widgets]
+	>=dev-qt/qtconcurrent-5.15:5
+	dev-libs/libgcrypt:=
+	sys-libs/zlib
+	dev-libs/openssl:=
+	net-dns/unbound:=[threads]
+	net-libs/czmq:=
+"
+RDEPEND="
+	${DEPEND}
+	net-vpn/tor
+	xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${P}.tar.gz \
+		${P}-singleapplication.tar.gz \
+		${P}-monero.tar.gz \
+		${P}-monero-miniupnp.tar.gz \
+		${P}-monero-randomx.tar.gz \
+		${P}-monero-rapidjson.tar.gz \
+		${P}-monero-supercop.tar.gz \
+		${P}-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}"/${PF}/src/config-feather.h || die
+	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
+	pushd monero || die
+		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+	popd || 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"
+
+	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
+	domenu "${WORKDIR}"/${PF}/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/files/feather_remove_cflags-2.3.0.patch b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,12 +262,8 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
+
+ add_subdirectory(src)

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -773,9 +773,6 @@
+     message(STATUS "AES support disabled")
+   endif()
+ 
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+-
+   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     if(ARM)
+@@ -901,9 +898,9 @@
+   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+ 
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+ 
+   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+   # is fixed in the code (Issue #847), force compiler to be conservative.


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2023-03-01 23:04 Adam Pimentel
  0 siblings, 0 replies; 6+ messages in thread
From: Adam Pimentel @ 2023-03-01 23:04 UTC (permalink / raw
  To: gentoo-commits

commit:     75e3b2116f53ecf20adfc300c1c2bbee76a4d522
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Wed Mar  1 23:03:52 2023 +0000
Commit:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Wed Mar  1 23:03:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=75e3b211

net-p2p/feather: version bump for real this time

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

 net-p2p/feather/feather-2.4.1_pre20230301.ebuild   | 149 +++++++++++++++++++++
 .../feather_remove_cflags-2.4.1_pre20230301.patch  |  18 +++
 .../monero_remove_cflags-2.4.1_pre20230301.patch   |  25 ++++
 3 files changed, 192 insertions(+)

diff --git a/net-p2p/feather/feather-2.4.1_pre20230301.ebuild b/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
new file mode 100644
index 000000000..2f597359e
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+# Comit that fixes qt5:
+FEATHER_DIST_COMIT="8e10731e37621e271eea481dd93065a55c0a74c8"
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="772d207026dac31f927efa733fda3f73b103e71a"
+	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/${FEATHER_DIST_COMIT}.tar.gz -> \
+${P}.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 -> \
+${P}-monero.tar.gz
+	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-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/qtcore-5.15:5
+	>=dev-qt/qtwidgets-5.15:5
+	>=dev-qt/qtgui-5.15:5
+	>=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/qtmultimedia-5.15:5[widgets]
+	>=dev-qt/qtconcurrent-5.15:5
+	dev-libs/libgcrypt:=
+	sys-libs/zlib
+	dev-libs/openssl:=
+	net-dns/unbound:=[threads]
+	net-libs/czmq:=
+"
+RDEPEND="
+	${DEPEND}
+	net-vpn/tor
+	xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${P}.tar.gz \
+		${P}-singleapplication.tar.gz \
+		${P}-monero.tar.gz \
+		${P}-monero-miniupnp.tar.gz \
+		${P}-monero-randomx.tar.gz \
+		${P}-monero-rapidjson.tar.gz \
+		${P}-monero-supercop.tar.gz \
+		${P}-monero-trezorcommon.tar.gz
+	mv -T "${WORKDIR}"/feather-${FEATHER_DIST_COMIT} \
+		"${WORKDIR}"/${P} || die
+	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}"/${PF}/src/config-feather.h || die
+	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
+	pushd monero || die
+		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+	popd || 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"
+
+	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
+	domenu "${WORKDIR}"/${PF}/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/files/feather_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,12 +262,8 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
+
+ add_subdirectory(src)

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -773,9 +773,6 @@
+     message(STATUS "AES support disabled")
+   endif()
+ 
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+-
+   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     if(ARM)
+@@ -901,9 +898,9 @@
+   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+ 
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+ 
+   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+   # is fixed in the code (Issue #847), force compiler to be conservative.


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2023-08-17 16:11 David Roman
  0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-08-17 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f75e829550641520489b7911fd68aefe89105d90
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Aug 17 16:07:48 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Aug 17 16:07:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f75e8295

net-p2p/feather: drop 2.2.3, 2.3.0, 2.4.1_pre20230301

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 net-p2p/feather/Manifest                           |  24 ----
 net-p2p/feather/feather-2.2.3.ebuild               | 145 --------------------
 net-p2p/feather/feather-2.3.0.ebuild               | 144 --------------------
 net-p2p/feather/feather-2.4.1_pre20230301.ebuild   | 149 ---------------------
 .../files/feather_remove_cflags-2.2.3.patch        |  18 ---
 .../files/feather_remove_cflags-2.3.0.patch        |  18 ---
 .../feather_remove_cflags-2.4.1_pre20230301.patch  |  18 ---
 7 files changed, 516 deletions(-)

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 37e26bba1c..e9d6f65e19 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,27 +1,3 @@
-DIST feather-2.2.3-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.2.3-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.2.3-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.2.3-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
-DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
-DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
-DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0
-DIST feather-2.4.1_pre20230301-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.1_pre20230301-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.1_pre20230301-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.1_pre20230301-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.1_pre20230301-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.1_pre20230301-monero.tar.gz 11621070 BLAKE2B 8361a9f44eeb8a2035d3e110481aada7607b4bac2b52efc04ac6003665585d4d56629e88ab8c501e51997b3c3fe514a81b6f981bc07f3070eb24b897169300a6 SHA512 1bc23d60bebd51fdf459244376406c3eaec698457d0fc58f9628081c4b6297a15fb12dc848bbbbaafc77c367c59811ff36dbe499ac0fbcafd4ea10e0c6771f7e
-DIST feather-2.4.1_pre20230301-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.1_pre20230301.tar.gz 5458207 BLAKE2B 40f754a19778c227fcf73350f4bc5b61df142d18d17227dc7d83f2beef160ad170d1d40eea589d003c19459c2821b6b8630220dc612ba3abb981ebe622225b6d SHA512 eb09f6c7d45e238110d2f7c60401aba147acbb38784e51d5e43966b077c52e4e26c1d08cfbf4093cdb777fc8a01932b927603cb834f0d1b4b8b41fa913a9987b
 DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
 DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
 DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7

diff --git a/net-p2p/feather/feather-2.2.3.ebuild b/net-p2p/feather/feather-2.2.3.ebuild
deleted file mode 100644
index 6a22d7eb07..0000000000
--- a/net-p2p/feather/feather-2.2.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="5e3c15637ed0ecbef44782247ce7364c2893a674"
-	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 -> \
-${P}.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 -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-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/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=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/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-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}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-		eapply "${FILESDIR}"/monero_add_some_includes-${PV}.patch
-	popd || 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"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/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-2.3.0.ebuild b/net-p2p/feather/feather-2.3.0.ebuild
deleted file mode 100644
index 02e20aa061..0000000000
--- a/net-p2p/feather/feather-2.3.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
-	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 -> \
-${P}.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 -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-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/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=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/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-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}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || 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"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/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-2.4.1_pre20230301.ebuild b/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
deleted file mode 100644
index 2f597359e7..0000000000
--- a/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-# Comit that fixes qt5:
-FEATHER_DIST_COMIT="8e10731e37621e271eea481dd93065a55c0a74c8"
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="772d207026dac31f927efa733fda3f73b103e71a"
-	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/${FEATHER_DIST_COMIT}.tar.gz -> \
-${P}.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 -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-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/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=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/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/feather-${FEATHER_DIST_COMIT} \
-		"${WORKDIR}"/${P} || die
-	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}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || 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"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/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/files/feather_remove_cflags-2.2.3.patch b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
deleted file mode 100644
index 480179a15f..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,12 +284,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)

diff --git a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)

diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2023-08-17 16:11 David Roman
  0 siblings, 0 replies; 6+ messages in thread
From: David Roman @ 2023-08-17 16:11 UTC (permalink / raw
  To: gentoo-commits

commit:     af3ffc3cfd5ce3400f84e1fbd9a8762d944c7411
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Aug 17 16:11:32 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Aug 17 16:11:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af3ffc3c

net-p2p/feather: drop 2.4.2

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 net-p2p/feather/Manifest                           |   8 --
 net-p2p/feather/feather-2.4.2.ebuild               | 144 ---------------------
 .../files/feather_remove_cflags-2.4.2.patch        |  18 ---
 .../files/monero_add_some_includes-2.2.3.patch     |  25 ----
 .../feather/files/monero_remove_cflags-2.2.3.patch |  24 ----
 .../feather/files/monero_remove_cflags-2.3.0.patch |  25 ----
 .../monero_remove_cflags-2.4.1_pre20230301.patch   |  25 ----
 .../feather/files/monero_remove_cflags-2.4.2.patch |  25 ----
 8 files changed, 294 deletions(-)

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index e9d6f65e19..54c83270ef 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,11 +1,3 @@
-DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.2-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
-DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
 DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
 DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
 DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7

diff --git a/net-p2p/feather/feather-2.4.2.ebuild b/net-p2p/feather/feather-2.4.2.ebuild
deleted file mode 100644
index 54dbc41f48..0000000000
--- a/net-p2p/feather/feather-2.4.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="72519d14203061b59191144ee8cab736bc88b978"
-	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 -> \
-${P}.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 -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-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/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=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/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-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}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || 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"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/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/files/feather_remove_cflags-2.4.2.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)

diff --git a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch b/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
deleted file mode 100644
index d048d13de2..0000000000
--- a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
-index e00421f873e..da144aca403 100644
---- a/src/common/dns_utils.cpp
-+++ b/src/common/dns_utils.cpp
-@@ -30,6 +30,8 @@
- // check local first (in the event of static or in-source compilation of libunbound)
- #include "unbound.h"
- 
-+#include <deque>
-+#include <set>
- #include <stdlib.h>
- #include "include_base_utils.h"
- #include "common/threadpool.h"
-diff --git a/src/common/threadpool.h b/src/common/threadpool.h
-index 53421e18b30..fcf8ca9455a 100644
---- a/src/common/threadpool.h
-+++ b/src/common/threadpool.h
-@@ -31,6 +31,7 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <cstddef>
-+#include <deque>
- #include <functional>
- #include <utility>
- #include <vector>

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
deleted file mode 100644
index 23360c8179..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,8 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
-
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
-
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -901,9 +899,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.

diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/
@ 2024-07-16 15:46 Lucio Sauer
  0 siblings, 0 replies; 6+ messages in thread
From: Lucio Sauer @ 2024-07-16 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     2384af57b074f474030f5525ffe484b9c9b4d76e
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Tue Jul 16 15:36:27 2024 +0000
Commit:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Tue Jul 16 15:43:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2384af57

net-p2p/feather: add optional distfile authentication

Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>

 net-p2p/feather/Manifest                |  1 +
 net-p2p/feather/feather-2.6.7-r1.ebuild | 10 ++++---
 net-p2p/feather/files/MoneroArbo.asc    | 51 --------------------------------
 net-p2p/feather/files/featherwallet.asc | 52 ---------------------------------
 net-p2p/feather/files/tobtoht.asc       | 51 --------------------------------
 5 files changed, 7 insertions(+), 158 deletions(-)

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index cd498beb0..3d327bf92 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1 +1,2 @@
 DIST feather-2.6.7.tar.gz 29105182 BLAKE2B efdeee978cccc859c8951440e2d32f5375d251963aa99d50b676a7c8dd753ee8eb8f8ee401f5d4045b277e8c8133c260a62b97450f32f8a6fe7db3563140237e SHA512 c304a45f3a6a5ec89805012d8c5a6b906387db329e58969d88f45a4743eba5875e1f5ba76fc3f2be14764efc28b0e63c7641378e20fe312deed53900c35c939d
+DIST feather-2.6.7.tar.gz.asc 833 BLAKE2B 337e7c41ad3c6e2d101470ef32d47ded55b5abb4c9451c66ccff55a62f49d19ed335371278fa1ef76d77e67e08b93dba2efd51855ebe7a7d2630c2a12937b269 SHA512 f9242645e7e2f591173f29949a87a31ec9eab5898e33179cde3031ad050441f03f9b4dff3eb1a72681f6873c84ecc198aef2e08a7224cd92d72de3c1b00b4618

diff --git a/net-p2p/feather/feather-2.6.7-r1.ebuild b/net-p2p/feather/feather-2.6.7-r1.ebuild
index 1b44e944b..1694478cd 100644
--- a/net-p2p/feather/feather-2.6.7-r1.ebuild
+++ b/net-p2p/feather/feather-2.6.7-r1.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=8
 
-inherit cmake desktop xdg
-
-#TODO: Verify feather-${PV}.tar.gz with GPG keys provided at release page (against files/featherwallet.asc)
+inherit cmake desktop verify-sig xdg
 
 DESCRIPTION="A free, open-source Monero wallet"
 HOMEPAGE="https://featherwallet.org"
 SRC_URI="
 	https://github.com/feather-wallet/feather/releases/download/${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/feather-wallet/feather/releases/download/${PV}/${P}.tar.gz.asc )
 "
 
 # Feather is released under the terms of the BSD license, but it vendors
@@ -18,7 +17,7 @@ SRC_URI="
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="bounties calc crowdfunding exchange home localmonero qrcode reddit revuo tickers xmrig"
+IUSE="bounties calc crowdfunding exchange home localmonero qrcode reddit revuo tickers verify-sig xmrig"
 DEPEND="
 	dev-libs/libsodium:=
 	media-gfx/qrencode:=
@@ -44,8 +43,11 @@ RDEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-featherwallet )
 "
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/featherwallet.asc
+
 src_prepare() {
 	default
 	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die

diff --git a/net-p2p/feather/files/MoneroArbo.asc b/net-p2p/feather/files/MoneroArbo.asc
deleted file mode 100644
index 6ecc8b67d..000000000
--- a/net-p2p/feather/files/MoneroArbo.asc
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=L0EV
------END PGP PUBLIC KEY BLOCK-----

diff --git a/net-p2p/feather/files/featherwallet.asc b/net-p2p/feather/files/featherwallet.asc
deleted file mode 100644
index c047b2f4c..000000000
--- a/net-p2p/feather/files/featherwallet.asc
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-Ig==
-=2rq8
------END PGP PUBLIC KEY BLOCK-----

diff --git a/net-p2p/feather/files/tobtoht.asc b/net-p2p/feather/files/tobtoht.asc
deleted file mode 100644
index 16311b2d8..000000000
--- a/net-p2p/feather/files/tobtoht.asc
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=KI4D
------END PGP PUBLIC KEY BLOCK-----


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-07-16 15:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 15:46 [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/feather/files/, net-p2p/feather/ Lucio Sauer
  -- strict thread matches above, loose matches on Subject: below --
2023-08-17 16:11 David Roman
2023-08-17 16:11 David Roman
2023-03-01 23:04 Adam Pimentel
2023-02-04  9:22 Adam Pimentel
2022-12-25 21:02 Adam Pimentel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox