[gentoo-commits] repo/gentoo:master commit in: media-sound/mikmod/files/, media-sound/mikmod/

[gentoo-commits] repo/gentoo:master commit in: media-sound/mikmod/files/, media-sound/mikmod/

[Sam James]

commit:     14f6cd650db9d3f9f3c05951acd823ea27475ed7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 03:12:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 03:13:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f6cd65

media-sound/mikmod: EAPI 8, fix -Wstrict-prototypes in configure

We may well have people proactively trying to use it and it's cheap to fix & build.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/mikmod-3.2.8-macro-strict-prototypes.patch       | 14 ++++++++++++++
 .../mikmod/{mikmod-3.2.8.ebuild => mikmod-3.2.8-r1.ebuild} | 12 ++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch b/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch
new file mode 100644
index 000000000000..2ede6e74c5b4
--- /dev/null
+++ b/media-sound/mikmod/files/mikmod-3.2.8-macro-strict-prototypes.patch
@@ -0,0 +1,14 @@
+Already fixed upstream in https://github.com/sezero/mikmod/commit/4ceeed3f3929b9d9f7cfe891d44f43d202b64416.
+
+Fixes -Wstrict-prototypes.
+--- a/m4/libmikmod.m4
++++ b/m4/libmikmod.m4
+@@ -79,7 +79,7 @@ char* my_strdup (char *str)
+   return new_str;
+ }
+ 
+-int main()
++int main(void)
+ {
+   int major,minor,micro;
+   int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;

diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8-r1.ebuild
similarity index 73%
rename from media-sound/mikmod/mikmod-3.2.8.ebuild
rename to media-sound/mikmod/mikmod-3.2.8-r1.ebuild
index 35c7ad01c3a3..9f75f52e84cb 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="A console MOD-Player based on libmikmod"
 HOMEPAGE="http://mikmod.sourceforge.net/"
@@ -10,11 +10,15 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE=""
 
 DEPEND="
 	>=media-libs/libmikmod-3.3
-	>=sys-libs/ncurses-5.7-r7:0="
+	>=sys-libs/ncurses-5.7-r7:=
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-macro-strict-prototypes.patch
+)