Revision bump, removing the wrong call to modules-update, module-init-tools has been stable for a looong while.

Package-Manager: portage-2.1.3.9

5 files changed, 137 insertions, 9 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 56615b10ef4d..71f574cda163 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.216 2007/09/17 17:06:31 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.217 2007/10/03 14:41:30 phreak Exp $
+
+*alsa-utils-1.0.14-r2 (03 Oct 2007)
+
+  03 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +files/alsa-utils-1.0.14-alsaconf-modules-update.patch,
+  +alsa-utils-1.0.14-r2.ebuild:
+  Revision bump, removing the wrong call to modules-update, module-init-tools
+  has been stable for a looong while.
 
   17 Sep 2007; Christian Heim <phreak@gentoo.org>
   +files/alsa-utils-1.0.15_rc1-seq.patch, alsa-utils-1.0.15_rc1.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 650b0ecbc4ab..5ccdf7131741 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -13,6 +13,10 @@ AUX alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649 RMD160 cfb4dac18bfacf45bbb
 MD5 6d9f0b77efeae08719b53549edfb9507 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
 RMD160 cfb4dac18bfacf45bbb78e0c3278b431d5015d30 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
 SHA256 e4da9da92bb88fbf66897da35b588bb81b6d4899a129d59237fd4d65cdd59a55 files/alsa-utils-1.0.11_rc5-alsaconf-redirect.patch 649
+AUX alsa-utils-1.0.14-alsaconf-modules-update.patch 502 RMD160 01d37569b6c54c5825dd5a351a83cdf874d30a00 SHA1 57a25ec1591211655440137787302bd98559fd48 SHA256 7dcf7813c0c33fe1f59b5d97bcabf6cf92f62e1bab906c88543615c502d2c1b6
+MD5 de50956d79487a7d912ceb4f9e545086 files/alsa-utils-1.0.14-alsaconf-modules-update.patch 502
+RMD160 01d37569b6c54c5825dd5a351a83cdf874d30a00 files/alsa-utils-1.0.14-alsaconf-modules-update.patch 502
+SHA256 7dcf7813c0c33fe1f59b5d97bcabf6cf92f62e1bab906c88543615c502d2c1b6 files/alsa-utils-1.0.14-alsaconf-modules-update.patch 502
 AUX alsa-utils-1.0.14-remove-debug-printing.patch 728 RMD160 466ed5e32c8254d31104374726df42605563d2ae SHA1 921689fb952d38a09de613b9b122af1312a2f610 SHA256 92677275afd32170d8043bb1e06d194f2e9ee1d11cf89f3339d1c05a3ad59082
 MD5 a95f9b4f5f8cd2c8de22d6d4f47397d8 files/alsa-utils-1.0.14-remove-debug-printing.patch 728
 RMD160 466ed5e32c8254d31104374726df42605563d2ae files/alsa-utils-1.0.14-remove-debug-printing.patch 728
@@ -58,6 +62,10 @@ EBUILD alsa-utils-1.0.14-r1.ebuild 2307 RMD160 a61ce4b98aefd267d30f59f95ee2a0274
 MD5 90af03f7f2d80d0975653af04612a7ae alsa-utils-1.0.14-r1.ebuild 2307
 RMD160 a61ce4b98aefd267d30f59f95ee2a027407dfeee alsa-utils-1.0.14-r1.ebuild 2307
 SHA256 84681dc48af3b777016dd5fec1d553b06c1db1d2c2908e84fcc39ee98a4428f6 alsa-utils-1.0.14-r1.ebuild 2307
+EBUILD alsa-utils-1.0.14-r2.ebuild 2364 RMD160 6de2ded97a4c3d83c74df63146cd6f0059af5fee SHA1 a56ba02496c31ec2329f65e5b7ac012168abc5d7 SHA256 be5415900361544144a2b8bf753f38e541cbf2490c9914dc0e0d748fe0e9b271
+MD5 add8dde21cd3810f9dbd0e57885e03aa alsa-utils-1.0.14-r2.ebuild 2364
+RMD160 6de2ded97a4c3d83c74df63146cd6f0059af5fee alsa-utils-1.0.14-r2.ebuild 2364
+SHA256 be5415900361544144a2b8bf753f38e541cbf2490c9914dc0e0d748fe0e9b271 alsa-utils-1.0.14-r2.ebuild 2364
 EBUILD alsa-utils-1.0.14.ebuild 2244 RMD160 d05c36156d6f17ff3861e12a1d52360996c3e822 SHA1 902fc0d270ea5242032277920fcd8bbdc7460da2 SHA256 7adf13892d5e1f4ebbc2ed7f1709f282b141b01a950da90262a464a54fae9ec3
 MD5 002a43aa7d5da96c9147cd05efea4410 alsa-utils-1.0.14.ebuild 2244
 RMD160 d05c36156d6f17ff3861e12a1d52360996c3e822 alsa-utils-1.0.14.ebuild 2244
@@ -74,10 +82,10 @@ EBUILD alsa-utils-1.0.15_rc1.ebuild 2269 RMD160 5ee6b7f1a006cf5bcb0454ad7a0b8609
 MD5 dd9020923f8f75e6ec7912bba4fb94c2 alsa-utils-1.0.15_rc1.ebuild 2269
 RMD160 5ee6b7f1a006cf5bcb0454ad7a0b86099346f587 alsa-utils-1.0.15_rc1.ebuild 2269
 SHA256 2b1c1ae082dca2659469ca86f433183d72732787e95747ec5eff2240d553c6aa alsa-utils-1.0.15_rc1.ebuild 2269
-MISC ChangeLog 32558 RMD160 a17a9b93e8ca8418f36b5e79e93ad060c1d98b51 SHA1 02297e093c8f44a0a6e09efaa92b7d9dfc908cb8 SHA256 d8c7f6d2846c1de2d5d5ed2492efa6361de462da1bf8fd372a5407975456aff9
-MD5 9ce2c8f01f2f8cb503c41a5fc33c7b40 ChangeLog 32558
-RMD160 a17a9b93e8ca8418f36b5e79e93ad060c1d98b51 ChangeLog 32558
-SHA256 d8c7f6d2846c1de2d5d5ed2492efa6361de462da1bf8fd372a5407975456aff9 ChangeLog 32558
+MISC ChangeLog 32852 RMD160 37667997c0732b1e51236bad116a5fbfde2015c1 SHA1 c6c2f934e33f3ff5a1991e44f5ff698ea100f5f4 SHA256 1f3f4040c5b5a589c205bd144b65b71f6ea17fb16ae0c7703083d3a8bcd41c2c
+MD5 85004f8d87be2c5eca56d10e8cc3a841 ChangeLog 32852
+RMD160 37667997c0732b1e51236bad116a5fbfde2015c1 ChangeLog 32852
+SHA256 1f3f4040c5b5a589c205bd144b65b71f6ea17fb16ae0c7703083d3a8bcd41c2c ChangeLog 32852
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -91,6 +99,9 @@ SHA256 f7f0c237cf483c89becd58c2b9ed066dd9dfeed94a2423f79807bc3064bd82d8 files/di
 MD5 0c2a6c72a41e1738cc76f7a53551ce62 files/digest-alsa-utils-1.0.14-r1 259
 RMD160 8283462339cf37d00284ab7930fb15cfd486efe3 files/digest-alsa-utils-1.0.14-r1 259
 SHA256 f7f0c237cf483c89becd58c2b9ed066dd9dfeed94a2423f79807bc3064bd82d8 files/digest-alsa-utils-1.0.14-r1 259
+MD5 0c2a6c72a41e1738cc76f7a53551ce62 files/digest-alsa-utils-1.0.14-r2 259
+RMD160 8283462339cf37d00284ab7930fb15cfd486efe3 files/digest-alsa-utils-1.0.14-r2 259
+SHA256 f7f0c237cf483c89becd58c2b9ed066dd9dfeed94a2423f79807bc3064bd82d8 files/digest-alsa-utils-1.0.14-r2 259
 MD5 f8e360f72fb522664cc3cff972790e57 files/digest-alsa-utils-1.0.14_rc1 265
 RMD160 85500534608395a7592671c03d8318e3dbad90c9 files/digest-alsa-utils-1.0.14_rc1 265
 SHA256 1a28d2f5f3186283c68d15b4893b297a550cfe99eb416389fed13d8298c46ae3 files/digest-alsa-utils-1.0.14_rc1 265
@@ -101,9 +112,9 @@ MD5 0b57a41455d85160451983a6f742ebfb files/digest-alsa-utils-1.0.15_rc1 268
 RMD160 ee4ffedce7a2cb7693942f6bbf4358e1905af91f files/digest-alsa-utils-1.0.15_rc1 268
 SHA256 f3bb99bb7c81d2ab3250d016670381ad12f5d834cc44b9cfe5f3a01feb72671d files/digest-alsa-utils-1.0.15_rc1 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG7rQkyuNVb5qfaOYRAoCBAJ9PCi2rq4L0XyTIfHn5Q2k5yeBbEwCeMuHN
-vL1JbMPtvVzHrdJZ6d98XKk=
-=XQda
+iD8DBQFHA6ofyuNVb5qfaOYRAvqKAKCyySZBgaLAwbwfcAB8LMerK5iRXgCfeFd+
+Ao5/AYL9p6D29FBthRofPaI=
+=M/lS
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14-r2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14-r2.ebuild
new file mode 100644
index 000000000000..ac0a14ab607d
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2007 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.14-r2.ebuild,v 1.1 2007/10/03 14:41:30 phreak Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls midi"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.14"
+RDEPEND="${DEPEND}
+	virtual/modutils
+	sys-apps/pciutils"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils with midi support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
+	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
+	epatch "${FILESDIR}/${P}-seq.patch"
+	epatch "${FILESDIR}/${P}-remove-debug-printing.patch"
+	epatch "${FILESDIR}"/${P}-alsaconf-modules-update.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable midi sequencer) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	emake DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	newinitd "${FILESDIR}/alsasound.initd" alsasound
+	newconfd "${FILESDIR}/alsasound.confd" alsasound
+	insinto /etc/modules.d
+	newins "${FILESDIR}/alsa-modules.conf-rc" alsa
+
+	keepdir /var/lib/alsa
+}
+
+pkg_postinst() {
+	echo
+	elog "To take advantage of the init script, and automate the process of"
+	elog "loading and unloading the ALSA sound drivers as well as"
+	elog "storing and restoring sound-card mixer levels you should"
+	elog "add alsasound to the boot runlevel. You can do this as"
+	elog "root like so:"
+	elog "	# rc-update add alsasound boot"
+	echo
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch
new file mode 100644
index 000000000000..a20f8918c6e7
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.14-alsaconf-modules-update.patch
@@ -0,0 +1,18 @@
+--- a/alsaconf/alsaconf.in
++++ b/alsaconf/alsaconf.in
+@@ -904,13 +904,8 @@ BEGIN { in_sound=0; }
+ 
+     farewell
+     clear
+-    if [ "$distribution" = "gentoo" ]; then
+-      xecho "Running modules-update..."
+-      modules-update
+-    elif [ "$distribution" = "debian" ]; then
+-      xecho "Running update-modules..."
+-      update-modules
+-    fi
++    xecho "Running update-modules..."
++    update-modules
+     if [ -x $rcalsasound ] ; then
+       echo Loading driver...
+       $rcalsasound restart
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14-r2 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14-r2
new file mode 100644
index 000000000000..53fead4703ee
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.14-r2
@@ -0,0 +1,3 @@
+MD5 6d3009c157ac6fc803696d6590a48366 alsa-utils-1.0.14.tar.bz2 1013872
+RMD160 e912588fc6ad223c7176847b8f99c80dd2ca7bb5 alsa-utils-1.0.14.tar.bz2 1013872
+SHA256 307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb alsa-utils-1.0.14.tar.bz2 1013872