7 files changed, 6 insertions, 49 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 37f21e307a56..572b065007d2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 9d9142dbdfa4..bda26bfd4ae5 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,5 +1,5 @@
 DIST abcMIDI-2024.04.30.zip 633484 BLAKE2B 39935e46647556e2de2f920bb2ae4eebc8497827f22f950f7f6473cec4145009e5f6d31649c9e560424102bbd926684b338539076d157974c16abae978673d27 SHA512 95f78bb6d88f285ce74febb8937921a6c4740902caf1dc67cfca0c1a934636035792a0c5426ead46c85745e5900905e5530d9ab7feaa6107e7c6b10eeeb36aef
-DIST abcMIDI-2024.06.09.zip 633626 BLAKE2B 08f8a3081cbe6281c52a3c30287cc839a9d76e3aed98c0fb28a229f94e70aad1c7ad137471310ffd7c39c24065a65e0fb33a6d2e7db06f8cb5b48a3e16ef5e7d SHA512 c3d118245978db694e064a6fa605c65068d46bbcc23fdb433ea5166655b46ee945e712128a2bc4f803d96a3be2882b0951775ce610eab10d4ec3a14c8187d2cc
+DIST abcMIDI-2024.06.12.zip 633653 BLAKE2B 3afa8681f28032529b1c29bf6102ca7176878d1241348d046eaa59969142f9a610c0d88795c6efcc02052aaeca974453383287a4fb738423e9b98aa768fc6582 SHA512 828d7bfdd4ac6fd212ab1b41a201a9417289a3ee9fcc5b69414f6c2f14b169ea2aa20ba44c3abeacfb3a30ee1ecbd997eb816b7c3ea94c4ab3cfc13ff4b4712b
 EBUILD abcmidi-2024.04.30.ebuild 842 BLAKE2B 55bd4449eefe4c0860ae462842dd378a99a09af0b65d48947eae1d32053f93260e35e02e03455422cd62657c966723e42243bb291f9a2719daa83bf41988e7fe SHA512 434499075ba0ddbf9f75291dd229dcada503b62aaa7b7c6e408d15412302f7d4a6a22fb3302daf53c8ef06bb139988d6806a559d8aae8b154308fb5b480edc9b
-EBUILD abcmidi-2024.06.09.ebuild 844 BLAKE2B 40322a8d9af19c1d73ef93feffeb8ad8954c8b231de27870012c7c644832eeb220122204ce0af51499c7a22f12655b9c76f7209117039416c378152b6827fcf0 SHA512 fda5935c54e9f8c3ca30c7126f5bdc59618104c8947ec5dbe5f861cd5b357ff472bfd317186ff41bbf7a65cb17b0bdcb565de21b0af943ff1f7e61c2c17a10f5
+EBUILD abcmidi-2024.06.12.ebuild 844 BLAKE2B 40322a8d9af19c1d73ef93feffeb8ad8954c8b231de27870012c7c644832eeb220122204ce0af51499c7a22f12655b9c76f7209117039416c378152b6827fcf0 SHA512 fda5935c54e9f8c3ca30c7126f5bdc59618104c8947ec5dbe5f861cd5b357ff472bfd317186ff41bbf7a65cb17b0bdcb565de21b0af943ff1f7e61c2c17a10f5
 MISC metadata.xml 382 BLAKE2B c115548ee2b0caa47535aeeda6dfac2666bdd08aa444d1a39f2ba829ccbfaabfefc0c94a1fc0d59a72c17d6cea045531c13b66c449c40351432ad4830ced6c1d SHA512 ba8f57a005267fda3d71bf26cbaffb4cd16bcdd6811a4b618140d6d56dd0b16477d02d66ebd86b93bebd52a22cd554d9bb4ca8e9c2bf865e4c95a8c1205922af
diff --git a/media-sound/abcmidi/abcmidi-2024.06.09.ebuild b/media-sound/abcmidi/abcmidi-2024.06.12.ebuild
index 8aed3dc3a8d2..8aed3dc3a8d2 100644
--- a/media-sound/abcmidi/abcmidi-2024.06.09.ebuild
+++ b/media-sound/abcmidi/abcmidi-2024.06.12.ebuild
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d96c4be8e19a..3a3ba9d6bb06 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,7 +1,7 @@
 AUX hydrogen-1.2.1-gnuinstalldirs.patch 1725 BLAKE2B e6b4b0f00b3a155d391ee21ad031b3a12882e652914b9ab40550bade3fc2465c327abe2edb9a4a9ff8e7d15d6700a16ba3e081bba696110ce96f21b91c90ed98 SHA512 d81f04c4f66d860832d767cdb0ef85fbfd05c4846c38ea1b4128ed1bb7e384b54e9844f91236b8fa39af50691334f22efcbea348fc48fc71e844a5b9bd03acab
 AUX hydrogen-1.2.2-cflags.patch 282 BLAKE2B 9535b11fe3d29d5a2ae621aa25084d3cf1540143a3c17979ef9f088b99a7ace4a7e0307f06582f660cb3e7820f27486d130d0f9738670d84e2892a5553043021 SHA512 07d1d0fad5d018507fbf533d71f38ba2325fefb2e51973e3b032fe029b4688695388e7962556d57d9f128178c05235a0aad2281d4b4bd5c293f2f8e10eb51815
 AUX hydrogen-1.2.2-no-pch-include.patch 293 BLAKE2B 11c8990480cbab309736e922d6fd87234865779685a619e9e912359474329d4b0b214f9a37cd29eaad67487418803c9c3e9b261ac72d127c57631dcb3a37869d SHA512 63b9e2bd89d8cacd9f953aff993de9b6aebf4242957e8fd67bfb1715658d192e6864012ededa67a9348616f73f8d12182f2756c39b8751e85095a1b55855c1d1
-AUX hydrogen-1.3.0-cflags.patch 282 BLAKE2B c16bd70b48e231f98787d416d2658c95c329237433f5734a24bd50caa4cf4922964afe80d2a4c4e08e5e169dacfbe415e75db9502169dfae15e6b9ded3d4eb68 SHA512 ff7733a3e1123e6851f5697f2c36c46a457ba22e9543399abe1cd9969d75eddd1c5afc27b4eb97747f86457485acb42c8154fc423b49c8a8a112c519639bae39
+AUX hydrogen-1.3.0-cflags.patch 276 BLAKE2B 69c498f23394f4c29f46c48462f6454d294683e79a809f451d8c080684bb2e5b519f82ba2c31f1f324412c45dbafe335bb59c056c510b33dcb7ba5c6960d7933 SHA512 405d6851db83229fdaf1ff7c4534f7477555e583aad91bb2148947a40303ae1d1b44efa780d56c635854984c87f44b8caa438a8c8cc2ad068a8f7f74b1294a37
 AUX hydrogen-1.3.0-gnuinstalldirs.patch 1677 BLAKE2B 3346a4043f26f7cb9eb65ecb2f42c996b14fc9eab6ba87ace41e928868248e1ed12c00eef55b4d6ea54205d8fb561e42cdb39a6f7e21ca1e3e6497571c17055f SHA512 0e675e6fa839aa0451bdf1caf6fee66b973092ef5ac32ff301f8e9d5f114461d0d95b836012da5cc2fcf756c38eed33ff7233bb44ff83f6275f439eecdd247f5
 DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0
 EBUILD hydrogen-1.2.2-r1.ebuild 2155 BLAKE2B 8b5ff3f837d6b08c8c1fbc3ba45ee9ff3c017788685bc08fbf8474322602c150be59da7e134b9c64acae54e190f3105e923ab1c9f76e94997bf84541dce02f94 SHA512 5a94e68f6efd31b6ef051e927c180ad39609b2ee5716c673cd0f16dcb6a144e50e291d4dba2585d86d1e2273d8810f05b91e764ce8b8e9d1a2da2a638ad15410
diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
index f08f1af10ddd..8bb93a12366f 100644
--- a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
+++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch
@@ -1,10 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -173,7 +173,7 @@ endif()
+@@ -174,7 +174,7 @@ endif()
  if(WANT_DEBUG)
- 	set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0")
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
  else()
--	set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math")
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math")
 +	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
  endif()
  
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index eda4a9fcb4c1..33a8d3f1c16a 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -2,5 +2,4 @@ AUX streamripper-1.64.6-fix-autotools.patch 260 BLAKE2B b216a7a62c3c1ec53e98b85f
 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 910 BLAKE2B db06fbe7a9b1c6174f6ca8e2e4740a06324d1ea60e92cb9d6ec54773fce3409cb7bd855c91a0cdccf2de5bffdc54a7b29d121c320f1bb9ea4fdc9236f2c6d0f9 SHA512 a6413d0302ec68764f3f7fd7b4bd119bfc7eaafeed7a84e1dec57eca382cebd1b0bd579c767239a5ada1157b7ba12bb1a13147648c701a24e60aa23928bc3613
-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/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
deleted file mode 100644
index 72dbeb087df7..000000000000
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-included-libmad \
-		--without-included-argv \
-		$(use_with vorbis ogg)
-}
-
-src_install() {
-	default
-	dodoc parse_rules.txt
-}