Version bump.

10 files changed, 153 insertions, 24 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 5d89fba518e3..e1d3c5f1acd5 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.123 2004/12/19 10:11:41 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.124 2005/01/01 11:43:17 eradicator Exp $
+
+*alsa-driver-1.0.8_rc1 (01 Jan 2005)
+
+  01 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.8_rc1.ebuild:
+  Version bump.
 
   19 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.7-r4.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 4d4795044a4f..68dfc183b7b8 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 02bc9873393acc3f2e8ac8f53795cac1 ChangeLog 21142
 MD5 3cf8457f3b4539274b720ee10a852c82 alsa-driver-1.0.7-r4.ebuild 3729
 MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341
 MD5 5c299dfdb0455c12de1f2e842884aa48 alsa-driver-1.0.7-r3.ebuild 3670
 MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
+MD5 6c3468b2b1072e593086d3ed8a98ac4a alsa-driver-1.0.8_rc1.ebuild 3386
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603
 MD5 45f95cf50aad5f544f0fa05dcf94d1ad alsa-driver-1.0.6a.ebuild 3501
@@ -15,6 +13,7 @@ MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
 MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
 MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
 MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
+MD5 178c3d0a289f3998f750d292905084a9 files/digest-alsa-driver-1.0.8_rc1 74
 MD5 831a1a1097613c2444cc3e512ff09a01 files/alsa-driver-1.0.7-audigy71.patch 643
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
 MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72
@@ -27,10 +26,3 @@ MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough
 MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 721
 MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
 MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxVPmArHZZzCEUG0RAqQMAJ9AnJ7QZ3yKrHQ+H//8NC0Gd2Bu/QCfblRA
-QSL9PB4axYctZVx/77JaTqw=
-=+ziO
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
index 7dd594b108b2..950c8fadfdad 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-0.9.8.ebuild,v 1.14 2004/07/24 05:44:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild,v 1.15 2005/01/01 11:43:17 eradicator Exp $
 
 inherit eutils
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
index eee7c9a4b480..8bc4262fccae 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3.ebuild,v 1.10 2004/07/21 16:24:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.11 2005/01/01 11:43:17 eradicator Exp $
 
 inherit eutils kernel-mod flag-o-matic
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
index f6b6bb35a8c8..8448b8b91e5f 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5a.ebuild,v 1.5 2004/07/23 10:41:10 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild,v 1.6 2005/01/01 11:43:17 eradicator Exp $
 
 inherit kernel-mod flag-o-matic eutils
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
index 67cdfd2c20c6..c4b329813c27 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.6a.ebuild,v 1.5 2004/11/12 10:41:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild,v 1.6 2005/01/01 11:43:17 eradicator Exp $
 
 IUSE="oss"
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
index cffa2912223f..2998192fafcf 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.7-r3.ebuild,v 1.6 2004/12/19 05:05:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild,v 1.7 2005/01/01 11:43:17 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
index 24d33d702960..06b8a92d4d12 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.7-r4.ebuild,v 1.4 2004/12/19 10:11:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild,v 1.5 2005/01/01 11:43:17 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
new file mode 100644
index 000000000000..65fda2bbbfc6
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
@@ -0,0 +1,130 @@
+# 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.8_rc1.ebuild,v 1.1 2005/01/01 11:43:17 eradicator Exp $
+
+IUSE="oss doc"
+inherit linux-mod flag-o-matic eutils
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/modutils
+	 ~media-sound/alsa-headers-${PV}"
+
+DEPEND="${RDEPEND}
+	sys-devel/patch
+	virtual/linux-sources
+	>=sys-devel/autoconf-2.50
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+pkg_setup() {
+	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
+	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."
+
+	linux-mod_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
+	#
+	if [ -z "${ALSA_CARDS}" ]; then
+		ewarn "\${ALSA_CARDS} isn't set, so we are compiling all alsa drivers."
+		ALSA_CARDS="all"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	[ "${PROFILE_ARCH}" == "xbox" ] && \
+		epatch ${FILESDIR}/${PN}-1.0.7-xbox.patch
+
+	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
+	unset ARCH
+	# -j1 : see bug #71028
+	emake -j1 || die "Parallel Make Failed"
+
+	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
+
+	# 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
+}
+
+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
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1
new file mode 100644
index 000000000000..b68e5ffbf3cd
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1
@@ -0,0 +1 @@
+MD5 21020d6cfa467f4b9f86d45067777aee alsa-driver-1.0.8rc1.tar.bz2 1887764