media-radio/rivendell: Version bump. Removed system user/group. Init script now automatically applies correct permissions. Rewrote sox patch.

svn path=/sunrise/; revision=8122

5 files changed, 288 insertions, 8 deletions

diff --git a/media-radio/rivendell/ChangeLog b/media-radio/rivendell/ChangeLog
index 9741226a7..b0017278c 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: $
 
+  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:
diff --git a/media-radio/rivendell/Manifest b/media-radio/rivendell/Manifest
index 32b75a041..4d7be0535 100644
--- a/media-radio/rivendell/Manifest
+++ b/media-radio/rivendell/Manifest
@@ -1,7 +1,10 @@
-AUX rivendell-init.patch 253 RMD160 0ce9acb58830cc0f38ee6cbe12c344f7a7f018c3 SHA1 373cbbd286f51c3e8eadfa884bfcd7a7d526c3fb SHA256 c30c37e5b57bcdd7390d77847ad5a03cd60b421176e2a4f26fe983a758f95e80
+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 2068 RMD160 bc4a1a19c3fa28af5412a9face2b6a2963837ebf SHA1 fad71e936d443a549c2268cccec06f1dbbc345ee SHA256 d92b71166be84a7499ae951a9da4e5ae3395545c4e3bcabd0a58f991f7c57c30
-MISC ChangeLog 1249 RMD160 e7335d6505620ead0b21285e4a4ac36a7070f237 SHA1 23dc0eaf54b7d25c9b519c315f8857029307ed4c SHA256 6eb96ac4e58af096a8a552dbb10e95e552115bcf34418aabe336a3e614282dd0
+EBUILD rivendell-1.3.0.ebuild 2037 RMD160 92581d85b36bfb83e9971e5e4d8f970dcf4c049f SHA1 4973d68f96e9e9603c518aaa3898c39eb1745d57 SHA256 6b96d52c0be8fa373e2a80e3af3a462d59379d9916dafe2c5aa13d00d6f6a5f9
+MISC ChangeLog 1516 RMD160 22a2797ab8c09f2ab7d25e1c5ce5f6fdd2d156df SHA1 b95bfc76f327adc70a82e6a49448b63b142a3241 SHA256 1c6dc263819d857343a8ff5bac852a0354faa1130b720c02ec062d1672c8ff26
 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
index be8967e37..bfb566ea4 100644
--- a/media-radio/rivendell/files/rivendell-init.patch
+++ b/media-radio/rivendell/files/rivendell-init.patch
@@ -1,10 +1,25 @@
-# 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 @@
+--- 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
- }
\ No newline at end of file
+-        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-sox.patch b/media-radio/rivendell/files/rivendell-sox.patch
new file mode 100644
index 000000000..0b454971c
--- /dev/null
+++ b/media-radio/rivendell/files/rivendell-sox.patch
@@ -0,0 +1,178 @@
+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/rivendell-1.3.0.ebuild b/media-radio/rivendell/rivendell-1.3.0.ebuild
new file mode 100644
index 000000000..2e0a29de1
--- /dev/null
+++ b/media-radio/rivendell/rivendell-1.3.0.ebuild
@@ -0,0 +1,78 @@
+# 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="${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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-init.patch"
+	epatch "${FILESDIR}/${PN}-sandbox.patch"
+	epatch "${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"
+	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"
+}