media-radio/rivendell: whitespace, readability

svn path=/sunrise/; revision=8132

diff --git a/media-radio/rivendell/ChangeLog b/media-radio/rivendell/ChangeLog
index b0017278caa08ebdf5170db75948bce379c9918a..d7ba37d866e07c2ae96caa8aadf43d0ed574385d 100644 (file)
--- a/media-radio/rivendell/ChangeLog
+++ b/media-radio/rivendell/ChangeLog
@@ -2,6 +2,10 @@
 # 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:

diff --git a/media-radio/rivendell/Manifest b/media-radio/rivendell/Manifest
index 4d7be0535786433722d76038bfe4b65f3f8ef61e..3fa283e26982078a20d806a610a44894e544505e 100644 (file)
--- a/media-radio/rivendell/Manifest
+++ b/media-radio/rivendell/Manifest
@@ -4,7 +4,7 @@ AUX rivendell-sox-14.patch 11458 RMD160 e16f4f2788cb6b92e3268dfae506efffb6d9bb17
 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
-EBUILD rivendell-1.3.0.ebuild 2037 RMD160 92581d85b36bfb83e9971e5e4d8f970dcf4c049f SHA1 4973d68f96e9e9603c518aaa3898c39eb1745d57 SHA256 6b96d52c0be8fa373e2a80e3af3a462d59379d9916dafe2c5aa13d00d6f6a5f9
-MISC ChangeLog 1516 RMD160 22a2797ab8c09f2ab7d25e1c5ce5f6fdd2d156df SHA1 b95bfc76f327adc70a82e6a49448b63b142a3241 SHA256 1c6dc263819d857343a8ff5bac852a0354faa1130b720c02ec062d1672c8ff26
+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/rivendell-1.2.2.ebuild b/media-radio/rivendell/rivendell-1.2.2.ebuild
index 8b531d3ffefdd37358a4c474028a068bb1d593af..551db9951beabf681c9f37fd9e93275e6071e94a 100644 (file)
--- a/media-radio/rivendell/rivendell-1.2.2.ebuild
+++ b/media-radio/rivendell/rivendell-1.2.2.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit eutils
+inherit base eutils
 
 DESCRIPTION="An automated system for acquisition, management, scheduling and playout of audio content."
 HOMEPAGE="http://rivendellaudio.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://rivendellaudio.org/ftpdocs/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=" ~x86"
+KEYWORDS="~x86"
 IUSE="alsa jack pam"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -32,34 +32,35 @@ RDEPEND="${DEPEND}
        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_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
 }
@@ -69,12 +70,12 @@ pkg_postinst() {
        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
        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
+       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
index 2e0a29de1971bad8b34390dfa537bfe025713e5f..9d2caa2d684dd6516ad121af5f44feeb54fbfe0a 100644 (file)
--- a/media-radio/rivendell/rivendell-1.3.0.ebuild
+++ b/media-radio/rivendell/rivendell-1.3.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI="1"
-inherit eutils
+inherit  base eutils
 
 DESCRIPTION="An automated system for acquisition, management, scheduling and playout of audio content."
 HOMEPAGE="http://rivendellaudio.org/"
@@ -11,7 +11,7 @@ SRC_URI="http://rivendellaudio.org/ftpdocs/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=" ~x86"
+KEYWORDS="~x86"
 IUSE="alsa jack pam"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -35,29 +35,30 @@ RDEPEND="${DEPEND}
        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"
-}
+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
 }
@@ -67,12 +68,12 @@ pkg_postinst() {
        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
        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
+       einfo
        ewarn "If this is an upgrade, run rdadmin to ensure your"
        ewarn "database schema is up to date"
 }