5 files changed, 83 insertions, 13 deletions
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 456d0e9274c5..b154f40cca74 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/spindown/Manifest b/sys-block/spindown/Manifest
index 72c594991afc..0d80405a3984 100644
--- a/sys-block/spindown/Manifest
+++ b/sys-block/spindown/Manifest
@@ -1,6 +1,8 @@
 AUX spindown-0.4.0-CFLAGS-LDFLAGS.patch 1877 BLAKE2B 397a96234aa0c8a7d437b05dafcec92b4e341c5dd6df324ac7ca036102cf825f119c16323767dd93440a42a5c0f7cba189a7427518efb5232a59a24cb9ee45f8 SHA512 75b12fd3c4789b78260318da117f43a7439aa94b21cb5fe8403bad9045dab8725b1913023bbff704f3379eee37fd3726e0e28b8674bd42f3df3c61caadffd30e
+AUX spindown-0.4.0-Makefile.patch 2020 BLAKE2B 1799242bf4297b9bb73369455c9a275b2406391d4603cd19319e1af51b073fff95fb427ebfceadb25c5b54037d1770440e82b7b75d493d49be2bba06b66b3276 SHA512 bd25ac5b5e5ced591c57fc8b2b903232f816c80a6e220ec58f94c127f8b81ccc5f8b52f3cf59850ae3e9b66e1aec7ba2deccdfa2ec973a3e4c9d851b83b6e74b
+AUX spindown-0.4.0-musl-time-include.patch 186 BLAKE2B cbba240d473597232bf9cc64a5083ae76e9783c045f0846de2de1a75efe2d5c58a8faf307d6fead1321fd7f75b3716cae8d6730c1094e46049477038159107e5 SHA512 34a2b27e45a1a71b57ecb95e0cec2528495085e3acfa001fbce7409a22dcaea4182d88a4d721f9dced559a847913137a26638c692cc2dd8767f473d64c9d17a8
 AUX spindownd.confd-r1 270 BLAKE2B 9adc5d9b170125a5243ae23150a91750b91ee283ca9d2e95b7fed950f7e83373cd2f25389c9a2ef858c441e9b47a37c8c8f526d68889a50a17a4ecf816681f84 SHA512 64c7d820e3f3eda3f7fa9e18fdcbd0677338245c14e071f75531c96b679997c06346749975ef6060eec7bca5af569f2e0700457e3ca690d98b705b0ec4ba38ad
 AUX spindownd.initd-r1 1510 BLAKE2B e4755c4975cb602a86108e994d66c570991af34dabf2967f2188368e45a089bfe6dfebba43740817c68e5465791eda5a1ec6f64f23036148f6dcdaff502d97b1 SHA512 318aff8a054a150ffe22e120f02e33773cad3efe247500303e2c528c9ddcc43f0dc71c89909cf2bd883789eadfa3d16abe741c03402bbb06d16cfb790cafebe8
 DIST spindown-0.4.0.tar.gz 36837 BLAKE2B 9d394aa3706092c791dc7be214af68f0a3990f4d447cd89c7fc8cba2e253a3075b539b12dc6c2e44278db190a3936bf238a4414a3465f334cb5fe8f63859edde SHA512 12cfd63c2f2c1fe6c3082f824fea925e236a39ff68ef217178fc9798f1e0e1ef8aa9863f9c2c0babfa29ef7e21290d10914beefd2284ff73a2bb786ad4bc24dc
-EBUILD spindown-0.4.0-r5.ebuild 1004 BLAKE2B 08afec54a45ced35901ec40dfa52cbfbe3d7c4d76bb3dd3f869218bc7e1c197abeb0d691dcb8d3103ddc401b26a639a426f59b5f036e6bf98b4065b26694f636 SHA512 4d59eb20e7d65c328ce9d0a3886be169d64274c596b8932baed0868a72702a69414aa6440e3975b7236979f91416363a8dadbe9f2e32823b5c08557178434a68
+EBUILD spindown-0.4.0-r5.ebuild 1079 BLAKE2B 5164885e1c47963a9856af54691dc607fde0624d311777d63f9a95ba0fafc978604885d01403440b248cc4887e93ae0e435563786fc44ae8b71434b9a3645ffb SHA512 4a7bfab9df2c1ac127af82003c03fa495aa31d5846f09db3942c001dc710d748abb36d5570de0cb3e3521ede1560099f99818bcb92a252decd8bf6376b20b550
 MISC metadata.xml 246 BLAKE2B 4a64d43a48825660b055ff5a2f1bbe23e331e6ef17a0c65a9712384588d32d4b44876654b38ea1c9d1e7ce89bf96253ed12cfdc583c331e3becefc9c42b1b9ab SHA512 1d669922816e6f42c90d256384f31a080feb19a7fba9b1ecfe5326d60b2d27422e4700f232a142bed5dc77ad08528a9e448349e564235ea35efe2febe4949e0a
diff --git a/sys-block/spindown/files/spindown-0.4.0-Makefile.patch b/sys-block/spindown/files/spindown-0.4.0-Makefile.patch
new file mode 100644
index 000000000000..60bfdb25616f
--- /dev/null
+++ b/sys-block/spindown/files/spindown-0.4.0-Makefile.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,8 +3,8 @@ ETCDIR = $(DESTDIR)/etc
+ VERSION = 0.4.0
+ OBJS = main.o diskset.o disk.o spindown.o iniparser.o dictionary.o log.o spindownd.o\
+         exceptions.o
+-CC = g++
+-CFLAGS +=
++CXX ?= c++
++CXXFLAGS +=
+ LDFLAGS +=
+ SRC = src/
+ INPARSER = $(SRC)ininiparser3.0b/
+@@ -61,31 +61,31 @@ dist:
+ 	rm -d -r -f $(SRCDIR)
+ 
+ spindownd: $(OBJS)
+-	g++ $(CFLAGS) $(LDFLAGS) -o spindownd $(OBJS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o spindownd $(OBJS)
+ 
+ main.o: $(SRC)main.cpp $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)main.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)main.cpp
+ 
+ diskset.o: $(SRC)diskset.cpp $(SRC)diskset.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)diskset.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)diskset.cpp
+ 
+ disk.o: $(SRC)disk.cpp $(SRC)disk.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)disk.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)disk.cpp
+ 
+ spindown.o: $(SRC)spindown.cpp $(SRC)spindown.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindown.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)spindown.cpp
+ 
+ spindownd.o: $(SRC)spindownd.cpp $(SRC)spindownd.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)spindownd.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)spindownd.cpp
+ 
+ log.o: $(SRC)log.cpp $(SRC)log.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)log.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)log.cpp
+ 
+ exceptions.o: $(SRC)exceptions.cpp $(SRC)exceptions.h $(SRC)general.h
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(SRC)exceptions.cpp
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(SRC)exceptions.cpp
+ 
+ iniparser.o: $(INPARSER)iniparser.c
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)iniparser.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(INPARSER)iniparser.c
+ 
+ dictionary.o: $(INPARSER)dictionary.c
+-	g++ $(CFLAGS) $(LDFLAGS) -c $(INPARSER)dictionary.c
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -c $(INPARSER)dictionary.c
diff --git a/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch b/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch
new file mode 100644
index 000000000000..8b42b5e41c9d
--- /dev/null
+++ b/sys-block/spindown/files/spindown-0.4.0-musl-time-include.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/863074
+--- a/src/disk.h
++++ b/src/disk.h
+@@ -30,6 +30,7 @@
+ 
+ #include "ininiparser3.0b/iniparser.h"
+ 
++#include <ctime>
+ #include <string>
+ using std::string;
+ 
diff --git a/sys-block/spindown/spindown-0.4.0-r5.ebuild b/sys-block/spindown/spindown-0.4.0-r5.ebuild
index ecc1c975e4cc..8d80fdb10e54 100644
--- a/sys-block/spindown/spindown-0.4.0-r5.ebuild
+++ b/sys-block/spindown/spindown-0.4.0-r5.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Spindown is a daemon that can spin down idle disks"
 HOMEPAGE="https://code.google.com/p/spindown"
@@ -10,33 +12,33 @@ SRC_URI="https://spindown.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-apps/sg3_utils"
+RDEPEND="sys-apps/sg3_utils"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-CFLAGS-LDFLAGS.patch
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-CFLAGS-LDFLAGS.patch
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-musl-time-include.patch
+)
 
 src_compile() {
-	emake
+	emake CXX="$(tc-getCXX)"
 }
 
 src_install() {
 	insinto /etc
 	newins spindown.conf.example spindown.conf
+
 	newinitd "${FILESDIR}"/spindownd.initd-r1 spindownd
 	newconfd "${FILESDIR}"/spindownd.confd-r1 spindownd
+
 	dosbin spindownd
 	dodoc CHANGELOG README TODO spindown.conf.example
 }
 
 pkg_postinst() {
 	elog "Before starting spindownd the first time"
-	elog "you should modify /etc/spindown.conf"
+	elog "you should modify ${EROOT}/etc/spindown.conf"
 	elog
 	elog "To start spindownd by default"
 	elog "you should add it to the default runlevel:"