tidy ebuild

(Portage version: 2.0.51.19)

6 files changed, 29 insertions, 31 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index 774698ab904b..f8663fc617c3 100644
--- a/media-libs/libmpeg2/ChangeLog
+++ b/media-libs/libmpeg2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmpeg2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.33 2004/12/17 19:50:08 mr_bones_ Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.34 2005/03/21 06:58:07 mr_bones_ Exp $
+
+  21 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> libmpeg2-0.2.1.ebuild:
+  tidy ebuild
 
   17 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> libmpeg2-0.4.0b.ebuild:
   address bug #74711; tidy
diff --git a/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild
index ca62a0b863d7..e4dfa2cfcd13 100644
--- a/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild
@@ -1,14 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild,v 1.13 2004/06/24 23:12:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.2.1.ebuild,v 1.14 2005/03/21 06:58:07 mr_bones_ Exp $
 
-IUSE="sdl X"
-
-inherit libtool
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic
-filter-flags "-maltivec -mabi=altivec"
+inherit libtool flag-o-matic
 
 MY_P="${P/libmpeg2/mpeg2dec}"
 S="${WORKDIR}/${MY_P}"
@@ -19,24 +13,27 @@ HOMEPAGE="http://libmpeg2.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ~ppc"
+IUSE="sdl X"
 
 DEPEND="sdl? ( media-libs/libsdl )
 	X? ( virtual/x11 )"
 
-
 src_unpack() {
 	unpack ${A}
 
+	cd "${S}"
+	# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
+	filter-flags "-maltivec -mabi=altivec"
 	# get rid of the -mcpu
-	cd ${S} ; cp configure configure.orig
-	sed -e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-		configure.orig > configure
+	sed -i \
+		-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
+		configure \
+		|| die "sed failed"
+	elibtoolize
 }
 
 src_compile() {
-	elibtoolize
-
-	local myconf=""
+	local myconf
 
 	use sdl || myconf="${myconf} --disable-sdl"
 
@@ -46,12 +43,10 @@ src_compile() {
 	econf --enable-shared \
 		${myconf} || die "./configure failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
-
diff --git a/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild b/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild
index 48b577af677f..4971a2093280 100644
--- a/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild,v 1.9 2004/06/24 23:12:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.1.ebuild,v 1.10 2005/03/21 06:58:07 mr_bones_ Exp $
 
 IUSE="sdl X"
 
diff --git a/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild b/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild
index 21e2e56d0c6e..3164d1c1bc3a 100644
--- a/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild,v 1.6 2004/06/24 23:12:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.3.2_pre20030625.ebuild,v 1.7 2005/03/21 06:58:07 mr_bones_ Exp $
 
 IUSE="sdl X"
 
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild
index 2a03c017bbde..6d488e2475b7 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild,v 1.3 2004/06/24 23:12:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0.ebuild,v 1.4 2005/03/21 06:58:07 mr_bones_ Exp $
 
 inherit libtool flag-o-matic
 
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 2a406a5dd350..b8c13636fa3f 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.17 2004/12/17 19:56:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.18 2005/03/21 06:58:07 mr_bones_ Exp $
 
 inherit eutils flag-o-matic