gentoo (leap year) resync : 29.02.2020

8 files changed, 6 insertions, 574 deletions

diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index cf3a2eea2c6d..d75bd91ffd90 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,18 +1,10 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
 AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
-AUX alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch 9191 BLAKE2B 964557f65786fd53c15e9047e1d65d63610f1a120dee71e1ec4ce1e6828d6a7b5cd140a5ad1f49d1ddc39592a2286829ee23ee76ca08a8f5ef6a7e04ff6203a9 SHA512 9969883807bfbe1638b8cf676cb1ec2160b33007af8e7cb0c6289064995c9bbc16a249c18b25dea2c5b10732471f101e7b824bb8c7b4eb080f0482706acd12b5
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
-AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 AUX alsasound.initd-r8 2183 BLAKE2B 3c3e59847817e06e7847399fad02885fc493e2b51b769a16d3cff57a2270a7769de2072855e5d09883e6c339d207185b4cb75639cbb2c5d3d16c07d9b07a75a3 SHA512 983172bbec6792028d0757d2385bfe1a7226b1db72a4490acf2a4927e6a20d8cca0746a2b1747f0f3390353196051b041397e3eae1d04a6fa02985c87a5e178f
-DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
-DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
-DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
-DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da338208bfa646fc2a46d38f2d1d937b55b90acc5f75bb630aa288dee458c9f555a5727990c5cd7a59b627cb1ecf1e2c SHA512 92fa689ea5897150972d5376e7999ff060cad09cb0b06991d81c87b61a243ecec944e2a4c7ad38878596cd8b4246e44c5a3a35e5bc6452c02ebf35c9bed91970
 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
-EBUILD alsa-utils-1.1.2.ebuild 2215 BLAKE2B b677f9d46e0a4a0a4b112fd3cb4def0f8fb64c30b653cd17e293ebd899eaf8b68fccf7a755017029e159443578c514174d4abd48f3e7b98115ff7af7fe78ce6a SHA512 c5d16a95c08491eeba7107f66e9fd51c4e03a3ac768fa8f6b3de584632cef5ea0c2b8c3651e16a64f3c4f54685a2c4ff54068dd4f531d8dba1d21fde82516c07
-EBUILD alsa-utils-1.1.6.ebuild 2268 BLAKE2B 417f204910822421e8e40d388bd3563d1cbc25af2c4e9e55350498a3edce81524d222ec59bb0b13a42b04c4a0a40c6062e2eb7b9f3dfae8d78dcf1f55c4d9b04 SHA512 48f8112139924aa6c2a3f721afcef746c624c9084659d6b96714131eea16039882f34ef8de8d91715820cb73722eb04f031ffcc05a83c44eeb39b9d88424715b
-EBUILD alsa-utils-1.1.8.ebuild 2339 BLAKE2B 63652717e76d9f002ad9458908a08c3e5cd7d06ea9352dc7626b3cfd38c20bce9937517995281154f5a753f801a4b63458f28fd7af9c311b9e003446b07bf57c SHA512 530c27b7a606be234f9af020a68ad2fb61ece525f136e33a2c54b775156ca30aea335c8c9e6fbf0fa185d9f285c9070b38133d65a8b37eb4eaa5ff1eee5ea0f5
-EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2338 BLAKE2B c78c4be518e14b70caed6f39ad6a0e18ab8c22048719300c67bc07eeec932899894020057ce1adb58e23b83fb111f87d1de56a2769c65b9ffa12acd2c8b13d38 SHA512 7557b5c7ed077f977d5a5e9bb8e4f3a862a037872e011d574f641aea3c22693e4bb19e9371382bab5d71eaf837d609c15d6496f81a749e1df1bb5f805da21b6b
+DIST alsa-utils-1.2.2.tar.bz2 1274821 BLAKE2B 79b6cd719dbf36ca65b186c6682c9617fb89cb76aa530e4f40850004170703990054b5e96f700c652b11781e0086490824ce2433e33b17c03655fea089f59ceb SHA512 30598c658f3f2ad71a5ce7911b09ae13add54b293bcf3bebb053371d84a91528bd64fd376f167456b2e27e2546a2279019678e099247513e5142b283af756fd9
+EBUILD alsa-utils-1.2.1.ebuild 2336 BLAKE2B 404f5bc2b620c326b0551c7dac868aa4a390db9700b6ce1db0656552097af3f66192a2db83136c6293c7633784932186260d5441b633144c52402c2501f1cf1d SHA512 8e0d04c00d0933ec7ba4a5c264ec6eacf254c38b717b1bea36fbbd94d716fbed194a6732b860c7c7efee9788fee12fea22c8bf98766b90b9fe3432c3aff55238
+EBUILD alsa-utils-1.2.2.ebuild 2345 BLAKE2B 2fbcf540ef9b7892ad1f87f1b2ced6c2d9993174b1b83e5ece2b2d6feb0bd1f2455e6cf7518179f5cf278c99821b3d6e7d04b4fa9abe5f9aa63c4bc054fc2135 SHA512 6dab5aa079badb0dc7ba7572414aeca79dde991523544bc8954a9f802807d60cf2be1070a06a73478ae7786aacf7798a3af854e578bb1c517f2f399fd54d178b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
deleted file mode 100644
index ced234f3433c..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
deleted file mode 100644
index 757dbfdfeb79..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
deleted file mode 100644
index 23a733a8a7b8..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-		--disable-alsaconf
-		--disable-maintainer-mode
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(use_enable bat)
-		$(use_enable libsamplerate alsaloop)
-		$(use_enable ncurses alsamixer)
-		$(use_enable nls)
-		$(usex doc '' --disable-xmlto)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index c06211c22447..3b5d439a2f69 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
index 280d4466e121..564a4e6888fc 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.9.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
@@ -25,7 +25,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
-	"${FILESDIR}"/${P}-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
 )
 
 src_configure() {
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch b/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
deleted file mode 100644
index 654358399737..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.1.9-axfer-test-fix-invalid-comparison-of-64-bit-storage-.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From fbb222c9bccb407750cea61e3bb6285cb8c1b330 Mon Sep 17 00:00:00 2001
-From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-Date: Sun, 28 Jul 2019 13:48:50 +0900
-Subject: [PATCH] axfer: test: fix invalid comparison of 64 bit storage in
- ILP32 data type
-
-In system V ABIs with ILP32 data model, bit shift for '1ul' can brings
-undefined behaviour when the calculation result is over 32 bit width.
-
-This commit fixes the bug.
-
-Reported-by: Rolf Eike Beer <eike@sf-mail.de>
-Reference: https://bugs.gentoo.org/681652
-Reference: https://github.com/alsa-project/alsa-utils/issues/23
-Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- axfer/test/container-test.c | 142 ++++++++++++++++++------------------
- axfer/test/generator.c      |   4 +-
- axfer/test/mapper-test.c    |  24 +++---
- 3 files changed, 85 insertions(+), 85 deletions(-)
-
-diff --git a/axfer/test/container-test.c b/axfer/test/container-test.c
-index 0e2e6e9..9b30ae3 100644
---- a/axfer/test/container-test.c
-+++ b/axfer/test/container-test.c
-@@ -172,82 +172,82 @@ int main(int argc, const char *argv[])
- {
- 	static const uint64_t sample_format_masks[] = {
- 		[CONTAINER_FORMAT_RIFF_WAVE] =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S24_BE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW) |
--			(1ul << SND_PCM_FORMAT_S24_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_3BE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3BE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S18_3BE),
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S24_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW) |
-+			(1ull << SND_PCM_FORMAT_S24_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_3BE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3BE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3BE),
- 		[CONTAINER_FORMAT_AU] =
--			(1ul << SND_PCM_FORMAT_S8) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW),
-+			(1ull << SND_PCM_FORMAT_S8) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW),
- 		[CONTAINER_FORMAT_VOC] =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW),
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW),
- 		[CONTAINER_FORMAT_RAW] =
--			(1ul << SND_PCM_FORMAT_S8) |
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S16_BE) |
--			(1ul << SND_PCM_FORMAT_U16_LE) |
--			(1ul << SND_PCM_FORMAT_U16_BE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S24_BE) |
--			(1ul << SND_PCM_FORMAT_U24_LE) |
--			(1ul << SND_PCM_FORMAT_U24_BE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_S32_BE) |
--			(1ul << SND_PCM_FORMAT_U32_LE) |
--			(1ul << SND_PCM_FORMAT_U32_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT_BE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_BE) |
--			(1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
--			(1ul << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
--			(1ul << SND_PCM_FORMAT_MU_LAW) |
--			(1ul << SND_PCM_FORMAT_A_LAW) |
--			(1ul << SND_PCM_FORMAT_S24_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_3BE) |
--			(1ul << SND_PCM_FORMAT_U24_3LE) |
--			(1ul << SND_PCM_FORMAT_U24_3BE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3BE) |
--			(1ul << SND_PCM_FORMAT_U20_3LE) |
--			(1ul << SND_PCM_FORMAT_U20_3BE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S18_3BE) |
--			(1ul << SND_PCM_FORMAT_U18_3LE) |
--			(1ul << SND_PCM_FORMAT_U18_3BE) |
--			(1ul << SND_PCM_FORMAT_DSD_U8) |
--			(1ul << SND_PCM_FORMAT_DSD_U16_LE) |
--			(1ul << SND_PCM_FORMAT_DSD_U32_LE) |
--			(1ul << SND_PCM_FORMAT_DSD_U16_BE) |
--			(1ul << SND_PCM_FORMAT_DSD_U32_BE),
-+			(1ull << SND_PCM_FORMAT_S8) |
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S16_BE) |
-+			(1ull << SND_PCM_FORMAT_U16_LE) |
-+			(1ull << SND_PCM_FORMAT_U16_BE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S24_BE) |
-+			(1ull << SND_PCM_FORMAT_U24_LE) |
-+			(1ull << SND_PCM_FORMAT_U24_BE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_BE) |
-+			(1ull << SND_PCM_FORMAT_U32_LE) |
-+			(1ull << SND_PCM_FORMAT_U32_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT_BE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_BE) |
-+			(1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_LE) |
-+			(1ull << SND_PCM_FORMAT_IEC958_SUBFRAME_BE) |
-+			(1ull << SND_PCM_FORMAT_MU_LAW) |
-+			(1ull << SND_PCM_FORMAT_A_LAW) |
-+			(1ull << SND_PCM_FORMAT_S24_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_3BE) |
-+			(1ull << SND_PCM_FORMAT_U24_3LE) |
-+			(1ull << SND_PCM_FORMAT_U24_3BE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3BE) |
-+			(1ull << SND_PCM_FORMAT_U20_3LE) |
-+			(1ull << SND_PCM_FORMAT_U20_3BE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3BE) |
-+			(1ull << SND_PCM_FORMAT_U18_3LE) |
-+			(1ull << SND_PCM_FORMAT_U18_3BE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U8) |
-+			(1ull << SND_PCM_FORMAT_DSD_U16_LE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U32_LE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U16_BE) |
-+			(1ull << SND_PCM_FORMAT_DSD_U32_BE),
- 	};
- 	static const uint64_t access_mask =
--		(1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
--		(1ul << SND_PCM_ACCESS_RW_INTERLEAVED);
-+		(1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
-+		(1ull << SND_PCM_ACCESS_RW_INTERLEAVED);
- 	struct test_generator gen = {0};
- 	struct container_trial *trial;
- 	int i;
-diff --git a/axfer/test/generator.c b/axfer/test/generator.c
-index cdea2c9..bde8c5f 100644
---- a/axfer/test/generator.c
-+++ b/axfer/test/generator.c
-@@ -220,7 +220,7 @@ static int test_sample_format(struct test_generator *gen,
- 	int err = 0;
- 
- 	for (i = 0; i <= SND_PCM_FORMAT_LAST; ++i) {
--		if (!((1ul << i) & gen->sample_format_mask))
-+		if (!((1ull << i) & gen->sample_format_mask))
- 			continue;
- 
- 		err = test_samples_per_frame(gen, access, i);
-@@ -237,7 +237,7 @@ static int test_access(struct test_generator *gen)
- 	int err = 0;
- 
- 	for (i = 0; i <= SND_PCM_ACCESS_LAST; ++i) {
--		if (!((1ul << i) & gen->access_mask))
-+		if (!((1ull << i) & gen->access_mask))
- 			continue;
- 
- 		err = test_sample_format(gen, i);
-diff --git a/axfer/test/mapper-test.c b/axfer/test/mapper-test.c
-index 6b24d54..f0376c7 100644
---- a/axfer/test/mapper-test.c
-+++ b/axfer/test/mapper-test.c
-@@ -396,13 +396,13 @@ int main(int argc, const char *argv[])
- {
- 	// Test 8/16/18/20/24/32/64 bytes per sample.
- 	static const uint64_t sample_format_mask =
--			(1ul << SND_PCM_FORMAT_U8) |
--			(1ul << SND_PCM_FORMAT_S16_LE) |
--			(1ul << SND_PCM_FORMAT_S18_3LE) |
--			(1ul << SND_PCM_FORMAT_S20_3LE) |
--			(1ul << SND_PCM_FORMAT_S24_LE) |
--			(1ul << SND_PCM_FORMAT_S32_LE) |
--			(1ul << SND_PCM_FORMAT_FLOAT64_LE);
-+			(1ull << SND_PCM_FORMAT_U8) |
-+			(1ull << SND_PCM_FORMAT_S16_LE) |
-+			(1ull << SND_PCM_FORMAT_S18_3LE) |
-+			(1ull << SND_PCM_FORMAT_S20_3LE) |
-+			(1ull << SND_PCM_FORMAT_S24_LE) |
-+			(1ull << SND_PCM_FORMAT_S32_LE) |
-+			(1ull << SND_PCM_FORMAT_FLOAT64_LE);
- 	uint64_t access_mask;
- 	struct test_generator gen = {0};
- 	struct mapper_trial *trial;
-@@ -451,13 +451,13 @@ int main(int argc, const char *argv[])
- 			goto end;
- 		}
- 
--		access_mask = 1ul << access;
-+		access_mask = 1ull << access;
- 		verbose = true;
- 	} else {
--		access_mask = (1ul << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_RW_INTERLEAVED) |
--			      (1ul << SND_PCM_ACCESS_RW_NONINTERLEAVED);
-+		access_mask = (1ull << SND_PCM_ACCESS_MMAP_INTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_MMAP_NONINTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_RW_INTERLEAVED) |
-+			      (1ull << SND_PCM_ACCESS_RW_NONINTERLEAVED);
- 		verbose = false;
- 	}
- 
--- 
-2.21.0
-
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
deleted file mode 100644
index f80a3518f3e2..000000000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r6
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-alsahomedir=/var/run/alsasound
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	if [ ! -r "${alsastatedir}/asound.state" ] ; then
-		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
-		eend 0
-		return 0
-	fi
-
-	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
-	local CARDNUM
-	for cardnum in ${cards}; do
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
-			|| ewarn "Errors while restoring defaults, ignoring"
-	done
-
-	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
-		[ -e "${ossfile}" ] || continue
-		# We use cat because I'm not sure if cp works properly on /proc
-		local procfile=${ossfile##${alsastatedir}/oss}
-		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
-		if [ -e /proc/asound/"${procfile}"/oss ] ; then
-		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
-		fi
-	done
-
-	eend 0
-}
-
-save() {
-	ebegin "Storing ALSA Mixer Levels"
-
-	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
-		eerror "Error saving levels."
-		eend 1
-		return 1
-	fi
-
-	for ossfile in /proc/asound/card*/pcm*/oss; do
-		[ -e "${ossfile}" ] || continue
-		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
-		device="$(echo "${device}" | sed -e 's,/,_,g')"
-		mkdir -p "${alsastatedir}/oss/"
-		cp "${ossfile}" "${alsastatedir}/oss/${device}"
-	done
-
-	eend 0
-}
-
-start() {
-	if [ "${RESTORE_ON_START}" = "yes" ]; then
-		restore
-	fi
-
-	return 0
-}
-
-stop() {
-	if [ "${SAVE_ON_STOP}" = "yes" ]; then
-		save
-	fi
-	return 0
-}