Version bump, closes bug #171872. Clean-up of older ALSA modules will now be nice and silent thanks to András <bogar@hej.hu>, closes bug #182773.

Package-Manager: portage-2.1.3_rc5

4 files changed, 212 insertions, 5 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 066b741f9d67..a664d16f97f8 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.270 2007/05/01 09:38:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.271 2007/06/28 15:16:38 chainsaw Exp $
+
+*alsa-driver-1.0.14 (28 Jun 2007)
+
+  28 Jun 2007; Tony Vroon <chainsaw@gentoo.org> +alsa-driver-1.0.14.ebuild:
+  Version bump, closes bug #171872. Clean-up of older ALSA modules will now be
+  nice and silent thanks to András <bogar@hej.hu>, closes bug #182773.
 
   01 May 2007; Markus Rothe <corsair@gentoo.org>
   alsa-driver-1.0.14_rc2-r1.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 0c758234d0ef..aa1cd8bae5b3 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.0.14_rc3-configure.in-core2.patch 843 RMD160 c64d41133b7e93fa1842c45b18f3332c42e38eec SHA1 ffbe56bb87d41b60dc0ac9852e3cb61ad181292e SHA256 6f8f462a654a0f56b49c520be7c0d832903966176f48309d4c82c2bc5be5aef8
 MD5 b4a4e849d298c7f0dd811084d07b546c files/1.0.14_rc3-configure.in-core2.patch 843
 RMD160 c64d41133b7e93fa1842c45b18f3332c42e38eec files/1.0.14_rc3-configure.in-core2.patch 843
@@ -11,6 +14,7 @@ MD5 e755c981c442750f6ecbc088ba86d9ba files/alsa-driver-1.0.14_rc2-tumbler-ppc.pa
 RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
 SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76 files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
+DIST alsa-driver-1.0.14.tar.bz2 2600096 RMD160 2d017ed11bd037e450ffa969602f84cc104e5b72 SHA1 9bb16c918e7e57a419c563425d1d8f76b535970a SHA256 4987c05fd5516f9cb36ff4b73ccb77300124423b2bd6c66260eed73317529eca
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
 DIST alsa-driver-1.0.14rc2.tar.bz2 2525315 RMD160 cdaadd027d7be5a71e4fe281efcbbd9b64f7b892 SHA1 6a8fcab92e64da092aa0f566e13d1634b1ed1d2a SHA256 67e0f2ab476c0f08c642b33e4f57b17311fa07fd56eb3a02c76df22738f6d387
 DIST alsa-driver-1.0.14rc3.tar.bz2 2528674 RMD160 10c8d191079e9d7bfb37c71cbc8a2c509fd6423b SHA1 71836d8b08083028d48ae6f4d6792f78cce69fb4 SHA256 b7b99936bb118c0b808a386795625946e04841d24758e4c61370165e50999fc1
@@ -18,6 +22,10 @@ EBUILD alsa-driver-1.0.13.ebuild 5054 RMD160 79871790207d5bae9bba9ffcdef475eeec0
 MD5 954316b16804d0ffcf815f9a723d721d alsa-driver-1.0.13.ebuild 5054
 RMD160 79871790207d5bae9bba9ffcdef475eeec063a06 alsa-driver-1.0.13.ebuild 5054
 SHA256 c9c8254cd7f9549dfe120735d97e64eb8fe0695573a4ccced820cade1ec85a78 alsa-driver-1.0.13.ebuild 5054
+EBUILD alsa-driver-1.0.14.ebuild 6974 RMD160 7947bab3165493ad54eb2dda860ef783e196fb4e SHA1 f08a8e01b556adf9dfff6277fd04bdf1f5d4c5b8 SHA256 d80c13605d5576b39ce224406edb2761e8ce11f6b69e88360a3ffb8e52f1fae9
+MD5 b9d033c510ea425f5a908f46ec9a552b alsa-driver-1.0.14.ebuild 6974
+RMD160 7947bab3165493ad54eb2dda860ef783e196fb4e alsa-driver-1.0.14.ebuild 6974
+SHA256 d80c13605d5576b39ce224406edb2761e8ce11f6b69e88360a3ffb8e52f1fae9 alsa-driver-1.0.14.ebuild 6974
 EBUILD alsa-driver-1.0.14_rc1.ebuild 6452 RMD160 b420faa5022a0872b3aa29007e587deb8d1b8fe3 SHA1 3920a0dedbca2db762265b91fedb9a02dac00550 SHA256 2910b091fe29b381267e328ae2f851292d9eb57bb3e7c67dfebe0f58a92c55dc
 MD5 994c4a536ff06c606b8c691f1c21979e alsa-driver-1.0.14_rc1.ebuild 6452
 RMD160 b420faa5022a0872b3aa29007e587deb8d1b8fe3 alsa-driver-1.0.14_rc1.ebuild 6452
@@ -38,10 +46,10 @@ EBUILD alsa-driver-9999.ebuild 6608 RMD160 b5c7bbf0633f855bc03a6bcbb45030a247f64
 MD5 ed99909810cb40c34681323c8eaaa151 alsa-driver-9999.ebuild 6608
 RMD160 b5c7bbf0633f855bc03a6bcbb45030a247f6479f alsa-driver-9999.ebuild 6608
 SHA256 43efef148f2adf3f0371e91672f8dcd41c1544b13dfb0cdfc9250c4ec3b6315f alsa-driver-9999.ebuild 6608
-MISC ChangeLog 46715 RMD160 73267c93f25cac3b54848a030ef7dc30a4675b84 SHA1 a6061042482603ddc20812d9afe1762dec2a62c8 SHA256 3d17435d06042dda062b6f2f521544059a478d9b43d3990ba47de0081003b722
-MD5 fa0ba701e21d13daba58d3ca243eae1a ChangeLog 46715
-RMD160 73267c93f25cac3b54848a030ef7dc30a4675b84 ChangeLog 46715
-SHA256 3d17435d06042dda062b6f2f521544059a478d9b43d3990ba47de0081003b722 ChangeLog 46715
+MISC ChangeLog 46979 RMD160 c41ae58519b0c65f99511f75d2c8bdc39dda7aca SHA1 525f85ca45acce2154194adb3a6c345ca6abe1a9 SHA256 1a51f6d406646849d5e5d54cc94a85959c9fe46e7d2295dfd339535bd43eea3e
+MD5 58b78cdc2196c9d2cd0104eaa3b3db5d ChangeLog 46979
+RMD160 c41ae58519b0c65f99511f75d2c8bdc39dda7aca ChangeLog 46979
+SHA256 1a51f6d406646849d5e5d54cc94a85959c9fe46e7d2295dfd339535bd43eea3e ChangeLog 46979
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -49,6 +57,9 @@ SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 metadata
 MD5 22b201fa4a4e6f6c844b7a469072daf0 files/digest-alsa-driver-1.0.13 262
 RMD160 cc71e221ac628aa73cc60f3df7a43301ac78999b files/digest-alsa-driver-1.0.13 262
 SHA256 45a8c562fbfcf8f05cb4ff799d55c3aa6506ef33539cbfd159a9d24bd634f553 files/digest-alsa-driver-1.0.13 262
+MD5 0344afd7bf64fd13878a008e3d520555 files/digest-alsa-driver-1.0.14 262
+RMD160 0d55c65feb917aa6b96030d863773f01309d8235 files/digest-alsa-driver-1.0.14 262
+SHA256 8a989ed4567638f0374445a4eba48f5b5a9bb29b6c28aa043687e9f55c20ebb3 files/digest-alsa-driver-1.0.14 262
 MD5 28d9b8b0d667802a060f3d2619046d22 files/digest-alsa-driver-1.0.14_rc1 271
 RMD160 b09664e66f08a3af26e8c36ce1c03eba90c06704 files/digest-alsa-driver-1.0.14_rc1 271
 SHA256 2fcc9c3a03d7cb5056f3254204a82ed8d48ff5c5c58a8447ebeeb609654fb4c8 files/digest-alsa-driver-1.0.14_rc1 271
@@ -64,3 +75,10 @@ SHA256 4d00b45f4a13e2dd77d80cee737cb995f60d7870d98ac8e6cb845be2eb183ced files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-alsa-driver-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-alsa-driver-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-alsa-driver-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGg9Dgp5vW4rUFj5oRAkdhAKC28ELaHlbpbjbSit0AMO16xLK5IACgmFjU
+Haz/rC9huQoiv7NqpRZNgog=
+=bWuU
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14.ebuild
new file mode 100644
index 000000000000..8b76e18b8c9e
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2007 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.14.ebuild,v 1.1 2007/06/28 15:16:38 chainsaw Exp $
+
+inherit autotools linux-mod flag-o-matic eutils multilib
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+
+if [[ ${MY_P} == ${MY_P/_p*/} ]]; then
+	SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+else # Gentoo snapshots
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss debug midi"
+
+IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401
+loopback portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848
+als100 azt2320 cmi8330 cs4231 cs4232 cs4236 dt019x es968 es1688 es18xx
+gusclassic gusextreme gusmax interwave interwave-stb opl3sa2
+opti92x-ad1848 opti92x-cs4231 opti93x miro sb8 sb16 sbawe sgalaxy
+sscape wavefront pc98-cs4232 msnd-pinnacle ad1889 als300 als4000
+ali5451 atiixp atiixp-modem au8810 au8820 au8830 azt3328 bt87x ca0106
+cmipci cs4281 cs46xx cs5535audio darla20 gina20 layla20 darla24 gina24
+layla24 mona mia echo3g indigo indigoio indigodj emu10k1 emu10k1x
+ens1370 ens1371 es1938 es1968 fm801 fm801-tea575x hda-intel hdsp hdspm
+ice1712 ice1724 intel8x0 intel8x0m korg1212 maestro3 mixart nm256
+pcxhr riptide rme32 rme96 rme9652 sonicvibes trident via82xx
+via82xx-modem vx222 ymfpci pdplus asihpi powermac aoa
+aoa-fabric-layout aoa-onyx aoa-tas aoa-toonie aoa-soundbus
+aoa-soundbus-i2s sa11xx-uda1341 armaaci s3c2410 pxa2xx-i2sound au1x00
+usb-audio usb-usx2y vxpocket pdaudiocf sun-amd7930 sun-cs4231 sun-dbri
+harmony soc at91-soc at91-soc-eti-b1-wm8731 pxa2xx-soc
+pxa2xx-soc-corgi pxa2xx-soc-spitz pxa2xx-soc-poodle pxa2xx-soc-tosa"
+
+for iuse_card in ${IUSE_CARDS}; do
+	IUSE="${IUSE} alsa_cards_${iuse_card}"
+done
+
+RDEPEND="virtual/modutils
+	 !media-sound/snd-aoa"
+DEPEND="${RDEPEND}
+	~media-sound/alsa-headers-${PV}
+	virtual/linux-sources
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+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
+	#
+	ALSA_CARDS=${ALSA_CARDS:-${IUSE_ALSA_CARDS}}
+
+	local PNP_DRIVERS="interwave interwave-stb"
+	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local ISA_DRIVERS="cs4232 msnd-pinnacle cs4231-lib adlib ad1816a ad1848 als100 azt2320
+		cmi8330 cs4231 cs4236 dt019x  es968 es1688 es18xx gusclassic gusextreme gusmax
+		interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro sb8
+		sb16 sbawe sb16_csp sgalaxy sscape wavefront"
+	local ISA_ERROR="Some of the drivers you selected require ISA support in your kernel ($(echo $ISA_DRIVERS)). Either enable ISA in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local FW_DRIVERS="darla20 gina20 layla20 darla24 gina24 layla24 mona mia echo3g indigo
+		indigoio indigodj emu10k1 korg1212 maestro3 riptide ymfpci asihpi"
+	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local PARPORT_DRIVERS="portman2x4"
+	local PARPORT_ERROR="Some if the drivers you selected require Parallel Port support (${PARPORT_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local TMP_ALSA_CARDS
+	local CHECK_PNP
+	local CHECK_ISA
+	local CHECK_FW
+	local CHECK_PARPORT
+	for card in ${ALSA_CARDS}; do
+		if has alsa_cards_${card} ${IUSE} && use alsa_cards_${card}; then
+			TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
+			has ${card} ${PNP_DRIVERS} && CHECK_PNP="PNP"
+			has ${card} ${ISA_DRIVERS} && CHECK_ISA="ISA"
+			has ${card} ${FW_DRIVERS} && CHECK_FW="FW_LOADER"
+			has ${card} ${PARPORT_DRIVERS} && CHECK_PARPORT="PARPORT"
+		fi
+	done
+	ALSA_CARDS="${TMP_ALSA_CARDS}"
+
+	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW} ${CHECK_PARPORT}"
+	local SND_ERROR="ALSA is already compiled into the kernel. This is the recommended configuration, don't emerge alsa-driver."
+	local SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	local 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
+
+	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+		export CBUILD=${CBUILD-${CHOST}}
+		export CHOST="sparc64-unknown-linux-gnu"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	convert_to_m "${S}/Makefile"
+	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
+	eautoconf
+}
+
+src_compile() {
+	local myABI=${ABI:-${DEFAULT_ABI}}
+
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
+
+	econf $(use_with oss) \
+		$(use_with debug debug full) \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_OUT_DIR}" \
+		--with-isapnp=yes \
+		$(use_with midi sequencer) \
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# linux-mod_src_compile doesn't work well with alsa
+
+	ARCH=$(tc-arch-kernel)
+	ABI=${KERNEL_ABI}
+	emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" CC="$(tc-getCC)" || die "Make Failed"
+	ARCH=$(tc-arch)
+	ABI=${myABI}
+}
+
+
+src_install() {
+	emake DESTDIR="${D}" install-modules || die "make install failed"
+
+	dodoc CARDS-STATUS FAQ README WARNING TODO
+
+	if kernel_is 2 6; then
+		# mv the drivers somewhere they won't be killed by the kernel's make modules_install
+		mv "${D}/lib/modules/${KV_FULL}/kernel/sound" "${D}/lib/modules/${KV_FULL}/${PN}"
+		rmdir "${D}/lib/modules/${KV_FULL}/kernel" &> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Remember that all mixer channels will be MUTED by default."
+	elog "Use the 'alsamixer' program to unmute them, then save your"
+	elog "mixer settings with /etc/init.d/alsasound save"
+	elog
+	elog "If you experience problems, please try building the in-kernel"
+	elog "ALSA drivers instead. This ebuild is not recommended and is"
+	elog "likely to be removed from portage at a later date."
+	elog
+
+	linux-mod_pkg_postinst
+
+	if kernel_is 2 6 && [ -e "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" ]; then
+		# Cleanup if they had older alsa installed
+		for file in $(find "${ROOT}/lib/modules/${KV_FULL}/${PN}" -type f); do
+			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
+		done
+
+		find "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" -type d -print0 | xargs --null rmdir
+	fi
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14
new file mode 100644
index 000000000000..1249e22daedf
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14
@@ -0,0 +1,3 @@
+MD5 78232c1c38db6a1f4e1d304e2cc1f660 alsa-driver-1.0.14.tar.bz2 2600096
+RMD160 2d017ed11bd037e450ffa969602f84cc104e5b72 alsa-driver-1.0.14.tar.bz2 2600096
+SHA256 4987c05fd5516f9cb36ff4b73ccb77300124423b2bd6c66260eed73317529eca alsa-driver-1.0.14.tar.bz2 2600096