Version bump and mention the doc in postinst to close bug #77339.

7 files changed, 159 insertions, 17 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index e1d3c5f1acd5..7efb010a6a36 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.124 2005/01/01 11:43:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.125 2005/01/11 12:47:47 eradicator Exp $
+
+*alsa-driver-1.0.8_rc2 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.7-r3.ebuild, alsa-driver-1.0.7-r4.ebuild,
+  alsa-driver-1.0.8_rc1.ebuild, +alsa-driver-1.0.8_rc2.ebuild:
+  Version bump and mention the doc in postinst to close bug #77339.
 
 *alsa-driver-1.0.8_rc1 (01 Jan 2005)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 5a59cd1f30f1..d0cb724bc353 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,12 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4e1d7e7209efe6276743948f75142636 ChangeLog 21287
-MD5 b80a86818511c9f0be0a43312aab7d41 alsa-driver-1.0.7-r4.ebuild 3729
+MD5 3f6fea75c726e0d5145b470067eb37fd alsa-driver-1.0.7-r4.ebuild 3862
 MD5 29f93511201747e9c6a7262f04f5a2cd alsa-driver-0.9.8.ebuild 2341
-MD5 2ab45bc5a76a4f97a6d35794492baa53 alsa-driver-1.0.7-r3.ebuild 3670
+MD5 ea3b7d4c0589e28062e7eb3c459e7cb5 alsa-driver-1.0.7-r3.ebuild 3803
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
-MD5 a3c057870ba2986b9b1c926b6ce773d0 alsa-driver-1.0.8_rc1.ebuild 3387
+MD5 d196ae555f631056f7a788c58d08f264 alsa-driver-1.0.8_rc1.ebuild 3520
+MD5 d196ae555f631056f7a788c58d08f264 alsa-driver-1.0.8_rc2.ebuild 3520
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 9b2cf1594fd2216b4c6ce2e0f26616fb alsa-driver-1.0.5a.ebuild 3609
 MD5 0bf804c34fffec8a8eced3d6f6672a71 alsa-driver-1.0.6a.ebuild 3501
@@ -25,14 +23,8 @@ MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
 MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
+MD5 71ab62fbf3703a83b2fa4a80fe46a0ad files/digest-alsa-driver-1.0.8_rc2 74
 MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446
 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.4.0 (GNU/Linux)
-
-iD8DBQFB1o03ArHZZzCEUG0RAteSAKCCaDySWf9/rtiUf8kKhkIGnx9IOgCcDNah
-gSkmIdssu7Rp8g6M2VLvB1g=
-=2Mr1
------END PGP SIGNATURE-----
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 2998192fafcf..8e0b7fffee4e 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-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.7 2005/01/01 11:43:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild,v 1.8 2005/01/11 12:47:47 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -137,4 +137,7 @@ pkg_postinst() {
 	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"
 }
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 06b8a92d4d12..b7106f27db7a 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-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.5 2005/01/01 11:43:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild,v 1.6 2005/01/11 12:47:47 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -139,4 +139,7 @@ pkg_postinst() {
 	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"
 }
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
index 65fda2bbbfc6..aaf2be30779d 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild,v 1.2 2005/01/11 12:47:47 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -127,4 +127,7 @@ pkg_postinst() {
 	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"
 }
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8_rc2.ebuild
new file mode 100644
index 000000000000..e1e2555289ae
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8_rc2.ebuild
@@ -0,0 +1,133 @@
+# 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_rc2.ebuild,v 1.1 2005/01/11 12:47:47 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
+
+	einfo "Check out the ALSA installation guide availible at the following URL:"
+	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc2 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc2
new file mode 100644
index 000000000000..cc032849dbd0
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc2
@@ -0,0 +1 @@
+MD5 74ae089d6a7f8d27af65f46c2e1c8b32 alsa-driver-1.0.8rc2.tar.bz2 1924956