Skip to content

Commit

Permalink
net-p2p/p2pool: version bump, fix live ebuild
Browse files Browse the repository at this point in the history
Fixes: https://bugs.gentoo.org/941380

Signed-off-by: Adam Pimentel <[email protected]>
  • Loading branch information
Adam Pimentel committed Feb 12, 2025
1 parent d07bf3c commit ddf22cb
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 25 deletions.
4 changes: 2 additions & 2 deletions net-p2p/p2pool/Manifest
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIST p2pool-4.0.tar.xz 127772256 BLAKE2B 77de14bd19f43483fa7da0e65f8a27d5f6cf8c2daf5d8d5e07be373c752794bd35c421fd812b65328acd22004766ff235e9ad6e7e613d08ca3c27ac95153cbc3 SHA512 ea37993d13342b303902e6aa6acb090a908ba99ae304d9415480ff39a3647c84a963ab80b317c9c78a9f11631e0ca9547a08c6e0c23b83892037b63d4beef7a2
DIST p2pool-4.0_shasums.asc 2038 BLAKE2B f8f20875a9fa4771753b1eade7c609be761f007ac32a0641109d87890bdd7f2123f11a203d56ffcca5b74b16667e0d8288479688938935434b86875c6c72959c SHA512 bf4a933a81ce9bd48bf293a26d3e4e75b82c67fcfd48d79c57dd86aaac2c2cd54def43b47b05222e0b93fd61623d2c116c403531500a93d45059bca4a0dd3cb4
DIST p2pool-4.1.1.tar.xz 129219228 BLAKE2B b6ceebcb497b928dd61f9c85086295b674216afa24b6c74a4a60695a2fb72201c5544fe4d1904d3c3fd2f9e2d49a54db836946afc6dfeae8a457450c1ac177eb SHA512 d9e87336ed5b7aee7dc6dd4761dd1ea4a7afc5901985404976ebd442155a16fe3b09e6b6133c8f617c0dce073fd6d7dff98d535032338633a4a452d99410e0c9
DIST p2pool-4.1.1_shasums.asc 2021 BLAKE2B 6bf7bf3c4c1681944ee4296ca079111e2536a35ded2d39c741f6b2a15f36fe5b9de12e846fb4ce07f7d4fc17ef6c216c6d36ea1a6bb08828c45ccff9f0834467 SHA512 8a0740614f70725161f15bd179a10cc3597225f3b68b4bc5c2f31dadadd9f9b054062af635bd2a2fa550428fc2147f9729283490cb9d4fbe82d6c0c1202f1992
DIST p2pool-4.3.tar.xz 121435168 BLAKE2B fe09dbf3239b3a3785dcdcddb768f2ae2cdd8e4c7c4e07c4521c9f03b2eb6755b83ddb4ecc46fc9a2d524e6689be83bebea8dc43667b4f187db61d9aa9671084 SHA512 d3a1d4bd1b757fbdc3f7fd91aaeb457e19ed4f72dc9b6adf2ffb2e2e70916036d08ed19ec5e4b0aa534ebabfe43fba8f6956cd6c408c04b609ad761b985d35e5
DIST p2pool-4.3_shasums.asc 2007 BLAKE2B f772d5ed9f93ce54d90f1fc168af8e92f18872d1d274bdfadcf3444cc9a0d5e6a97ced411ec4150f819243cd7fbd373a6f9219b746f661e099f61ac21c6f566a SHA512 6e8ebc1cdcd3ad81ccabf29532d788662d89fab089166d038c53d5d5685b864c45bfe92c81cb39a69cea1bdd8f9bf94f69578d64e29cc093af4ccf4108865ea9
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

#TODO: enable/fix GRPC dependency and add it as USE flag (https://github.com/SChernykh/p2pool/issues/313)
#TODO: enable/fix GRPC/TLS dependency and add it as USE flag (https://github.com/SChernykh/p2pool/issues/313)
# These features build fine in cmake outside of portage, I can't figure out how to link them here for the life of me.
# It's probably better to just re-write the CMakeLists.txt to dynamicially link with gRPC

EAPI=8

Expand All @@ -17,11 +19,13 @@ SRC_URI="
LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
#IUSE="grpc"
#IUSE="grpc tls"

DEPEND="
dev-libs/libsodium
dev-libs/openssl
net-libs/czmq
dev-libs/libuv
net-misc/curl
"
BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-schernykh )
Expand All @@ -45,18 +49,13 @@ src_unpack() {
mv -T "${WORKDIR}"/${PN} "${WORKDIR}"/${P} || die
}

src_prepare(){
rm "${S}/cmake/flags.cmake" || die
cp "${FILESDIR}/flags.cmake" "${S}/cmake/flags.cmake" || die
cmake_src_prepare
default_src_prepare
}

src_configure() {
local mycmakeargs=(
-DSTATIC_BINARY=OFF
-DSTATIC_LIBS=OFF
-DWITH_RANDOMX=OFF
-DWITH_GRPC=OFF
#-DWITH_GRPC=$(usex grpc)
-DWITH_GRPC=OFF #$(usex grpc)
-DWITH_TLS=OFF #$(usex tls)
)
cmake_src_configure
}
Expand Down
18 changes: 7 additions & 11 deletions net-p2p/p2pool/p2pool-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,20 @@ LICENSE="BSD GPL-3+ ISC LGPL-3+ MIT"
SLOT="0"

DEPEND="
dev-libs/libsodium
dev-libs/openssl
net-libs/czmq
dev-libs/libuv
net-misc/curl
"

src_prepare() {
default

# 884447: remove -s from OPTIMIZATION_FLAGS
sed -i 's/-s\>//' cmake/flags.cmake || die

cmake_src_prepare
}

src_configure() {
local mycmakeargs=(
-DSTATIC_BINARY=OFF
-DSTATIC_LIBS=OFF
-DWITH_RANDOMX=OFF
-DWITH_GRPC=OFF
-DWITH_TLS=OFF
)

cmake_src_configure
}

Expand Down

0 comments on commit ddf22cb

Please sign in to comment.