7 files changed, 69 insertions, 44 deletions
diff --git a/net-p2p/p2pool/files/3.0-build-disable-strip.patch b/net-p2p/p2pool/files/3.0-build-disable-strip.patch
deleted file mode 100644
index b4c968a6..00000000
--- a/net-p2p/p2pool/files/3.0-build-disable-strip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8ec60266561939958bda2d848e480d120edabd9e Mon Sep 17 00:00:00 2001
-From: Bertrand Jacquin <bertrand@jacquin.bzh>
-Date: Thu, 16 Feb 2023 01:20:01 +0000
-Subject: [PATCH] build: disable strip
-
----
- cmake/flags.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/flags.cmake b/cmake/flags.cmake
-index 832697b97c6d..83a914636b81 100644
---- a/cmake/flags.cmake
-+++ b/cmake/flags.cmake
-@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
- if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
- 	set(GENERAL_FLAGS "-pthread")
- 	set(WARNING_FLAGS "-Wall -Wextra -Wcast-align -Wcast-qual -Wlogical-op -Wstrict-overflow=2 -Wundef -Wformat=2 -Wpointer-arith -Werror")
--	set(OPTIMIZATION_FLAGS "-Ofast -s -flto -fuse-linker-plugin")
-+	set(OPTIMIZATION_FLAGS "-Ofast -flto -fuse-linker-plugin")
- 
- 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
- 	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GENERAL_FLAGS} ${WARNING_FLAGS} ${OPTIMIZATION_FLAGS}")
diff --git a/net-p2p/p2pool/files/3.9-build-disable-strip.patch b/net-p2p/p2pool/files/3.9-build-disable-strip.patch
new file mode 100644
index 00000000..aa0f2332
--- /dev/null
+++ b/net-p2p/p2pool/files/3.9-build-disable-strip.patch
@@ -0,0 +1,22 @@
+From 5d9f36616a0a9b6b2a05cd5cf4135910aa1ec3ed Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Thu, 16 Feb 2023 01:20:01 +0000
+Subject: [PATCH] build: disable strip
+
+---
+ cmake/flags.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/flags.cmake b/cmake/flags.cmake
+index 1aac963ec8f4..8c27709e50a7 100644
+--- a/cmake/flags.cmake
++++ b/cmake/flags.cmake
+@@ -40,7 +40,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+ 	if (DEV_WITH_TSAN OR DEV_WITH_UBSAN OR DEV_WITH_ASAN)
+ 		set(OPTIMIZATION_FLAGS "-O2 -g")
+ 	else()
+-		set(OPTIMIZATION_FLAGS "-Ofast -s")
++		set(OPTIMIZATION_FLAGS "-Ofast")
+ 	endif()
+ 
+ 	if (WITH_LTO)
diff --git a/net-p2p/p2pool/files/3.0-build-randomx-static.patch b/net-p2p/p2pool/files/3.9-build-randomx-static.patch
index 0ad08058..0ad08058 100644
--- a/net-p2p/p2pool/files/3.0-build-randomx-static.patch
+++ b/net-p2p/p2pool/files/3.9-build-randomx-static.patch
diff --git a/net-p2p/p2pool/files/p2pool.service b/net-p2p/p2pool/files/p2pool.service
new file mode 100644
index 00000000..3e447c33
--- /dev/null
+++ b/net-p2p/p2pool/files/p2pool.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=p2pool daemon
+After=network-online.target monerod.service
+Wants=network-online.target monerod.service
+Requires=p2pool@%i.socket
+
+[Service]
+User=%p
+Group=%p
+WorkingDirectory=~
+RuntimeDirectory=%p/%i
+
+Type=exec
+ExecStart=/usr/bin/p2pool --wallet %i --data-api %t/%p/%i --local-api
+Sockets=p2pool@%i.socket
+
+StandardInput=socket
+StandardOutput=journal
+StandardError=journal
+
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-p2p/p2pool/files/p2pool.socket b/net-p2p/p2pool/files/p2pool.socket
new file mode 100644
index 00000000..b9f58bb8
--- /dev/null
+++ b/net-p2p/p2pool/files/p2pool.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Command FIFO for p2pool daemon
+
+[Socket]
+ListenFIFO=/run/p2pool/%i.control
+DirectoryMode=0755
+SocketMode=0666
+SocketUser=%p
+SocketGroup=%p
+RemoveOnStop=true
diff --git a/net-p2p/p2pool/files/p2pool@.service b/net-p2p/p2pool/files/p2pool@.service
deleted file mode 100644
index 02beef77..00000000
--- a/net-p2p/p2pool/files/p2pool@.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Monero P2Pool
-After=network.target
-
-[Service]
-User=%p
-Group=%p
-WorkingDirectory=~
-RuntimeDirectory=%p/%i
-
-Type=exec
-ExecStart=/usr/bin/p2pool --wallet %i --data-api %t/%p/%i --local-api
-
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-p2p/p2pool/p2pool-3.0.ebuild b/net-p2p/p2pool/p2pool-3.9.ebuild
index 41bf909b..b922672a 100644
--- a/net-p2p/p2pool/p2pool-3.0.ebuild
+++ b/net-p2p/p2pool/p2pool-3.9.ebuild
@@ -12,17 +12,16 @@ EGIT_COMMIT="v${PV}"
 
 EGIT_SUBMODULES=(
 	external/src/RandomX
+	external/src/miniupnp
 	external/src/robin-hood-hashing
 )
-EGIT_OVERRIDE_BRANCH_CHERNYKH_RANDOMX="${PN}"
-EGIT_OVERRIDE_COMMIT_SCHERNYKH_RANDOMX="1009a63ddf34beb359182aa296437ff4ead3b27d"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="lto upnp"
 
-DEPEND="net-libs/zeromq:=[sodium,pgm]
+DEPEND="net-libs/zeromq:=[sodium]
 	net-libs/cppzmq:=
 	dev-libs/libuv:=
 	net-misc/curl:="
@@ -41,6 +40,14 @@ src_configure () {
 		-DSTATIC_LIBS=OFF
 		-DWITH_RANDOMX=ON
 		-DDEV_TEST_SYNC=OFF
+		-DDEV_WITH_ASAN=OFF
+		-DDEV_WITH_MSAN=OFF
+		-DDEV_WITH_TSAN=OFF
+		-DDEV_WITH_UBSAN=OFF
+		-DDEV_CLANG_TIDY=OFF
+		-DDEV_TRACK_MEMORY=OFF
+		-DWITH_LTO=$(usex lto)
+		-DWITH_UPNP=$(usex upnp)
 	)
 	cmake_src_configure
 }
@@ -51,5 +58,6 @@ src_install () {
 	insinto "/usr/share/${PN}"
 	doins -r "${S}/docs/html"
 
-	systemd_dounit "${FILESDIR}/${PN}@.service"
+	systemd_newunit "${FILESDIR}/${PN}.service" "${PN}@.service"
+	systemd_newunit "${FILESDIR}/${PN}.socket" "${PN}@.socket"
 }