media-radio/rivendell: Application removed on request from Emery Hemingway - it has been

  moved to the proaudio overlay. 

svn path=/sunrise/; revision=9521

9 files changed, 0 insertions, 854 deletions

diff --git a/media-radio/rivendell/ChangeLog b/media-radio/rivendell/ChangeLog
deleted file mode 100644
index d7ba37d86..000000000
--- a/media-radio/rivendell/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-# ChangeLog for media-radio/rivendell
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  22 Mar 2009; Christian Ruppert <idl0r@gentoo.org> rivendell-1.2.2.ebuild,
-  rivendell-1.3.0.ebuild:
-  whitespace, readability
-
-  20 Mar 2009; Emery Hemingway <emery@werenotkillers.com>
-  +rivendell-1.3.0.ebuild, files/rivendell-init.patch,
-  +files/rivendell-sox.patch:
-  Version bump. Removed system user/group. Init script now automatically
-  applies correct permissions. Rewrote sox patch.
-
-  16 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
-  -rivendell-1.2.1.ebuild, -files/rivendell-1.2.1-init.patch,
-  -files/rivendell-1.2.1-sandbox.patch, rivendell-1.2.2.ebuild:
-  Drop old ebuild + patches, add DEPEND to RDEPEND
-
-  16 Jan 2009; Emery Hemingway (sandpaper) <emery@lcom.net>
-  rivendell-1.2.2.ebuild:
-  Changed cdrtools dependency to cdrkit to correct cdda2wav issue. Removed
-  dependencies made unnessecary by sox patch
-
-  16 Jan 2009; Emery Hemingway (sandpaper) <emery@lcom.net>
-  +rivendell-1.2.2.ebuild, +files/rivendell-sox-14.patch,
-  +files/rivendell-init.patch, +files/rivendell-sandbox.patch:
-  Version bump. A patch to correct issues with using a current version of sox
-  is included, and has been submitted to upstream.
-
-  13 Jan 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> metadata.xml:
-  Fix metadata.xml
-
-  11 Jan 2009; Emery Hemingway <emery@lcom.net> +rivendell-1.2.1.ebuild,
-  +files/rivendell-1.2.1-init.patch, +files/rivendell-1.2.1-sandbox.patch,
-  +metadata.xml:
-  New ebuild for Rivendell, bug 94505. Thanks be to Ycarus, #gentoo-sunrise,
-  and the incomprable Fred Gleason.
-
diff --git a/media-radio/rivendell/Manifest b/media-radio/rivendell/Manifest
deleted file mode 100644
index 3fa283e26..000000000
--- a/media-radio/rivendell/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX rivendell-init.patch 868 RMD160 712599de6d6c4c622c93243c70f14ea16afc9097 SHA1 22c65bb7d26176eb7905093ca622fb20265b19a6 SHA256 2893aad5c43bfa5c7231f825b77853a1c378f8d00a8d93fa00ee4d94083a5d8f
-AUX rivendell-sandbox.patch 712 RMD160 0b0ca87e0b70eb9e9a54f3ebabfecee160aa656e SHA1 c4e07d6384b26aaa0d9d7e75c2049c07c8baa428 SHA256 b3525f319bd079eb0cf74ce95806d6fd220190b19d82baac6db4b93fd8c94f2a
-AUX rivendell-sox-14.patch 11458 RMD160 e16f4f2788cb6b92e3268dfae506efffb6d9bb17 SHA1 0109c2899e52878095128e6f38c79fe4c6e37b37 SHA256 b6095c08fb7cce91b27a2f3b5e286658f7ce19242ffee80d391f61da28b6f1c3
-AUX rivendell-sox.patch 7505 RMD160 dd68eb6857373ae5aba86fe1f58d4b6de476618a SHA1 5a70475779364b03e25651551aadbd93e7c4f28d SHA256 71a7ec9a0074a3d078254d34860392cad59679a52f2330d15b31c58a31bbf7d6
-DIST rivendell-1.2.2.tar.gz 4168375 RMD160 25e46898926a84f12bd2a10649c1d70b4d05523d SHA1 740affe6650f1e014b8e204a1183c9a2b746cb17 SHA256 64e7d32f4b3df9ef4b56240088bb43537baa9adf4572d08fff6f8c5592595b46
-DIST rivendell-1.3.0.tar.gz 2102008 RMD160 677ee252db67b6bddcec94a5800cdb67a5e90484 SHA1 de952f72129a429a2937cea7325f01b9f39e39a3 SHA256 4ba293e618a9080df19f14453aedfc977ea0707388aa1b1bd19a8d723f5e2239
-EBUILD rivendell-1.2.2.ebuild 2028 RMD160 282c075cd5b42b57e7f4b6d906dd3f89e8753282 SHA1 da22dd147278b29c334931af7a8bb3f14356ea1b SHA256 374aff58a7c8177f7804fac8a365407c7a95ee81a76aec52c2eacf86c916f5b1
-EBUILD rivendell-1.3.0.ebuild 1998 RMD160 548ad1975934faa08b37ddd545fbfccdfbb30dd1 SHA1 c64eb89b0611c947496128999fb746549e762453 SHA256 5ff01e41481ee1bab006ee208a7daadd9868a04f70b24e89775a44db39d928df
-MISC ChangeLog 1645 RMD160 21ea79fbf5b9eefdb54b8d7cd5ffdda911e84975 SHA1 dd42d8bc2b55d750f18319c8c1c121b090890554 SHA256 8933d233a5a54617d2bda420860a79c99b4c45411a1db69b6d8f23fc72bee9d7
-MISC metadata.xml 953 RMD160 5325369c637625c16f3ca93ee1d7b755f9586021 SHA1 44af0a1a2135f2f0186b4b871be24c990481e7f5 SHA256 fc1a6108c4e44dd03bff3ec2160c5d41aa5ebbeffd165662501f292416106aff
diff --git a/media-radio/rivendell/files/rivendell-init.patch b/media-radio/rivendell/files/rivendell-init.patch
deleted file mode 100644
index bfb566ea4..000000000
--- a/media-radio/rivendell/files/rivendell-init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- rivendell-1.2.2/rivendell-gentoo	2007-10-05 09:31:21.000000000 -0500
-+++ /etc/init.d/rivendell	2009-03-18 11:49:59.000000000 -0500
-@@ -26,17 +26,17 @@
- ##
- 
- depend() {
--        need jackd
--        use mysql
-+	use mysql
- }
- 
- start() {
-         ebegin "Starting Rivendell"
-         ipcrm -M 0x5005 2> /dev/null
--        start-stop-daemon --start --quiet --exec /usr/bin/caed
--        start-stop-daemon --start --quiet --exec /usr/bin/ripcd
-+        RDUSER=$(grep AudioOwner= /etc/rd.conf |sed 's/AudioOwner=//')
-+        start-stop-daemon --start --quiet --chuid $RDUSER --exec /usr/bin/caed
-+        start-stop-daemon --start --quiet --chuid $RDUSER --exec /usr/bin/ripcd
-         sleep 1
--        start-stop-daemon --start --quiet --exec /usr/bin/rdcatchd
-+        start-stop-daemon --start --quiet --chuid $RDUSER --exec /usr/bin/rdcatchd
-         eend $?
- }
- 
diff --git a/media-radio/rivendell/files/rivendell-sandbox.patch b/media-radio/rivendell/files/rivendell-sandbox.patch
deleted file mode 100644
index 8b9265386..000000000
--- a/media-radio/rivendell/files/rivendell-sandbox.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Corrects a sandbox violation
---- rivendell-1.2.1/install-init.sh	2007-10-03 05:24:06.000000000 -0600
-+++ rivendell-1.2.1.new/install-init.sh	2009-01-14 22:23:58.000000000 -0600
-@@ -23,12 +23,12 @@
- #
- 
- if test ! -f ./building-debian ; then
--  mkdir -p /etc/init.d
--  cp rivendell /etc/init.d/rivendell
--  mkdir -p /etc/sysconfig
--  cp rivendell.sys /etc/sysconfig/rivendell
--  mkdir -p /var/run/rivendell
--  chmod 777 /var/run/rivendell
-+  mkdir -p ${DESTDIR}/etc/init.d
-+  cp rivendell ${DESTDIR}/etc/init.d/rivendell
-+  mkdir -p ${DESTDIR}/etc/sysconfig
-+  cp rivendell.sys ${DESTDIR}/etc/sysconfig/rivendell
-+  mkdir -p ${DESTDIR}/var/run/rivendell
-+  chmod 777 ${DESTDIR}/var/run/rivendell
-   ldconfig
- fi
\ No newline at end of file
diff --git a/media-radio/rivendell/files/rivendell-sox-14.patch b/media-radio/rivendell/files/rivendell-sox-14.patch
deleted file mode 100644
index 87caa3ffc..000000000
--- a/media-radio/rivendell/files/rivendell-sox-14.patch
+++ /dev/null
@@ -1,404 +0,0 @@
-# This patches three scripts to fix some sox version campatability issues and cut down 
-# audio conversion times. Some features are not fully functional but upstream will receive a
-# submission, and will hopefully support sox's improved capabilities.
- 
-diff -urN rivendell-1.2.1/scripts/rd_export_file rivendell-1.2.1.new/scripts/rd_export_file
---- rivendell-1.2.1/scripts/rd_export_file	2008-09-18 13:02:16.000000000 -0600
-+++ rivendell-1.2.1.new/scripts/rd_export_file	2009-01-14 22:18:51.000000000 -0600
-@@ -79,13 +79,6 @@
- CUSTOM_CMD=${13}
- 
- #
--# Resampling Flag
--#
--if [ $SAMPRATE_IN != $SAMPRATE_OUT ] ; then
--  RESAMPLE_FLAG="resample -q"
--fi
--
--#
- # MPEG Stuff
- #
- if [ $CHANS_OUT = 1 ] ; then
-@@ -121,22 +114,16 @@
-   mpg321 -q -w $WORK $FILE_IN
- fi
- 
--#
--# Get Peak Level
--#
-+SOX_OPTIONS="$FILE_IN -r $SAMPRATE_OUT -c $CHANS_OUT"
- if [ $NORMAL_LEVEL != 0 ] ; then
--  PEAK_LEVEL=`sox $WORK -e stat -v 2>&1 | grep -v ^sox` 
-+  PEAK_LEVEL=`sox $WORK -n stat -v 2>&1`
-   SCALE=`echo "$NORMAL_LEVEL * $PEAK_LEVEL" | bc -l`
--  if [ "$SCALE" == "1.00000000000000000000" ]; then
--    SCALE="1"
--  fi
--  SOX_SCALE="-v $SCALE"
--  chmod 644 $WORK
-+  NORM_FLAG="norm vol $NORMAL_LEVEL"
- fi
- 
- case "$FORMAT_OUT" in
-   0)  # PCM16
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT "$FILE_OUT" $RESAMPLE_FLAG
-+      sox $SOX_OPTIONS "$FILE_OUT" $NORM_FLAG
-   ;;
- 
-   1)  # MPEG Layer 1
-@@ -144,32 +131,26 @@
-   ;;
- 
-   2)  # Mpeg Layer 2
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t wav - $RESAMPLE_FLAG | toolame -t 0 -s $TOOLAME_SAMPRATE -m $MPEG_MODE -b $BITRATE_OUT /dev/stdin "$FILE_OUT"
-+    sox $SOX_OPTIONS -t wav $NORM_FLAG | toolame -t 0 -s $TOOLAME_SAMPRATE -m $MPEG_MODE -b $BITRATE_OUT /dev/stdin "$FILE_OUT"
-   ;;
- 
-   3)  # MPEG Layer 3
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | lame --silent -r -x -s $SAMPRATE_OUT -m $MPEG_MODE $LAME_RATE - "$FILE_OUT"
--  ;;
--
--  4)  # FLAC
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | flac -f --silent --best --endian=little --sign=signed --bps=16 --channels=$CHANS_OUT --sample-rate=$SAMPRATE_OUT --force-raw-format -o "$FILE_OUT" -
-+    sox $SOX_OPTIONS -t raw - $NORM_FLAG | lame --silent -r -x -s $SAMPRATE_OUT -m $MPEG_MODE $LAME_RATE - "$FILE_OUT"
-   ;;
- 
--  5)  # OggVorbis
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | oggenc -r -B 16 -C $CHANS_OUT -R $SAMPRATE_OUT -q $QUALITY_OUT -o "$FILE_OUT" -
-+  4)  # FLAC & OggVorbis
-+    sox $SOX_OPTIONS -C $QUALITY_OUT "$FILE_OUT" $NORM_FLAG
-   ;;
- 
-   *)  # Custom Format
-     if [ -z "$CUSTOM_CMD" ] ; then
-       rm -f $WORK
--      rm -f $PEAK
-       exit 1
-     fi
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | $CUSTOM_CMD
-+    sox $SOX_OPTIONS $NORM_FLAG | $CUSTOM_CMD
-   ;;
- esac
- 
- rm -f $WORK
--rm -f $PEAK
- 
- exit 0
-diff -urN rivendell-1.2.1/scripts/rd_import_file rivendell-1.2.1.new/scripts/rd_import_file
---- rivendell-1.2.1/scripts/rd_import_file	2007-02-14 15:59:12.000000000 -0600
-+++ rivendell-1.2.1.new/scripts/rd_import_file	2009-01-14 22:18:51.000000000 -0600
-@@ -70,169 +70,44 @@
- PEAK=${10}
- WORK=${11}
- 
--set -e
--
--EXTENSION_IN=`echo $FILE_IN | sed 's/.*\.\([a-zA-Z0-9]\)/\1/'`
--
--case "$EXTENSION_IN" in
--    atx)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    ATX)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    tmc)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    TMC)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    mp2)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    MP2)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    mp3)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    MP3)
--    function convert() {
--       mpg321 -q --stereo -w $2 "$1"
--    }
--    ;;
--    ogg)
--    function convert() {
--       ogg123 -q -d wav -f $2 "$1"
--    }
--    ;;
--    OGG)
--    function convert() {
--       ogg123 -q -d wav -f $2 "$1"
--    }
--    ;;
--    flac)
--    function convert() {
--      flac -f -s -d -o $2 "$1"
--    }
--    ;;
--    FLAC)
--    function convert() {
--      flac -f -s -d -o $2 "$1"
--    }
--    ;;
--    wav)
--    if [ $FORMAT_IN = "0" ] ; then
--      function convert() {
--        cp "$1" $2
--      }
--    else 
--      function convert() {
--         mpg321 -q --stereo -w $2 "$1"
--      }
--    fi
--    ;;
--    WAV)
--    if [ $FORMAT_IN = "0" ] ; then
--      function convert() {
--        cp "$1" $2
--      }
--    else 
--      function convert() {
--         mpg321 -q --stereo -w $2 "$1"
--      }
--    fi
--    ;;
--    *)
--    echo "unsupported input format: $FILE_IN"
--    exit 1
--esac
--
--case "$FORMAT_OUT" in
--    0)
--    function masterize() {
--	SOX_OPTIONS="$1 -t raw -s -w -c $CHANS_OUT -r $SAMPRATE_OUT -"
--
--	if [ $SAMPRATE_OUT -ne $SAMPRATE_IN ]; then
--#	    SOX_OPTIONS="$SOX_OPTIONS resample -q"
--	    SOX_OPTIONS="$SOX_OPTIONS resample"
--	fi
--    
--	if [ $3 != 1  ]; then
--	    SOX_OPTIONS="-v $3 $SOX_OPTIONS"
--    fi
--    sox $SOX_OPTIONS | rdfilewrite --channels=$4 --sample-rate=$5 $2
--    }
--    ;;
--    1)
--    function masterize() {
--	SOX_OPTIONS="$1 -w -c $CHANS_OUT -r $SAMPRATE_OUT -t raw"
--	if [ $3 != 1  ]; then
--	    SOX_OPTIONS="-v $3 $SOX_OPTIONS"
--        fi
--
--	SOX_OPTIONS="$SOX_OPTIONS -"
--
--	if [ $SAMPRATE_OUT -ne $SAMPRATE_IN ]; then
--	    SOX_OPTIONS="$SOX_OPTIONS resample"
--	fi
--    
--        if [ $CHANS_OUT = 1 ]; then
--	    MODE="m"
--        else
--	    MODE="s"
--        fi
--        case "$SAMPRATE_OUT" in
--	    32000)
--		LAMERATE=32
--	    ;;
--	    44100)
--		LAMERATE=44.1
--	    ;;
--	    48000)
--		LAMERATE=48
--            ;;
--        esac
--        LAME_OPTIONS="-t 0 -m $MODE -s $LAMERATE -b $BITRATE_OUT"
--	sox $SOX_OPTIONS | toolame $LAME_OPTIONS /dev/stdin -W $2 > /dev/null 2> /dev/null
--    }
--    ;;
--    *)
--    echo "unsupported output format $FORMAT_OUT";
--    ;;
--esac
-+rm -f $FILE_OUT
-+cp "$FILE_IN" $WORK
- 
--convert "$FILE_IN" $WORK
--# > /dev/null 2>&1
--    
--# TODO: extract the PEAK_LEVEL during the convertion
--SCALE=1
- if [ $NORMAL_LEVEL != 0 ]; then
--    PEAK_LEVEL=`sox $WORK -t wav /dev/null stat -v 2>&1 | grep -v ^sox` 
--    # grep avoid sox warning messages
--    
--    SCALE=`echo "$NORMAL_LEVEL * $PEAK_LEVEL" | bc -l`
--    if [ "$SCALE" == "1.00000000000000000000" ]; then
--	SCALE="1"
--    fi
--    chmod 644 $WORK
-+  PEAK_LEVEL=`sox $WORK -n stat -v 2>&1`
-+  SCALE=`echo "$NORMAL_LEVEL * $PEAK_LEVEL" | bc -l`
- fi
- 
--rm -f $FILE_OUT
-+if [ $FORMAT_OUT = 0 ] ; then
-+  SOX_OPTIONS="$WORK -2 -c $CHANS_OUT -r $SAMPRATE_OUT -t raw -"
-+  if [ $NORMAL_LEVEL != 0 ] ; then
-+    SOX_OPTIONS="$SOX_OPTIONS vol $SCALE"
-+  fi
-+  sox $SOX_OPTIONS | rdfilewrite --channels=$CHANS_OUT --sample-rate=$SAMPRATE_OUT $FILE_OUT
-+fi
- 
--masterize $WORK $FILE_OUT $SCALE $CHANS_OUT $SAMPRATE_OUT
--# > /dev/null 2>&1
-+if [ $FORMAT_OUT = 1 ] ; then
-+  SOX_OPTIONS="$WORK -2 -c $CHANS_OUT -r $SAMPRATE_OUT -t raw -"
-+  if [ $NORMAL_LEVEL != 0 ] ; then
-+    SOX_OPTIONS="$SOX_OPTIONS vol $SCALE"
-+  fi
-+    
-+  if [ $CHANS_OUT = 1 ]; then
-+    MODE="m"
-+  else
-+    MODE="s"
-+  fi
-+  case "$SAMPRATE_OUT" in
-+    32000)
-+      LAMERATE=32
-+    ;;
-+    44100)
-+      LAMERATE=44.1
-+    ;;
-+    48000)
-+      LAMERATE=48
-+    ;;
-+    esac
-+      LAME_OPTIONS="-t 0 -m $MODE -s $LAMERATE -b $BITRATE_OUT"
-+      sox $SOX_OPTIONS | toolame $LAME_OPTIONS /dev/stdin -W $FILE_OUT > /dev/null 2> /dev/null
-+fi
-\ No newline at end of file
-diff -urN rivendell-1.2.1/scripts/rd_rip_cd rivendell-1.2.1.new/scripts/rd_rip_cd
---- rivendell-1.2.1/scripts/rd_rip_cd	2007-02-14 15:59:12.000000000 -0600
-+++ rivendell-1.2.1.new/scripts/rd_rip_cd	2009-01-14 22:18:51.000000000 -0600
-@@ -69,52 +69,16 @@
-     PARANOIA_FLAG="-P 10"
- fi
- 
--#
--# Set Resample Algorithm
--#
--if [ $SAMPRATE -ne 44100 ]; then
--    RESAMPLE_FLAG="resample"
--#    RESAMPLE_FLAG="resample -q"
--fi
--
- # ############################################################################
- # Encode to PCM16
- if [ $FORMAT = 0 ]; then
--    if [ $NORMAL_LEVEL = "0" ]; then
--# ############################################################################
--# # No Normalization, do single pass
--#	echo "SINGLE PASS, PCM, NO NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -t raw -w -s -r $SAMPRATE -c $CHANS - $RESAMPLE_FLAG | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
--# ############################################################################
-+	SOX_OPTIONS="-t wav - -t raw -2 -r $SAMPRATE -c $CHANS -"
-+	if [ $NORMAL_LEVEL != 0 ] ; then
-+	  SOX_OPTIONS="$SOX_OPTIONS norm vol $NORMAL_LEVEL"
-+	fi
-+	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox $SOX_OPTIONS | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
- 
--# ############################################################################
--# # Normalization needed, do two passes
--    else
--#
--# Phase One - Rip to 44.1 Stereo WAV, get peak level data
--#
--#	echo "PASS ONE, PCM, NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - $WORK stat -v 2> $PEAK
--
--#
--# Calculate Needed Gain
--#
--	PEAK_LEVEL=`cat $PEAK`
--	RATIO=`echo $NORMAL_LEVEL*$PEAK_LEVEL | bc -l`
--
--#
--# Phase Two - Encode audio to final destination
--#
--#	echo "PASS TWO, PCM, NORMALIZATION!"
--	sox -v $RATIO $WORK -t raw -w -s -c $CHANS -r $SAMPRATE - $RESAMPLE_FLAG | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
--    
--#
--# Clean Up
--#
--	rm -f $PEAK
- 	rm -f $WORK
--# ############################################################################
--    fi
- fi
- # ############################################################################
- 
-@@ -137,41 +101,11 @@
- 	    LAMERATE="48"
- 	;;
-     esac
--    if [ $NORMAL_LEVEL = "0" ]; then
--# ############################################################################
--# # No Normalization, do single pass
--#	echo "SINGLE PASS, MPEG, NO NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -t raw -r $SAMPRATE -c $CHANS - $RESAMPLE_FLAG | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
--# ############################################################################
--
--# ############################################################################
--# # Normalization needed, do two passes
--    else
--#
--# Phase One - Rip to 44.1 Stereo WAV, get peak level data
--#
--#	echo "PASS ONE, MPEG, NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - $WORK stat -v 2> $PEAK
--
--#
--# Calculate Needed Gain
--#
--	PEAK_LEVEL=`cat $PEAK`
--	RATIO=`echo $NORMAL_LEVEL*$PEAK_LEVEL | bc -l`
--
--#
--# Phase Two - Encode audio to final destination
--#
--#	echo "PASS TWO, MPEG, NORMALIZATION!"
--	sox -v $RATIO $WORK -t raw -c $CHANS -r $SAMPRATE - $RESAMPLE_FLAG | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
--    
--#
--# Clean Up
--#
--	rm -f $PEAK
--	rm -f $WORK
--# ############################################################################
--    fi
-+	SOX_OPTIONS="-t wav - -t raw -r $SAMPRATE -c $CHANS -"
-+	if [ $NORMAL_LEVEL != 0 ] ; then
-+	  SOX_OPTIONS="$SOX_OPTIONS norm vol $NORMAL_LEVEL"
-+	fi
-+	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox $SOX_OPTIONS | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
- 
- fi
- 
diff --git a/media-radio/rivendell/files/rivendell-sox.patch b/media-radio/rivendell/files/rivendell-sox.patch
deleted file mode 100644
index 0b454971c..000000000
--- a/media-radio/rivendell/files/rivendell-sox.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Rivendell was intended to be installed with sox-12 on the side. This patch replaces deprecated 
-so that we might use sox-14 instead. The -w is now -2, -s has been removed (it requested the 
-the default resampling algorithm), volume adjustment syntax has changed, and resampling has 
-been simplifed. 
-diff -urN rivendell-1.2.2/scripts/rd_export_file rivendell-1.2.2.gentoo/scripts/rd_export_file
---- rivendell-1.2.2/scripts/rd_export_file	2008-09-18 14:02:16.000000000 -0500
-+++ rivendell-1.2.2.gentoo/scripts/rd_export_file	2009-03-18 11:11:03.000000000 -0500
-@@ -79,13 +79,6 @@
- CUSTOM_CMD=${13}
- 
- #
--# Resampling Flag
--#
--if [ $SAMPRATE_IN != $SAMPRATE_OUT ] ; then
--  RESAMPLE_FLAG="resample -q"
--fi
--
--#
- # MPEG Stuff
- #
- if [ $CHANS_OUT = 1 ] ; then
-@@ -125,18 +118,18 @@
- # Get Peak Level
- #
- if [ $NORMAL_LEVEL != 0 ] ; then
--  PEAK_LEVEL=`sox $WORK -e stat -v 2>&1 | grep -v ^sox` 
-+  PEAK_LEVEL=`sox $WORK -n stat -v 2>&1 | grep -v ^sox` 
-   SCALE=`echo "$NORMAL_LEVEL * $PEAK_LEVEL" | bc -l`
-   if [ "$SCALE" == "1.00000000000000000000" ]; then
-     SCALE="1"
-   fi
--  SOX_SCALE="-v $SCALE"
-+  SOX_SCALE="vol $SCALE"
-   chmod 644 $WORK
- fi
- 
- case "$FORMAT_OUT" in
-   0)  # PCM16
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT "$FILE_OUT" $RESAMPLE_FLAG
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT "$FILE_OUT" $SOX_SCALE
-   ;;
- 
-   1)  # MPEG Layer 1
-@@ -144,19 +137,19 @@
-   ;;
- 
-   2)  # Mpeg Layer 2
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t wav - $RESAMPLE_FLAG | toolame -t 0 -s $TOOLAME_SAMPRATE -m $MPEG_MODE -b $BITRATE_OUT /dev/stdin "$FILE_OUT"
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t wav - $SOX_SCALE | toolame -t 0 -s $TOOLAME_SAMPRATE -m $MPEG_MODE -b $BITRATE_OUT /dev/stdin "$FILE_OUT"
-   ;;
- 
-   3)  # MPEG Layer 3
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | lame --silent -r -x -s $SAMPRATE_OUT -m $MPEG_MODE $LAME_RATE - "$FILE_OUT"
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $SOX_SCALE | lame --silent -r -x -s $SAMPRATE_OUT -m $MPEG_MODE $LAME_RATE - "$FILE_OUT"
-   ;;
- 
-   4)  # FLAC
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | flac -f --silent --best --endian=little --sign=signed --bps=16 --channels=$CHANS_OUT --sample-rate=$SAMPRATE_OUT --force-raw-format -o "$FILE_OUT" -
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $SOX_SCALE | flac -f --silent --best --endian=little --sign=signed --bps=16 --channels=$CHANS_OUT --sample-rate=$SAMPRATE_OUT --force-raw-format -o "$FILE_OUT" -
-   ;;
- 
-   5)  # OggVorbis
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | oggenc -r -B 16 -C $CHANS_OUT -R $SAMPRATE_OUT -q $QUALITY_OUT -o "$FILE_OUT" -
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $SOX_SCALE | oggenc -r -B 16 -C $CHANS_OUT -R $SAMPRATE_OUT -q $QUALITY_OUT -o "$FILE_OUT" -
-   ;;
- 
-   *)  # Custom Format
-@@ -165,7 +158,7 @@
-       rm -f $PEAK
-       exit 1
-     fi
--    sox $SOX_SCALE $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $RESAMPLE_FLAG | $CUSTOM_CMD
-+    sox $WORK -r $SAMPRATE_OUT -c $CHANS_OUT -t raw - $SOX_SCALE | $CUSTOM_CMD
-   ;;
- esac
- 
-diff -urN rivendell-1.2.2/scripts/rd_import_file rivendell-1.2.2.gentoo/scripts/rd_import_file
---- rivendell-1.2.2/scripts/rd_import_file	2007-02-14 15:59:12.000000000 -0600
-+++ rivendell-1.2.2.gentoo/scripts/rd_import_file	2009-03-18 11:05:33.000000000 -0500
-@@ -165,31 +165,20 @@
- case "$FORMAT_OUT" in
-     0)
-     function masterize() {
--	SOX_OPTIONS="$1 -t raw -s -w -c $CHANS_OUT -r $SAMPRATE_OUT -"
-+	SOX_OPTIONS="$1 -2 -c $CHANS_OUT -r $SAMPRATE_OUT -t raw -"
- 
--	if [ $SAMPRATE_OUT -ne $SAMPRATE_IN ]; then
--#	    SOX_OPTIONS="$SOX_OPTIONS resample -q"
--	    SOX_OPTIONS="$SOX_OPTIONS resample"
--	fi
--    
- 	if [ $3 != 1  ]; then
--	    SOX_OPTIONS="-v $3 $SOX_OPTIONS"
-+	    SOX_OPTIONS="$SOX_OPTIONS vol $3"
-     fi
-     sox $SOX_OPTIONS | rdfilewrite --channels=$4 --sample-rate=$5 $2
-     }
-     ;;
-     1)
-     function masterize() {
--	SOX_OPTIONS="$1 -w -c $CHANS_OUT -r $SAMPRATE_OUT -t raw"
-+	SOX_OPTIONS="$1 -2 -c $CHANS_OUT -r $SAMPRATE_OUT -t raw -"
- 	if [ $3 != 1  ]; then
--	    SOX_OPTIONS="-v $3 $SOX_OPTIONS"
-+	    SOX_OPTIONS="$SOX_OPTIONS vol $3"
-         fi
--
--	SOX_OPTIONS="$SOX_OPTIONS -"
--
--	if [ $SAMPRATE_OUT -ne $SAMPRATE_IN ]; then
--	    SOX_OPTIONS="$SOX_OPTIONS resample"
--	fi
-     
-         if [ $CHANS_OUT = 1 ]; then
- 	    MODE="m"
-@@ -222,7 +211,7 @@
- # TODO: extract the PEAK_LEVEL during the convertion
- SCALE=1
- if [ $NORMAL_LEVEL != 0 ]; then
--    PEAK_LEVEL=`sox $WORK -t wav /dev/null stat -v 2>&1 | grep -v ^sox` 
-+    PEAK_LEVEL=`sox $WORK -n stat -v 2>&1 | grep -v ^sox` 
-     # grep avoid sox warning messages
-     
-     SCALE=`echo "$NORMAL_LEVEL * $PEAK_LEVEL" | bc -l`
-diff -urN rivendell-1.2.2/scripts/rd_rip_cd rivendell-1.2.2.gentoo/scripts/rd_rip_cd
---- rivendell-1.2.2/scripts/rd_rip_cd	2007-02-14 15:59:12.000000000 -0600
-+++ rivendell-1.2.2.gentoo/scripts/rd_rip_cd	2009-03-18 11:14:57.000000000 -0500
-@@ -69,14 +69,6 @@
-     PARANOIA_FLAG="-P 10"
- fi
- 
--#
--# Set Resample Algorithm
--#
--if [ $SAMPRATE -ne 44100 ]; then
--    RESAMPLE_FLAG="resample"
--#    RESAMPLE_FLAG="resample -q"
--fi
--
- # ############################################################################
- # Encode to PCM16
- if [ $FORMAT = 0 ]; then
-@@ -84,7 +76,7 @@
- # ############################################################################
- # # No Normalization, do single pass
- #	echo "SINGLE PASS, PCM, NO NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -t raw -w -s -r $SAMPRATE -c $CHANS - $RESAMPLE_FLAG | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
-+	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -2 -r $SAMPRATE -c $CHANS -t raw - | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
- # ############################################################################
- 
- # ############################################################################
-@@ -106,7 +98,7 @@
- # Phase Two - Encode audio to final destination
- #
- #	echo "PASS TWO, PCM, NORMALIZATION!"
--	sox -v $RATIO $WORK -t raw -w -s -c $CHANS -r $SAMPRATE - $RESAMPLE_FLAG | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
-+	sox $WORK -t raw -2 -c $CHANS -r $SAMPRATE - vol $RATIO | rdfilewrite --channels=$CHANS --sample-rate=$SAMPRATE $WAVE
-     
- #
- # Clean Up
-@@ -141,7 +133,7 @@
- # ############################################################################
- # # No Normalization, do single pass
- #	echo "SINGLE PASS, MPEG, NO NORMALIZATION!"
--	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -t raw -r $SAMPRATE -c $CHANS - $RESAMPLE_FLAG | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
-+	cdda2wav --quiet -D $RIPDEV -t $TRACK $PARANOIA_FLAG - | sox -t wav - -r $SAMPRATE -c $CHANS -t raw - | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
- # ############################################################################
- 
- # ############################################################################
-@@ -163,7 +155,7 @@
- # Phase Two - Encode audio to final destination
- #
- #	echo "PASS TWO, MPEG, NORMALIZATION!"
--	sox -v $RATIO $WORK -t raw -c $CHANS -r $SAMPRATE - $RESAMPLE_FLAG | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
-+	sox $WORK -c $CHANS -r $SAMPRATE -t raw - vol $RATIO | toolame -t 0 -W -m $MODE -b $BITRATE -s $LAMERATE - $WAVE
-     
- #
- # Clean Up
diff --git a/media-radio/rivendell/metadata.xml b/media-radio/rivendell/metadata.xml
deleted file mode 100644
index 1a8bd118c..000000000
--- a/media-radio/rivendell/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-wanted</herd>
-<!-- <longdescription>
- Rivendell  is a complete radio broadcast automation solution, with facilities 
- for the acquisition, management, scheduling and playout of audio content. It 
- has all of the features one would expect in a modern, fully-fledged radio 
- automation system, including support for both PCM and MPEG audio encoding, full 
- voicetracking and log customization as well as support for a wide variety of 
- third party software and hardware. As a robust, functionally complete digital 
- audio system for broadcast radio applications, Rivendell uses industry standard 
- components like the GNU/Linux Operating System, the AudioScience HPI Driver 
- Architecture and the MySQL Database Engine. Rivendell is available under the 
- GNU Public License. 
-</longdescription> -->
-</pkgmetadata>
diff --git a/media-radio/rivendell/rivendell-1.2.2.ebuild b/media-radio/rivendell/rivendell-1.2.2.ebuild
deleted file mode 100644
index 551db9951..000000000
--- a/media-radio/rivendell/rivendell-1.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-inherit base eutils
-
-DESCRIPTION="An automated system for acquisition, management, scheduling and playout of audio content."
-HOMEPAGE="http://rivendellaudio.org/"
-SRC_URI="http://rivendellaudio.org/ftpdocs/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa jack pam"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	media-libs/flac
-	media-libs/id3lib
-	media-libs/libogg
-	media-libs/libsamplerate
-	media-libs/libvorbis
-	virtual/mysql
-	x11-libs/qt:3"
-RDEPEND="${DEPEND}
-	pam? ( sys-libs/pam )
-	app-cdr/cdrkit
-	media-sound/cdparanoia
-	media-sound/sox
-	net-ftp/lftp
-	net-misc/wget
-	sys-devel/bc"
-
-PATCHES=( "${FILESDIR}/${PN}-init.patch"
-	"${FILESDIR}/${PN}-sandbox.patch"
-	"${FILESDIR}/${PN}-sox-14.patch" )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},audio
-}
-
-src_compile() {
-	local myconf=""
-
-	use alsa || myconf="${myconf} --disable-alsa"
-	use jack || myconf="${myconf} --disable-jack"
-	use pam || myconf="${myconf} --disable-pam"
-
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc
-	doins conf/rd.conf-sample || die
-
-	keepdir /var/snd || die
-	fowners ${PN}:${PN} /var/snd || die
-
-	dodoc AUTHORS ChangeLog NEWS README SupportedCards docs/*.txt || die
-	prepalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like ASI or GPIO hardware support, install"
-	elog "their drivers and re-emerge this package. If you would"
-	elog "like the RDFeed RSS Podcast module to work, you'll need"
-	elog "www-servers/apache"
-	einfo
-	einfo "If this is a fresh install you will need to modify"
-	einfo "the /etc/rd.conf file and use rdadmin to initialize"
-	einfo "the Rivendell database. Don't forget to make sure you"
-	einfo "start /etc/init.d/rivendell."
-	einfo
-	ewarn "If this is an upgrade, run rdadmin to ensure your"
-	ewarn "database schema is up to date"
-}
diff --git a/media-radio/rivendell/rivendell-1.3.0.ebuild b/media-radio/rivendell/rivendell-1.3.0.ebuild
deleted file mode 100644
index 9d2caa2d6..000000000
--- a/media-radio/rivendell/rivendell-1.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-inherit  base eutils
-
-DESCRIPTION="An automated system for acquisition, management, scheduling and playout of audio content."
-HOMEPAGE="http://rivendellaudio.org/"
-SRC_URI="http://rivendellaudio.org/ftpdocs/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="alsa jack pam"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	media-libs/flac
-	media-libs/id3lib
-	media-libs/libogg
-	media-libs/libsamplerate
-	media-libs/libvorbis
-	virtual/mysql
-	x11-libs/qt:3"
-RDEPEND="${DEPEND}
-	pam? ( sys-libs/pam )
-	app-cdr/cdrkit
-	media-sound/cdparanoia
-	media-sound/lame
-	media-sound/mpg321
-	media-sound/sox
-	media-sound/vorbis-tools
-	net-ftp/lftp
-	net-misc/wget
-	sys-devel/bc"
-
-PATCHES=( "${FILESDIR}/${PN}-init.patch"
-	"${FILESDIR}/${PN}-sandbox.patch"
-	"${FILESDIR}/${PN}-sox.patch" )
-
-src_compile() {
-	local myconf=""
-
-	use alsa || myconf="${myconf} --disable-alsa"
-	use jack || myconf="${myconf} --disable-jack"
-	use pam || myconf="${myconf} --disable-pam"
-
-	econf ${myconf}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc
-	doins conf/rd.conf-sample || die
-
-	keepdir /var/snd || die
-	fperms 777 /var/snd || die
-
-	dodoc AUTHORS ChangeLog NEWS README SupportedCards docs/*.txt || die
-	prepalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like ASI or GPIO hardware support, install"
-	elog "their drivers and re-emerge this package. If you would"
-	elog "like the RDFeed RSS Podcast module to work, you'll need"
-	elog "www-servers/apache"
-	einfo
-	einfo "If this is a fresh install you will need to modify"
-	einfo "the /etc/rd.conf file and use rdadmin to initialize"
-	einfo "the Rivendell database. Don't forget to make sure you"
-	einfo "start /etc/init.d/rivendell."
-	einfo
-	ewarn "If this is an upgrade, run rdadmin to ensure your"
-	ewarn "database schema is up to date"
-}