slight cleanups

2 files changed, 45 insertions, 37 deletions

diff --git a/app-cdr/eroaster/ChangeLog b/app-cdr/eroaster/ChangeLog
index a7a98369c9e7..e8c295cce79c 100644
--- a/app-cdr/eroaster/ChangeLog
+++ b/app-cdr/eroaster/ChangeLog
@@ -1,29 +1,34 @@
-# ChangeLog for app-cdr/arson
+# ChangeLog for app-cdr/eroaster
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/eroaster/ChangeLog,v 1.6 2002/10/19 16:34:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/eroaster/ChangeLog,v 1.7 2002/10/22 05:36:44 seemant Exp $
 
 *eroaster-2.1.0 (11 July 2002) 
 
+  21 Oct 2002; Seemant Kulleen <seemant@gentoo.org> eroaster-2.1.0.ebuild :
+
+  Cleaned up ebuild, and also added lame and oggvorbis as USE dependent
+  runtime dependencies.
+
   19 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> eroaster-2.1.0.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 
-   11 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> eroaster-2.1.0.ebuild:  
+  11 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> eroaster-2.1.0.ebuild:  
 
-   Eroaster development version added, but *masked*. Closes bug #4250. 
-   Ebuild submitted by:  Philip Walls <malverian@hotmail.com>
+  Eroaster development version added, but *masked*. Closes bug #4250. 
+  Ebuild submitted by:  Philip Walls <malverian@hotmail.com>
 
-   6 Aug 2002; Micheal Nazaroff <naz@gentoo.org> eroaster-2.1.0.ebuild:
+  6 Aug 2002; Micheal Nazaroff <naz@gentoo.org> eroaster-2.1.0.ebuild:
 
-   I removed the dependency on mkisofs since that is now part of the cdrtools
-   package, and sys-app/mkisofs has been depreciated.  I also fixed the sandbox
-   violation for this version.
+  I removed the dependency on mkisofs since that is now part of the cdrtools
+  package, and sys-app/mkisofs has been depreciated.  I also fixed the sandbox
+  violation for this version.
 
-   29 Aug 2002; Micheal Nazaroff <naz@gentoo.org> eroaster-2.1.0.ebuild:
+  29 Aug 2002; Micheal Nazaroff <naz@gentoo.org> eroaster-2.1.0.ebuild:
 
-   Fixed eroaster.gnorba path since it was getting dropped into /usr, this
-   should fix about everything in this package.
+  Fixed eroaster.gnorba path since it was getting dropped into /usr, this
+  should fix about everything in this package.
 
 *eroaster-2.0.12 (5 July 2002) Bart Verwilst <verwilst@gentoo.org>
 
-   initial ebuild
-   ebuild written by Mark Dillavou <line72@postmark.net>
+  initial ebuild
+  ebuild written by Mark Dillavou <line72@postmark.net>
diff --git a/app-cdr/eroaster/eroaster-2.1.0.ebuild b/app-cdr/eroaster/eroaster-2.1.0.ebuild
index 0ca9357238f3..f487782776fd 100644
--- a/app-cdr/eroaster/eroaster-2.1.0.ebuild
+++ b/app-cdr/eroaster/eroaster-2.1.0.ebuild
@@ -1,53 +1,56 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/eroaster/eroaster-2.1.0.ebuild,v 1.10 2002/10/19 16:34:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/eroaster/eroaster-2.1.0.ebuild,v 1.11 2002/10/22 05:36:44 seemant Exp $
 
 IUSE="xmms"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A graphical frontend for cdrecord and mkisofs written in gnome-python"
 HOMEPAGE="http://eroaster.sourceforge.net"
 SRC_URI="mirror://sourceforge/eroaster/${P}.tar.gz"  
 
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"
-SLOT="0"
 
 # cdrecord and mkisofs are needed or configure fails
 DEPEND=">=dev-lang/python-2.0
 	>=dev-python/gnome-python-1.4
 	app-cdr/cdrtools"
 
-# xmms here is only used in runtime
+# xmms, lame and vorbis-tools are just runtime conveniences
 # not a bulild dep.
 RDEPEND="${DEPEND}
-	xmms? ( media-sound/xmms )"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die
-}
+	xmms? ( media-sound/xmms )
+	encode? ( media-sound/lame )
+	oggvorbis? ( media-sound/vorbis-tools )
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		gnorbadir=${D}/usr/share/eroaster \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall \
+		gnorbadir=${D}/usr/share/eroaster || die
 }
 
 pkg_postinst() {
-	einfo
 	einfo "The following binaries are needed to make full use of this program:"
 	einfo
 	einfo "mpg123   For converting MP3s to WAVs and playing MP3s"
 	einfo "sox      For converting MP3s to WAVs"
-	einfo "xmms     For playing MP3s"
+	
+	if [ -z "`use xmms`" ]
+	then
+		einfo "xmms     For playing MP3s"
+	fi
+
 	einfo "bchunk   For converting BIN/CUE to ISO"
-	einfo "lame     For Encoding MP3s"
-	einfo "ogginfo  For Getting OGG ID3 information"
-	einfo "ogg123   For converting OGGs to WAVs"
-	einfo
+
+	if [ -z "`use encode`" ]
+	then
+		einfo "lame     For Encoding MP3s"
+	fi
+
+	if [ -z "`use oggvorbis`" ]
+	then
+		einfo "ogginfo  For Getting OGG ID3 information"
+		einfo "ogg123   For converting OGGs to WAVs"
+	fi
 }