gentoo auto-resync : 06:04:2023 - 11:27:37

5 files changed, 4 insertions, 60 deletions

diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 7d038fbac66a..c270fe038f0a 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -1,8 +1,5 @@
-AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320ab3488e13dbbfb420f8185fd615732912e17f416537b4d210cf8cf48745a3b6dc2df8be49274904626e9db432f2f347dacfbe99a6 SHA512 4fa8bfe0665713b65b0b3f9be59589c98c7fbe5aa278ee95107fd1b91ba1a25fbd20a86bf91ab7eb7e160f522e04dc78838ada6298d4f5c1905b528c1fd7a57e
-AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
-AUX libmodplug-0.8.9.1-timidity.patch 415 BLAKE2B b227b051a542879127230963e378419dfec4d10b603d4b0707ab24e9d150d37769763da88db0c893aa08e6ba930013b91a195f8f764dcaa231adbcaecb9bedf5 SHA512 b0a8847698e335b11ae4f729aaa729cf72dc5be3cd890d4a11c258480e9178f20d431786acab22a1edcbadc64858f204a9e1ca6c99e81b8cf9d9dbdc52596dc8
-DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
+AUX libmodplug-0.8.9.0-no-fast-math.patch 325 BLAKE2B a9f21d2e1c344ba597e67c3edf68f1811381e666000746d23375655264d0a4e45982886f4de85b61916cd31c613eb8dd8093236b05266e767500e9baaaaa662a SHA512 21793db02544be3238dc78586b876dd6a28afd95f2bb68d557c9bac304debb52cc05d315078537276b01a900c17130656c0b433915f0a0d5c540e79f484a8ed1
+AUX libmodplug-0.8.9.1-timidity.patch 336 BLAKE2B 3c006bc0acb64f92b7368135c9ee704f3f4c6cca0f3b51d69c9b7142b96a3f079e2693b92de3e7f5e725be55e2417fb608372e53cee7671bd6bd83401a263bde SHA512 8338e54811a31c37bff642945b027d1b55a977bc09b943d36613ddea3275fcd99ef8f74223d3a1b413ef658686cb4e8c129bf9520cf282ca1ef2a801c69c6ba8
 DIST libmodplug-0.8.9.1.tar.gz 238609 BLAKE2B ae992de04e38d341bc561afe042afd83c09bd2d8e71773ec82a2a541db9e462a163b0175cd5307f04a4449b98bd57ab4852e44be04a06f1a265bd728c3434aa6 SHA512 7eca5519369c66d96069f2c56cd087e60fb8c4d04ee994c410b5ab0cef2480fdd95dd0602a01310fd064fade23abfb841a3f5ddc12b31187e23e24f10b780d8c
-EBUILD libmodplug-0.8.9.0-r1.ebuild 842 BLAKE2B e2570155daf60061e0acdab6a8e2d28980c494f9c4ec071f135fbbaa5139519e710a3d9db5e3325a1a660ac0831ca094a76d9e8f35ffbdb429477e5319d80b5c SHA512 da152ef21563f8f9289f5a2f97f6e47eb1cbf814e94994f5f135f425129df81fdb6965500ea7e3f6bb50f127b500d927c000bc444bb72a301a0176c76a3a526f
 EBUILD libmodplug-0.8.9.1.ebuild 948 BLAKE2B 6e154d68d3879fd508b6250e1229b91884a9c7c6794dfebed9d2b0ab7578733d416a7c5a7617f0d8c26270b9e0d1e92fe232e6eb5583c5a330fc0dfbae481c7c SHA512 477d66c00580d28832b53c69b0e20664d6ebb9858321a229c260d2640b43c0a4eea90cc43e654fef892ca90da26bc402283bb674b71a149c68df98c864391387
 MISC metadata.xml 396 BLAKE2B 5e597902d3b70673452b64143c3adfd810e5040fd19c2e542719755db89bd3d36fe2928c42a4a3195c12399f7318d1d21efd2564558aed4ff214a750e65863e5 SHA512 2d630e3182fa888c31810aac8d1249259df1516dbe267711a8540fb6f9f81373d5b801fe448995b2ed20b3cf0d70d61b9cb8d12dd812663f74d311868fcdcefd
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch b/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch
deleted file mode 100644
index cb5d56006102..000000000000
--- a/media-libs/libmodplug/files/libmodplug-0.8.4-timidity-patches.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libmodplug-0.8.4/src/load_pat.cpp
-===================================================================
---- a/src/load_pat.cpp
-+++ b/src/load_pat.cpp
-@@ -53,8 +53,8 @@ typedef UWORD WORD;
- #define PATHFORPAT	"C:\\TIMIDITY\\INSTRUMENTS"
- #else
- #define DIRDELIM		'/'
--#define TIMIDITYCFG	"/usr/local/share/timidity/timidity.cfg"
--#define PATHFORPAT	"/usr/local/share/timidity/instruments"
-+#define TIMIDITYCFG	"/usr/share/timidity/timidity.cfg"
-+#define PATHFORPAT	"/usr/share/timidity/current"
- #endif
- 
- #define PAT_ENV_PATH2CFG			"MMPAT_PATH_TO_CFG"
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
index 83bf8d9a8e30..85774eb515f4 100644
--- a/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
+++ b/media-libs/libmodplug/files/libmodplug-0.8.9.0-no-fast-math.patch
@@ -1,6 +1,5 @@
-diff -uNr a/configure.ac b/configure.ac
---- a/configure.ac	2017-07-26 22:39:07.461198820 +0100
-+++ b/configure.ac	2017-07-26 22:39:53.284622741 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -31,7 +31,7 @@
  AC_CHECK_HEADERS([inttypes.h stdint.h malloc.h])
  AC_CHECK_FUNCS(setenv sinf)
diff --git a/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch b/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch
index 152f157f26cc..905e2be06ee3 100644
--- a/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch
+++ b/media-libs/libmodplug/files/libmodplug-0.8.9.1-timidity.patch
@@ -1,5 +1,3 @@
-diff --git a/src/load_pat.cpp b/src/load_pat.cpp
-index fe78731..a52dec6 100644
 --- a/src/load_pat.cpp
 +++ b/src/load_pat.cpp
 @@ -56,7 +56,7 @@
diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
deleted file mode 100644
index 70ac9526dd91..000000000000
--- a/media-libs/libmodplug/libmodplug-0.8.9.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library for playing MOD-like music files"
-HOMEPAGE="http://modplug-xmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.4-timidity-patches.patch"
-	"${FILESDIR}/${P}-no-fast-math.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf --disable-static
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}