Changed src_install () to src_install()

2 files changed, 26 insertions, 45 deletions

diff --git a/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild b/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild
index 31f1c0b111ca..b2292a077e26 100644
--- a/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild
+++ b/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild
@@ -1,53 +1,47 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild,v 1.10 2002/10/17 13:22:03 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.0_pre1.ebuild,v 1.11 2002/11/30 03:01:48 vapier Exp $
 
 MY_P="${PN}-`echo ${PV} |sed -e 's:_:-:'`"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="CD ripping/mastering"
 SRC_URI="http://ogre.rocky-road.net/files/${MY_P}.tar.bz2"
 HOMEPAGE="http://ogre.rocky-road.net/cdr.shtml"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64"
 IUSE="gnome"
 
 #todo: add blade encoder
-DEPEND="sys-devel/gcc media-sound/mad app-cdr/cdrtools app-cdr/cdrdao 
-	media-sound/cdparanoia media-sound/lame media-libs/libogg
-	media-sound/mpg123 virtual/x11 =x11-libs/gtk+-1.2* \
-	dev-libs/glib media-libs/libvorbis
-	media-libs/libao"
-		
-RDEPEND="media-sound/mad app-cdr/cdrtools app-cdr/cdrdao 
-	media-sound/cdparanoia media-sound/lame media-libs/libogg
-	media-sound/mpg123 virtual/x11 =x11-libs/gtk+-1.2* \
-	dev-libs/glib media-libs/libvorbis
+DEPEND="sys-devel/gcc
+	media-sound/mad
+	app-cdr/cdrtools
+	app-cdr/cdrdao
+	media-sound/cdparanoia
+	media-sound/lame
+	media-libs/libogg
+	media-sound/mpg123
+	virtual/x11
+	=x11-libs/gtk+-1.2*
+	dev-libs/glib
+	media-libs/libvorbis
 	media-libs/libao"
 
-
 src_compile() {
-
 	cp src/main.c src/main.c.orig
 	sed -e 's:/usr/local/share:/usr/share:g' \
 		src/main.c.orig >src/main.c || die
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| die
-	
+	econf
 	emake || die
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
 
-
 	# Add the Gnome menu entry
-	if [ "`use gnome`" ] ; then
+	if [ `use gnome` ] ; then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/simplecdrx.png
 		insinto /usr/share/gnome/apps/Applications/
@@ -55,7 +49,5 @@ src_install () {
 	fi
 
 	doman man/simplecdr-x.1
-
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 }
-
diff --git a/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild b/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild
index 1fbbb62886ac..e09baef45c89 100644
--- a/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild
+++ b/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild
@@ -1,10 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild,v 1.2 2002/11/03 19:17:14 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/simplecdrx/simplecdrx-1.2.1.ebuild,v 1.3 2002/11/30 03:03:09 vapier Exp $
 
 DESCRIPTION="CD ripping/mastering"
 HOMEPAGE="http://ogre.rocky-road.net/cdr.shtml"
+SRC_URI="http://ogre.rocky-road.net/files/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc sparc64"
+SLOT="0"
+IUSE="gnome"
 
 #todo: add blade encoder
 DEPEND="media-sound/mad
@@ -19,32 +24,16 @@ DEPEND="media-sound/mad
 	=x11-libs/gtk+-1.2*
 	dev-libs/glib
 	media-libs/libao"
-		
-KEYWORDS="x86 ppc sparc sparc64"
-SLOT="0"
-IUSE="gnome"
-
-SRC_URI="http://ogre.rocky-road.net/files/${P}.tar.bz2"
-S=${WORKDIR}/${P}
-
 
 src_compile() {
-
 	cp src/main.c src/main.c.orig
 	sed -e 's:/usr/local/share:/usr/share:g' \
 		src/main.c.orig >src/main.c || die
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| die
-	
+	econf
 	emake || die
 }
 
-src_install () {
-
+src_install() {
 	make DESTDIR=${D} install || die
 
 	doman man/simplecdr-x.1
@@ -53,7 +42,7 @@ src_install () {
 	doins pixmaps/simplecdr.xpm ${FILESDIR}/simplecdrx.png
 
 	# Add the Gnome menu entry
-	if [ "`use gnome`" ] ; then
+	if [ `use gnome` ] ; then
 		insinto /usr/share/gnome/apps/Applications/
 		doins ${FILESDIR}/simplecdrx.desktop
 	fi