gentoo auto-resync : 12:03:2025 - 01:49:51next

4 files changed, 14 insertions, 53 deletions

diff --git a/media-libs/libxmp/Manifest b/media-libs/libxmp/Manifest
index 88724670a21e..e077c812f6aa 100644
--- a/media-libs/libxmp/Manifest
+++ b/media-libs/libxmp/Manifest
@@ -1,6 +1,5 @@
 DIST libxmp-4.6.0.tar.gz 738532 BLAKE2B d383cb2e8c15c27e9f55954a4ae2ead6978b7e073e647ab667a2c0bb15848ff582626611b3f274ac5075bcdb7b5cfdc1a4f95d2ea76dc0ea64dab595ba8ca1b8 SHA512 d287544c9b569515f1a3fa92d8d930097b252e84f86cba5dd70e9b4460d0fa70754ece45dcc7ec314e434d821b43207d700afb12c9df80b467d73e9d029baafe
 DIST libxmp-4.6.1.tar.gz 798994 BLAKE2B 8bf853ee85b61c9bec46bd786f4741fcf2cff37a07cea4d8d6f60a66c09d6c9a6144e54786e8744942285d642ee7ab454290f06d0da946f2985d0c417752be26 SHA512 a772a489d8c1bedda378cd36f4f359bc224a1ac16ba12486b675667c76826d1308697f03e2d6502b654e4127eaaf3930684ee4367a73b75432273662af29111d
-EBUILD libxmp-4.6.0.ebuild 643 BLAKE2B 5160696d6f976e6ee5386da309dc45d8ed7cacec747d5caa108e94add93660ec3c19e584d9aad58517587cb94aa4afd895c5a313e170993160f1eb1134db01e6 SHA512 8c10dcb84568cad32635eac1bb2f81faf9302bbb964c550b448ee58efc70848949b732d15e98411f21755ce1c60251f21a5e1884ad6b70e3c6acd256a6d48f3d
-EBUILD libxmp-4.6.1.ebuild 653 BLAKE2B d7657a9e16a6887e2a6d435d5a132509538c9f7b86e3ba350e5ed75c10b28f83d4136fef228eecec42e0ce0a6b7e5f506c4002957c6069b13451366193b10f4f SHA512 8f056c156419e2f73ce5e08ab16711f8998138f0a3fbf3e028a1983c24d9303049a348c40eaba85daa98943809427a7dd0b034b2cbf263ac9a532917eb00e60f
-EBUILD libxmp-9999.ebuild 602 BLAKE2B 5b41171b295bbcc012f7c8cdac6cdb2afa4ce6117da3ceba041e5b87eb3428473bdab496c43b1348716db3a0ea171d3dc06d794b0f715cc3f3efc7ffc46cc797 SHA512 4d72118768fde5a197626facec4a7cdbfd6770636457017c0bdc87ec378aaaf44cd7f65db12ecd3d8be95570c8a181287c08fb3b2b0a15dba43929c372188bcc
+EBUILD libxmp-4.6.0.ebuild 513 BLAKE2B 4c3edce3dfcc0502b98e7f210ed8bf7f16a8658712295df6478521430e86d6c67611e971fa591666a3c07affa6752762071a85699da54a5efced9f19c40a1cb8 SHA512 1fe523a3d769fcb7bf78fb7e0e8600796a3042292ae86aba8a1e34e083e5c640055cdee59fa9e3f5b2894122ba13c73d9fce2e9cc3473ae16a486fd43999e813
+EBUILD libxmp-4.6.1.ebuild 523 BLAKE2B 3ac2dc01ea3baab55377066500151e8a531599fbaaa45b9fffc84845859d359e0ed68844963d57e004ab376dc5def8d77f2ab54b4084c78fbe6ba58ce8eb8700 SHA512 eeabcc2c02a9e3036fab0d0571f662a595c93c121274ca7a146b7b35f5eb91f0da910b6f1b4d1c79dfd88ea00e98e31a80ed371c103e208ef3116edffd270666
 MISC metadata.xml 246 BLAKE2B 03221de27616f3f7500121e460112bd248eaee25473a1866f22ad14529545303feeac5f21cd63d996a70ef4575780fabd63f8663a54174f4df7871090f39644d SHA512 79fe8212db6969bff7497a619d4e8f6c3118b490a69eb31e73a70cc788beb03715d4a6d3bca8f1be2756137a13334e29ce90956b5498e7581c91899069bbb8e9
diff --git a/media-libs/libxmp/libxmp-4.6.0.ebuild b/media-libs/libxmp/libxmp-4.6.0.ebuild
index e6e5aea207d4..64b8f3c9c57d 100644
--- a/media-libs/libxmp/libxmp-4.6.0.ebuild
+++ b/media-libs/libxmp/libxmp-4.6.0.ebuild
@@ -3,26 +3,21 @@
 
 EAPI=8
 
+inherit multilib-minimal
+
 DESCRIPTION="Library that renders module files to PCM data"
 HOMEPAGE="https://github.com/libxmp/libxmp"
+SRC_URI="https://github.com/libxmp/libxmp/releases/download/${P}/${P}.tar.gz"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libxmp/libxmp.git"
-else
-	SRC_URI="https://github.com/libxmp/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86"
-fi
-
-# bzip2 depacker code is 0BSD
 LICENSE="LGPL-2.1+ MIT 0BSD"
 SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake V=1
 }
diff --git a/media-libs/libxmp/libxmp-4.6.1.ebuild b/media-libs/libxmp/libxmp-4.6.1.ebuild
index 56b147867904..8cef43b4ee39 100644
--- a/media-libs/libxmp/libxmp-4.6.1.ebuild
+++ b/media-libs/libxmp/libxmp-4.6.1.ebuild
@@ -3,26 +3,21 @@
 
 EAPI=8
 
+inherit multilib-minimal
+
 DESCRIPTION="Library that renders module files to PCM data"
 HOMEPAGE="https://github.com/libxmp/libxmp"
+SRC_URI="https://github.com/libxmp/libxmp/releases/download/${P}/${P}.tar.gz"
 
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libxmp/libxmp.git"
-else
-	SRC_URI="https://github.com/libxmp/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-# bzip2 depacker code is 0BSD
 LICENSE="MIT 0BSD public-domain"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~sparc ~x86"
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	emake V=1
 }
diff --git a/media-libs/libxmp/libxmp-9999.ebuild b/media-libs/libxmp/libxmp-9999.ebuild
deleted file mode 100644
index 1e3ce2b867a3..000000000000
--- a/media-libs/libxmp/libxmp-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Library that renders module files to PCM data"
-HOMEPAGE="https://github.com/libxmp/libxmp"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/libxmp/libxmp.git"
-else
-	SRC_URI="https://github.com/libxmp/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-# bzip2 depacker code is 0BSD
-LICENSE="MIT 0BSD public-domain"
-SLOT="0"
-
-src_prepare() {
-	default
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_compile() {
-	emake V=1
-}