net-p2p/feather: deleted old files and simplified latest ebuild

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

4 files changed, 6 insertions, 101 deletions

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 40863a595..36e426a97 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -6,11 +6,5 @@ DIST feather-2.6.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
 DIST feather-2.6.2-monero.tar.gz 14007104 BLAKE2B e14c36698dfce91e430960166a3d6012139c12c6eda4bbf5cd1372054e80c7f762612a477a41bb5193cb7e01330edd138770fad03230b93ed7325ecff1a28943 SHA512 d1597e76bb51d3b56cb44c0b16b8e9e5329221e61364c4053319319736cd392ba354056fc2e911dda281d0f456b2a7da2393991b2e1d002ee23ae051351a2c58
 DIST feather-2.6.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
 DIST feather-2.6.2.tar.gz 1390990 BLAKE2B b173be0a32b9781613a22d6454ba9a2ed8d8512b210b36a1c0f99d4a7e5b344b86bcb3fc1c92652b5222c4df9b67f5adc767c06b9865390e9f265776068fd43f SHA512 4d59a79462634ac7ab2d8060457979c69a1f5ca42d92b8b565f98f8f2ccd7f8de13ea0bd698632eb0b09621ac725052629c128d77ef9389cff0ab855ef0e57d8
-DIST feather-2.6.7-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.6.7-monero-randomx.tar.gz 181365 BLAKE2B 93c061f2531747c25f3e232c52f7dae39bde798ed54174e186be7d6fbe20675281279157d6fe7f3495887a88524cd0a10a78ff827ea8c7584249db47dd66c49b SHA512 9bbe7d106a6cd518b81f3fcae7ddc78c94cc95ba7862911a0bd291755a0b6fcabcc183235befa7806945abde8160833b1fda1fa656bde6816f3d2672c5460fb5
-DIST feather-2.6.7-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.6.7-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.6.7-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.6.7-monero.tar.gz 14030046 BLAKE2B 9f366c65381085641c1ccfed96272fbced14a8217dd3021e54809b10f0d08132754f05a1257c5dc1950a15897a3480524d876a296002c481583057da3bdc38de SHA512 52115dcc0eb974c187250e964a5423dd210f4a66e317170312da550e768fa2244b3a6cc541066cd97609ae86b3994d1dcec6d041817f042d151d774bd313a95e
-DIST feather-2.6.7-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.6.7.tar.gz 1475553 BLAKE2B 167802dd711c536514ba5f989b96390e9d09cbbc8e72bcdb374b1eb588c5d80d0c45ba3242a546553eaf47934ec48d1803961b5faa2ea14a28291479f5759007 SHA512 babf869bb4546d5b40bcead3ba5aa6511db918f937c3ef28500fb48b24dd759c942adfb1884e21aac52c2ea6966171b580c941cceafb64bc47e77d4fcd5f29aa
+DIST feather-2.6.7-r1.tar.gz 29105182 BLAKE2B efdeee978cccc859c8951440e2d32f5375d251963aa99d50b676a7c8dd753ee8eb8f8ee401f5d4045b277e8c8133c260a62b97450f32f8a6fe7db3563140237e SHA512 c304a45f3a6a5ec89805012d8c5a6b906387db329e58969d88f45a4743eba5875e1f5ba76fc3f2be14764efc28b0e63c7641378e20fe312deed53900c35c939d
+DIST feather-2.6.7-r1.tar.gz.asc 833 BLAKE2B 337e7c41ad3c6e2d101470ef32d47ded55b5abb4c9451c66ccff55a62f49d19ed335371278fa1ef76d77e67e08b93dba2efd51855ebe7a7d2630c2a12937b269 SHA512 f9242645e7e2f591173f29949a87a31ec9eab5898e33179cde3031ad050441f03f9b4dff3eb1a72681f6873c84ecc198aef2e08a7224cd92d72de3c1b00b4618
diff --git a/net-p2p/feather/feather-2.6.7.ebuild b/net-p2p/feather/feather-2.6.7-r1.ebuild
index 639462fc7..d61a00d47 100644
--- a/net-p2p/feather/feather-2.6.7.ebuild
+++ b/net-p2p/feather/feather-2.6.7-r1.ebuild
@@ -5,33 +5,13 @@ EAPI=8
 
 inherit cmake desktop xdg
 
-#TODO: Verify feather-${PV}.tar.gz with https://github.com/feather-wallet/feather-sigs
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="ad951be2edfb3045ec3d0bb74a25badb91bc8b92"
-	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-	RANDOMX_DIST_COMIT="102f8acf90a7649ada410de5499a7ec62e49e1da"
-	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+#TODO: Verify feather-${PV}.tar.gz with GPG keys provided at release page (against files/tobtoht.asc) perhaps with pkg_pretend?
 
 DESCRIPTION="A free, open-source Monero wallet"
 HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${PF}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${PF}-singleapplication.tar.gz
-	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${PF}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${PF}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${PF}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${PF}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${PF}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${PF}-monero-trezorcommon.tar.gz
+SRC_URI="
+	https://github.com/feather-wallet/feather/releases/download/${PV}/feather-${PV}.tar.gz -> ${PF}.tar.gz
+	https://github.com/feather-wallet/feather/releases/download/2.6.7/feather-2.6.7.tar.gz.asc -> ${PF}.tar.gz.asc
 "
 
 # Feather is released under the terms of the BSD license, but it vendors
@@ -67,31 +47,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_unpack() {
-	unpack ${PF}.tar.gz \
-		${PF}-singleapplication.tar.gz \
-		${PF}-monero.tar.gz \
-		${PF}-monero-miniupnp.tar.gz \
-		${PF}-monero-randomx.tar.gz \
-		${PF}-monero-rapidjson.tar.gz \
-		${PF}-monero-supercop.tar.gz \
-		${PF}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
-	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero || die
-	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/miniupnp || die
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/randomx || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/rapidjson || die
-	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/supercop || die
-	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
 src_prepare() {
 	default
 	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die
@@ -123,7 +78,6 @@ src_configure() {
 		-DDONATE_BEG=OFF
 		-DWITH_SCANNER=$(usex qrcode)
 	)
-
 	cmake_src_configure
 }
 
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
deleted file mode 100644
index a3dbbb06e..000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.5.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_remove_cflags-2.4.5.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
deleted file mode 100644
index 869a7bdc8..000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.5.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.