Remove once again the broken driver, upstream didn't fix it yet. Closes bug #139034.

(Portage version: 2.1.1_pre2-r2)
 (Signed Manifest commit)

3 files changed, 11 insertions, 198 deletions

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 81d6b1929768..15bcb7770d22 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -36,18 +36,14 @@ EBUILD alsa-driver-1.0.11.ebuild 5134 RMD160 5cf5632f21ec116d323e2fe19db71bd4ead
 MD5 0ca9e75c9aa10f06cf578837ead7c3f7 alsa-driver-1.0.11.ebuild 5134
 RMD160 5cf5632f21ec116d323e2fe19db71bd4ead1ffaf alsa-driver-1.0.11.ebuild 5134
 SHA256 abe0999a1b8ef9b759bc4dbfe24802ff3dc50c45b8d50d7ceb238479add71f73 alsa-driver-1.0.11.ebuild 5134
-EBUILD alsa-driver-1.0.12_rc1-r1.ebuild 5175 RMD160 9cfeb211ea58c9499acfe6fd20376b8a18dabfd5 SHA1 5b73cfb7bb386891e3e8e97b416a3e9e97e88738 SHA256 c6ec79e3498f01f73c5c6af8f7dad685a8ac6f7a037449750bdea7302b477f5b
-MD5 419c113da2412b606da6cb64eb90a99a alsa-driver-1.0.12_rc1-r1.ebuild 5175
-RMD160 9cfeb211ea58c9499acfe6fd20376b8a18dabfd5 alsa-driver-1.0.12_rc1-r1.ebuild 5175
-SHA256 c6ec79e3498f01f73c5c6af8f7dad685a8ac6f7a037449750bdea7302b477f5b alsa-driver-1.0.12_rc1-r1.ebuild 5175
-EBUILD alsa-driver-1.0.12_rc1.ebuild 5133 RMD160 0cb695c9c0a448dda17faab94b35597a43f3155f SHA1 f97ebc7c0946df70779fd8ddde0396f660454120 SHA256 d395cb8bd464ec2b0d26cca0c362baaa04a6e44f4321e92f1bcd8229696ed35f
-MD5 358881a075546593298d255f20310bea alsa-driver-1.0.12_rc1.ebuild 5133
-RMD160 0cb695c9c0a448dda17faab94b35597a43f3155f alsa-driver-1.0.12_rc1.ebuild 5133
-SHA256 d395cb8bd464ec2b0d26cca0c362baaa04a6e44f4321e92f1bcd8229696ed35f alsa-driver-1.0.12_rc1.ebuild 5133
-MISC ChangeLog 37870 RMD160 45ea64b5f18c06d46c36bce41dd1a2b45ec960e6 SHA1 1191b148b57886352bbec87f83cf194c28ae8289 SHA256 169ff51e457afa024365c816821e3e34d603c691a1cda2e36ff88c197158e9e5
-MD5 126e796a5d66696b408b485439f9b402 ChangeLog 37870
-RMD160 45ea64b5f18c06d46c36bce41dd1a2b45ec960e6 ChangeLog 37870
-SHA256 169ff51e457afa024365c816821e3e34d603c691a1cda2e36ff88c197158e9e5 ChangeLog 37870
+EBUILD alsa-driver-1.0.12_rc1-r1.ebuild 5173 RMD160 df7c5d669dab399abec088345a146d9dcfc0363b SHA1 778e14de40d85609347630d4286fd188ae79d332 SHA256 bf5622c11baecbff3d2147e82f5c5918bb7e511097083289e1a8fd4065d9270f
+MD5 6432ca718aa0a05d0eeb5f48c7714128 alsa-driver-1.0.12_rc1-r1.ebuild 5173
+RMD160 df7c5d669dab399abec088345a146d9dcfc0363b alsa-driver-1.0.12_rc1-r1.ebuild 5173
+SHA256 bf5622c11baecbff3d2147e82f5c5918bb7e511097083289e1a8fd4065d9270f alsa-driver-1.0.12_rc1-r1.ebuild 5173
+MISC ChangeLog 38081 RMD160 c27765364f218a3bed280e874ed3ebf7eda7fbc3 SHA1 a4d9eb4ec2f446f447a0b901a58b4abedff6d484 SHA256 31596c67a8b67130b41c1355d099f67c1b8e006aec08c914ddca5ab0a68108e4
+MD5 562db87b4beb34379640b7cf7102c572 ChangeLog 38081
+RMD160 c27765364f218a3bed280e874ed3ebf7eda7fbc3 ChangeLog 38081
+SHA256 31596c67a8b67130b41c1355d099f67c1b8e006aec08c914ddca5ab0a68108e4 ChangeLog 38081
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -58,16 +54,13 @@ SHA256 1ae6a70927822418fdc319e0f5454b0799cc1c8d49deee5a4660b34d91458f9c files/di
 MD5 22644311058526795f233aaa7a6fc155 files/digest-alsa-driver-1.0.11 262
 RMD160 daeedeaa4b2d5bfa3dd386358fc231486bc0f895 files/digest-alsa-driver-1.0.11 262
 SHA256 685909b916bf91fe04291a0f9dcb11865ed4efb588efb3b876ec3e367fede2ad files/digest-alsa-driver-1.0.11 262
-MD5 99149044f48398af37c69b8140037020 files/digest-alsa-driver-1.0.12_rc1 271
-RMD160 a54051df4adac2e89d66386fc6663b4cda7eb5da files/digest-alsa-driver-1.0.12_rc1 271
-SHA256 f1c2be6353a83ed145d4e76fa7fe8a2a8a4e62898ff8ce815fbf69370f5fec87 files/digest-alsa-driver-1.0.12_rc1 271
 MD5 99149044f48398af37c69b8140037020 files/digest-alsa-driver-1.0.12_rc1-r1 271
 RMD160 a54051df4adac2e89d66386fc6663b4cda7eb5da files/digest-alsa-driver-1.0.12_rc1-r1 271
 SHA256 f1c2be6353a83ed145d4e76fa7fe8a2a8a4e62898ff8ce815fbf69370f5fec87 files/digest-alsa-driver-1.0.12_rc1-r1 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEpwJKAiZjviIA2XgRAkEsAKCOg+PQ6SksxCrGkWEMGaZbhBziTACdFJ1z
-mkDc/LIlxrGBtUoS66lWcpE=
-=ZqOC
+iD8DBQFEqU7zAiZjviIA2XgRAtWyAJ4nbRqbBfY68L0bTQxXTtJGXa/44gCggh/o
+d46NSED4G3m6YykEcvnq4yg=
+=U8g2
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.12_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.12_rc1.ebuild
deleted file mode 100644
index 6492d7f57e7b..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.12_rc1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2006 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.12_rc1.ebuild,v 1.1 2006/06/23 12:48:26 flameeyes Exp $
-
-inherit 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/"
-SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="oss doc debug"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}
-	 !media-sound/snd-aoa"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sparc? ( >=sys-devel/autoconf-2.50 )
-	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:-all}
-
-	# Which drivers need PNP
-	local PNP_DRIVERS="interwave interwave-stb"
-
-	CONFIG_CHECK="SOUND"
-	SND_ERROR="ALSA is already compiled into the kernel."
-	SOUND_ERROR="Your kernel doesn't have sound support enabled."
-	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
-	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	if [[ "${ALSA_CARDS}" == "all" ]]; then
-
-		# Ignore PNP checks for ppc architecture, as PNP can't be enabled there.
-		if [[ ${ARCH} != "ppc" ]]; then
-			CONFIG_CHECK="${CONFIG_CHECK} PNP"
-		fi
-	else
-		for pnpdriver in ${PNP_DRIVERS}; do
-			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
-		done
-	fi
-
-	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}"
-
-	epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
-
-	if kernel_is ge 2 6 17 ; then
-		# These are needed for some drivers to build with kernel 2.6.17
-		# until a refreshed release of alsa-driver is done
-		epatch "${FILESDIR}/${PN}-1.0.11-kernel-2.6.17.patch"
-
-		# asihpi driver is broken, skip it until upstream releases something
-		# working.
-		# sed -i -e 's:asihpi/::' "${S}/pci/Makefile"
-	fi
-
-	convert_to_m "${S}/Makefile"
-	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
-}
-
-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 \
-		--with-sequencer=yes \
-		--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}
-
-	if use doc;
-	then
-		ebegin "Building Documentation"
-		cd ${S}/scripts
-		emake || die Failed making docs in ${S}/scripts
-
-		cd ${S}/doc/DocBook
-		emake || die Failed making docs in ${S}/doc/DocBook
-		eend $?
-	fi
-}
-
-
-src_install() {
-	emake DESTDIR=${D} install-modules || die "make install failed"
-
-	dodoc CARDS-STATUS FAQ README WARNING TODO
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
-
-		docinto DocBook
-		dodoc doc/DocBook/*
-		rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
-
-		docinto Documentation
-		dodoc sound/Documentation/*
-	fi
-
-	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() {
-	einfo
-	einfo "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
-	einfo
-	einfo "Also, remember that all mixer channels will be MUTED by default."
-	einfo "Use the 'alsamixer' program to unmute them."
-	einfo
-	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
-	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
-	einfo
-
-	linux-mod_pkg_postinst
-
-	einfo "Check out the ALSA installation guide availible at the following URL:"
-	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
-
-	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
-
-		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
-			rmdir ${dir} &> /dev/null
-		done
-	fi
-}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1
deleted file mode 100644
index b92ea29b4294..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78d721fbbf51d84752c39313de06336a alsa-driver-1.0.12rc1.tar.bz2 2395489
-RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 alsa-driver-1.0.12rc1.tar.bz2 2395489
-SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3 alsa-driver-1.0.12rc1.tar.bz2 2395489