Version bump.

9 files changed, 78 insertions, 138 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 20266558f97e..ecad0a440714 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,11 +1,14 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.74 2004/11/12 10:22:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.75 2004/11/12 11:11:49 eradicator Exp $
 
-  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  -alsa-utils-1.0.2.ebuild, -alsa-utils-1.0.5.ebuild,
-  alsa-utils-1.0.6.ebuild:
-  Removing old versions.
+*alsa-utils-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -files/alsa-0.5.10,
+  -files/alsa-modules.conf-rc, -files/alsa-utils-0.5.10-aplay-destdir.diff,
+  -files/alsa-utils-1.0.4-alsaconf.patch, -alsa-utils-1.0.2.ebuild,
+  -alsa-utils-1.0.5.ebuild, alsa-utils-1.0.6.ebuild, +alsa-utils-1.0.7.ebuild:
+  Version bump. Removing old versions.
 
   06 Nov 2004; Lars Weiler <pylon@gentoo.org> alsa-utils-1.0.6.ebuild:
   Stable on ppc.
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 24b7d2977770..e6285ff93c7d 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 110f30bba90c27e74a4df7e7eaf097d0 ChangeLog 11820
+MD5 5cb7438d1f2cea2af96abc5f6f43d0e8 alsa-utils-1.0.7.ebuild 1807
 MD5 f708f7156af58c40d9e8c3c8619894f2 alsa-utils-0.9.8.ebuild 1729
-MD5 de6c9146c9536c8b1c6226bc3fb04ee0 alsa-utils-1.0.6.ebuild 1804
+MD5 5cb7438d1f2cea2af96abc5f6f43d0e8 alsa-utils-1.0.6.ebuild 1807
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 3d11dd42884e1123fcacf5fb054ac5ff files/alsasound.confd 162
-MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392
-MD5 4d2978b89e32f1ae922eca319b87ccc0 files/alsa-modules.conf-rc 1163
-MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626
-MD5 d331cfdb897b5cd5b0a3eca37ff47b9b files/alsa-utils-1.0.4-alsaconf.patch 1182
+MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
 MD5 f1913da934ebac3ce3178bd825459d2c files/alsasound 6247
 MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69
 MD5 fb7f68ad1c0d4ad52a9de4477b47c5c8 files/digest-alsa-utils-1.0.6 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBlI7zArHZZzCEUG0RAu1uAJ9pX3ol/qlK73H7f6ZntoC5bE73rwCcC5Dl
-8hPdNW5mLjwrKKy9xbO2t64=
-=i0W8
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
index 0940735c3973..2a5737f8ebf5 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild
@@ -1,8 +1,12 @@
 # Copyright 1999-2004 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.6.ebuild,v 1.8 2004/11/12 10:22:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.6.ebuild,v 1.9 2004/11/12 11:11:49 eradicator Exp $
+
+IUSE=""
 
 MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
@@ -10,7 +14,6 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.9"
 KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86"
-IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.1
 	dev-util/dialog
@@ -19,14 +22,12 @@ DEPEND=">=sys-libs/ncurses-5.1
 RDEPEND="${DEPEND}
 	sys-apps/pciutils"
 
-S=${WORKDIR}/${MY_P}
-
 src_install() {
 	local ALSA_UTILS_DOCS="ChangeLog README TODO
 		seq/aconnect/README.aconnect
 		seq/aseqnet/README.aseqnet"
 
-	make DESTDIR=${D} install || die "Installation Failed"
+	make DESTDIR="${D}" install || die "Installation Failed"
 
 	dodoc ${ALSA_UTILS_DOCS}
 	newdoc alsamixer/README README.alsamixer
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild
new file mode 100644
index 000000000000..404a2d226d5c
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 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.7.ebuild,v 1.1 2004/11/12 11:11:49 eradicator Exp $
+
+IUSE=""
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+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 ~ppc ~ppc64 ~x86"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.3"
+
+RDEPEND="${DEPEND}
+	sys-apps/pciutils"
+
+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
+}
diff --git a/media-sound/alsa-utils/files/alsa-0.5.10 b/media-sound/alsa-utils/files/alsa-0.5.10
deleted file mode 100644
index 9d73fdad55cc..000000000000
--- a/media-sound/alsa-utils/files/alsa-0.5.10
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need modules
-}
-
-start() {
-	if [ -e /etc/asound.conf ]
-	then
-		ebegin "Restoring ALSA volume settings"
-		/usr/sbin/alsactl restore
-	else
-		ebegin "/etc/asound.conf not found, ALSA muted"
-	fi
-    eend $? 
-}
-
-stop() {
-	ebegin "Saving ALSA volume settings"
-	/usr/sbin/alsactl store
-	eend 
-	#will fail if no modules were loaded, so we don't process the return val
-}
diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc
deleted file mode 100644
index 4e07fd70dbae..000000000000
--- a/media-sound/alsa-utils/files/alsa-modules.conf-rc
+++ /dev/null
@@ -1,39 +0,0 @@
-# Alsa 0.9.X kernel modules' configuration file.
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsa-modules.conf-rc,v 1.2 2004/07/18 03:40:55 dragonheart Exp $
-
-# ALSA portion
-alias char-major-116 snd
-# OSS/Free portion
-alias char-major-14 soundcore
-
-##
-## IMPORTANT:
-## You need to customise this section for your specific sound card(s)
-## and then run `update-modules' command.
-## Read alsa-driver's INSTALL file in /usr/share/doc for more info.
-##
-##  ALSA portion
-## alias snd-card-0 snd-interwave
-## alias snd-card-1 snd-ens1371
-##  OSS/Free portion
-## alias sound-slot-0 snd-card-0
-## alias sound-slot-1 snd-card-1
-##
-
-# OSS/Free portion - card #1
-alias sound-service-0-0 snd-mixer-oss
-alias sound-service-0-1 snd-seq-oss
-alias sound-service-0-3 snd-pcm-oss
-alias sound-service-0-8 snd-seq-oss
-alias sound-service-0-12 snd-pcm-oss
-##  OSS/Free portion - card #2
-## alias sound-service-1-0 snd-mixer-oss
-## alias sound-service-1-3 snd-pcm-oss
-## alias sound-service-1-12 snd-pcm-oss
-
-alias /dev/mixer snd-mixer-oss
-alias /dev/dsp snd-pcm-oss
-alias /dev/midi snd-seq-oss
-
-# Set this to the correct number of cards.
-options snd cards_limit=1
diff --git a/media-sound/alsa-utils/files/alsa-utils-0.5.10-aplay-destdir.diff b/media-sound/alsa-utils/files/alsa-utils-0.5.10-aplay-destdir.diff
deleted file mode 100644
index 45e6389bdd5e..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-0.5.10-aplay-destdir.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur alsa-utils-0.5.10.orig/aplay/Makefile.in alsa-utils-0.5.10/aplay/Makefile.in
---- alsa-utils-0.5.10.orig/aplay/Makefile.in	Thu Dec  7 11:59:27 2000
-+++ alsa-utils-0.5.10/aplay/Makefile.in	Wed Nov  7 16:21:45 2001
-@@ -380,11 +380,11 @@
- 	$(LN_S) $< $@
- 
- install-exec-hook:
--	rm -f $(bindir)/arecord
-+	rm -f $(DESTDIR)$(bindir)/arecord
- 	(cd $(DESTDIR)$(bindir) && $(LN_S) aplay arecord)
- 
- install-data-hook:
--	rm -f $(mandir)/man1/arecord.1
-+	rm -f $(DESTDIR)$(mandir)/man1/arecord.1
- 	(cd $(DESTDIR)$(mandir)/man1 && $(LN_S) aplay.1 arecord.1)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch
deleted file mode 100644
index 5218c25ba2d9..000000000000
--- a/media-sound/alsa-utils/files/alsa-utils-1.0.4-alsaconf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- alsaconf/alsaconf.in.orig	2004-04-17 00:06:35.000000000 -0700
-+++ alsaconf/alsaconf.in	2004-04-17 00:10:27.000000000 -0700
-@@ -26,6 +26,8 @@
- # Check for GNU/Linux distributions
- if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]; then
-   distribution="suse"
-+elif [ -f /etc/gentoo-release ]; then
-+  distribution="gentoo"
- elif [ -f /etc/debian_version ]; then
-   distribution="debian"
- elif [ -f /etc/mandrake-release ]; then
-@@ -153,7 +155,9 @@
- 
- # cfgfile = base config file to remove/update the sound setting
- # cfgout = new config file to write the sound setting (if different from $cfgfile)
--if [ "$kernel" = "new" ]; then
-+if [ "$distribution" = "gentoo" ]; then
-+  cfgfile="/etc/modules.d/alsa"
-+elif [ "$kernel" = "new" ]; then
-   if [ -d /etc/modprobe.d ]; then
-     cfgout="/etc/modprobe.d/sound"
-   fi
-@@ -649,7 +653,10 @@
- 
-     farewell "OK, driver $CARD_DRIVER is configured."
-     clear
--    if [ "$distribution" = "debian" ]; then
-+    if [ "$distribution" = "gentoo" ]; then
-+      echo Running modules-update...
-+      modules-update
-+    elif [ "$distribution" = "debian" ]; then
-       echo Running update-modules...
-       update-modules
-     fi
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.7 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.7
new file mode 100644
index 000000000000..05e1c8ac4b25
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.7
@@ -0,0 +1 @@
+MD5 b9dc0f9aae6131a6e6df9934a7b96a18 alsa-utils-1.0.7.tar.bz2 148037