gentoo auto-resync : 13:10:2022 - 07:41:53

3 files changed, 21 insertions, 10 deletions

diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
index 1b352713f76a..dc23eefc92b3 100644
--- a/media-sound/mp3asm/Manifest
+++ b/media-sound/mp3asm/Manifest
@@ -1,4 +1,5 @@
 AUX mp3asm-0.1.3-fix-autotools.patch 179 BLAKE2B 423f263f1305f23189861ace8c44f8f4c10df05b7949d9d0b0b93f7f380eb8f546bd5653af1cd9d289dbf477db823a75bee8cb5058de8b842cf70d3f90c8c60e SHA512 052cfe837ef8736e974f1991b175c2a7d52992ffc80e11daa474d533a72f64ea333a9f2d0cb808f87f6d298c42fdd27706e6ecd863af28826fd525cbe386338a
+AUX mp3asm-0.1.3-log.patch 267 BLAKE2B 91d446051316961887989b0c34136da34e7d2f10980bcf8aaf4f044d3cd3c8d2b6daea50c0d26eb4fe1051ae8de5b47e0c84cf741b306146618856ad9562f9c3 SHA512 75ddb4201c61c920032d6ac42a479540a2c8776567a1f8a736dd20114afddec723f9e287b138b57b55d769b6388126415661d43ce8cdd2ee2418ef59098c683f
 DIST mp3asm-0.1.3-1.tar.bz2 46530 BLAKE2B 031ce687662f107285e373ccb1702743cd340017dd8b49414576454f12338824d1e417625fa1f6228d5f1dff33879b91c88e88ce2c7ee8deb498d01d2d165b57 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83
-EBUILD mp3asm-0.1.3-r2.ebuild 624 BLAKE2B 0f127a8a5774ca3824c17f0fa7cdac16c66de67626a16ed9f54ca69b52a6f7a8409343e709a7fb755a74962672ea482cc498375801fa06993a7a36a440960adf SHA512 3aa235b52897954da1b2b4ed03ebe0787585b5c5da9e919fd08e4897ad22132a2dc75b4f972a677bb2852d63a23c8891342dd548af90e33f9a0f8a68f4d220c3
+EBUILD mp3asm-0.1.3-r2.ebuild 626 BLAKE2B e4da117cfb622dfc0d5f92b39649e6157dcf0b4972453b2e02a113631a43dad6ccc02f4a4387ba82b226be6db5ba1274c5b1ab20b87ec7b3e54bdfbeeb0fdf05 SHA512 e4da0af47476a3215a66fd6d319191ce6d0020f1e36571258075d8371ff2c3039b49d4c628fadcc1a1e8b3ec0287aeda36334a411258fd9997890839fa1d9cdb
 MISC metadata.xml 330 BLAKE2B ead8743df1594ea8206cb23bea81b8508d9533d0bcd1d428bfe64d4654019a3e78bda35bf566227f5bb1b8f834651da8a5b9ae293402f4af2320c341bb6f482f SHA512 2fac487a715321c5aaa7c90f5756836f5ccd8b50c9b9bd59aa9c89894edc39249bb68d70a33612972cd06f0372288f10cf04f04dfa1ca601a39c61a4895ec4ae
diff --git a/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
new file mode 100644
index 000000000000..2fe3c032ce79
--- /dev/null
+++ b/media-sound/mp3asm/files/mp3asm-0.1.3-log.patch
@@ -0,0 +1,8 @@
+Lazy fix to prevent log() overlap that leads to failure with clang.
+https://bugs.gentoo.org/731028
+--- a/src/mp3asm.h
++++ b/src/mp3asm.h
+@@ -48,2 +48,3 @@
+ extern char *me; /* name of the executable */
++#define log logfile
+ extern logfile_t log; /* file to log to */
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
index a03af0ddc1db..ea03c2c4e219 100644
--- a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
 MY_PV="${PV}-1" # Patchlevel
 
-DESCRIPTION="A command line tool to clean and edit mp3 files"
+DESCRIPTION="Command line tool to clean and edit mp3 files"
 HOMEPAGE="https://sourceforge.net/projects/mp3asm/"
 SRC_URI="mirror://sourceforge/mp3asm/${PN}-${MY_PV}.tar.bz2"
+S="${WORKDIR}/${PN}-0.1" # the author uses weird numbering...
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-# the author uses weird numbering...
-S="${WORKDIR}/${PN}-0.1"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-autotools.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-autotools.patch
+	"${FILESDIR}"/${P}-log.patch
+)
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
 src_install() {
 	default
+
 	dodoc Changelog
 }