media-radio/rivendell: Drop old ebuild + patches, add DEPEND to RDEPEND

svn path=/sunrise/; revision=7653

6 files changed, 9 insertions, 133 deletions

diff --git a/media-radio/rivendell/ChangeLog b/media-radio/rivendell/ChangeLog
index c94eb77f7..9741226a7 100644
--- a/media-radio/rivendell/ChangeLog
+++ b/media-radio/rivendell/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
diff --git a/media-radio/rivendell/Manifest b/media-radio/rivendell/Manifest
index 78d3fdc46..32b75a041 100644
--- a/media-radio/rivendell/Manifest
+++ b/media-radio/rivendell/Manifest
@@ -1,11 +1,7 @@
-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
-EBUILD rivendell-1.2.2.ebuild 2057 RMD160 bde5681a22d84b421897c5f56f1d1d0699b41b47 SHA1 24bdbcf08489313c4f15b4aa0e968c05c212faf2 SHA256 3e47ec5b1cd40db8982f2e0448cee4841bc5598ff204095db3e4e034124ddecc
-MISC ChangeLog 1012 RMD160 93c620c69d6869c994d7841eaeee105dc1af17eb SHA1 d74390e1ccba1395778c581e5339766092dba097 SHA256 df31da5b1eb5008b724cd00e3363cba4391c56a7f11068ebc375bb7314ca4c81
+EBUILD rivendell-1.2.2.ebuild 2068 RMD160 bc4a1a19c3fa28af5412a9face2b6a2963837ebf SHA1 fad71e936d443a549c2268cccec06f1dbbc345ee SHA256 d92b71166be84a7499ae951a9da4e5ae3395545c4e3bcabd0a58f991f7c57c30
+MISC ChangeLog 1249 RMD160 e7335d6505620ead0b21285e4a4ac36a7070f237 SHA1 23dc0eaf54b7d25c9b519c315f8857029307ed4c SHA256 6eb96ac4e58af096a8a552dbb10e95e552115bcf34418aabe336a3e614282dd0
 MISC metadata.xml 953 RMD160 5325369c637625c16f3ca93ee1d7b755f9586021 SHA1 44af0a1a2135f2f0186b4b871be24c990481e7f5 SHA256 fc1a6108c4e44dd03bff3ec2160c5d41aa5ebbeffd165662501f292416106aff
diff --git a/media-radio/rivendell/files/rivendell-1.2.1-init.patch b/media-radio/rivendell/files/rivendell-1.2.1-init.patch
deleted file mode 100644
index f5dd2e6f4..000000000
--- a/media-radio/rivendell/files/rivendell-1.2.1-init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-## Fixes jack depend and reduces daemons permissions
---- /usr/src/rivendell-1.2.1/rivendell-gentoo	2007-10-05 09:31:21.000000000 -0500
-+++ /etc/init.d/rivendell	2009-01-10 07:24:04.226186550 -0600
-@@ -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 $?
- }
- 
diff --git a/media-radio/rivendell/files/rivendell-1.2.1-sandbox.patch b/media-radio/rivendell/files/rivendell-1.2.1-sandbox.patch
deleted file mode 100644
index 2f2c7269a..000000000
--- a/media-radio/rivendell/files/rivendell-1.2.1-sandbox.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# This keeps the install script from playing outside the sandbox
---- install-init.sh	2007-10-03 06:24:06.000000000 -0500
-+++ install-init.sh.new	2009-01-09 00:04:14.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
- 
diff --git a/media-radio/rivendell/rivendell-1.2.1.ebuild b/media-radio/rivendell/rivendell-1.2.1.ebuild
deleted file mode 100644
index c9ce6c0dc..000000000
--- a/media-radio/rivendell/rivendell-1.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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="~amd64 ~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/cdrtools
-	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}/${P}-init.patch"
-	epatch "${FILESDIR}/${P}-sandbox.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"
-}
diff --git a/media-radio/rivendell/rivendell-1.2.2.ebuild b/media-radio/rivendell/rivendell-1.2.2.ebuild
index 462c2fafb..8b531d3ff 100644
--- a/media-radio/rivendell/rivendell-1.2.2.ebuild
+++ b/media-radio/rivendell/rivendell-1.2.2.ebuild
@@ -23,7 +23,8 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/libvorbis
 	virtual/mysql
 	x11-libs/qt:3"
-RDEPEND="pam? ( sys-libs/pam )
+RDEPEND="${DEPEND}
+	pam? ( sys-libs/pam )
 	app-cdr/cdrkit
 	media-sound/cdparanoia
 	media-sound/sox