8 files changed, 93 insertions, 68 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 00c6ad30e010..b2eca69ea583 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index 7d33b5191eeb..48c07d524c61 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -2,6 +2,5 @@ AUX cdparanoia-missing-sys_types_h.patch 876 BLAKE2B 4624baa06a6d9c4d233104267b3
 AUX cdparanoia-pkgconfig.patch 2669 BLAKE2B d093fab1a683ff7713dd2fd9e0437d0fb0db467ed2f6f338b963a0aa8f90d405b3c8026720dd8d4243a7e0496870f1c43c22e51caec3c41442681b22e55285f2 SHA512 44e7c98b381867c619b8d16f80f176e281e4870a3bfcb4b1967d8567408240fbec6bb3b60d2f85f41c4497008d56dbc82265bdbba8a108784e37c30dc4cce056
 DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a8fb5af8add5c77b93b3cf219b1dd19d1317d0bf0197c9bf1cc2217b37c08ab1ff576982a0408d2c0adf6be79f25e35e0b36c SHA512 48ef57334f48d8b7449ea5ca361666d1a618529bf2e78182026fa09a94cd55865d18f4925369bf9de2c251d9420c0edfae17eb8726c157bb6eafd8b4fd410a5a
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
-EBUILD cdparanoia-3.10.2-r7.ebuild 1454 BLAKE2B e0707a180db7411bc2f026a3c659895c87639686e8ac3350bb31d67fcfcdf8b55a0877fa6373dd8321b3997894a8a63077ca750c2e5a9e3cb266000b55ce9a52 SHA512 cdd5f6adca1a8799a9850721339fcadfdd04e1d3dc19a58ceab8e4bab40674cfb98f971500687500e4a8fd1648f0f8aa987ab2578f03ddf246077669ad911e8a
 EBUILD cdparanoia-3.10.2-r8.ebuild 1486 BLAKE2B 6feccd9344543678c778f1fa514587ab17e5ff4a22aafa37e6867651f07e155d140fb4893d1d1548e9470467db327f28e007c28d250246cba35ccc121113e893 SHA512 9ec4cfe9c23b5a37d78ba799bf6303ea9b8cdb7e5492dee8ee8b7def884787961cfa641e11196ec2c9f23ef0fe0e41a4c6b3f18317f1f51074cd749cc382cf91
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
deleted file mode 100644
index 525682875051..000000000000
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools libtool toolchain-funcs multilib-minimal
-
-MY_P="${PN}-III-$(ver_cut 2-3)"
-DESCRIPTION="An advanced CDDA reader with error correction"
-HOMEPAGE="https://www.xiph.org/paranoia"
-SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
-	https://dev.gentoo.org/~pacho/${PN}/${P}-patches.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-eselect/eselect-cdparanoia"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Patches from previus patchset + Fedora + Debian
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply "${FILESDIR}"/${PN}-missing-sys_types_h.patch #713740
-
-	mv configure.guess config.guess
-	mv configure.sub config.sub
-
-	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
-
-	mv configure.{in,ac} || die
-	eautoconf
-	elibtoolize
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export AR CC RANLIB
-	econf
-}
-
-multilib_src_compile() {
-	emake OPT="${CFLAGS} -I${S}/interface"
-	use static-libs && emake lib OPT="${CFLAGS} -I${S}/interface"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/${PN}{,-paranoia}
-}
-
-pkg_postinst() {
-	eselect ${PN} update ifunset
-}
-
-pkg_postrm() {
-	eselect ${PN} update ifunset
-}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index b3086f53cec9..fa7818b3fe34 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -2,6 +2,6 @@ DIST schismtracker-20240328.source.tar.gz 1162427 BLAKE2B fe7b0337d4d3260242c30d
 DIST schismtracker-20240409.source.tar.gz 1162489 BLAKE2B 733ffd624e15b143c995bc124971ff49c18fb37fb65df1d8b3d1bf8b7283ddbfe9ab9906ee03230f68f85a224dcc149dce61e1d0ed1498a77e9dfcf2be2a8c7a SHA512 4ce52e4837148ff04487e1d060a4cde20f3ae924074949e225298ac6ed22a2a05186000536bdd48e38a19b09be34fa10054d68e2bda58634e92af86f0f4a2142
 DIST schismtracker-20240503.source.tar.gz 1172609 BLAKE2B 3229262a47a5b87174fc1113704100b0d5ed65468df441d7d84be9e7bd4b246613e83f6d6eaf3977d01f0c09f3a02d8d6f45c72749f5d9a6b6882f31c92b544d SHA512 f9f344962419b263a57306dd49635185a7d265da771439b6186222e768061b4b65258b87705b021d33c22c92413f07e4356c2b9db6491da86aed2ef3099aab6c
 EBUILD schismtracker-20240328.ebuild 1317 BLAKE2B d58825d7fe7144744656daf21732a92e2fa3b70f3ec074e2db828c14e7a99e4162621202e0f8b043fda6c2ee636de0f167c5406b63e5d061fd9a12d3e9333ef7 SHA512 44a5a15f9f59f559f79a6bf246511be968aa39260041f8a07b1188104e258a2188cf565ff3bab4977d9beb605595c814b21b9644e8e65ce39e97e6782323978d
-EBUILD schismtracker-20240409.ebuild 1319 BLAKE2B 23c25a3721c9794cb88eef64bc0423656fc9169d2863d4093b59f2b400fd88c91e811e92480e6851cbc5cadb27c7b6d109b790edc7c31018cf6a4a9f2521942d SHA512 d2d6925adfae5952afee421c38bd3788d64228e51a6a50be108350d0f5417fe58a4512c23dde412316db1f24e759fed1135c33c52876eff28164c5e868f783fc
+EBUILD schismtracker-20240409.ebuild 1317 BLAKE2B d58825d7fe7144744656daf21732a92e2fa3b70f3ec074e2db828c14e7a99e4162621202e0f8b043fda6c2ee636de0f167c5406b63e5d061fd9a12d3e9333ef7 SHA512 44a5a15f9f59f559f79a6bf246511be968aa39260041f8a07b1188104e258a2188cf565ff3bab4977d9beb605595c814b21b9644e8e65ce39e97e6782323978d
 EBUILD schismtracker-20240503.ebuild 1319 BLAKE2B 23c25a3721c9794cb88eef64bc0423656fc9169d2863d4093b59f2b400fd88c91e811e92480e6851cbc5cadb27c7b6d109b790edc7c31018cf6a4a9f2521942d SHA512 d2d6925adfae5952afee421c38bd3788d64228e51a6a50be108350d0f5417fe58a4512c23dde412316db1f24e759fed1135c33c52876eff28164c5e868f783fc
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20240409.ebuild b/media-sound/schismtracker/schismtracker-20240409.ebuild
index 9f693420ffe6..401281380980 100644
--- a/media-sound/schismtracker/schismtracker-20240409.ebuild
+++ b/media-sound/schismtracker/schismtracker-20240409.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/schismtracker/schismtracker/releases/download/${PV}/
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=media-libs/libsdl2-2.0.5[X]
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 68231312d223..5f53c5d0efd7 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,4 +1,6 @@
 AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f47c7e3b07746dbb3483de7de0b1f9face420395abc10f1205624e92eede1247e4c75785b3797a6ec373ada26f876d6a8cb45acbb SHA512 49714d3ea1db143771a2ebcfd3ddd08a60e6eb63fd1e2a0b676b2d0c359b25ebd9dd40510c0137e24ef7c44c718cc83843535fae00325a098f4f1542e18e6f67
+AUX streamripper-1.64.6-fix-c99.patch 1123 BLAKE2B 3e9c0e358cdccf7df935e1247a32a1b834ce0494bd210aec20000511085667634656ed9a8b21b3731c963aa7de5805b90ca569e2c4ff67ce1c95c1b47dbdc7d1 SHA512 6569b16e8656e24a2d424fd5a5c013e5dabfae5bf8a9f8025cae9062172a4dd317ce192623c8043a8a9faa3fc6a2853831012717496634049b99f9ff7f7bcc6d
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
+EBUILD streamripper-1.64.6-r1.ebuild 915 BLAKE2B 659e7d1843e74abb543ea3b763141bafc8d6fe37fc3f85a0b9e1e8af6a30325cdc90c961cce09d8fdd0b1cc39c549185b4bc5459c916152ff67d2c7f67940a11 SHA512 6c54cd180d6aa918ec49f85822aac419a68e12a9911838934d569e54592db1b9d7362097cd67c031714c16e5923cf0c77b81c4d991170b8b799311d6787e9883
 EBUILD streamripper-1.64.6.ebuild 875 BLAKE2B 9681460e4d97fab1cb862b1cc73735083f9f883d3c99816dbf16ef5595541658658fd02d4c1f5be69957c843ea21660b768910dc7a589d7fa77be3e5b2776cb2 SHA512 ef511d36b8d52fb0afbb8e53b7ebb64160b6512a839160bd74bfb3a5fb33377e462c24c519c125a669ad60f37e17265cae7adb055a89098f2b5c9c05f031a8cc
 MISC metadata.xml 346 BLAKE2B 676b46ee59507f6893d33744c01d5864fa50923718eb8907db92b05b2ee9449ddd2514c378d8dbe715a82e26633c7d370a62fc0414a4c2924c5a6cf950701167 SHA512 71db384aebbce86d8f5c01eeacd3064aa31678026e0d54a57e9eaf0080c0ac450d54fe4f9fc036b7225147b7483def87cd2e29b7dedb921696a59116fc4cce4d
diff --git a/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch b/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch
new file mode 100644
index 000000000000..60fb15da9433
--- /dev/null
+++ b/media-sound/streamripper/files/streamripper-1.64.6-fix-c99.patch
@@ -0,0 +1,44 @@
+We live in modern world and have ANSI C here. Plus, nothing defines ANSI_PROTOTYPES
+Include unconditionally
+
+Closes: https://bugs.gentoo.org/713314
+Closes: https://bugs.gentoo.org/896432
+--- a/lib/argv.c
++++ b/lib/argv.c
+@@ -52,25 +52,10 @@
+ 
+ /*  Routines imported from standard C runtime libraries. */
+ 
+-#ifdef ANSI_PROTOTYPES
+-
+ #include <stddef.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#else	/* !ANSI_PROTOTYPES */
+-
+-#if !defined _WIN32 || defined __GNUC__
+-extern char *memcpy ();		/* Copy memory region */
+-extern int strlen ();		/* Count length of string */
+-extern char *malloc ();		/* Standard memory allocater */
+-extern char *realloc ();	/* Standard memory reallocator */
+-extern void free ();		/* Free malloc'd memory */
+-extern char *strdup ();		/* Duplicate a string */
+-#endif
+-
+-#endif	/* ANSI_PROTOTYPES */
+-
+ 
+ #ifndef NULL
+ #define NULL 0
+--- a/lib/ripstream.c
++++ b/lib/ripstream.c
+@@ -714,7 +714,7 @@
+     char bigbuf[HEADER_SIZE] = "";
+     ID3V2frame id3v2frame;
+ #ifndef WIN32
+-    __uint32_t framesize = 0;
++    uint32_t framesize = 0;
+ #else
+     unsigned long int framesize = 0;
+ #endif
diff --git a/media-sound/streamripper/streamripper-1.64.6-r1.ebuild b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
new file mode 100644
index 000000000000..1efacf79082f
--- /dev/null
+++ b/media-sound/streamripper/streamripper-1.64.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
+HOMEPAGE="https://streamripper.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="vorbis"
+
+RDEPEND="
+	media-libs/libmad
+	media-libs/faad2
+	>=dev-libs/glib-2.16
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-fix-c99.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-included-libmad \
+		--without-included-argv \
+		$(use_with vorbis ogg)
+}
+
+src_install() {
+	default
+	dodoc parse_rules.txt
+}