4 files changed, 59 insertions, 1 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ccd929bd6b40..d33497af3287 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 5549967ef286..ef860b3831f3 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -4,5 +4,6 @@ AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651
 AUX audiofile-0.3.6-gcc6-build-fixes.patch 3785 BLAKE2B 7f016bfa9af8a440e31bcc395c654c9bb25a1d914a6b57bc191ad36e55ca191f924d57d48834a05ea30913ddd744056e244654a96529b1c3632ef5b162252c76 SHA512 60837bcc9aa53d546708210e87a4f24db56c8a4b0c6896c8e39e0d213aafa15f59a65a60726e6abbf16681fc1fa6ca59cf1748a63caf5ff2652d55f10f62a976
 AUX audiofile-0.3.6-mingw32.patch 687 BLAKE2B dec0680a401890f64a659a7303b089d03a40001d2b73da66c174663f818e5e72b7b8985e8fa220c15685b4cd857ba24cefb341c95059a4d9e10ae81a580a8f50 SHA512 b568b189f7316a41c724b02ee881adcdcb0e01fe22d4d6adc82fefef3296c34822943ec1cb299169dfd8fcdac9c260e1dd69fc9b5b6b4058382cc2f246c382f8
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
-EBUILD audiofile-0.3.6-r5.ebuild 1418 BLAKE2B 854e37dfafdd503c0961661f56bb05a567d30239467e318e7799034cfe28511e4b79d7636724ef341f9e3169783699b3a945fed1c5ac5d66dea030951fa02eb5 SHA512 00287eb0f0db4e69d95a628f4a64ecc1b7001f9fd6f1c60daa26fa7c07e812d053e638149f0b13d9c0351da99939154863748ef1488d4319e7a89770456ee629
+EBUILD audiofile-0.3.6-r4.ebuild 1416 BLAKE2B 6f9cd373d6b44060fa4112b2eebc5f7ffd105a07cf4f90bd5faba092bdf4c61b96b10267344d75e5ca4d0482f2326702db46d486656a8ac4a43a0d4fd0e34984 SHA512 ac0594b20467d54df456d6e720d652a5bb6aeea66fcaba513a2d66e5f53e9137d65ab53bea4d66c21cabad69ee2eb1d83bb3713a7931250a9cdb8a103f62a3f6
+EBUILD audiofile-0.3.6-r5.ebuild 1477 BLAKE2B 6d9d4ec01a01a25d73c8c6c430444e940bb67a53c730634d91913ef2ec5a86f62f8d07b166e6ff2dc5bc2a698f86bb147ad36ed2e37f6927d192ec0dcc79a098 SHA512 18ca01a31f7970ae98ee143e4714a6e5208ea4ca6ebb311c0bebf2745e0922f2591d3207abce8128e03a6736fc3c1d0a18edc7f28bdbed6849b8f0934548325b
 MISC metadata.xml 450 BLAKE2B 7aa693f92285a5d204d7206189e8c82c9a93146736db0cec6aa203c22f284bceca73b937bc962246f21668779c59a51504de7f52ba2901d4a8687fd28c5c4afb SHA512 eab3f3957975ecb7bb5bee29b221e19176461725fc9bdf5a6a382b8d8d9ed258db969af99fbcdfa9f5cdbfc628f4058605a9fe98fadc3971b227d811afcf185a
diff --git a/media-libs/audiofile/audiofile-0.3.6-r4.ebuild b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
new file mode 100644
index 000000000000..6c7e04198274
--- /dev/null
+++ b/media-libs/audiofile/audiofile-0.3.6-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools gnome.org multilib-minimal
+
+DESCRIPTION="An elegant API for accessing audio files"
+HOMEPAGE="https://audiofile.68k.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/1" # subslot = soname major version
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="flac"
+
+RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.6-gcc6-build-fixes.patch
+	"${FILESDIR}"/${PN}-0.3.6-CVE-2015-7747.patch
+	"${FILESDIR}"/${PN}-0.3.6-mingw32.patch
+	"${FILESDIR}"/${PN}-0.3.6-CVE-2017-68xx.patch
+	"${FILESDIR}"/${PN}-0.3.6-CVE-2018-13440-CVE-2018-17095.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Tests depend on statically compiled binaries to work, so we'll have to
+	# delete them later rather than not compile them at all
+	local myconf=(
+		--enable-largefile
+		--disable-werror
+		--disable-examples
+		$(use_enable flac)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc file
+	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
+}
diff --git a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
index 2e9e462ef23b..02f89e0f9b41 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
@@ -35,6 +35,8 @@ multilib_src_configure() {
 	# delete them later rather than not compile them at all
 	local myconf=(
 		--enable-largefile
+		# static needed for tests, bug #869677
+		--enable-static
 		--disable-werror
 		--disable-examples
 		$(use_enable flac)