new upstream release, see #94831

(Portage version: 2.0.51.22-r1)

8 files changed, 248 insertions, 22 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 54d4d8793d7c..de6e68f383d8 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.145 2005/05/27 20:36:16 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.146 2005/06/03 20:00:26 luckyduck Exp $
+
+*alsa-driver-1.0.9a (03 Jun 2005)
+
+  03 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-driver-1.0.9a.ebuild:
+  new upstream release, see #94831
 
 *alsa-driver-1.0.9 (27 May 2005)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 56e81b085f3f..004df7367c44 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,13 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 721a402d8414fdec8acbd5dafc37620d alsa-driver-1.0.9.ebuild 4377
 MD5 13eab1abd6e32da978f5cb85fee1d382 alsa-driver-1.0.9_rc3.ebuild 4402
+MD5 6ef1820ddaa68d27f5cf48316ae8c588 alsa-driver-1.0.9a.ebuild 4380
 MD5 6f09dc63bc18f2d9e3369dc425211b62 alsa-driver-1.0.8.ebuild 4634
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
 MD5 1d64819ed43da53bd1115649edd80ece ChangeLog 25634
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
+MD5 93487426454ca1b229a75ded21dfa455 files/digest-alsa-driver-1.0.9a 72
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 112205863c92fbee731b363e46c8c1af files/digest-alsa-driver-1.0.9_rc3 74
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
@@ -15,10 +14,3 @@ MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
 MD5 ec76197e2819df2d5725bda1201250ae files/digest-alsa-driver-1.0.9 71
 MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
 MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCl4Td06ebR+OMO78RApPuAJ43bmekjtCzdNpA3fw6Yg+Di4JL6QCeI0aI
-RR7j2OTjy9I4EFsFT7JfUmU=
-=LR5g
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.9a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.9a.ebuild
new file mode 100644
index 000000000000..278ef11fab5d
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.9a.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.9a.ebuild,v 1.1 2005/06/03 20:00:26 luckyduck Exp $
+
+inherit linux-mod flag-o-matic eutils
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="oss doc"
+
+RDEPEND="virtual/modutils
+	 ~media-sound/alsa-headers-${PV/a/}"
+DEPEND="${RDEPEND}
+	sys-devel/patch
+	virtual/linux-sources
+	>=sys-devel/autoconf-2.50
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+pkg_setup() {
+	# By default, drivers for all supported cards will be compiled.
+	# If you want to only compile for specific card(s), set ALSA_CARDS
+	# environment to a space-separated list of drivers that you want to build.
+	# For example:
+	#
+	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
+	#
+	ALSA_CARDS=${ALSA_CARDS:-all}
+
+	# Which drivers need PNP
+	local PNP_DRIVERS="interwave interwave-stb"
+
+	CONFIG_CHECK="SOUND"
+	SND_ERROR="ALSA is already compiled into the kernel."
+	SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
+	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	if [[ "${ALSA_CARDS}" == "all" ]]; then
+		CONFIG_CHECK="${CONFIG_CHECK} PNP"
+	else
+		for pnpdriver in ${PNP_DRIVERS}; do
+			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		done
+	fi
+
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	convert_to_m ${S}/Makefile
+}
+
+src_compile() {
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+
+	econf $(use_with oss) \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_OUT_DIR}" \
+		--with-isapnp=yes \
+		--with-sequencer=yes \
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# linux-mod_src_compile doesn't work well with alsa
+
+	# -j1 : see bug #71028
+	set_arch_to_kernel
+	emake -j1 || die "Make Failed"
+	set_arch_to_portage
+
+	if use doc;
+	then
+		ebegin "Building Documentation"
+		cd ${S}/scripts
+		emake || die Failed making docs in ${S}/scripts
+
+		cd ${S}/doc/DocBook
+		emake || die Failed making docs in ${S}/doc/DocBook
+		eend $?
+	fi
+}
+
+
+src_install() {
+	dodir /usr/include/sound
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	# Provided by alsa-headers now
+	rm -rf ${D}/usr/include/sound
+
+	# We have our own scripts in alsa-utils
+	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
+	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
+
+	dodoc CARDS-STATUS INSTALL FAQ README WARNING TODO
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
+
+		docinto DocBook
+		dodoc doc/DocBook/*
+		rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
+
+		docinto Documentation
+		dodoc sound/Documentation/*
+	fi
+
+	if kernel_is 2 6; then
+		# mv the drivers somewhere they won't be killed by the kernel's make modules_install
+		mv ${D}/lib/modules/${KV_FULL}/kernel/sound ${D}/lib/modules/${KV_FULL}/${PN}
+		rmdir ${D}/lib/modules/${KV_FULL}/kernel &> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
+	einfo
+	einfo "Also, remember that all mixer channels will be MUTED by default."
+	einfo "Use the 'alsamixer' program to unmute them."
+	einfo
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
+	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
+	einfo
+
+
+	linux-mod_pkg_postinst
+
+	einfo "Check out the ALSA installation guide availible at the following URL:"
+	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
+
+	if kernel_is 2 6; then
+		# Cleanup if they had older alsa installed
+		for file in $(find ${ROOT}/lib/modules/${KV_FULL}/${PN} -type f); do
+			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
+		done
+
+		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
+			rmdir ${dir} &> /dev/null
+		done
+	fi
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9a b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9a
new file mode 100644
index 000000000000..1b165d1fdc5f
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9a
@@ -0,0 +1 @@
+MD5 fddaa2710abc940aeba886f13f7d31e5 alsa-driver-1.0.9a.tar.bz2 2019069
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 1f3d80f798f7..98401031fc10 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.94 2005/05/27 20:48:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.95 2005/06/03 20:00:20 luckyduck Exp $
+
+*alsa-utils-1.0.9a (03 Jun 2005)
+
+  03 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +alsa-utils-1.0.9a.ebuild:
+  new upstream release, see #94831
 
   27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-utils-1.0.9.ebuild:
   introduced support for the nls useflag, fixes #92080
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index f6fc41d8028e..a2fe247d8e10 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 76a0e8910cb1451478cf46a9bd93c6a5 alsa-utils-1.0.9.ebuild 2350
+MD5 76a0e8910cb1451478cf46a9bd93c6a5 alsa-utils-1.0.9a.ebuild 2350
 MD5 26f5354615b23de013a20117251274ee alsa-utils-1.0.8.ebuild 2269
 MD5 064c8dec9972aca1b101581ab7d751bb ChangeLog 14646
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 a2a37bf9cb817343a6a58e20cfea9bb8 alsa-utils-1.0.7.ebuild 2272
+MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 MD5 954b0951b5fed9bf591abf9e7cc1963e files/alsa-modules.conf-rc 1162
 MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
 MD5 ec6210532acb9b397bacb3eb81f7593a files/digest-alsa-utils-1.0.8 69
 MD5 95a3737b14bbdd8f540bce955ecf02cd files/digest-alsa-utils-1.0.9 69
 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCl4e106ebR+OMO78RAtRGAJ4pK0zx8kVeVvgJDlf91DwWnYo5mgCeKBuu
-OslCA833LekcaJwL6DoyX5Y=
-=3b6k
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild
new file mode 100644
index 000000000000..1625c8c0f835
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.9a.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 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.9a.ebuild,v 1.1 2005/06/03 20:00:20 luckyduck Exp $
+
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.9"
+RDEPEND="${DEPEND}
+	sys-apps/pciutils"
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	make DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/alsasound.confd alsasound
+	insinto /etc/modules.d
+	newins ${FILESDIR}/alsa-modules.conf-rc alsa
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/alsasound
+}
+
+pkg_postinst() {
+	echo
+	einfo "The alsasound initscript is now provided by alsa-utils"
+	einfo "instead of alsa-driver for compatibility with kernel-sources"
+	einfo "which provide ALSA internally."
+	echo
+	einfo "To take advantage of this, and automate the process of"
+	einfo "loading and unloading the ALSA sound drivers as well as"
+	einfo "storing and restoring sound-card mixer levels you should"
+	einfo "add alsasound to the boot runlevel. You can do this as"
+	einfo "root like so:"
+	einfo "	# rc-update add alsasound boot"
+	echo
+	einfo "You will also need to edit the file /etc/modules.d/alsa"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
+	echo
+
+	if use sparc; then
+		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
+		ewarn "which causes sparc64 machines to lockup on such tasks as"
+		ewarn "changing the volume.  Because of this, it is VERY important"
+		ewarn "that you do not use the snd-ioctl32 modules contained in"
+		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
+		ewarn "may result in an unbootable system if you start alsasound at boot."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.9a b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.9a
new file mode 100644
index 000000000000..c7f488e60009
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.9a
@@ -0,0 +1 @@
+MD5 d4b77e9fe0311772293e402fdd634ad2 alsa-utils-1.0.9a.tar.bz2 957419