Version bump

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 191 insertions, 2 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index af8c017ac26c..2ede2355e91a 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.303 2009/08/13 15:11:32 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.304 2009/09/01 16:02:40 beandog Exp $
+
+*alsa-driver-1.0.21 (01 Sep 2009)
+
+  01 Sep 2009; Steve Dibb <beandog@gentoo.org> +alsa-driver-1.0.21.ebuild:
+  Version bump
 
   13 Aug 2009; Steve Dibb <beandog@gentoo.org> alsa-driver-9999.ebuild:
   Add missing cards, bug 269167
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 7e108823ae50..16b4053c4b26 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -4,7 +4,9 @@ AUX alsa-driver-1.0.14-seq_file.patch 11129 RMD160 ac02481afc9d9b4cab1cb56a5c0cd
 AUX alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105 RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f SHA1 c4dd46e302417272b1123fc435d742e89677ee8d SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76
 AUX alsa-driver-1.0.15-linux-2.4.patch 278 RMD160 13b53ecf56b11de3d6ae4683578b12b3fdc8c649 SHA1 4bfb7c3bf4980cbe26a33ef271f3ea3813c46d0f SHA256 e7584aedf46dcbfbc6ee5afaa998991e5adaea3057b69b747d2cd403dccac877
 DIST alsa-driver-1.0.20.tar.bz2 2900799 RMD160 33aaed9ab466827b7e543d45f137a0b38ba7ff61 SHA1 b72678d625053bff3de922f211a969ae90544f66 SHA256 e831852f1e50b50e13667b126a65064282218e0ad130dce7fdeb614314cee626
+DIST alsa-driver-1.0.21.tar.bz2 3112563 RMD160 8ceb899707714fefbf7f19c6f0fda79bb7ea0c05 SHA1 149d2253e3c9f5923314ba1528606e6563182ac0 SHA256 ae5ce695377eeb6c4ecdcecf18516d51b9e2f4c3a0bc5dc429ca29d5e5617194
 EBUILD alsa-driver-1.0.20-r1.ebuild 7060 RMD160 9122240193984d53a2ef5de94deaaa563ab57afd SHA1 e8fe964933d03c8d970d305e5f4e50162d227de8 SHA256 b4d363ef0327baf83f8b879323a8a766a3d93c5fd20006c12fbbbcb6fe430b58
+EBUILD alsa-driver-1.0.21.ebuild 7057 RMD160 730a5b0896efbeb17a4b66b7ab6a03e21abda22e SHA1 2e73b1803f58ddd95c92be99a1c0e6325e3ac73a SHA256 7e4c3ef4aa5c6ee4813be022a1df5a85405f4b3cb3972709c58ec924db56c528
 EBUILD alsa-driver-9999.ebuild 6800 RMD160 88ed11624bd5cdc8ed533c01c2a65b01ee356c7f SHA1 ceb52d29b266f4bc4db9b210321b2ccdee3f9fcb SHA256 407deecff4a3d4c57e248e37be827dc794193866fa81714c4f5170565212d65e
-MISC ChangeLog 51724 RMD160 173d6f37ac8b4675293e530e1c0405ae4c663a27 SHA1 c31c6c6603d34d4d5d33fb0f3dd2c41f894cbbc2 SHA256 9b98fe9bdede3a30866d574524d605e22bc6464842822a154afc95c2518e4454
+MISC ChangeLog 51850 RMD160 a54093f05c69a33f8212b949348dd244bfd017bd SHA1 2b0b3fc34f95403c927186095105c0a3c6263e1c SHA256 5cb76ba57444bd467b24de8d3fcfc7a7a32d31f99982462b95506c856b72a320
 MISC metadata.xml 231 RMD160 24abe9408b4c6e5156b661d0889c57f7b341bd6f SHA1 bac14117a40aabff9dfd27f2a8ff55d9071c8265 SHA256 34105d33263c918eca8ca9f6dc9aeec9008cb2349196d130d77f66610abcf701
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.21.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.21.ebuild
new file mode 100644
index 000000000000..260db911a7a7
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.21.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2009 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.21.ebuild,v 1.1 2009/09/01 16:02:40 beandog Exp $
+
+inherit autotools linux-mod flag-o-matic eutils multilib linux-info
+
+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"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss debug"
+
+IUSE_CARDS="hrtimer rtctimer hpet pcsp seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401
+loopback portman2x4 ad1848-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 usb-us122l 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 hifier
+ml403-ac97cr oxygen pxa2xx-soc-e800 sis7019 virtuoso"
+
+for iuse_card in ${IUSE_CARDS}; do
+	IUSE="${IUSE} alsa_cards_${iuse_card}"
+done
+
+RDEPEND="virtual/modutils"
+DEPEND="${RDEPEND}
+	>=media-sound/alsa-headers-1.0.21
+	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 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 oss pcm-oss-plugins) \
+		$(use_with debug debug full) \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_OUT_DIR}" \
+		--with-redhat=no \
+		--with-suse=no \
+		--with-isapnp=auto \
+		--with-sequencer \
+		--with-cards="${ALSA_CARDS}" \
+		--with-card-options=all || 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 SUPPORTED_KERNELS
+
+	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 unsupported."
+	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
+}