[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/

2024-01-28 Thread Matt Turner
commit: 03d7cfe8f4e95fb251bb8079202c48ec08f5
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Jan 25 19:04:35 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jan 28 17:35:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d7

media-libs/alsa-lib: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/alsa-lib/Manifest   |   2 -
 media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild  | 100 -
 media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild   |  97 
 media-libs/alsa-lib/alsa-lib-1.2.9.ebuild  |  98 
 .../files/alsa-lib-1.2.8-clang16-macro.patch   |  31 ---
 5 files changed, 328 deletions(-)

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index c4404eab1825..d9325967f41a 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1 @@
 DIST alsa-lib-1.2.10.tar.bz2 1107007 BLAKE2B 
b2e4f8431e61f5bb56b2b5d124e67d5a68bbca3c647bebfa93f5e5ff092ec9ef3f6cb6315801fcd93e21151784814ff238d357313b8b44f32d4e7c9ee565388f
 SHA512 
4ccbd1dc5a612044571c26290923009e4c3f7959b30a5d0bed47daa68bbefaff9059c4f0fa3bc16f22c1eed2d36f079139369f40243da5921ae4de02a4541939
-DIST alsa-lib-1.2.8.tar.bz2 1091475 BLAKE2B 
e6171ac557db6265e3f02df7bd269eca62d09afaf2c04dc913d3bb217df23a8e66e808ad453fea5ed90d4d9226feb05065ad5d9b3575241b76675ccd27b9b4d4
 SHA512 
865ff05a8f589996f8d63d43a91c961f1b64144f3e1d17c7074b7ac16f25b3fd1c371d46ed63a8cc20fa01e63c76b75f1a9802b56889ae1073854dd050d27688
-DIST alsa-lib-1.2.9.tar.bz2 1094660 BLAKE2B 
ec0c6966802196016679652292a579c6301cce33a2e887fce79cdb80629b6df047269787445cf0645e6cf43d3d2aae8fa57ddad5ab79fc254ee65a0ed695f449
 SHA512 
8f39c8166c3648d46695a9287d9b9a35e5bfffed11d79e868ff7aba92d0fee792e82784186ebeb2a3e44d6b617c916025c7fce9a802565bb8e0dc8fdcce2311a

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
deleted file mode 100644
index 98cbaa2d28db..
--- a/media-libs/alsa-lib/alsa-lib-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit autotools multilib-minimal flag-o-matic python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page";
-if [[ ${PV} == *_p* ]] ; then
-   # Please set correct commit ID for a snapshot release!
-   COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
-   
SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
 -> ${P}.tar.gz"
-   S="${WORKDIR}"/${PN}-${COMMIT:0:7}
-else
-   # TODO: Upstream does publish .sig files, so someone could implement 
verify-sig ;)
-   SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2";
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alisp debug doc python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-   media-libs/alsa-topology-conf
-   media-libs/alsa-ucm-conf
-   python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-text/doxygen-1.2.6 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
-   "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
-   "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
-)
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || 
die
-   # bug #545950
-   sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' 
test/lsb/Makefile.am || die
-
-   eautoreconf
-}
-
-multilib_src_configure() {
-   # Broken upstream. Could in theory work with -flto-partitions=none
-   # but it's a hack to workaround the real problem and not strictly safe.
-   # bug #616108, bug #669086, and 
https://github.com/alsa-project/alsa-lib/issues/6.
-   # (This bug is closed as of 1.2.9 but there's been no clear actual fix 
to it.
-   # Let us know if you can identify one.)
-   filter-lto
-
-   local myeconfargs=(
-   --disable-maintainer-mode
-   --disable-resmgr
-   --enable-aload
-   --enable-rawmidi
-   --enable-seq
-   --enable-shared
-   --enable-thread-safety
-
-   $(multilib_native_use_enable python)
-   $(use_enable alisp)
-   $(use_with debug)
-   )
-
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-   emake
-
-   if multilib_is_native_abi && use doc; then
-   emake doc
-   grep -FZ

[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/

2023-12-12 Thread Sam James
commit: cc52c5e316ca5a61f4a85e34e513480e41801360
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 13 01:18:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 13 01:18:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc52c5e3

media-libs/alsa-lib: backport lld 17 fix

Closes: https://bugs.gentoo.org/914511
Signed-off-by: Sam James  gentoo.org>

 media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild  | 103 +
 .../alsa-lib/files/alsa-lib-1.2.10-lld-17.patch|  35 +++
 2 files changed, 138 insertions(+)

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
new file mode 100644
index ..410467070681
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools multilib-minimal flag-o-matic python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page";
+if [[ ${PV} == *_p* ]] ; then
+   # Please set correct commit ID for a snapshot release!
+   COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+   
SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
 -> ${P}.tar.gz"
+   S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+   # TODO: Upstream does publish .sig files, so someone could implement 
verify-sig ;)
+   SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2";
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   media-libs/alsa-topology-conf
+   media-libs/alsa-ucm-conf
+   python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+   "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
+   "${FILESDIR}/${P}-ump-header-detection.patch" # bug #913573, backport
+   "${FILESDIR}/${P}-pcm-fix-segfault-32bit-libs.patch" # backport
+   "${FILESDIR}/${P}-reshuffle-included-files-config-h.patch" # backport
+   "${FILESDIR}/${P}-lld-17.patch" # bug #914511, backport
+)
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || 
die
+   # bug #545950
+   sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' 
test/lsb/Makefile.am || die
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   # Broken upstream. Could in theory work with -flto-partitions=none
+   # but it's a hack to workaround the real problem and not strictly safe.
+   # bug #616108, bug #669086, and 
https://github.com/alsa-project/alsa-lib/issues/6.
+   # (This bug is closed as of 1.2.9 but there's been no clear actual fix 
to it.
+   # Let us know if you can identify one.)
+   filter-lto
+
+   local myeconfargs=(
+   --disable-maintainer-mode
+   --disable-resmgr
+   --enable-aload
+   --enable-rawmidi
+   --enable-seq
+   --enable-shared
+   --enable-thread-safety
+
+   $(multilib_native_use_enable python)
+   $(use_enable alisp)
+   $(use_with debug)
+   )
+
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+   emake
+
+   if multilib_is_native_abi && use doc; then
+   emake doc
+   grep -FZrl "${S}" doc/doxygen/html | \
+   xargs -0 sed -i -e "s:${S}::" || die
+   fi
+}
+
+multilib_src_install() {
+   multilib_is_native_abi && use doc && local HTML_DOCS=( 
doc/doxygen/html/. )
+
+   default
+}
+
+multilib_src_install_all() {
+   find "${ED}" -type f -name '*.la' -delete || die
+
+   dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}

diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch 
b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
new file mode 100644
index ..cba1e2e2d507
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-lld-17.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/914511
+https://github.com/alsa-project/alsa-lib/issues/356
+https://github.com/alsa-project/alsa-lib/commit/96f60d829f2c9dc9ad9eda46410adaa41b4b0da0
+
+From 96f60d829f2c9dc9ad9eda46410adaa41b4b0da0 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai 
+Date: Tue, 10 Oct 2023 08:20:15 +0200
+Subject: [PATCH] seq: Fix typos in symbol version definitions
+
+There were obvious typos in src/Versions.in that resulted in the
+undefined s

[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/

2023-09-07 Thread Sam James
commit: b0ead6beba8b528c5d03c738a8214f8eeea27105
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Sep  7 00:13:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  7 14:46:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ead6be

media-libs/alsa-lib: backport musl fix for 1.2.10

Closes: https://bugs.gentoo.org/913573
Signed-off-by: Violet Purcell  inventati.org>
Signed-off-by: Sam James  gentoo.org>

 media-libs/alsa-lib/alsa-lib-1.2.10.ebuild |  1 +
 .../files/alsa-lib-1.2.10-musl-string.patch| 40 ++
 2 files changed, 41 insertions(+)

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild
index 9292f6f04563..bd8d097d5eff 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.10.ebuild
@@ -34,6 +34,7 @@ BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
 
 PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+   "${FILESDIR}/${P}-musl-string.patch" # bug #913573, backport
 )
 
 pkg_setup() {

diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch 
b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
new file mode 100644
index ..49747dcfecbe
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.10-musl-string.patch
@@ -0,0 +1,40 @@
+From 
https://github.com/alsa-project/alsa-lib/commit/10bd599970acc71c92f85eb08943eb8d3d702a9c
 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela 
+Date: Wed, 6 Sep 2023 15:16:44 +0200
+Subject: [PATCH] global.h: move __STRING() macro outside !PIC ifdef block
+
+It solves the musl libc compilation issue.
+
+control.c: In function 'snd_ctl_open_conf':
+../../include/global.h:98:36: warning: implicit declaration of function 
'__STRING' [-Wimplicit-function-declaratio]
+   98 | #define SND_DLSYM_VERSION(version) __STRING(version)
+  |^~~~
+
+Fixes: https://github.com/alsa-project/alsa-lib/issues/350
+Signed-off-by: Jaroslav Kysela 
+--- a/include/global.h
 b/include/global.h
+@@ -51,6 +51,11 @@ const char *snd_asoundlib_version(void);
+ #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+ #endif
+ 
++#ifndef __STRING
++/** \brief Return 'x' argument as string */
++#define __STRING(x) #x
++#endif
++
+ #ifdef PIC /* dynamic build */
+ 
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+@@ -71,11 +76,6 @@ struct snd_dlsym_link {
+ 
+ extern struct snd_dlsym_link *snd_dlsym_start;
+ 
+-#ifndef __STRING
+-/** \brief Return 'x' argument as string */
+-#define __STRING(x) #x
+-#endif
+-
+ /** \hideinitializer \brief Helper macro for #SND_DLSYM_BUILD_VERSION. */
+ #define __SND_DLSYM_VERSION(prefix, name, version) _ ## prefix ## name ## 
version
+ /**



[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/

2022-10-30 Thread Sam James
commit: 3a7adf6acb026dd53e261d25d6de947f2314b04e
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 30 18:17:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 30 20:41:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7adf6a

media-libs/alsa-lib: fix alsa.m4 for clang 16

Signed-off-by: Sam James  gentoo.org>

 ...a-lib-1.2.8.ebuild => alsa-lib-1.2.8-r1.ebuild} |  1 +
 .../files/alsa-lib-1.2.8-clang16-macro.patch   | 31 ++
 2 files changed, 32 insertions(+)

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
similarity index 98%
rename from media-libs/alsa-lib/alsa-lib-1.2.8.ebuild
rename to media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
index ea97e535b5f7..60c8f343db4e 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.8-r1.ebuild
@@ -34,6 +34,7 @@ BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
 
 PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
+   "${FILESDIR}/${PN}-1.2.8-clang16-macro.patch"
 )
 
 pkg_setup() {

diff --git a/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch 
b/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch
new file mode 100644
index ..c74a7cc73e26
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.2.8-clang16-macro.patch
@@ -0,0 +1,31 @@
+https://github.com/alsa-project/alsa-lib/pull/278
+
+From 68a233404279366f7c7e34afb6197bcc70f4b7d7 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sun, 30 Oct 2022 18:06:37 +
+Subject: [PATCH] utils/alsa.m4: include  for exit()
+
+Clang 16 makes -Wimplicit-function-declaration an error by default
+and it's easier to just explicitly include  rather
+than hope the ALSA headers always have it.
+
+Signed-off-by: Sam James 
+--- a/utils/alsa.m4
 b/utils/alsa.m4
+@@ -85,6 +85,7 @@ AC_LANG_PUSH([C])
+ AC_MSG_CHECKING([for libasound headers version >= 
$alsa_min_major_version.$alsa_min_minor_version.$alsa_min_micro_version 
($min_alsa_version)])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include 
++#include 
+ ]], [[
+ /* ensure backward compatibility */
+ #if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
+@@ -130,6 +131,7 @@ AC_MSG_CHECKING([for libatopology (sound headers version > 
1.1.9)])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include 
+ #include 
++#include 
+ ]], [[
+ /* ensure backward compatibility */
+ #if !defined(SND_LIB_VERSION)
+



[gentoo-commits] repo/gentoo:master commit in: media-libs/alsa-lib/files/, media-libs/alsa-lib/

2021-06-16 Thread Lars Wendler
commit: 862b72f03dd319eca3ba50717c53a4e70b5622c9
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 16 17:17:35 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 16 17:17:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862b72f0

media-libs/alsa-lib: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 media-libs/alsa-lib/Manifest   |   2 -
 media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild   |  83 
 media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild |  84 
 ...lsa-lib-1.2.2-change-order-of-pcm-devices.patch |  80 ---
 .../alsa-lib-1.2.2-namehint-add-omit_noargs.patch  | 108 -
 5 files changed, 357 deletions(-)

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 278675767a8..7d94b680606 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,3 @@
-DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 
176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726
 SHA512 
d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
-DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 
70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6
 SHA512 
1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
 DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B 
e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db
 SHA512 
12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
 DIST alsa-lib-1.2.5.1.tar.bz2 1069073 BLAKE2B 
5464cc7f263bdf7b10aa7e1f542ad6dbc55bf300156fd1bded00375c41a518d4b14f96e28eb1c60a6ce7cc6e27da4b2e8598cd867f15417f260fc23513f93e11
 SHA512 
01998ffa449e925ff552c13aea47f9540903afdc533086067c78dcaba4d239c347180d3d28bbe6d19b7779c7249fcc77a30057930ca22d18ba55e163fa1c
 DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B 
d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e
 SHA512 
e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99

diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild 
b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
deleted file mode 100644
index 1a2b04a4ceb..000
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/wiki/Main_Page";
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 
~amd64-linux ~x86-linux"
-IUSE="alisp debug doc elibc_uclibc python +thread-safety"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.2.6 )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-1.1.6-missing_files.patch" #652422
-   "${FILESDIR}/${P}-change-order-of-pcm-devices.patch" #718106
-   "${FILESDIR}/${P}-namehint-add-omit_noargs.patch" #718106
-)
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || 
die
-   # https://bugs.gentoo.org/509886
-   if use elibc_uclibc ; then
-   sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am 
|| die
-   fi
-   # https://bugs.gentoo.org/545950
-   sed -i -e '5s:^$:\nAM_CPPFLAGS = -I$(top_srcdir)/include:' 
test/lsb/Makefile.am || die
-   default
-   eautoreconf
-}
-
-multilib_src_configure() {
-   local myeconfargs=(
-   --disable-maintainer-mode
-   --disable-resmgr
-   --enable-aload
-   --enable-rawmidi
-   --enable-seq
-   --enable-shared
-   # enable Python only on final ABI
-   $(multilib_native_use_enable python)
-   $(use_enable alisp)
-   $(use_enable thread-safety)
-   $(use_with debug)
-   $(usex elibc_uclibc --without-versioned '')
-   )
-
-   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-   emake
-
-   if multilib_is_native_abi && use doc; then
-   emake doc
-   grep -