commit: af70243ef6718d96690da406965e2dfe89d5d5f9 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Jul 29 21:38:19 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Jul 29 21:38:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af70243e
media-sound/mp3val: update EAPI 6 -> 8 Closes: https://bugs.gentoo.org/724820 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../mp3val/files/mp3val-0.1.8-makefile.patch | 12 +++++++++++ media-sound/mp3val/files/mp3val-0.1.8-open.patch | 20 +++++++++---------- ...{mp3val-0.1.8.ebuild => mp3val-0.1.8-r1.ebuild} | 23 +++++++++++----------- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch new file mode 100644 index 000000000000..8da20930602f --- /dev/null +++ b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch @@ -0,0 +1,12 @@ +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -1,7 +1,7 @@ +-CXXFLAGS=-Wall -O2 ++CXXFLAGS += -Wall + + mp3val: main.o mpegparse.o out.o report.o crossapi.o crc.o +- $(CXX) $(CXXFLAGS) $^ -o $@ ++ $(CXX) $(LDFLAGS) $(CXXFLAGS) $^ -o $@ + + clean: + rm -f mp3val diff --git a/media-sound/mp3val/files/mp3val-0.1.8-open.patch b/media-sound/mp3val/files/mp3val-0.1.8-open.patch index 2b844c1fac1e..499e23272387 100644 --- a/media-sound/mp3val/files/mp3val-0.1.8-open.patch +++ b/media-sound/mp3val/files/mp3val-0.1.8-open.patch @@ -1,11 +1,11 @@ ---- mp3val-0.1.8-src/crossapi.cpp.orig 2010-05-03 10:45:53.000000000 -0700 -+++ mp3val-0.1.8-src/crossapi.cpp 2017-02-19 23:38:21.000000000 -0000 +--- a/crossapi.cpp ++++ b/crossapi.cpp @@ -241,7 +241,7 @@ - //Moving failed due to different logical drives of source and destination. Let's copy: - id=open(szOldName,O_RDONLY); - if(id==-1) return 0; -- od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC); -+ od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); - if(od==-1) { - close(id); - return 0; + //Moving failed due to different logical drives of source and destination. Let's copy: + id=open(szOldName,O_RDONLY); + if(id==-1) return 0; +- od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC); ++ od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); + if(od==-1) { + close(id); + return 0; diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild similarity index 66% rename from media-sound/mp3val/mp3val-0.1.8.ebuild rename to media-sound/mp3val/mp3val-0.1.8-r1.ebuild index 3294d430344a..6a51bfd27fde 100644 --- a/media-sound/mp3val/mp3val-0.1.8.ebuild +++ b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild @@ -1,29 +1,26 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit edos2unix +EAPI=8 + +inherit toolchain-funcs DESCRIPTION="Validate and fix MPEG audio files" HOMEPAGE="http://mp3val.sourceforge.net/"; SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz" +S="${WORKDIR}/${P}-src" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="" - -S="${WORKDIR}/${P}-src" PATCHES=( - "${FILESDIR}/${P}-open.patch" + "${FILESDIR}"/${P}-open.patch + "${FILESDIR}"/${P}-makefile.patch ) -src_prepare() { - edos2unix "${S}"/{*.{cpp,h},Makefile*} - chmod a-x "${S}"/* - sed -i -e '/^C.*FLAGS.*=/d' "${S}"/Makefile.linux - default +src_configure() { + tc-export CXX } src_compile() { @@ -32,6 +29,8 @@ src_compile() { src_install() { dobin mp3val - dohtml manual.html + dodoc changelog.txt + docinto html + dodoc manual.html }
