removing emu10k1-cvs from the tree

10 files changed, 0 insertions, 689 deletions

diff --git a/media-sound/emu10k1-cvs/ChangeLog b/media-sound/emu10k1-cvs/ChangeLog
deleted file mode 100644
index d7e611487a77..000000000000
--- a/media-sound/emu10k1-cvs/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-# ChangeLog for media-sound/emu10k1-cvs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/emu10k1-cvs/ChangeLog,v 1.5 2004/02/07 16:50:21 ferringb Exp $
-
-  07 Feb 2004; Brian Harring <ferringb@gentoo.org>;
-  Checked with johnm about this, removing this package from 
-  the tree.  If people request it be brought back, we'll 
-  restore it- upstream isn't particularly active anymore.
-
-  17 Sep 2003; John Mylchreest <johnm@gentoo.org>;
-  emu10k1-cvs-16042003.ebuild, files/emu10k1-gcc-3.3.diff:
-  adding gcc-3.3 patch
-
-*emu10k1-cvs-16042003 (17 Apr 2003)
- 
-  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Added missing changelog entry.
-
-  16 April 2003; John Mylchreest <johnm@gentoo.org> :
-  Initial import.  Contributers (myself):
-  Mike Frysinger <vapier@gentoo.org>
-  Doug Haas <haas.118@osu.edu>
-  Eric Favre <e.f@laposte.net>
-  John Herdy <JohnHerdy@Hotmail.com>
-  psypete <psypete@windstone.darktech.org>
-  And others ... :P
diff --git a/media-sound/emu10k1-cvs/Manifest b/media-sound/emu10k1-cvs/Manifest
deleted file mode 100644
index b40c1888a4e0..000000000000
--- a/media-sound/emu10k1-cvs/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 192f363ee4bca972e24faa66feb3363c emu10k1-cvs-16042003.ebuild 3584
-MD5 560a7b5e6e9d56870877b874240ed5f6 ChangeLog 778
-MD5 cc1b5b194b1ed9e8f12c0ef441bd4958 files/README.gentoo 3591
-MD5 8f8ed21d0021c85614f43fc1ea4be240 files/digest-emu10k1-cvs-16042003 69
-MD5 53e0e08e3924674f55ca60bc3c34fd0d files/emu10k1-gcc-3.3.diff 5501
-MD5 5c0aeb3e4b0c3d110aa12e2145663155 files/modules-emu10k1 101
-MD5 33e92f14c4ebd59dcb789bd91964df92 files/emu10k1-script 1731
-MD5 0adf8538874d6081ae1a984f3e4809c6 files/audigy-script 4530
-MD5 5098f0c8f428a782347cc8b42ad0b018 files/emu10k1.conf-gentoo-header 465
diff --git a/media-sound/emu10k1-cvs/emu10k1-cvs-16042003.ebuild b/media-sound/emu10k1-cvs/emu10k1-cvs-16042003.ebuild
deleted file mode 100644
index 92c71fa4f919..000000000000
--- a/media-sound/emu10k1-cvs/emu10k1-cvs-16042003.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/emu10k1-cvs/emu10k1-cvs-16042003.ebuild,v 1.4 2003/09/17 19:46:10 johnm Exp $
-
-MY_P="emu10k1"
-DESCRIPTION="Drivers, utilities, and effects for Sound Blaster cards (SBLive!, SB512, Audigy, Audigy2)"
-SRC_URI="mirror://gentoo/${MY_P}-${PV}.tar.bz2"
-HOMEPAGE="http://www.sourceforge.net/projects/emu10k1/"
-
-DEPEND="virtual/linux-sources"
-RDEPEND="media-sound/aumix"
-
-KEYWORDS="-* ~x86"
-SLOT="${KV}"
-LICENSE="GPL-2"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	[ -z "$KV" ] && die "Couldn't detect kernel version.  Does /usr/src/linux exist?"
-	return 0
-}
-
-src_compile() {
-	epatch ${FILESDIR}/emu10k1-gcc-3.3.diff
-
-	echo "SEQUENCER_SUPPORT := y" > config
-	echo "MODVERSIONS := y" >> config
-	echo "DBGEMU := n" >> config
-
-	export KERNEL_SOURCE=/usr/src/linux
-	make || die "make failed"
-	make all || die "make all failed"
-	make tools || die "make tools failed"
-}
-
-src_install() {
-	insinto /etc/modules.d
-	newins ${FILESDIR}/modules-emu10k1 emu10k1
-
-	# first install the main parts
-	make DESTDIR=${D} install || die "could not install"
-	rm -f docs/*patch
-	dodoc docs/* ${FILESDIR}/README.gentoo
-
-	# now fix up the script so it'll install into /usr and not /usr/local
-	for f in ${S}/utils/{Makefile.config,scripts/emu-script} ; do
-		cp ${f} ${f}.old
-		sed -e 's:/usr/local:/usr:g' ${f}.old > ${f}
-	done
-	make man_prefix=${D}/usr/share/man DESTDIR=${D} install-tools || die "could not install tools"
-
-	# clean up the /usr/etc directory, movind stuff to /usr/bin...
-	cd ${D}/usr/etc
-	mv `find -type f -perm +1` ../bin/
-	mv * ${D}/etc/
-	cd ${D}
-	rm -rf ${D}/usr/etc
-
-	# add our special fixed audigy-script. Yes, the one in the driver package is b0rked and should
-	# not be used until you're absolutely sure it's superior to this one. Much thanks to
-	# Jonathan Boler (tenpin22@blueyonder.co.uk) for this excellent fixed version.
-	dobin ${FILESDIR}/audigy-script || die
-
-	# add wrapper script to handle audigy and emu cards
-	dobin ${FILESDIR}/emu10k1-script || die
-	cd ${D}/etc
-	cp emu10k1.conf ${T}/
-	{
-		cat ${FILESDIR}/emu10k1.conf-gentoo-header
-		cat ${T}/emu10k1.conf
-	} > emu10k1.conf
-
-	# clean up the scripts
-	dosed 's:$BASE_PATH/etc:/etc:g' /usr/bin/emu-script
-	dosed 's:\.aumixrc:aumixrc:g' /usr/bin/emu-script
-	# set tone control defaults to 50 (neutral)
-	dosed 's:68:50:g' /usr/bin/emu-script
-	# the audigy script is a local copy in ${FILESDIR} and has already been fixed up.
-
-	# change default settings
-	dosed 's:AC3PASSTHROUGH=no:AC3PASSTHROUGH=yes:' /etc/emu10k1.conf
-	dosed 's:ANALOG_FRONT_BOOST=no:ANALOG_FRONT_BOOST=yes:' /etc/emu10k1.conf
-	dosed 's:SURROUND=no:SURROUND=yes:' /etc/emu10k1.conf
-
-}
-
-pkg_postinst() {
-	#update-modules handles depmod -a for us
-	if [ -e /sbin/update-modules ]
-	then
-		/sbin/update-modules
-	else
-		/usr/sbin/update-modules
-	fi
-	einfo "In order for the module to work correctly you must"
-	einfo "Enable the following options in your kernel:"
-	echo
-	einfo "Sound/Sound card support    (module or builtin)"
-	einfo "Sound/OSS sound modules     (module or builtin)"
-	echo
-	einfo "In addition, ensure that the following modules are"
-	einfo "*not* built in to your kernel, or are at least"
-	einfo "built as modules are not currently loaded."
-	echo
-	einfo "Sound/Creative SBLive! (EMU10K1)  (disabled or module)"
-	einfo "Sound/Creative SBLive! MIDI       (disabled or module)"
-	echo
-	einfo "If you have not yet done this, rebuild and install"
-	einfo "your kernel modules and re-emerge this package."
-}
diff --git a/media-sound/emu10k1-cvs/files/README.gentoo b/media-sound/emu10k1-cvs/files/README.gentoo
deleted file mode 100644
index 912c3d164a7e..000000000000
--- a/media-sound/emu10k1-cvs/files/README.gentoo
+++ /dev/null
@@ -1,103 +0,0 @@
-This excellent Linux Audigy FAQ is from
-http://basic-rip.co.uk/tenpin/linux_audigy_faq.html, which is currently
-unreadable so we're adding a cached copy from google to this file for
-safe-keeping. PLEASE NOTE: the current version of the Gentoo Linux emu10k1
-auto-detects emu10k1 or audigy and also uses a fixed audigy-script as described
-in this FAQ. However, the MIDI/LiveWire fix may still be needed for some users.
-
-<audigy-faq>
-
-This page details my experience in getting my Creative Soundblaster Audigy to
-work properly under Linux (Gentoo Linux to be exact) using the Open Sound
-System driver.
-
-If you use Gentoo Linux then grab this package which contains an eBuild I wrote
-to do all the below (last updated 11:53 11th Oct):
-emu10k1-audigy-20020927-rl.tar.gz
-
-The first thing to do is download the driver source archive from
-http://sourceforge.net/projects/emu10k1/.
-
-Extract the archive in a directory you have write access to (your home
-directory): tar xvjf emu10k1-v0.20a.tar.bz2
-
-Enter the extracted directory:  cd emu10k1-v0.20
-
-Next run:
-
-make
-make all
-
-Then run (as root):
-
-make install
-
-If the first make fails then you will need to edit the file config so that the
-line KERNEL_SOURCE := gives the location of your kernel source code.
-
-Ussually this location is: /usr/src/linux
-
-Next run (not as root):
-
-make tools
-
-Then run (as root):
-
-make install-tools
-
-The script audigy-script and the config file emu10k1.conf are both installed to
-/usr/local/etc/.
-
-I have written replacements for these files which fix lots of bugs with the
-default ones. I would advise you to read them and then replace the existing
-ones with my versions:
-
-audigy-script
-emu10k1.conf
-
-audigy-script is used to configure the soundcard so that all the channels are
-setup properly and so that recording works.  emu10k1.conf is used to set some
-options for audigy-script.
-
-audigy-script sets up the following volume controls:
-
-Vol - Front Speaker Volumes
-OGain - Rear Speaker Volumes
-Igain - Center/Subwoofer Volumes
-
-Update: 30.10.02
-
-If you find that you are only getting a particular sound source (eg. CD
-playback) through the 2 front channels, you can mirror them to the rear 2
-channels by adding the following line to audigy-script:
-
-$DSPMGR -a"Pcm:$REAR"
-
-Also thanks to Colin McCambridge for these 2 tips:
-
-1) Don't download and use the 0.9.4 tools package from sourceforge, as it
-appears to contain an old version of the emu-dspmgr program that does *not*
-seem to support stereo input/output routing (Both the included script and yours
-were broken when using that tool, because "Pcm" was not a valid input for the
-route).  The included tools in the driver package work just fine
-
-2) For people with Audigy Platinum cards that have the Audigy Drive and
-InfraRed remote, the fix that took me so long to find to enable the system MIDI
-messages triggered by the infrared remote (and thus enable the remote's
-functionality) is this:
-
-Before compiling the emu10k1 driver, you have to edit the midi.h file and
-uncomment the line #define USE_AUDIGY_DRIVE_MIDI.   The Audigy card has two
-MIDI devices, and since the emu10k1 developers have yet to get both working at
-the same time, uncommenting that line switches support from the first to the
-second on Audigy Platinum cards.
-
-If you find any problems with my scripts or any of my instructions then please
-mail me: tenpin22@blueyonder.co.uk
-
-There are some forums on the driver Sourceforge homepage but I haven't found
-them very active. You can find them here.
-
-I will be updating this page when I remember what else I was going to put on
-it.
-</audigy-faq>
diff --git a/media-sound/emu10k1-cvs/files/audigy-script b/media-sound/emu10k1-cvs/files/audigy-script
deleted file mode 100644
index 347412a5c080..000000000000
--- a/media-sound/emu10k1-cvs/files/audigy-script
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/bash -e
-#
-#     audigy-script  --  A setup script
-#
-#     Author:        Jonathan Boler (tenpin22@blueyonder.co.uk)  Originally: Daniel Bertrand
-#     Last Updates:  
-#                    Daniel Robbins, 07th March 2003 (drobbins@gentoo.org)
-#                      Set tone control defaults to 50/100 (neutral)
-#					 Jonathan Boler, 11th October 2002
-#     Version:       0.31
-#
-# Optional argument processing:
-# This script takes arguments which can override the settings in the
-# config file. The following flags are supported:
-#
-# -d [yes|no]	use the digital output
-# -t [yes|no]	enable the tone controls
-# -3 [yes|no]	enable ac3 passthrough
-# -i [yes|no]	enable livedrive ir
-
-# Default location of programs:
-BASE_PATH=/usr
-DSPPATH=$BASE_PATH/share/emu10k1
-AUMIX=`which aumix`
-
-# To use something other than /dev/dsp
-# example "-D /dev/dsp1"
-DSPDEV=""
-
-# To use something other than /dev/dsp
-# example "-M /dev/mixer1"
-MIXERDEV=""
-
-DSPMGR=$BASE_PATH/bin/emu-dspmgr $DSPDEV $MIXERDEV
-
-CONFIG=$BASE_PATH/bin/emu-config $DSPDEV $MIXERDEV
-
-SAVEARGS="$@"
-
-load(){
-
-# Source configurations
-  . /etc/emu10k1.conf
-
-# Pick up any command line overrides
-while getopts d:t:3:i: OPT $SAVEARGS; do
-	case "$OPT" in
-	d)
-		USE_DIGITAL_OUTPUT=$OPTARG
-		;;
-	t)
-		ENABLE_TONE_CONTROL=$OPTARG
-		;;
-	3)
-		AC3PASSTHROUGH=$OPTARG
-		;;
-	i)
-		ENABLE_LIVEDRIVE_IR=$OPTARG
-		;;
-	*)
-		exit 1
-		;;
-	esac
-	shift 2
-done
-
-# Set some variables
-if [ "$USE_DIGITAL_OUTPUT" = yes ]; then
-    FRONT="Dig Front"
-    CENTER="Dig Center"
-    SUB="Dig LFE"
-    REAR="Dig rear"
-    CTR_SUB="Dig ctr/sub"
-else
-    FRONT="Front"
-    CENTER="Center"
-    SUB="Sub"
-    REAR="Rear"
-    CTR_SUB="Ctr/sub"
-fi
-
-# Functions to enable inputs and volume controls
-
-enable_volume(){
-    INPUT=$1
-    VOLUME=$2
-
-    $DSPMGR -p"$VOLUME Vol" -l"$INPUT" -f$DSPPATH/vol_2.bin -c"Vol_L" -m"${VOLUME}_l" -c"Vol_R" -m"${VOLUME}_r"
-}
-
-enable_with_vol(){
-    INPUT=$1
-    VOLUME=$2
-
-    $DSPMGR  -a"$INPUT:$FRONT" -a"$INPUT:$REAR" -a"$INPUT:Headphones"
-    $DSPMGR -p"$VOLUME Vol" -l"$INPUT" -f$DSPPATH/vol_2.bin -c"Vol_L" -m"${VOLUME}_l" -c"Vol_R" -m"${VOLUME}_r"
-}
-
-
-# Start by clearing everything and stopping the FX8010
-$DSPMGR -x -z
-
-
-# Enable inputs (route them to the outputs) and volume controls
-
-# Pcm can be up to 6 channels
-
-$DSPMGR -a"Pcm:$FRONT" -a"Pcm Rear:$REAR" -a"Pcm ctr/sub:$CTR_SUB" -a"Pcm:Headphones"
-$DSPMGR -l"pcm" -l"Pcm Rear" -l"Pcm Ctr/sub" -f$DSPPATH/vol_pcm.bin -c"Vol_L" -m"pcm_l" -c"Vol_R" -m"pcm_r"
-
-# Other inputs are only stereo
-
-if [ "$ENABLE_CD_Spdif" = yes ]; then
-     enable_with_vol "CD-Spdif" "dig1"
-fi
-
-if [ "$ENABLE_OPTICAL_SPDIF" = yes ]; then
-    enable_with_vol "Opt. Spdif" "dig2"
-fi
-
-if [ "$ENABLE_LINE2_MIC2" = yes ]; then
-    enable_with_vol "Line2/Mic2" "line2"
-fi
-
-if [ "$ENABLE_RCA_SPDIF" = yes ]; then
-    enable_with_vol "RCA Spdif" "dig3"
-fi
-
-if [ "$ENABLE_RCA_AUX" = yes ]; then
-    enable_with_vol  "RCA Aux2" "line3"
-fi
-
-
-# Analog-in is already routed to the analog front output
-# So we route it only to the remaining outputs
-
-$DSPMGR  -a"Analog:Recording" -a"Analog:Headphones"
-
-if [ "$USE_DIGITAL_OUTPUT" = yes ]; then
-    $DSPMGR -a"Analog:Dig Front"
-fi
-
-# Output volume controls:
-enable_volume "$FRONT" "vol"
-enable_volume "$REAR" "ogain"
-enable_volume "$CTR_SUB" "igain"
-
-
-if [ "$ENABLE_TONE_CONTROL" = yes ] ; then
-
-    TONE=tone.bin
-
-    $DSPMGR -l"$FRONT L" -f$DSPPATH/$TONE -cbass -mbass -ctreble -mtreble
-    # The next 3 'inherit' the oss control of the above line:
-    $DSPMGR -l"$FRONT R" -f$DSPPATH/$TONE
-    $DSPMGR -l"$REAR R" -f$DSPPATH/$TONE
-    $DSPMGR -l"$REAR L" -f$DSPPATH/$TONE
-
-	if [ -x $AUMIX ] ; then
-		# drobbins is an audiophile and has a problem with auto-bass and
-		# auto-treble. So these have been changed from 68 to 50.
-    	$AUMIX -t 50 
-    	$AUMIX -b 50
-	fi
-fi
-
-
-# Need to toggle third output into digital mode
-
-if [ "$USE_DIGITAL_OUTPUT" = yes ] ; then
-	$CONFIG -d
-fi
-
-# See if we should enable IR
-
-if [ "$ENABLE_LIVEDRIVE_IR" = yes ] ; then
-     $CONFIG -i
-fi
-
-# for digital output we can do ac3passthrough
-# this patch must be last in the signal chain
-if [ "$USE_DIGITAL_OUTPUT" = yes ]; then
-    if [ "$AC3PASSTHROUGH" = yes ] ; then
-	$DSPMGR -l"dig front" -F"$DSPPATH/ac3pass-audigy.bin"
-    fi
-fi
-
-
-# Restart the FX8010
-$DSPMGR -y
-
-}
-
-case "$1" in
-
-	restore | restart)
-        load
-		# Load mixer settings
-		$AUMIX -f /etc/aumixrc -L  >/dev/null 2>&1 || :
-        ;;
-    save | stop)
-		# Save mixer settings
-		$AUMIX -f /etc/aumixrc -S   >/dev/null 2>&1 || :
-		;;
-    *)
-		load
-esac
-
diff --git a/media-sound/emu10k1-cvs/files/digest-emu10k1-cvs-16042003 b/media-sound/emu10k1-cvs/files/digest-emu10k1-cvs-16042003
deleted file mode 100644
index bb6f2fa12e12..000000000000
--- a/media-sound/emu10k1-cvs/files/digest-emu10k1-cvs-16042003
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f0419ce193f627878bfc22d3467a95b emu10k1-16042003.tar.bz2 288726
diff --git a/media-sound/emu10k1-cvs/files/emu10k1-gcc-3.3.diff b/media-sound/emu10k1-cvs/files/emu10k1-gcc-3.3.diff
deleted file mode 100644
index 1683db65dbc5..000000000000
--- a/media-sound/emu10k1-cvs/files/emu10k1-gcc-3.3.diff
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -ur emu10k1-v0.20a/utils/as10k1/as10k1.c emu10k1-v0.20a-gentoo/utils/as10k1/as10k1.c
---- emu10k1-v0.20a/utils/as10k1/as10k1.c	2003-09-16 04:01:01.000000000 +1200
-+++ emu10k1-v0.20a-gentoo/utils/as10k1/as10k1.c	2003-09-16 04:25:18.000000000 +1200
-@@ -39,33 +39,32 @@
- 
- char version[]="As10k1 assembler version 1.0";
- 
--char help[]="
--Usage: as10k1 [option...] asmfile
--
--The as10k1 assembler is for the emu10k1 dsp processor
--found in Creative Lab's sblive series of sound cards.
--
--Author: Daniel Bertrand <d.bertrand@ieee.org>
--BUGS:   emu10k1-devel mailing list <emu10k1-devel@lists.sourceforge.net>
--URLs:   members.home.com/d-bertrand, opensource.creative.com
--
--Options:\n
--     -l [listfile]         Specify a listing file, default is none.
--     -o [binfile]          Specify an output file, default is based input,
--                           Substituting .asm fo .bin
--     -d [dbg_options...]   Turn on debug messages.
--            s              prints all symbols                
--            g              prints defined gprs
--            t              prints tram usage
--            i              prints instructions
--
--     -n                    no gpr declaration check 
--     -h                    Prints this message  
--     -v                    Prints version number. 
--
--This program is distributed under the GPL.
--
--";
-+char help[]=
-+"Usage: as10k1 [option...] asmfile\n"
-+"\n"
-+"The as10k1 assembler is for the emu10k1 dsp processor\n"
-+"found in Creative Lab's sblive series of sound cards.\n"
-+"\n"
-+"Author: Daniel Bertrand <d.bertrand@ieee.org>\n"
-+"BUGS:   emu10k1-devel mailing list <emu10k1-devel@lists.sourceforge.net>\n"
-+"URLs:   members.home.com/d-bertrand, opensource.creative.com\n"
-+"\n"
-+"Options:\n\n"
-+"     -l [listfile]         Specify a listing file, default is none.\n"
-+"     -o [binfile]          Specify an output file, default is based input,\n"
-+"                           Substituting .asm fo .bin\n"
-+"     -d [dbg_options...]   Turn on debug messages.\n"
-+"            s              prints all symbols        \n"
-+"            g              prints defined gprs\n"
-+"            t              prints tram usage\n"
-+"            i              prints instructions\n"
-+"\n"
-+"     -n                    no gpr declaration check \n"
-+"     -h                    Prints this message  \n"
-+"     -v                    Prints version number. \n"
-+"\n"
-+"This program is distributed under the GPL.\n"
-+"\n";
- 
- //  cli==Command-Line Interface && !Creative Labs Inc.
- 
-diff -ur emu10k1-v0.20a/utils/mixer/lib/debug.c emu10k1-v0.20a-gentoo/utils/mixer/lib/debug.c
---- emu10k1-v0.20a/utils/mixer/lib/debug.c	2003-09-16 04:05:59.000000000 +1200
-+++ emu10k1-v0.20a-gentoo/utils/mixer/lib/debug.c	2003-09-16 04:30:02.000000000 +1200
-@@ -10,7 +10,7 @@
-  * 
-  *     This program is distributed in the hope that it will be useful, 
-  *     but WITHOUT ANY WARRANTY; without even the implied warranty of 
-- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *     GNU General Public License for more details. 
-  * 
-  *     You should have received a copy of the GNU General Public 
-@@ -360,20 +360,19 @@
- 		else
- 			k=i;
- 	}
--	printf("\
--Usage Summary:
----------
--Instructions : %d
--GPRS:          %d (last used is %d)
--
--Tram
-- Internal
--   buffers:    %d
--   space  :    0x%06x
-- External
--   buffers:    %d
--   space  :    0x%06x
--",
-+	printf(
-+"Usage Summary:\n"
-+"--------\n"
-+"Instructions : %d\n"
-+"GPRS:          %d (last used is %d)\n"
-+"\n"
-+"Tram\n"
-+" Internal\n"
-+"   buffers:    %d\n"
-+"   space  :    0x%06x\n"
-+" External\n"
-+"   buffers:    %d\n"
-+"   space  :    0x%06x\n",
- 	       mgr->code_free_start/2, j,k,
- 	       mgr->traml_ifree_start,  mgr->tramb_ifree_start,
- 	       mgr->traml_efree_start,  mgr->tramb_efree_start);
-diff -ur emu10k1-v0.20a/utils/mixer/lib/dsp.c emu10k1-v0.20a-gentoo/utils/mixer/lib/dsp.c
---- emu10k1-v0.20a/utils/mixer/lib/dsp.c	2003-09-16 04:05:59.000000000 +1200
-+++ emu10k1-v0.20a-gentoo/utils/mixer/lib/dsp.c	2003-09-16 04:29:44.000000000 +1200
-@@ -10,7 +10,7 @@
-  * 
-  *     This program is distributed in the hope that it will be useful, 
-  *     but WITHOUT ANY WARRANTY; without even the implied warranty of 
-- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *     GNU General Public License for more details. 
-  * 
-  *     You should have received a copy of the GNU General Public 
-@@ -1403,12 +1403,12 @@
- int dsp_print_in_name(struct dsp_patch_manager *mgr){
- 	int i;
- 
--	printf("
--Available Inputs
--
--Mono Name       Stereo Name      Address
-----------       -----------      -------
--");
-+	printf(
-+"Available Inputs\n"
-+"\n"
-+"Mono Name       Stereo Name      Address\n"
-+"---------       -----------      -------\n"
-+);
- 	if(mgr->card_info.card_type==AUDIGY_CARD)
- 		for(i=0;i<A_DSP_NUM_INPUTS;i++){
- 			if(dsp_audigy_in_name[i][0]!='\0')
-@@ -1425,12 +1425,12 @@
- int dsp_print_out_name(struct dsp_patch_manager *mgr){
- 	int i;
- 
--	printf("
--Available Outputs
--
--Mono Name       Stereo Name      Address
-----------       -----------      -------
--");
-+	printf(
-+"Available Outputs\n"
-+"\n"
-+"Mono Name       Stereo Name      Address\n"
-+"---------       -----------      -------\n"
-+);
- 	if(mgr->card_info.card_type==AUDIGY_CARD)
- 		for(i=0;i<A_DSP_NUM_OUTPUTS;i++){
- 			if(dsp_audigy_out_name[i][0]!='\0')
diff --git a/media-sound/emu10k1-cvs/files/emu10k1-script b/media-sound/emu10k1-cvs/files/emu10k1-script
deleted file mode 100644
index 4aba311ec630..000000000000
--- a/media-sound/emu10k1-cvs/files/emu10k1-script
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-source /sbin/functions.sh
-source /etc/emu10k1.conf
-
-# setup regex strings to match
-AUDIGY_PCI_TAG="multimedia audio controller: creative labs.*audigy"
-EMU10K1_PCI_TAG="multimedia audio controller: creative labs.*emu10k1"
-
-# first, lets try to read the driver information in /proc/driver/
-proc="`ls /proc/driver/emu10k1/*/info 2> /dev/null | awk '{print $1}'`"
-if [ -z "${CARD_TYPE}" ] && [ ! -z "${proc}" ] && [ -e ${proc} ] ; then
-	if [ -n "$(egrep -i '^card type.*audigy.*' ${proc})" ] ; then
-		CARD_TYPE="audigy"
-	elif [ -n "$(egrep -i '^card type.*emu10k1.*' ${proc})" ] ; then
-		CARD_TYPE="emu"
-	fi
-fi
-
-# if that didnt work, try to detect via lspci (sys-apps/pciutils)
-if [ -z "${CARD_TYPE}" ] && [ -x /sbin/lspci ] ; then
-echo 1
-	if [ -n "$(lspci | egrep -i "${AUDIGY_PCI_TAG}")" ] ; then
-		CARD_TYPE="audigy"
-	elif [ -n "$(lspci | egrep -i "${EMU10K1_PCI_TAG}")" ] ; then
-		CARD_TYPE="emu"
-	fi
-fi
-
-# if that didnt work, lets try via the kernel's /proc/pci interface
-if [ -z "${CARD_TYPE}" ] && [ -e /proc/pci ] ; then
-	if [ -n "$(egrep -i "${AUDIGY_PCI_TAG}" /proc/pci)" ] ; then
-		CARD_TYPE="audigy"
-	elif [ -n "$(egrep -i "${EMU10K1_PCI_TAG}" /proc/pci)" ] ; then
-		CARD_TYPE="emu"
-	fi
-fi
-
-# if that failed, make the user tell us what it is
-case "`echo ${CARD_TYPE} | awk '{print toupper($1)}'`" in
-	AUDIGY)
-		/usr/bin/audigy-script $@
-		;;
-	EMU)
-		/usr/bin/emu-script $@
-		;;
-	*)
-		eerror "I was unable to figure out whether you have an Audigy"
-		eerror "or an Emu10k1 sound card.  Further more, you have not"
-		eerror "told me what kind of sound card you have."
-		eerror "Please edit /etc/emu10k1.conf and set the CARD_TYPE"
-		eerror "variable.  You will find it at the top of the file."
-		exit 1
-		;;
-esac
diff --git a/media-sound/emu10k1-cvs/files/emu10k1.conf-gentoo-header b/media-sound/emu10k1-cvs/files/emu10k1.conf-gentoo-header
deleted file mode 100644
index 20710ecdf74e..000000000000
--- a/media-sound/emu10k1-cvs/files/emu10k1.conf-gentoo-header
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set your card type on the next line so that loading the
-# kernel module works correctly.
-#
-# Accepted values are 'emu' and 'audigy'
-#  use 'audigy' if you have an audigy based sound card,
-#  otherwise use 'emu'
-#
-# Note: you should only have to set this if:
-#    (1) the auto-detect script fails
-#        - no lspci support
-#        - no /proc/pci support
-#        - the kernel just plain doesn't like you
-#    (2) you like to set everything
-#CARD_TYPE="set_me"
-
diff --git a/media-sound/emu10k1-cvs/files/modules-emu10k1 b/media-sound/emu10k1-cvs/files/modules-emu10k1
deleted file mode 100644
index d2beec537e63..000000000000
--- a/media-sound/emu10k1-cvs/files/modules-emu10k1
+++ /dev/null
@@ -1,2 +0,0 @@
-post-install emu10k1 /usr/bin/emu10k1-script restore
-pre-remove emu10k1 /usr/bin/emu10k1-script save