gentoo resync : 12.05.2022

4 files changed, 295 insertions, 0 deletions

diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 606cb88827dd..208b5d0f81ce 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,13 +1,16 @@
 AUX 65resid 63 BLAKE2B a50f13bb14d227e543b43b0a5969102431ae5903bb3c90106ec8b944d808317c0eacaeb06307774217f958335eead953847e28d07a0c615f89ba435020b11e16 SHA512 3233f4ec47f5ec6bb64aede57af5caf81a18d1cf258b6f3032e4df43a89e64c3e91a2aefaedbc767dc6c9d9de60a4634698968a59a21c592ed506f9afa10e4c2
 AUX libsidplay-1.36.59-fix-c++14.patch 786 BLAKE2B 4267e1c1ef3b982a4ff69c9e68b9a85a94c54866a9a2857bc290f6dc0ce4b268250439cab3ebfb093b8698456e660a003d53f94e1438ba1d8c80d64dc6295e36 SHA512 8fe86933a6009d2035e1a987c3da9050535a956833271cb59892c8093d5a66be6e2b3bf9d940a2f3e8c54fe54d2f70106a1796235f11ff11fff099ca040cd140
 AUX libsidplay-1.36.59-gcc43.patch 1338 BLAKE2B 8132fb754fd6fa3c9b5d34898f3a27c7db3ee221f91d89fa0b21cfc70a1bf689be6aa1f4bf6bc5409c98c7452077e706ae9358f0ade5faeb8aa90d67ff3c2671 SHA512 a3b795aef3bdfe3d435117b0d52a2f2bdd87f60b3ff1b21e0a3c08214396db897b75d8f97b8587a3cd4cb366598c01292f023003d3e055f542c903e91cb69cf6
+AUX libsidplay-2.1.1-autoconf.patch 5339 BLAKE2B 2658f312eadee4862279ed90635963c886c23402655f02a19f415379372b5f3d1f7204afaa5f4466f1fa1c03daaf490978dcda97a584a0eec0ed13bdc2991198 SHA512 fe67569cd0f4d7202f6dc4121c15365fbb6c97c57c4620f7bbc55c92dc28c72433f29e61241ca10e08a47db703718a03dfed3829b712bdcfd7dfc1fdf09f8954
 AUX libsidplay-2.1.1-fbsd.patch 333 BLAKE2B b55f14ba3aa8e73fd107a768991bc81aca78ce871f9933fef47cafa138fd11aabc286cad5b8a53ac829e371ffdda43be0514d244b4094b5f25469a13d2984559 SHA512 bb2f7f16a4932e49efa7353c4d13d4f50f226fe8dcd4ba2fd3eba0ddb5e7a967aef3fadf0c2c919cf10007b3d0c79deeb7f52c088b1843849223296a057a4f7c
 AUX libsidplay-2.1.1-gcc41.patch 1063 BLAKE2B 464044df0215d8b4af5ec688b275a0841ae2aacf7db43996a46f3999e820fbfbad36c7215efe93b9026791462cff7caa9b7d65e3b4f32bdaed94fb222ab95731 SHA512 f27ec81273af62271903102f87f904c8031e1b7fef963714e8a4479ac4227ea9b881843782ced003b80461ec3e07d9be3f2d0e2ecb5ab38c73a8a2bd4e8cda72
 AUX libsidplay-2.1.1-gcc43.patch 2057 BLAKE2B b66469b17702fa74fffc6ec554696898767f20fd4fb01d1e8dff56a52f1ba699c103c9949db4e8da2b12a9920e3dfd0e53d82d3776c5609f0de9f79f82924dde SHA512 77078813d4862628372bf1293747c38d55811cc4c68ef3001252a520a89d83a91e1ba102f861825bb534039c4811bb8bbbea2e47609b5762ad2353477561d9ce
 AUX libsidplay-2.1.1-gcc6.patch 906 BLAKE2B 8d9682c5a3a9ee2b44547d1ce2091c6f727fb55431f53060a913be8fcf6267c5e2f29d2efec49b756b458d656be3f67fca66b65d9c413ba72961b6636e8ed993 SHA512 5853b9f66d26b6027b54591b1f2fc8db9addfabdfd3e90a8182f06282f38cc646f6b3bb1eb75caa400a7c080f30d4f61cfc48a9529974e2e8ede5fcbba677e46
 AUX libsidplay-2.1.1-no_libtool_reference.patch 558 BLAKE2B 7f115c941dc0f9dd8201fd42368d55ee247032ecc4b70c20b89253593e7f6259d533ac724aed22e2229c0c0168f465ac41cb49f3a634e8c9bd618100a5d98dc0 SHA512 826531798593a0e597d2a8a310da584e0097256fe580f7858aa84d9be70f77e1a0b0f9af7e6c94a91602e73f9aff6197f10f2a22ecf1f6fce85ce1f408e04b86
+AUX libsidplay-2.1.1-slibtool.patch 967 BLAKE2B ed31c7ac9c567fae2d802103d8f8f1f9e7b47929423c01d2dd4a1da15058716de268ab7a26619d58ffb0fb771e3d1203f37551b7dcfc23deab5a99b2cd8f9224 SHA512 fa8f3abe5df90e85d97fad36b77d987a4c8339a961b42573b9e9555ce29f98cafc19bea5134e79262f2be782044d24ecd7f3ef51d3b40a80097dc0165eb80295
 DIST libsidplay-1.36.59.tgz 390097 BLAKE2B bcb7e9eab4884270c8047af7f61e0afb2cf6ba24465b4859ac404f34cacec9a8c67ad42f3adf0c5f109cedecaa7710919296e30401c2dc0ca6f337186c9a329a SHA512 e7b0859e1389683d3e6aad7040b78ba37bb0a393c85f68ddb8a064371f978b34cc2e951ec564fa1117d12885cd976d10b02937e132d9a11badecd8652cf4d410
 DIST sidplay-libs-2.1.1.tar.gz 1900252 BLAKE2B f04e34f4cfc641a8222e5d53575108bd52deb2de2dc0b0d58e91581ade7128ac87f320f16e044baa23b54de6b5b6b833e9f6c0d37a1885341a329e778c0a0228 SHA512 754cd41f3d2d76754049522c395022bc090f99ea838e6d1ffb8d7689f3aedad9b3879be0312d0af49ba108563296c1176d1e533d1151d5b33368bfda0a1910e3
 EBUILD libsidplay-1.36.59-r2.ebuild 766 BLAKE2B 33fb576676adfe11e1eb49fec9072fcbbb1200d6d1a084ce9332178529f798e74a37a16d2a47b15e18cb738af0d03830c865f00f7b583936357b8dbea92cd87a SHA512 54426f91c6bf5753f523e8a73154773396ddfb040315e91476e2dda2aa32641c1cf09258ed4777638f42779ac3e8732b8551e9ff9c582479201fa5e6a70885e9
 EBUILD libsidplay-2.1.1-r5.ebuild 1233 BLAKE2B cfb102036b715eabf1ad4b28c27be0d56e01c5403ed8a6a26d271d12b3a03a3162aa53a0771ad7634262630f6292ea3887ba5f164be2e2793b3729eaee06ef69 SHA512 da1a7fdbda9b46a6133de346d756d295d674ba1e1bb5a646fcd897384e0d3fd83e17934ec862f90ce99630d904e2904d2fde6120f9474f6f202003d4497787b8
+EBUILD libsidplay-2.1.1-r6.ebuild 1524 BLAKE2B 0e2718cfb22054596cb50b146e6e07a48122986147dc016a6a744d2fa4d6286b2bc6ce0f1c154daf1a11d350a3a4fd869b2c443d29bd6a47beebd1ba8aadf6b1 SHA512 6aad8bc4af5a2238236b975185b046c5dd8a5f16c22509051e8ba7f14d70a82a502adf74b0f6a63b15f668400beb1da615b6fa9f7bc225a85691ac721916a825
 MISC metadata.xml 246 BLAKE2B 5791eec1fea2211cdfa2d13a89732df17195754dddcb9122157536f9f398f783de194f304cc545db22ae0506f69cb13cb1b9e03449959edc96097b2f0eac2d13 SHA512 8f5558a12be53599ddda50ec08e80a33b37ee1f4c73048b4a02983121e22c149dca53abda7985c840aedc506a9945a66ef94e034f168d868b9933b8c5c2c9fdb
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch
new file mode 100644
index 000000000000..cdb92c63a034
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-autoconf.patch
@@ -0,0 +1,172 @@
+From 426bebc250c24cb4482c85131927303cbf7c606d Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 13:47:57 -0700
+Subject: [PATCH 1/2] build: Fix autoreconf
+
+---
+ builders/hardsid-builder/configure.ac |   1 +
+ builders/resid-builder/configure.ac   |   1 +
+ configure.ac                          |  75 ++----
+ libsidplay/configure.ac               |   1 +
+ libsidutils/configure.ac              |   1 +
+ resid/{configure.in => configure.ac}  |   0
+ 6 files changed, 30 insertions(+), 49 deletions(-)
+ rename resid/{configure.in => configure.ac} (100%)
+ create mode 100644 unix/ax_subdirs_configure.m4
+
+diff --git a/builders/hardsid-builder/configure.ac b/builders/hardsid-builder/configure.ac
+index a54cf26..bdc2bd0 100644
+--- a/builders/hardsid-builder/configure.ac
++++ b/builders/hardsid-builder/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/builders/resid-builder/configure.ac b/builders/resid-builder/configure.ac
+index 4a98801..5f5561b 100644
+--- a/builders/resid-builder/configure.ac
++++ b/builders/resid-builder/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/configure.ac b/configure.ac
+index 5724156..d622982 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,70 +3,47 @@ AC_INIT(Makefile.am)
+ #Variables
+ pwd=`pwd`
+ builders='${libdir}'/sidplay/builders
+-ac_configure_args="$ac_configure_args --disable-library-checks"
+ 
+ AC_CONFIG_AUX_DIR(unix)
++AC_CONFIG_MACRO_DIR([unix])
+ AM_INIT_AUTOMAKE(sidplay-libs,2.1.1)
+ AC_CANONICAL_HOST
+ 
+ hardsid=false
+ case "$host" in
+-    *linux*) hardsid=true
+-        ;;
++    *linux*) hardsid=true ;;
+ esac
+-AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue)
+ 
+-echo; echo "Configuring libsidplay..."
+-cd $pwd/libsidplay
+-if ! eval ./configure $ac_configure_args \
+---with-sidbuilders=$builders;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([libsidplay], [
++        [--disable-library-checks],
++        [--with-sidbuilders=$builders]])
+ 
+-echo; echo "Configuring resid..."
+-cd "$pwd/resid"
+-if ! eval ./configure $ac_configure_args \
+---disable-resid-install;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([resid], [
++       [--disable-library-checks],
++       [--disable-resid-install]])
+ 
+-echo; echo "Configuring resid-builder..."
+-cd $pwd/builders/resid-builder
+-if ! eval ./configure $ac_configure_args \
+---with-sidplay2-includes=$pwd/libsidplay/include \
+---with-sidplay2-library=$pwd/libsidplay/src \
+---with-resid-includes=$pwd/resid \
+---with-resid-library=$pwd/resid \
+---libdir=$builders;
+-then
+-exit
+-fi
++AX_SUBDIRS_CONFIGURE([builders/resid-builder], [
++        [--disable-library-checks],
++        [--with-sidplay2-includes=$pwd/libsidplay/include],
++        [--with-sidplay2-library=$pwd/libsidplay/src],
++        [--with-resid-includes=$pwd/resid],
++        [--with-resid-library=$pwd/resid],
++        [--libdir=$builders]])
+ 
+-if test x$hardsid = xtrue; then
+-    echo; echo "Configuring hardsid-builder..."
+-    cd $pwd/builders/hardsid-builder
+-    if ! eval ./configure $ac_configure_args \
+-        --with-sidplay2-includes=$pwd/libsidplay/include \
+-        --with-sidplay2-library=$pwd/libsidplay/src \
+-        --libdir=$builders;
+-    then
+-    exit
+-    fi
+-fi
++AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue)
+ 
+-echo; echo "Configuring libsidutils..."
+-cd $pwd/libsidutils
+-if ! eval ./configure $ac_configure_args \
+---with-sidplay2-includes=$pwd/libsidplay/include \
+---with-sidplay2-library=$pwd/libsidplay/src;
+-then
+-exit
++if test x$hardsid = xtrue; then
++    AX_SUBDIRS_CONFIGURE([builders/hardsid-builder], [
++            [--disable-library-checks],
++            [--with-sidplay2-includes=$pwd/libsidplay/include],
++            [--with-sidplay2-library=$pwd/libsidplay/src],
++            [--libdir=$builders]])
+ fi
+ 
+-echo
+-cd $pwd
++AX_SUBDIRS_CONFIGURE([libsidutils], [
++        [--disable-library-checks],
++        [--with-sidplay2-includes=$pwd/libsidplay/include],
++        [--with-sidplay2-library=$pwd/libsidplay/src]])
+ 
+ AC_OUTPUT(
+ Makefile \
+diff --git a/libsidplay/configure.ac b/libsidplay/configure.ac
+index 1946508..9c9d808 100644
+--- a/libsidplay/configure.ac
++++ b/libsidplay/configure.ac
+@@ -8,6 +8,7 @@ AC_INIT(libsidplay,2.LIBCUR.LIBREV)
+ AC_CONFIG_HEADER(unix/config.h)
+ AC_CONFIG_SRCDIR(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
++AC_CONFIG_MACRO_DIR([unix])
+ AM_INIT_AUTOMAKE(no-define)
+ 
+ dnl libtool-style version-info number
+diff --git a/libsidutils/configure.ac b/libsidutils/configure.ac
+index 1e38d14..4461aa1 100644
+--- a/libsidutils/configure.ac
++++ b/libsidutils/configure.ac
+@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
++AC_CONFIG_MACRO_DIR([unix])
+ 
+ dnl Setup library CURRENT, REVISION and AGE
+ LIBCUR=0
+diff --git a/resid/configure.in b/resid/configure.ac
+similarity index 100%
+rename from resid/configure.in
+rename to resid/configure.ac
+-- 
+2.35.1
+
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch
new file mode 100644
index 000000000000..f549ed7c6d97
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-slibtool.patch
@@ -0,0 +1,39 @@
+From 6536bf3ceb05e4d32f985a896354b98310c49b5b Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Sat, 7 May 2022 14:04:08 -0700
+Subject: [PATCH 2/2] resid: Fix build with slibtool
+
+---
+ resid/Makefile.am | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/resid/Makefile.am b/resid/Makefile.am
+index bbec226..0a32647 100644
+--- a/resid/Makefile.am
++++ b/resid/Makefile.am
+@@ -7,20 +7,15 @@ if INSTALL_RESID
+ lib_LTLIBRARIES = libresid.la
+ pkginclude_HEADERS = $(resid_headers)
+ else
+-noinst_LTLIBRARIES = libresidc.la
++noinst_LTLIBRARIES = libresid.la
+ noinst_HEADERS = $(resid_headers)
+-
+-all-local:
+-	ln -sf libresidc.la libresid.la
+-
+ endif
+ 
+ ## Make sure these will be cleaned even when they're not built by
+ ## default.
+-CLEANFILES = libresid.la libresidc.la
++CLEANFILES = libresid.la
+ 
+ libresid_la_SOURCES = $(resid_sources)
+-libresidc_la_SOURCES = $(resid_sources)
+ 
+ BUILT_SOURCES = $(noinst_DATA:.dat=.cc)
+ 
+-- 
+2.35.1
+
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
new file mode 100644
index 000000000000..b56e698d40da
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_P=sidplay-libs-${PV}
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+BDEPEND="sys-devel/autoconf-archive"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/sidplay/sidconfig.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-fbsd.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-no_libtool_reference.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	local subdirs=(
+		builders/hardsid-builder
+		builders/resid-builder
+		libsidplay
+		libsidutils
+		resid
+		.
+	)
+
+	for i in ${subdirs[@]}; do
+		(
+			cd "$i" || die
+			eautoreconf
+		)
+	done
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		--with-pic
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	docinto libsidplay
+	dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto libsidutils
+	dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
+
+	docinto resid
+	dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
+
+	doenvd "${FILESDIR}"/65resid
+
+	find "${D}" -name '*.la' -delete || die
+}