Version bump wrt #513670 by "PG". Don't save pulseaudio state files to filesystem root directory / wrt #438844 by Alexander Tsoy.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 182 insertions, 9 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index c4a4aed810c8..43c6bc2ab837 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.371 2014/04/05 19:21:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.372 2014/06/23 21:34:42 ssuominen Exp $
+
+*alsa-utils-1.0.28 (23 Jun 2014)
+
+  23 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +alsa-utils-1.0.28.ebuild,
+  +files/alsasound.initd-r6:
+  Version bump wrt #513670 by "PG". Don't save pulseaudio state files to
+  filesystem root directory / wrt #438844 by Alexander Tsoy.
 
   05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove unused USE="minimal" description from metadata.xml
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 1379c768d29d..31d721a7e9d7 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,18 +4,21 @@ Hash: SHA256
 AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757 WHIRLPOOL 75fdfe4802af6a020bc6a4d46da7872b3481657f13d92e30c9fa61d5accdd8cd19b14a0c813c454d2ca89fa655f5ad375c0163fa4f947342ee759ab80a4700e4
 AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
 AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
+AUX alsasound.initd-r6 2313 SHA256 5fdcb0212bf8a4be74f410534534fdda6dd8d57df0d2a6c4a158464f705fed18 SHA512 a0997f5934c6680cae250133bc51633487492d367f9031cb39850520e1685c47571a432976dda09d3c2f574b839011284ee413d3dbef6866ceaa8e3feaca522e WHIRLPOOL 258070418f10866f0ea37714ee385dc81dda25dcb8e1e4eb4e1a4f16e32a8c89da402501e02da43b2ecb2c98c7c1f5dec53da24e676c6615569b4d1b5845236e
 DIST alsa-utils-1.0.27.2.tar.bz2 1143802 SHA256 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea SHA512 c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6 WHIRLPOOL 9e95c37f307498bb9a7829fd721bf54888f3fe9ec78f014702cc26493e81369a44b571f1f5e65b3e32dbde926f97ab1152e22cf66fdff17be209e61ae34d9d46
+DIST alsa-utils-1.0.28.tar.bz2 1146887 SHA256 f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc SHA512 faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786 WHIRLPOOL d58587d9f302f3f1a7ab4de45c3889ce82e5be782e4aa9a953c39a908a4693e99c8ea9aeeb5669f0f606d980983beb7d5fc53e4c76ce1bb76500c7c2bcb45013
 EBUILD alsa-utils-1.0.27.2.ebuild 2286 SHA256 860bc5c7bd54f1341831c6811e340c7c7eb110f0f12802291b4051eb6af19d2f SHA512 69013489e2636c958f9046754df38d51e8b6564d782785ad7630a3360220e9bbacb56dd1ccd6a8df88d9046c6f88fe247cfcbaaedfb46cc8f4948ebeb5422fff WHIRLPOOL 6264c7538e8dc1dbacdc93d84e6ae4a9c3780e480e4c7d1bf00508c899121fa243c82071fbdfe10f7e3cca64448c57d02e9208a2013b94e5cd94d764337779dd
-MISC ChangeLog 57303 SHA256 3f6b7d8103e5a8929f00631102ab8065642c5d218b2ceda942be5668d21676a8 SHA512 17d612001b5abb1e720a6ba38593191bb2da53a96cffaf44c00ca9820eba17a9567b0a68223b9acec9108f46b880387be4ae9d420dd49892efe697d310907bef WHIRLPOOL b972e02eccf49425cff61e8f74d2a22c039529a59c7710f7f3a9f0cf9f15a7976b18e5f2dd4267657bfa891d9747ed3359061844979084610e920db3284b8131
+EBUILD alsa-utils-1.0.28.ebuild 2295 SHA256 aff8f718044a2e76c9700b7233c2341483b2d3a61149e4ce7d0c7bda3712c243 SHA512 ee59bbae73b3cdaf9f5ca6978dca45b37949b5608214d8bbe23462e003ddcb98cc4380285ff23b37f2a731082d8409774237cde1f19e9ab2a1c002317ca887bf WHIRLPOOL 0ab065fc76adc1cd2fa6d5fc0bfe236c89382ae6b9a08b66157ec48d15d6ff351b5b30646c5699c8d2ae695b8e10ece1f9b1d6a89bd7fe785bf1b33e4b1630cb
+MISC ChangeLog 57582 SHA256 88993e1c411b3a8a39a90b9cea15a0e94e55de0e9e02712607259484dae1367c SHA512 d44c4eb79e51747fc854adb433b50cc7177affb10ae93195b850611b925b70a3e9b4c8a3a6b759377cefd3ba2dbc6921f430815095cbe49802762617f0806515 WHIRLPOOL f531c99311f3f7c2c0411e9cce2d8ca77be6889dbfb02f0fdc50e396245a17d8477fe0d533c1c8720a33dd5051cf492b5a7fc18c5d0805a0837370fb5f4bdc46
 MISC metadata.xml 418 SHA256 5283e8e4df90b1d6dee867370ca08668ff9cadf333f2af896b260d66cd772dcf SHA512 337fdc5a670690722273d2c7aaa5c0b7a44f4a167f8ac22f860680c544e97b04c34816dbbca6d2cf44236a99890f0767534496795a4e9727b3dc735585c3298f WHIRLPOOL 3e2ba0b9cab5298ccdff2522b03079b85f8016bca115ff354196d84793312cda732ef984cf6cd68bfc09cab16bd66f11c14e5a0a7c2898c9ca23db563cc6407a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQFZPAAoJEEdUh39IaPFNDwQH/1vIZPI6Xql5Qw595Yr02HFV
-bwEBNPW5IdR0Yal3FTYr5r009xJJxPZ1UBG2Fazb2orRQf6VelAdWHVRgfyZzE2g
-3kivs8sV7DdhYyuY0bRzPVs4fJf3BxcX4ymQjv4KehMwq8VMQs11Y1qJXtwUFGOR
-+2/qSdwQmmzpTIZlSGOSeDYRkCGYU6lqGx74bw6/2c12eV46cafXwPnZ5D/DA4YG
-qqkKNVL4gqYjA/C8kC0TMJFN3+RPk3LkBZ7iUEA3a1JophZE2hnTdSnFPMXXbzyY
-Cub96hT64Oxx4AMg8ZA570lBrWkKzApvOyCwskb6G9ZGd548ky7mh13uAYLu5Ao=
-=MqxG
+iQEcBAEBCAAGBQJTqJydAAoJEEdUh39IaPFNHn8H/A6PGzKC62DclukBG18PLggi
+/qnAM2PvrY8zbP4IFsi48YY1CztX5enrSsu2VNMl52GUzHWO2pqPU50aa4t3jOkO
+ETGQ84oVaq7370geFGFbcrxf6bBTg841XGauCTmzJC7u3ScT6BblIvJeE0GoYQ2P
+xMenjmWo3+fxFlFLKmox/5vFQBvnH7+O9k749TxkmT9SXAbo0tyfJyqcllsxy+ZF
+5rX8oD97EntngtNmtj0J29G6MdTf+Q6Wa5Gg8vJbSY417VvsOwMqOnSJfcFS7X8l
+ip3GgijoWPZ5yTareXl4ymDAQP/Ac2amBgx2UY21lBv8pSg5MEETT/rNLQvSqBs=
+=Si37
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
new file mode 100644
index 000000000000..dc7866570146
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild,v 1.1 2014/06/23 21:34:42 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
+	selinux? ( sec-policy/selinux-alsa )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch_user
+}
+
+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 libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO 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/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
new file mode 100644
index 000000000000..2eddfd308db4
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r6
@@ -0,0 +1,88 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r6,v 1.1 2014/06/23 21:34:42 ssuominen Exp $
+# Copyright 1999-2014 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
+}