gentoo resync : 07.08.2021

3 files changed, 2 insertions, 61 deletions

diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index 1aba1def8b84..5888849ff273 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,6 +1,5 @@
 AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689bb66b7abcd93552a6a87aed0a8677c5d1352944071f3621b6298d27bcad0e02dfe54c2abf386396e71fae2b923747dae5999684 SHA512 8aae4dc353f6299e7790743694d7c67ddaba1cc02a8cba81a36962112f3a0ecbf4e078ef27d5d3c28bf779fbfdc6e5c3935ca5437ccfcf84b3e2e5ed5cba1f63
 AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
 DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
-EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-EBUILD libao-1.2.2-r2.ebuild 1673 BLAKE2B e9cb19b6edca77165583e62ffdee238c6c95e223612fedb1fe77b84a064bdc1007398b0b837ce5204a2e592f20c757d8fcf105f4ed6d733516b468eacbd61711 SHA512 91dc0f1606e0e17e435db638a53dc6ec88629cfaeeb035051f0f77f87ccb291d140b60bfb32b3fa0d1ce37bf5b450d9f68fcf8b6cea7490651a7d27e44f62f18
+EBUILD libao-1.2.2-r2.ebuild 1672 BLAKE2B 957ccd681083dd4eb55e648bb41f73938401033d2a0383ec7814fa310ac4a044cc47fb6acda5b50f8b1dd9edd8074351c15552ef994d2bafeda365ded6fe0359 SHA512 bd0e334eeec769b7af6ff087e7eaba9c93ea49c8830603c567d020a41a3f0f9f823cbd42b9860c12dd17c5a6e7d729c957b4e0a3d178e250668d90f10d6a6973
 MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/libao-1.2.2-r1.ebuild b/media-libs/libao/libao-1.2.2-r1.ebuild
deleted file mode 100644
index dda461774e57..000000000000
--- a/media-libs/libao/libao-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib multilib-minimal
-
-DESCRIPTION="The Audio Output library"
-HOMEPAGE="https://www.xiph.org/ao/"
-#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
-#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
-SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="alsa nas mmap pulseaudio"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-implicit.patch
-)
-
-src_prepare() {
-	default
-	sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-arts
-		--disable-esd
-		--disable-static
-		$(use_enable alsa alsa)
-		$(use_enable mmap alsa-mmap)
-		$(use_enable nas)
-		$(use_enable pulseaudio pulse)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS CHANGES README TODO
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
index eb03b8bb5fad..da2b67d21cd9 100644
--- a/media-libs/libao/libao-1.2.2-r2.ebuild
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="alsa nas mmap pulseaudio sndio"
 
 RDEPEND="