Revision: 1727
Author: emery
Date: 2010-08-27 08:29:45 +0200 (Fri, 27 Aug 2010)
Log Message:
-----------
It merges now, but needs jack to compile and keeps the replication deamon
script from installing.
(Portage version: 2.2_rc67-r2/svn/Linux i686, RepoMan options: --force)
Modified Paths:
--------------
trunk/overlays/proaudio-dev/media-radio/rivendell/rivendell-2.0.0_beta0.ebuild
Added Paths:
-----------
trunk/overlays/proaudio-dev/media-radio/rivendell/files/initscript.patch
trunk/overlays/proaudio-dev/media-radio/rivendell/files/sandbox.patch
Added: trunk/overlays/proaudio-dev/media-radio/rivendell/files/initscript.patch
===================================================================
--- trunk/overlays/proaudio-dev/media-radio/rivendell/files/initscript.patch
(rev 0)
+++ trunk/overlays/proaudio-dev/media-radio/rivendell/files/initscript.patch
2010-08-27 06:29:45 UTC (rev 1727)
@@ -0,0 +1,23 @@
+--- rivendell-gentoo 2007-10-05 09:31:21.000000000 -0500
++++ rivendell-gentoo.new 2009-08-16 12:52:05.000000000 -0500
+@@ -26,17 +26,16 @@
+ ##
+
+ depend() {
+- need jackd
+ 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
++ start-stop-daemon --start --quiet --chuid rivendell --exec
/usr/bin/caed
++ start-stop-daemon --start --quiet --chuid rivendell --exec
/usr/bin/ripcd
+ sleep 1
+- start-stop-daemon --start --quiet --exec /usr/bin/rdcatchd
++ start-stop-daemon --start --quiet --chuid rivendell --exec
/usr/bin/rdcatchd
+ eend $?
+ }
+
Added: trunk/overlays/proaudio-dev/media-radio/rivendell/files/sandbox.patch
===================================================================
--- trunk/overlays/proaudio-dev/media-radio/rivendell/files/sandbox.patch
(rev 0)
+++ trunk/overlays/proaudio-dev/media-radio/rivendell/files/sandbox.patch
2010-08-27 06:29:45 UTC (rev 1727)
@@ -0,0 +1,49 @@
+# This corrects what would cause sandbox errors in the install proccess.
+
+--- install-init.sh 2010-07-29 14:32:30.000000000 -0500
++++ install-init.sh.new 2010-08-27 00:58:42.173553662 -0500
+@@ -23,14 +23,10 @@
+ #
+
+ if test ! -f ./building-debian ; then
+- mkdir -p /etc/init.d
+- cp rivendell /etc/init.d/rivendell
+- cp rdrepld-suse /etc/init.d/rdrepld
+- mkdir -p /etc/sysconfig
+- cp rivendell.sys /etc/sysconfig/rivendell
+- mkdir -p /var/run/rivendell
+- chmod 777 /var/run/rivendell
+- ldconfig
++ mkdir -p ${DESTDIR}/etc/init.d
++ cp rivendell ${DESTDIR}/etc/init.d/rivendell
++ mkdir -p ${DESTDIR}/var/run/rivendell
++ chmod 777 ${DESTDIR}/var/run/rivendell
+ fi
+
+ chmod 4755 $1/bin/caed
+--- rlm/Makefile.in 2010-08-19 07:12:33.000000000 -0500
++++ rlm/Makefile.in.new 2010-08-26 23:52:01.158553625 -0500
+@@ -450,8 +450,8 @@
+ install: all
+ mkdir -p $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell
+ cp $(RLM_MODULES) $(DESTDIR)$(prefix)/@RD_LIB_PATH@/rivendell/
+- mkdir -p $(headerdir)
+- cp rlm.h $(headerdir)
++ mkdir -p $(DESTDIR)$(headerdir)
++ cp rlm.h $(DESTDIR)$(headerdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+--- web/rdxport/Makefile.in 2010-08-19 07:12:35.000000000 -0500
++++ web/rdxport/Makefile.in.new 2010-08-27 00:27:13.106553053 -0500
+@@ -522,8 +522,8 @@
+
+
+ install-exec-hook:
+- chown root $(libexecdir)/rdxport.cgi
+- chmod 4755 $(libexecdir)/rdxport.cgi
++ chown root $(DESTDIR)$(libexecdir)/rdxport.cgi
++ chmod 4755 $(DESTDIR)$(libexecdir)/rdxport.cgi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Modified:
trunk/overlays/proaudio-dev/media-radio/rivendell/rivendell-2.0.0_beta0.ebuild
===================================================================
---
trunk/overlays/proaudio-dev/media-radio/rivendell/rivendell-2.0.0_beta0.ebuild
2010-08-25 00:08:13 UTC (rev 1726)
+++
trunk/overlays/proaudio-dev/media-radio/rivendell/rivendell-2.0.0_beta0.ebuild
2010-08-27 06:29:45 UTC (rev 1727)
@@ -16,13 +16,13 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="alsa gpio jack mpeg mp2 mp3 pam"
+IUSE="alsa gpio mpeg mp2 mp3 pam"
RESTRICT="nomirror"
DEPEND="alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- mpeg? ( media-sound/libmad )
+ media-sound/jack-audio-connection-kit
+ mpeg? ( media-libs/libmad )
media-libs/flac
media-libs/id3lib
media-libs/libogg
@@ -42,7 +42,6 @@
media-sound/mpg321
media-sound/vorbis-tools
net-misc/curl
- sys-apps/ivman
sys-devel/bc"
pkg_setup() {
@@ -52,7 +51,8 @@
src_prepare() {
cd "${MY_S}"
- epatch "${FILESDIR}/${PN}-init.patch"
+ epatch "${FILESDIR}/initscript.patch"
+ epatch "${FILESDIR}/sandbox.patch"
}
src_configure() {
@@ -61,7 +61,6 @@
use alsa || myconf="${myconf} --disable-alsa"
use gpio || myconf="${myconf} --disable-gpio"
- use jack || myconf="${myconf} --disable-jack"
use mpeg || myconf="${myconf} --disable-mad"
use mp2 || myconf="${myconf} --disable-twolame"
use mp3 || myconf="${myconf} --disable-lame"
@@ -71,10 +70,12 @@
}
src_compile () {
+ cd "${MY_S}"
emake || die "make failed"
}
src_install() {
+ cd "${MY_S}"
emake DESTDIR="${D}" install || die "install failed"
insinto /etc
@@ -85,13 +86,13 @@
fperms 0775 /var/snd
fperms 0664 /var/snd/*
- dodoc AUTHORS ChangeLog INSTALL NEWS README SupportedCards docs/*.txt
+ dodoc AUTHORS ChangeLog NEWS README UPGRADING docs/*.txt
prepalldocs
}
pkg_postinst() {
- elog "If you would like ASI or GPIO hardware support,"
- elog "install their drivers and re-emerge this package."
+ einfo "If you would like ASI hardware support, install those drivers
and"
+ einfo "re-emerge this package."
einfo
einfo "See
http://rivendell.tryphon.org/wiki/index.php/Install_under_Gentoo";
einfo "for Gentoo specific instructions."
@@ -102,6 +103,6 @@
einfo "and active on the system. Any server that complies with CGI-1.1"
einfo "should work, although as of this writing only Apache 2.2 has
been"
einfo "well tested."
-
- ewarn "If ${P} is an update, it may use a new database schema, run
rdadmin to ensure your schema is current."
+ einfo
+ ewarn "If this is an update, read /usr/share/doc/${P}/UPGRADING.bz2"
}
