touchups

5 files changed, 30 insertions, 37 deletions

diff --git a/media-libs/flac/flac-1.0.3.ebuild b/media-libs/flac/flac-1.0.3.ebuild
index 643c00e8050e..3a827a088bfd 100644
--- a/media-libs/flac/flac-1.0.3.ebuild
+++ b/media-libs/flac/flac-1.0.3.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.3.ebuild,v 1.11 2003/02/13 12:42:25 vapier Exp $
-
-IUSE="sse xmms"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.3.ebuild,v 1.12 2003/04/25 13:45:33 vapier Exp $
 
 inherit libtool
 
 DESCRIPTION="A free lossless audio encoder"
 SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 HOMEPAGE="http://flac.sourceforge.net/"
-S=${WORKDIR}/${P}
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
+IUSE="sse xmms"
 
 RDEPEND="virtual/glibc 
 	>=media-libs/libogg-1.0_rc2
 	xmms? ( media-sound/xmms )"
-
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm ) 
 	sys-apps/gawk"
@@ -41,9 +38,8 @@ src_compile() {
 
 	#emake seems to mess up the building of the xmms input plugin
 	make || die
-
 }
+
 src_install() {
-	cd ${S}
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 }
diff --git a/media-libs/flac/flac-1.0.4.ebuild b/media-libs/flac/flac-1.0.4.ebuild
index 611fc4a1291a..3e4d00e301b6 100644
--- a/media-libs/flac/flac-1.0.4.ebuild
+++ b/media-libs/flac/flac-1.0.4.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.4.ebuild,v 1.7 2003/02/28 01:46:36 gerk Exp $
-
-IUSE="sse xmms"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.4.ebuild,v 1.8 2003/04/25 13:45:33 vapier Exp $
 
 inherit libtool
 
-DESCRIPTION="FLAC is a free lossless audio encoder which includes an XMMS plugin."
+DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
 SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 HOMEPAGE="http://flac.sourceforge.net/"
-S=${WORKDIR}/${P}
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="x86 ppc ~sparc"
+IUSE="sse xmms"
 
 RDEPEND="virtual/glibc 
 	>=media-libs/libogg-1.0_rc2
 	xmms? ( media-sound/xmms )"
-
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm ) 
 	sys-apps/gawk"
 
 src_compile() {
-
 	use xmms || {
 		cp src/Makefile.in src/Makefile.in.orig
 		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' \
@@ -48,8 +44,8 @@ src_compile() {
 
 	#emake seems to mess up the building of the xmms input plugin
 	make || die
-
 }
+
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 }
diff --git a/media-libs/flac/flac-1.1.0.ebuild b/media-libs/flac/flac-1.1.0.ebuild
index 7174fe8715ec..3699665a5b8a 100644
--- a/media-libs/flac/flac-1.1.0.ebuild
+++ b/media-libs/flac/flac-1.1.0.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.6 2003/03/14 07:10:02 drobbins Exp $
-
-IUSE="sse xmms"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.7 2003/04/25 13:45:33 vapier Exp $
 
 inherit libtool
 
-DESCRIPTION="FLAC is a free lossless audio encoder which includes an XMMS plugin."
+DESCRIPTION="=free lossless audio encoder which includes an XMMS plugin"
 SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
 HOMEPAGE="http://flac.sourceforge.net/"
-S=${WORKDIR}/${P}
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="x86 ppc ~sparc ~alpha"
+IUSE="sse xmms"
 
-RDEPEND="virtual/glibc id3lib >=media-libs/libogg-1.0_rc2 xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND} x86? ( dev-lang/nasm ) sys-apps/gawk"
+RDEPEND="virtual/glibc
+	media-libs/id3lib
+	>=media-libs/libogg-1.0_rc2
+	xmms? ( media-sound/xmms )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk"
 
 src_compile() {
-
 	use xmms || {
 		cp src/Makefile.in src/Makefile.in.orig
 		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' \
@@ -40,8 +42,8 @@ src_compile() {
 
 	#emake seems to mess up the building of the xmms input plugin
 	make || die
-
 }
+
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 }
diff --git a/media-libs/libfame/libfame-0.8.10.ebuild b/media-libs/libfame/libfame-0.8.10.ebuild
index 4856c0c58747..cae08f645e18 100644
--- a/media-libs/libfame/libfame-0.8.10.ebuild
+++ b/media-libs/libfame/libfame-0.8.10.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.8.10.ebuild,v 1.7 2003/02/13 12:48:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.8.10.ebuild,v 1.8 2003/04/25 13:46:40 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="libfame is a video encoding library. (MPEG-1 and MPEG-4)"
+DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
 SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
-HOMEPAGE="http://fame.sourceforge.net"
+HOMEPAGE="http://fame.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
 
 DEPEND="virtual/glibc"
 
diff --git a/media-libs/libfame/libfame-0.9.0.ebuild b/media-libs/libfame/libfame-0.9.0.ebuild
index 2390ebac6809..47aa82652ae6 100644
--- a/media-libs/libfame/libfame-0.9.0.ebuild
+++ b/media-libs/libfame/libfame-0.9.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.0.ebuild,v 1.7 2003/03/10 22:35:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfame/libfame-0.9.0.ebuild,v 1.8 2003/04/25 13:46:40 vapier Exp $
 
 inherit flag-o-matic
 
 S=${WORKDIR}/${P}
-DESCRIPTION="libfame is a video encoding library. (MPEG-1 and MPEG-4)"
+DESCRIPTION="MPEG-1 and MPEG-4 video encoding library"
 SRC_URI="mirror://sourceforge/fame/${P}.tar.gz"
-HOMEPAGE="http://fame.sourceforge.net"
+HOMEPAGE="http://fame.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc ~alpha"
+KEYWORDS="x86 ~ppc sparc ~alpha"
 
 DEPEND="virtual/glibc"