Make sure the user isn't using OSS Drivers in the kernel.

2 files changed, 29 insertions, 24 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 50788a9d37d0..74e810ee7862 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.117 2004/12/04 10:12:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.118 2004/12/08 09:54:15 eradicator Exp $
+
+  08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r3.ebuild:
+  Make sure the user isn't using OSS Drivers in the kernel.
 
   04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/alsa-driver-1.0.7-configure.patch:
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 7f005c84cc6d..859025bb538e 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
 # 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.4 2004/12/05 12:44:55 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild,v 1.5 2004/12/08 09:54:15 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -17,16 +17,34 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 
 RDEPEND="virtual/modutils
-		~media-sound/alsa-headers-${PV}"
+	 ~media-sound/alsa-headers-${PV}"
 
 DEPEND="${RDEPEND}
-		sys-devel/patch
-		virtual/linux-sources
-		>=sys-devel/autoconf-2.50
-		sys-apps/debianutils"
+	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
+	#
+	[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
+}
+
 src_unpack() {
 	unpack ${A}
 
@@ -107,23 +125,6 @@ src_install() {
 	fi
 }
 
-pkg_setup() {
-	CONFIG_CHECK="SOUND !SND"
-	SND_ERROR="ALSA is already compiled into the kernel."
-	SOUND_ERROR="Your kernel doesn't have sound support enabled."
-
-	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
-	#
-	[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
-}
-
 pkg_postinst() {
 	einfo
 	einfo "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"