3 files changed, 4 insertions, 84 deletions
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 2c3c27583be6..c2ab5bfcb1f9 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -12,6 +12,5 @@ AUX libsidplay-2.1.1-slibtool.patch 967 BLAKE2B ed31c7ac9c567fae2d802103d8f8f1f9
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r3.ebuild 988 BLAKE2B 56b2819a2dfb8df3a8af6c1bfed0d52953c5fd376599fe23f795a1aa5a5cd568bdfc3a1435f327cb700bf6f6199531725de493af5fdd14803bdf50460750f6a6 SHA512 f614c0682c3b00fe70bc3f5874fe085854d292cfb7a84aed38de29ee44ce7edee352439d6eb4a0ef67ae534ed59debf112090ebc2be043b7631660d31cef205a
-EBUILD libsidplay-2.1.1-r6.ebuild 1526 BLAKE2B 8915ac65a033fe9d6715577b0184a6f1729139c03815dd97ab2af1a0873fc3c3b98fb1ae61ab59b9123069781b41143bfa47b625d4cd9c6c3b5b55f10651cffd SHA512 57a84d4cc19ea0b5638cff0fbfb2554eeaab37a25759e4849e07eeafc3e2c55220c44cb158e23b64aeff44d6ca49e31ec994943eb5898a570c5d0da5574b1a84
-EBUILD libsidplay-2.1.1-r7.ebuild 1560 BLAKE2B f983b9723cb753e9017da93adc24414c21efed98cbccebe846e5c8755d5e70ffd0c5b2204c390c309d1c9c5d35b31c1fb0cb1447f2cb18eeb21d4b3b1e833cef SHA512 265c65fe4e8892a500f2d054077c33af97f1c73892c6adc0096ec6168b8d829de8e3da42db34cd2c2e30c605e62231935e73a724fad24b311739f5b7579c6322
+EBUILD libsidplay-2.1.1-r7.ebuild 1614 BLAKE2B 5657b52339b91cddc9e275bb868a5f1104e513d038cdf4f0dc4c77fa43999bfa0317cf163e4f7d1df723cf6eb0b4330022716de9b69909166a9f00eb83dec259 SHA512 5d75a9fd90d1dfb96a489264b00894d95e069aaa8662cb6414add5cac900294abe1ae611a28178883deab1a741e2bc4d39ace4952b26b402e05ed3d148bd3bd3
 MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
deleted file mode 100644
index 3ce5bf9beb7a..000000000000
--- a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-MY_P=sidplay-libs-${PV}
-
-DESCRIPTION="C64 SID player library"
-HOMEPAGE="http://sidplay2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="static-libs"
-
-BDEPEND="sys-devel/autoconf-archive"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/sidplay/sidconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-fbsd.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-no_libtool_reference.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-	"${FILESDIR}"/${P}-autoconf.patch
-	"${FILESDIR}"/${P}-slibtool.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	local subdirs=(
-		builders/hardsid-builder
-		builders/resid-builder
-		libsidplay
-		libsidutils
-		resid
-		.
-	)
-
-	for i in ${subdirs[@]}; do
-		(
-			cd "$i" || die
-			eautoreconf
-		)
-	done
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		--with-pic
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	docinto libsidplay
-	dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
-
-	docinto libsidutils
-	dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
-
-	docinto resid
-	dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
-
-	doenvd "${FILESDIR}"/65resid
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild
index 80158fbce0fb..82c377be1d06 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r7.ebuild
@@ -47,9 +47,10 @@ src_prepare() {
 		.
 	)
 
+	local i
 	for i in ${subdirs[@]}; do
 		(
-			cd "$i" || die
+			cd "${i}" || die
 			eautoreconf
 		)
 	done
@@ -59,6 +60,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
 		--enable-shared
 		--with-pic
 		$(use_enable static-libs static)