gentoo auto-resync : 14:02:2023 - 01:55:20

3 files changed, 32 insertions, 9 deletions

diff --git a/media-libs/id3lib/Manifest b/media-libs/id3lib/Manifest
index b8f2e2b95f19..be5b9494b8b7 100644
--- a/media-libs/id3lib/Manifest
+++ b/media-libs/id3lib/Manifest
@@ -1,4 +1,5 @@
 AUX id3lib-3.8.3-autoconf259.patch 1103 BLAKE2B f9bc438534eb157fece6500cc8d009d88e3ff88d4b486c54eacd6c735b768a24bf1487eb1e3db24d621f2879b0d049d5a08ca8a92b943477b69f1ead6056c943 SHA512 b0a4bcea15e42b9f599726918d690ec707afcb7e5c7c1b7f80900947f0b3b8a877bdabf303ba001a43139a1249cb48c9099a96e4b1b78438f26b4fa37d2e8f4a
+AUX id3lib-3.8.3-configure-clang.patch 771 BLAKE2B 7379e52d18a53e84c452e98836f2cc2a2ba5693b86bcfb0ccfcd9cf535be4756a87ddf8b5bb42cca98539b470c88bf13c53fbf28244fdcda6f2f6851b2d332c1 SHA512 1d626d8288ee2a25f813c5217fedaae12d65e5e6d74ee7c4c75cffad0d9c63a47eeb0ef264694b6f0e8c081509a11c11d64007adb5cee9620ed5ea004867291b
 AUX id3lib-3.8.3-doxyinput.patch 950 BLAKE2B 85c44b5aec6a2c5ab385db977f0ace57cd463cc25f4a628e88ab92d74d2fd98c348ce1699889b7d806a9341a15e80d0721b9a06269c28a088e408847f7a58a1d SHA512 86bdec42d0b6411d493899d1ad00f667ea38133f5b8cf2665fe94ce9db80d54e4aad1f9d8e94bc7578b8c1fd5c43747d07c929f01f66e0d4f71b63543ff04012
 AUX id3lib-3.8.3-gcc-4.3.patch 2670 BLAKE2B 065b6d57a20b0af65c8fb584decfcec56f58162bb356a6fd83c96e1b8897d87ebd409ec9aa9520bc67b352132dc8f5978213dffb6dc47e80c66ce7daa420fc9b SHA512 a8eec4e9b122f4627af2e81fa3b391fb5bfca5d95c6520fe2b67f1388824490c1434f8dfabdbd42ab2855d8ad7a85f2477a0c26c9930dd033a5d4e596f9838cb
 AUX id3lib-3.8.3-missing_nullpointer_check.patch 302 BLAKE2B fe6fd77ab360b1804f937dbeb903aa8837a32dea0c0c3822c469dc0d08093dba90d8682a4a050850072249389c7638311b8b97a323959fe4d887896d7aa45116 SHA512 aad3b6371e060d4121b34831fa84791ad81558f64dcafa2ebd729de62c8b9c160fe949030c985c4bd3fafbc05290eb4268a3821db6bf3e1c44f414883f61f598
@@ -8,5 +9,5 @@ AUX id3lib-3.8.3-unicode16.patch 1490 BLAKE2B 8e9c23cacc11fe87e846830c91946e1664
 AUX id3lib-3.8.3-vbr-stack-smashing.patch 892 BLAKE2B fbb3de3258409c2aab439dc1e7061a3a910f771e1a7219ff81d5b61dcfd39638f42145b70bbd7817c008bf011530df35f6267ec6e11b525ff348c19b78b56c71 SHA512 b4fe59876edf87ed06183e2557b72e1b40f1d09ebd707bf1695d522ee5ad8eb75b80f3011a861505929b4e28ae9ed4037bbb2eefc3d7e8de83ef5bc495df67c5
 AUX id3lib-3.8.3-zlib.patch 779 BLAKE2B e7379e6d3136ebc93ddc8b79ce52ba92a41d911b883a74bfdb58d0ac6f774483f821ef66b453fef96649e5e67dbb1afa9c871d104c0dd29a8e1bf11ae8caa853 SHA512 e9c29883731ef417602812d714a14e1b7547d89581ffe40d0d0400218b0491f38cf50b24ab6dd8bcfcc94c95af914c6d34b53429a2789d7c27f0cb7661474dae
 DIST id3lib-3.8.3.tar.gz 950726 BLAKE2B 37afb1292d598e8416251e18beb1d1b4402d11ebd971d3e9b151ae9e092884ec4b0b7f9c19bbd8296fbb7fe7320ced7ba1f733a367662d378d2d82b2b52b7bb2 SHA512 3787e261f86933c1c2f2bff2c4b349b42f5d8636e489e4f39f9d75e6dfbdc79b87009a0f4ce4b786f2fb3dbc01ca9d56c4112095b46244f897e6c9a28573adaf
-EBUILD id3lib-3.8.3-r9.ebuild 1398 BLAKE2B adf31ee7b4b8972aa042b134858cbf785409a209adc8febabb69c790091fa0a0dc6a2286d456ff355b0d9fecdd40e992218509879ac9e4c07bf46b19eeab80ec SHA512 4e4ec899e517d5b9f0591cb0a9fe91a868c4302bac5d60d936ea1f706a493ba66fa019cb51733dd1d6518cae36a7840f92b70fa6ac5c32240e77ad5187724dc5
+EBUILD id3lib-3.8.3-r10.ebuild 1453 BLAKE2B f9c923e60a21c6907c192e65356a7e9fad319c2357b8ca95c41463b9d179cf066f9ea1de38e46d8c59ec03a9005c0b57ae4478798c0a694814541c242e217f7b SHA512 7893691aca727e391fa587ca57ed7c8337bdaeee8b4fe81c76e7b16e4249e28d1cafe20f5c4159ba5257b323d1b9ae51768aeb899aa2b5e309358b805b01cdbf
 MISC metadata.xml 340 BLAKE2B 044771ca278e771cff50aec79a2031b0af2aac34de8bd96b21c3598f9ce96bc4c269314e24e4644e8f4e7edc299cc7cce6b149d9ebbebbff6487cfe20b578c3a SHA512 fb2a9db289fcff5b18ccd2d2f7b2228774d560ae42e14339dce47f67148b94586de9e470d6e65fd5e4c91b4d606cde158dcf22e49fbf5eeca4f90e750ae8cad1
diff --git a/media-libs/id3lib/files/id3lib-3.8.3-configure-clang.patch b/media-libs/id3lib/files/id3lib-3.8.3-configure-clang.patch
new file mode 100644
index 000000000000..730a00b62dbf
--- /dev/null
+++ b/media-libs/id3lib/files/id3lib-3.8.3-configure-clang.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/871087
+--- a/m4/id3_cxx.m4
++++ b/m4/id3_cxx.m4
+@@ -81,7 +81,7 @@ AC_DEFUN(ID3_CXX_PORTABILITY,[
+ 
+   dnl Check whether we have bool
+   AC_MSG_CHECKING(whether C++ has bool)
+-  AC_TRY_RUN([main() { bool b1=true; bool b2=false; }],
++  AC_TRY_RUN([int main() { bool b1=true; bool b2=false; }],
+              [ AC_MSG_RESULT(yes) ],
+              [ AC_MSG_RESULT(no)
+                AC_DEFINE(CXX_HAS_NO_BOOL) ],
+@@ -90,7 +90,7 @@ AC_DEFUN(ID3_CXX_PORTABILITY,[
+ 
+   dnl Test whether C++ has buggy for-loops
+   AC_MSG_CHECKING(whether C++ has correct scoping in for-loops)
+-  AC_TRY_COMPILE([#include <iostream.h>], [
++  AC_TRY_COMPILE([#include <iostream>], [
+    for (int i=0;i<10;i++) { }
+    for (int i=0;i<10;i++) { }
+ ], [ AC_MSG_RESULT(yes) ],
diff --git a/media-libs/id3lib/id3lib-3.8.3-r9.ebuild b/media-libs/id3lib/id3lib-3.8.3-r10.ebuild
index 79e0b20e88b2..1a5880aba94a 100644
--- a/media-libs/id3lib/id3lib-3.8.3-r9.ebuild
+++ b/media-libs/id3lib/id3lib-3.8.3-r10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,16 +13,15 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc static-libs"
+RESTRICT="test"
 
 RDEPEND="sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-RESTRICT="test"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog HISTORY README THANKS TODO )
 
-S=${WORKDIR}/${P/_}
+S="${WORKDIR}"/${P/_}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-zlib.patch
@@ -34,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-missing_nullpointer_check.patch
 	"${FILESDIR}"/${P}-security.patch
 	"${FILESDIR}"/${P}-vbr-stack-smashing.patch # bug 398571
+	"${FILESDIR}"/${P}-configure-clang.patch
 )
 
 src_prepare() {
@@ -41,7 +41,7 @@ src_prepare() {
 
 	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {.,zlib}/configure.in || die
 
-	AT_M4DIR=${S}/m4 eautoreconf
+	AT_M4DIR="${S}"/m4 eautoreconf
 }
 
 src_configure() {
@@ -50,6 +50,7 @@ src_configure() {
 
 src_compile() {
 	default
+
 	if use doc; then
 		pushd doc >/dev/null || die
 		doxygen Doxyfile || die