gentoo auto-resync : 11:10:2022 - 01:37:00

7 files changed, 87 insertions, 185 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9eed48ab55d3..4f1f549d23aa 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index ef860b3831f3..c96745e3ef0a 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -3,7 +3,8 @@ AUX audiofile-0.3.6-CVE-2017-68xx.patch 12634 BLAKE2B d66ef71b5ce0d8b7356c856eb9
 AUX audiofile-0.3.6-CVE-2018-13440-CVE-2018-17095.patch 2702 BLAKE2B f56d2bd5651193984e00904ff916c4d1658d49da4db531d8cfa43b936857dc4ed142e83114890dc59f1c7a1b8d5cdf07127465ec9851323e50c37bd6045a7c07 SHA512 0fc8252ddab1430e960551093de1f4d5dc281440b0a583dde8ecf7ef3e6bad78667c049957cac24a2ff8731a22090d998406a6e4e84d80a9e2d5580663cd1f67
 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
+AUX audiofile-0.3.6-strict-prototypes.patch 2339 BLAKE2B ff14877c949bdb218ddd75ee95a0ddcd4014838d461fd19dc2c62feee2c1d3cb2796b12945b172d1a41a137dc197538f68e6e5280f67b39e698d22b46ee5b001 SHA512 26fd421be981208a18bd970054efc50e5b370937af9cd972e7a9206e3b92f389032808e4207726d17807e0c60cdc562826a77c288d85c0ae06534f7f036e2d78
 DIST audiofile-0.3.6.tar.xz 530760 BLAKE2B 5263e66b92471c8b7e8ad73a5065966fc93fd92d70481df804451353bafe44d670ec48b183bc19a7ac60025ea73b234d6aef1017fb220c16d14c68a27db027e4 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb
 EBUILD audiofile-0.3.6-r4.ebuild 1416 BLAKE2B 6f9cd373d6b44060fa4112b2eebc5f7ffd105a07cf4f90bd5faba092bdf4c61b96b10267344d75e5ca4d0482f2326702db46d486656a8ac4a43a0d4fd0e34984 SHA512 ac0594b20467d54df456d6e720d652a5bb6aeea66fcaba513a2d66e5f53e9137d65ab53bea4d66c21cabad69ee2eb1d83bb3713a7931250a9cdb8a103f62a3f6
-EBUILD audiofile-0.3.6-r5.ebuild 1477 BLAKE2B 6d9d4ec01a01a25d73c8c6c430444e940bb67a53c730634d91913ef2ec5a86f62f8d07b166e6ff2dc5bc2a698f86bb147ad36ed2e37f6927d192ec0dcc79a098 SHA512 18ca01a31f7970ae98ee143e4714a6e5208ea4ca6ebb311c0bebf2745e0922f2591d3207abce8128e03a6736fc3c1d0a18edc7f28bdbed6849b8f0934548325b
+EBUILD audiofile-0.3.6-r5.ebuild 1528 BLAKE2B 1fe49c9c6ef48e21f333932220bc7cd9980d045fbb65d99c918594276002a56631aa089b6aebf17eda1f37a79e41948fcb7318ba26269381cb310c63d8dae218 SHA512 63c43892973cd8ff33af4305bfc2cfd7f9e8820607a03c3a23370c7939a3469681d859e4cc7f77c2c367f40d97d2a1f9a1bb5922f390e5eaa44d14e6fd1888b4
 MISC metadata.xml 450 BLAKE2B 7aa693f92285a5d204d7206189e8c82c9a93146736db0cec6aa203c22f284bceca73b937bc962246f21668779c59a51504de7f52ba2901d4a8687fd28c5c4afb SHA512 eab3f3957975ecb7bb5bee29b221e19176461725fc9bdf5a6a382b8d8d9ed258db969af99fbcdfa9f5cdbfc628f4058605a9fe98fadc3971b227d811afcf185a
diff --git a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
index 02f89e0f9b41..a759228901b9 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r5.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
 	"${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
+	"${FILESDIR}"/${PN}-0.3.6-strict-prototypes.patch
 )
 
 src_prepare() {
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch b/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch
new file mode 100644
index 000000000000..6e78b773c93c
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.6-strict-prototypes.patch
@@ -0,0 +1,82 @@
+https://github.com/mpruett/audiofile/pull/64
+
+From 519f6c19d3bcfa048fc468f0094ab4235e7c77b2 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 10 Oct 2022 11:13:10 -0700
+Subject: [PATCH] Fix -Werror=strict-prototypes
+
+This will be required for upcoming gcc and clang versions.
+
+Reference: https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+
+diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c
+index 8fb2323..392766c 100644
+--- a/libaudiofile/g711.c
++++ b/libaudiofile/g711.c
+@@ -74,8 +74,7 @@ static int search(int val, const short *table, int size)
+  * John Wiley & Sons, pps 98-111 and 472-476.
+  */
+ unsigned char
+-_af_linear2alaw(pcm_val)
+-	int		pcm_val;	/* 2's complement (16-bit range) */
++_af_linear2alaw(int pcm_val)		/* 2's complement (16-bit range) */
+ {
+ 	int		mask;
+ 	int		seg;
+@@ -110,8 +109,7 @@ _af_linear2alaw(pcm_val)
+  *
+  */
+ int
+-_af_alaw2linear(a_val)
+-	unsigned char	a_val;
++_af_alaw2linear(unsigned char a_val)
+ {
+ 	int		t;
+ 	int		seg;
+diff --git a/sfcommands/sfinfo.c b/sfcommands/sfinfo.c
+index c8fb913..91221a5 100644
+--- a/sfcommands/sfinfo.c
++++ b/sfcommands/sfinfo.c
+@@ -48,7 +48,7 @@ void errorHandler(long error, const char *message)
+ 		fprintf(stderr, "sfinfo: %s [error %ld]\n", message, error);
+ }
+ 
+-void printusage()
++void printusage(void)
+ {
+ 	printf("usage: sfinfo [options...] soundfiles...\n");
+ 	printf("options:\n");
+@@ -58,7 +58,7 @@ void printusage()
+ 	printf("  -v, --version      Print version\n");
+ }
+ 
+-void printversion()
++void printversion(void)
+ {
+ 	printf("sfinfo: Audio File Library version %s\n", VERSION);
+ }
+https://github.com/mpruett/audiofile/commit/7227a65c9725a89f839d01826ea8427becee30be
+
+From 7227a65c9725a89f839d01826ea8427becee30be Mon Sep 17 00:00:00 2001
+From: Michael Pruett <michael@68k.org>
+Date: Thu, 7 Mar 2013 22:44:56 -0800
+Subject: [PATCH] Fix compiler warning regarding discarding const
+ qualification.
+
+diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c
+index 394543e..8fb2323 100644
+--- a/libaudiofile/g711.c
++++ b/libaudiofile/g711.c
+@@ -43,11 +43,7 @@
+ static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
+ 			    0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
+ 
+-static int
+-search(val, table, size)
+-	int		val;
+-	short		*table;
+-	int		size;
++static int search(int val, const short *table, int size)
+ {
+ 	int		i;
+ 
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 8fde118a49cb..2b381697e0df 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -7,6 +7,5 @@ AUX canvas-fix-an-integer-overflow-in-caca_resize.patch 5265 BLAKE2B e75b3366a8e
 AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c57185715d2ec7846ea5ea3990419d5b8a99062ace0f63ca06e68a45eb4c85210aacc2a6f29255b1088683ac SHA512 de6c43fb73d86dd8e8ee1e22e329ee2201bf09947568382c4637145b297edfae206c269edd05e08000d5670734f8e2c3373c5095682ac850cce588c4cd0cb636
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r8.ebuild 4490 BLAKE2B 2e53735e7b60e1f8224217724cbaf1f019329ec374520c915b4c0a73d9066c241e4ab21a2f9e144c4d26fda5bf4da4e9e84cecd8b43dca2883b77a9128f5dac2 SHA512 42f35bb2b657d16eabf6afe1a6323ae892edae5bd6bc87f8ec17647751831a7d9f6ec2c6ddfabcede558b22b21cb93a33ec17504a7e3a0864b6a7c0f0fef04cf
-EBUILD libcaca-0.99_beta19-r9.ebuild 3483 BLAKE2B ced6183a13552d60ce2cff2c373ea68cb930ee6939b1badea08849a504cf69107c2803e91c7428e1297d52261d7b20dd26b78c22e17aad76eccab1f918f3e4ab SHA512 e6e226f5fc47fc5886e2392f703e81c25c2ac80dea2528d752636f4b9bde30730f549d247249cb9f4a836c37223020ed4ce05fbe506d449b0830f9193a9b30ac
+EBUILD libcaca-0.99_beta19-r10.ebuild 3503 BLAKE2B 1d70f59f9d70d94d0217d83926a2ffc255731a4f97e5abcc5264c4e48f0b5b590dc103a5fba5ab6861f7dbcdd44ba4090e12312d72ca0bf7997c004871ce7b82 SHA512 2f2d6e01538228f0383277fe5e9b6343125df264deb62368e91f8479df2034ef9d520487365bdaedf2db457c6329b6dbe12291970fcf3b6f56f6400d783abfcd
 MISC metadata.xml 305 BLAKE2B 09d0fd38e248eee6d78d5cfc6d04cd454ba1b9c9b3474e1f94de41d0dff53e67f425875a9b27f9247ace85580025197e12c379ccec928474954bc3bd2ef0307d SHA512 6b8addbc26d79c54322fe838afaaf08ee7c73a8d1c7ecf529778e63490117e20ad744277506fea52b8ed6ba7652c7d75c7344642ad6521ad17b85c68d0a69713
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
index 29de0d6f6dee..86ee32249914 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
@@ -36,6 +36,7 @@ DEPEND="
 		>=x11-libs/libXt-1.1.4
 	)
 "
+RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
deleted file mode 100644
index 07175fc779eb..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=yes
-#USE_RUBY=ruby20
-
-inherit autotools ruby-ng flag-o-matic java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal
-
-MY_P=${P/_/.}
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
-RESTRICT="!test? ( test )"
-
-# ruby? ( ruby_targets_${USE_RUBY} )
-REQUIRED_USE=""
-
-# ruby? (  $(ruby_implementations_depend) )
-DEPEND="
-	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="java? ( >=virtual/jre-1.8:* )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		>=dev-texlive/texlive-fontsrecommended-2012
-		>=dev-texlive/texlive-latexextra-2012
-		dev-texlive/texlive-latexrecommended
-	)
-	java? ( >=virtual/jdk-1.8:* )
-	test? ( dev-util/cppunit )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-PATCHES=(
-	# Fix out of source tests
-	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-	# Debian patches
-	"${FILESDIR}/CVE-2018-20544.patch"
-	"${FILESDIR}/CVE-2018-20545+20547+20549.patch"
-	"${FILESDIR}/CVE-2018-20546+20547.patch"
-	"${FILESDIR}/canvas-fix-an-integer-overflow-in-caca_resize.patch"
-	"${FILESDIR}/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch"
-	"${FILESDIR}/100_doxygen.diff"
-	# Fix doxygen docs install, bug 543870
-	"${FILESDIR}/fix-css-path.patch"
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use mono && mono-env_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# bug #339962
-	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
-
-	sed -i \
-		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die
-
-	sed -i \
-		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
-		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
-		java/Makefile.am || die
-
-	if ! use truetype; then
-		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
-	fi
-
-	if use imlib && ! use X; then
-		append-cflags -DX_DISPLAY_MISSING
-	fi
-
-	# bug #653400
-	append-cxxflags -std=c++11
-
-	# bug #601902
-	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-	# fix docs install path, bug 543870#c14
-	sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
-
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-
-		# bug #44128
-		export VARTEXFONTS="${T}/fonts"
-
-		# bug #329651
-		use mono && export CSC="$(type -P gmcs)"
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
-	fi
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_enable X x11)
-		$(use_with X x)
-		--x-libraries=/usr/$(get_libdir)
-		$(use_enable opengl gl)
-		--enable-cxx
-		$(use_enable imlib imlib2)
-		$(use_enable test cppunit)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_enable ruby)
-		--disable-python
-		$(multilib_native_use_enable mono csharp)
-		$(multilib_native_use_enable doc)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-
-	# bug #480864
-	use java && _java_makeopts="-j1"
-	emake V=1 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake V=1 -j1 check
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	# Note: broken, see bug #508564 and bug #773913
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/libjava.jar
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/usr/share/java || die
-
-	find "${ED}" -name '*.la' -delete || die
-}