gentoo resync : 07.08.2021

4 files changed, 56 insertions, 54 deletions

diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest
index d3da9c2e1220..2170dd42d4d4 100644
--- a/games-arcade/ceferino/Manifest
+++ b/games-arcade/ceferino/Manifest
@@ -1,3 +1,4 @@
+AUX ceferino-0.97.8-fix-audio.patch 234 BLAKE2B 305b2a152d688648ea1c914d58db317eb7419e08cb5807b7c56db0a7742373538fd06d701964ccd43e165cd8727b8aa740c8b1f7d7eaf2ecefa7e9d5b5ac1bef SHA512 e7922ffdbb4bfd59a0492fb0741937c714570452d17ec0c324444dc50f763344ef8991fb367c2b8c98e8c163f711573f399a9bf8ab9d6843d2bca4dd668e9410
 DIST ceferino_0.97.8+svn37.orig.tar.gz 2104956 BLAKE2B b3cb68d37e383223def569a333950511e4506b1bea1337189dda36e4c04fd6261c45d532bb2ad3691e73989e8ce5544f7d5e750d035081441f8241401d62217b SHA512 83bccb39f0ecd9f41767c4d94cebb3266c77f11eb22d6cf517f6488af384bad88bdd538b5746e0a3c6e1a57481a4c946ec03afb97a000cd21664d3f179e1a9b6
-EBUILD ceferino-0.97.8-r2.ebuild 1126 BLAKE2B 64b68b3f59af2ca6577fcd2df882ff92f2c977c8aa0061b308a6aed6e7d4b3177fd61a99d69f3e2f5a5c38c9ee88b3cda844e4aa595a07d90369f295bce10ec6 SHA512 b172b191c483ac885fa88c33cf1c0d3cfc8fd3c6cdeebbca075933a36250f60c6d1550893b4f43551f266704f199e06ca1a52e14ccaddbba84535a66d38bed2a
+EBUILD ceferino-0.97.8-r3.ebuild 862 BLAKE2B c0e22f68d87f4ea5f2b0cbae6cf1f311ecd6746a0a1678ddf3f8d9ff757da282c557b50473029eb42f3573c81c970b2714ec0a6b49d54d1f7a1ae28b3f9c483a SHA512 398718fa3cbaf7021d5a2b079648d0795212341db19550fe7e6d0b0418da439b0481f6a911bd2cb76e9ac0025cad4cd9c6c39d7a01c5a75656822a1257a8c496
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
deleted file mode 100644
index 390859615e7d..000000000000
--- a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
-HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino"
-SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[video]
-	>=media-libs/sdl-image-1.2
-	>=media-libs/sdl-mixer-1.2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${P}+svn37"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
-		src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon data/ima/icono.png ${PN}.png
-	make_desktop_entry ceferino "Don Ceferino Hazaña"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
new file mode 100644
index 000000000000..d3aa76c8576c
--- /dev/null
+++ b/games-arcade/ceferino/ceferino-0.97.8-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
+HOMEPAGE="http://www.losersjuegos.com.ar/juegos/ceferino"
+SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
+S+="+svn37"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-audio.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	newicon data/ima/icono.png ${PN}.png
+	make_desktop_entry ${PN} "Don Ceferino Hazaña"
+}
diff --git a/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch
new file mode 100644
index 000000000000..6ac1de0d07f8
--- /dev/null
+++ b/games-arcade/ceferino/files/ceferino-0.97.8-fix-audio.patch
@@ -0,0 +1,11 @@
+12 .wav files for an array with 11 elements invokes undefined behavior.
+
+--- a/src/audio.h
++++ b/src/audio.h
+@@ -50,5 +50,5 @@
+ 		int canal_musica;
+ 
+-		Mix_Chunk *sonidos[11];
++		Mix_Chunk *sonidos[12];
+ 		Mix_Music *musicas[2];
+