use sed -i; use emake; more error checking/messages

3 files changed, 28 insertions, 23 deletions

diff --git a/media-video/mpeg2vidcodec/ChangeLog b/media-video/mpeg2vidcodec/ChangeLog
index 2833cf1d36fa..63da10c289c9 100644
--- a/media-video/mpeg2vidcodec/ChangeLog
+++ b/media-video/mpeg2vidcodec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg2vidcodec
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/ChangeLog,v 1.9 2003/12/03 15:52:52 agriffis Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/ChangeLog,v 1.10 2004/01/30 22:43:05 mr_bones_ Exp $
+
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  mpeg2vidcodec-12-r1.ebuild:
+  use sed -i; use emake; more error checking/messages
 
   03 Dec 2003; Aron Griffis <agriffis@gentoo.org> mpeg2vidcodec-12-r1.ebuild:
   Stable on alpha to support lilypond-1.8.2
diff --git a/media-video/mpeg2vidcodec/Manifest b/media-video/mpeg2vidcodec/Manifest
index 8d40f32adeb5..b23e402a891a 100644
--- a/media-video/mpeg2vidcodec/Manifest
+++ b/media-video/mpeg2vidcodec/Manifest
@@ -1,3 +1,3 @@
-MD5 c3c37115d3d5021595b15d73c20b46db ChangeLog 1433
-MD5 58f05ebac208a5eb1bf9588076853ab0 mpeg2vidcodec-12-r1.ebuild 776
+MD5 6e762d7bd15646bf0d312c9e0b401d3b ChangeLog 1575
+MD5 2de019dddf52fd2da409e2d768dedf50 mpeg2vidcodec-12-r1.ebuild 853
 MD5 ddb2656db72efd82cb2053a7e1eca471 files/digest-mpeg2vidcodec-12-r1 69
diff --git a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
index b5f71e46aa5f..d924159f75f7 100644
--- a/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
+++ b/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild
@@ -1,36 +1,37 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.15 2003/12/03 15:52:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg2vidcodec/mpeg2vidcodec-12-r1.ebuild,v 1.16 2004/01/30 22:43:05 mr_bones_ Exp $
 
-MY_P=${PN}_v${PV}
-S=${WORKDIR}/mpeg2
+MY_P="${PN}_v${PV}"
+S="${WORKDIR}/mpeg2"
 DESCRIPTION="MPEG Library"
-SRC_URI="ftp://ftp.mpeg.org/pub/mpeg/mssg/${MY_P}.tar.gz"
 HOMEPAGE="http://www.mpeg.org"
+SRC_URI="ftp://ftp.mpeg.org/pub/mpeg/mssg/${MY_P}.tar.gz"
 
-DEPEND="virtual/glibc"
-
-SLOT="0"
-LICENSE="as-is"
 KEYWORDS="x86 ppc alpha sparc amd64 hppa"
+LICENSE="as-is"
+SLOT="0"
+IUSE=""
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" "${S}/Makefile" \
+			|| die "sed Makefile failed"
 
 }
 
 src_compile() {
-	cd ${S}
-	make || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	cd ${S}
-	into /usr
-	dobin src/mpeg2dec/mpeg2decode
-	dobin src/mpeg2enc/mpeg2encode
-	dodoc README doc/*
+	dobin src/mpeg2dec/mpeg2decode src/mpeg2enc/mpeg2encode \
+		|| die "dobin failed"
+	dodoc README doc/* || die "dodoc failed"
 }