media-radio/rivendell: Version bump. A patch to correct issues with using a current version of sox is included, and has been submitted to upstream.

svn path=/sunrise/; revision=7645

6 files changed, 528 insertions, 1 deletions

diff --git a/media-radio/rivendell/ChangeLog b/media-radio/rivendell/ChangeLog
index b9ba200f0..4bffddfbb 100644
--- a/media-radio/rivendell/ChangeLog
+++ b/media-radio/rivendell/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
 
diff --git a/media-radio/rivendell/Manifest b/media-radio/rivendell/Manifest
index 4e3391631..25d65c45b 100644
--- a/media-radio/rivendell/Manifest
+++ b/media-radio/rivendell/Manifest
@@ -1,6 +1,11 @@
 AUX rivendell-1.2.1-init.patch 852 RMD160 60d28b0d88e7fe86d2ccb24b80255e807893805c SHA1 ed8d8673b4b556510e1214ee06a23ccbcca20311 SHA256 9577f041e488f48dd72810af85c7703efb11f8a0f339a5cc74942b826a2c2246
 AUX rivendell-1.2.1-sandbox.patch 717 RMD160 abda7f0c90eb730f9d11d89ce6ba4e15ba637ae3 SHA1 c88ecf1e2d07e0c5c2656d29f1efbdc67d974391 SHA256 f36c2a355471a2a5fd00a0d2dc26f1f85136236cd60caa9d61e6b8d1ba6aded8
+AUX rivendell-init.patch 253 RMD160 0ce9acb58830cc0f38ee6cbe12c344f7a7f018c3 SHA1 373cbbd286f51c3e8eadfa884bfcd7a7d526c3fb SHA256 c30c37e5b57bcdd7390d77847ad5a03cd60b421176e2a4f26fe983a758f95e80
+AUX rivendell-sandbox.patch 712 RMD160 0b0ca87e0b70eb9e9a54f3ebabfecee160aa656e SHA1 c4e07d6384b26aaa0d9d7e75c2049c07c8baa428 SHA256 b3525f319bd079eb0cf74ce95806d6fd220190b19d82baac6db4b93fd8c94f2a
+AUX rivendell-sox-14.patch 11458 RMD160 e16f4f2788cb6b92e3268dfae506efffb6d9bb17 SHA1 0109c2899e52878095128e6f38c79fe4c6e37b37 SHA256 b6095c08fb7cce91b27a2f3b5e286658f7ce19242ffee80d391f61da28b6f1c3
 DIST rivendell-1.2.1.tar.gz 2084108 RMD160 2da05c0c9647e1bf987271a1cbbf7cca03175bbd SHA1 23163a27539afb2089ff6c11eae92658a59132bb SHA256 5f71f77d5d4d7c53c84d912651cafca613473c9cdbc48c4fc3612332deaf9f11
+DIST rivendell-1.2.2.tar.gz 4168375 RMD160 25e46898926a84f12bd2a10649c1d70b4d05523d SHA1 740affe6650f1e014b8e204a1183c9a2b746cb17 SHA256 64e7d32f4b3df9ef4b56240088bb43537baa9adf4572d08fff6f8c5592595b46
 EBUILD rivendell-1.2.1.ebuild 2068 RMD160 0d5e39b47c7a029e58ce8f14db95f78a4002a0e7 SHA1 1541bdb5febdc37c1916dcc57e51a07461af7f47 SHA256 c006fd66a297708c7ec28c7f08e29c8b718061dc887a67a2bdcb30383136759f
-MISC ChangeLog 494 RMD160 529fe237017e8ae9f683656ac227c555734dfbb4 SHA1 6eea502422c390653c1913bed1325059e264eb7c SHA256 d42c3274f418314fd9514fbeb1e8048c78b7e27fab581eae8050ef4be53b7f48
+EBUILD rivendell-1.2.2.ebuild 2103 RMD160 8bc3734b7d36a6ba59a86c80f8c03993c4d6b4f3 SHA1 0b74f290fab80d849c4893ce11cfb6fd4872c51d SHA256 e34b44dea70b57c3257e0e629ed3116b61097c341ae3e538caa5d2a358efb579
+MISC ChangeLog 805 RMD160 2380af29ab262bc49d85c421a7ae6c72ab58ef9d SHA1 c3eef8fc9f6081cc8c5611d7842d98cf55b08383 SHA256 1e2dee92f6bc873f9092c3905850a3bb8371b0e92ae01d4ada9ec3d1573e95cf
 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
new file mode 100644
index 000000000..be8967e37
--- /dev/null
+++ b/media-radio/rivendell/files/rivendell-init.patch
@@ -0,0 +1,10 @@
+# There is no jack daemon
+--- rivendell-1.2.1/rivendell-gentoo	2007-10-05 08:31:21.000000000 -0600
++++ rivendell-1.2.1.new/rivendell-gentoo	2009-01-14 22:21:19.000000000 -0600
+@@ -26,7 +26,6 @@
+ ##
+ 
+ depend() {
+-        need jackd
+         use mysql
+ }
\ No newline at end of file
diff --git a/media-radio/rivendell/files/rivendell-sandbox.patch b/media-radio/rivendell/files/rivendell-sandbox.patch
new file mode 100644
index 000000000..8b9265386
--- /dev/null
+++ b/media-radio/rivendell/files/rivendell-sandbox.patch
@@ -0,0 +1,21 @@
+# 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
new file mode 100644
index 000000000..87caa3ffc
--- /dev/null
+++ b/media-radio/rivendell/files/rivendell-sox-14.patch
@@ -0,0 +1,404 @@
+# 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/rivendell-1.2.2.ebuild b/media-radio/rivendell/rivendell-1.2.2.ebuild
new file mode 100644
index 000000000..c688374b2
--- /dev/null
+++ b/media-radio/rivendell/rivendell-1.2.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+inherit 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="pam? ( sys-libs/pam )
+	app-cdr/cdrkit
+	media-sound/cdparanoia
+	media-sound/mpg321
+	media-sound/sox
+	media-sound/vorbis-tools
+	net-ftp/lftp
+	net-misc/wget
+	sys-devel/bc"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-init.patch"
+	epatch "${FILESDIR}/${PN}-sandbox.patch"
+	epatch "${FILESDIR}/${PN}-sox-14.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
+	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"
+	echo
+	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."
+	echo
+	ewarn "If this is an upgrade, run rdadmin to ensure your"
+	ewarn "database schema is up to date"
+}