Version bump, bug 243336

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

3 files changed, 192 insertions, 12 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 487b76edd0b4..caf41d4b5ac1 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.293 2008/09/01 18:23:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.294 2008/10/29 02:27:15 beandog Exp $
+
+*alsa-driver-1.0.18_rc3 (29 Oct 2008)
+
+  29 Oct 2008; Steve Dibb <beandog@gentoo.org>
+  +alsa-driver-1.0.18_rc3.ebuild:
+  Version bump, bug 243336
 
   01 Sep 2008; Petteri Räty <betelgeuse@gentoo.org>
   -alsa-driver-1.0.14-r1.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 7708dc8133c2..d83d473a9dc2 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.14_rc3-configure.in-core2.patch 843 RMD160 c64d41133b7e93fa1842c45b18f3332c42e38eec SHA1 ffbe56bb87d41b60dc0ac9852e3cb61ad181292e SHA256 6f8f462a654a0f56b49c520be7c0d832903966176f48309d4c82c2bc5be5aef8
 AUX alsa-driver-1.0.11-kernel-2.6.17.patch 953 RMD160 8790da12c78912a4dec53f287838846e303a18dd SHA1 71b552329bc6ab179956b3f7d65f92fa393dec4c SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c
 AUX alsa-driver-1.0.14-seq_file.patch 11129 RMD160 ac02481afc9d9b4cab1cb56a5c0cd8e11c32fd25 SHA1 5ffa287584464c57bbe3eee2fc512bccddcd749f SHA256 37f8020632147d89f2c97c9b6ea88abd2000efa2abafd2711652f22c8c6b20b0
@@ -9,16 +6,11 @@ AUX alsa-driver-1.0.15-linux-2.4.patch 278 RMD160 13b53ecf56b11de3d6ae4683578b12
 DIST alsa-driver-1.0.15.tar.bz2 2677415 RMD160 f3cc3a1ad06b5a894fc6732f5261f5fc06c63421 SHA1 f68bb889538ba04b6d2ce7722d491f98dd00c144 SHA256 dd34ac303ac49b655f3a1a342fd4bafd90722ffd41ceb9af59821d5c13caa01d
 DIST alsa-driver-1.0.16.tar.bz2 2725590 RMD160 936d57bd8c255539a6759756d52221963b4dbc5f SHA1 03cc55e6d23d8368d896e1582ce4588425ce00f9 SHA256 ec2a18fdd08e7678eae57e44f944061ebb256a3c5ce81674c74423a0555cf91d
 DIST alsa-driver-1.0.17.tar.bz2 2725803 RMD160 e9e33ef8be8d808c66cc93e6bf124d16636c805c SHA1 82fc35333a43f834e5e4b16c425e3ee49d137ae8 SHA256 7695cc9c8c42b3d4fe4f918d24a751deb36b2fbb0ff2aaa2b1605c8ce11d4c9f
+DIST alsa-driver-1.0.18rc3.tar.bz2 2802139 RMD160 4b20988776bdcecee473fd582b896c06b7956c16 SHA1 926c77e211a61687cfccd356fcb7ac9425d8d7f1 SHA256 bafce0f060608fc5157a88303ea82d78e207a28a60e1b60c467e19629b7e8dec
 EBUILD alsa-driver-1.0.15-r1.ebuild 7036 RMD160 c9e9e9e0bfc25247e9c931639c85a9826892645e SHA1 02b7e17d93f89ee0ce8433999fba8281a6bc4f66 SHA256 96b9b2be6cde805f47e139dbdb9cf001435ec014bd71e5d812ff816ab2b08071
 EBUILD alsa-driver-1.0.16.ebuild 7042 RMD160 38a81c5ba89afd496de264e0ac5bcbca39bcf2de SHA1 87f7c44777009781a7da65bfb71fbfee7e730c8c SHA256 319b748dee347377f5f71efa1cad17fc609c963471763e089886e21362ec35ea
 EBUILD alsa-driver-1.0.17.ebuild 7110 RMD160 3de35030eda848e639079906d6aa0b07e7792e2f SHA1 a5f6eec9c9e00f91330a896aa6319b03ac7c0f48 SHA256 c3b0c3dcab8df0561bd8ab8ffab5deb8761ed4b3b894156e3b15a9390a30b972
+EBUILD alsa-driver-1.0.18_rc3.ebuild 7049 RMD160 f842ab5d674340804fb9693b857cb23b1658a1ed SHA1 b638c9c8615c818cb40b78a26c1d3c46f29129cd SHA256 fe3490b6a096c34cce89cfdd265698657f6047b79978fb8d525e8045731df1f8
 EBUILD alsa-driver-9999.ebuild 6607 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 SHA1 552bd47dee56891409036e2b1812c972980906d8 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22
-MISC ChangeLog 50408 RMD160 bec76fa3e7d2e7153b06db6e5bcc6d15915fad7b SHA1 dca56a0bac8662f53337dc69ec5df8e19fc87b89 SHA256 019b4d21299be75b0a089cd07e347c89fb0be11958e577249acb913af6152c5e
+MISC ChangeLog 50553 RMD160 26c3fb2a6bf98fe3902e628262e5a12640231b7d SHA1 60e0a42c3ba4be2ef43d824f70792bcb00a497fa SHA256 fd40105c38e88f5e72d4841a54c6942851ef4840be8f13cb6bb46318b32cf9a7
 MISC metadata.xml 312 RMD160 a5173f1c404afd911cb3a12198f5c2a8ef12160a SHA1 36b18541c01657fbfcbe6adb06f10294286e30b7 SHA256 5625a06a616792669384b8bddd1a9fbed772066124de66ea91c39e4273726dd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki8MzoACgkQcxLzpIGCsLSEVACgjY9+dtZjPVBOc/jBvu3tyawI
-u8UAn2vxhsKUQt090dsvfki23hpmvazl
-=yYAu
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.18_rc3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.18_rc3.ebuild
new file mode 100644
index 000000000000..a63af14e5d49
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.18_rc3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2008 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.18_rc3.ebuild,v 1.1 2008/10/29 02:27:15 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 midi"
+
+IUSE_CARDS="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.17
+	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 \
+		$(use_with midi 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
+}