address bug #74711; tidy

3 files changed, 31 insertions, 42 deletions

diff --git a/media-libs/libmpeg2/ChangeLog b/media-libs/libmpeg2/ChangeLog
index 6b764deb5913..774698ab904b 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.32 2004/12/03 17:21:21 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/ChangeLog,v 1.33 2004/12/17 19:50:08 mr_bones_ Exp $
+
+  17 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> libmpeg2-0.4.0b.ebuild:
+  address bug #74711; tidy
 
   03 Dec 2004; Tom Martin <slarti@gentoo.org> libmpeg2-0.4.0b.ebuild:
   Added append-flags -fPIC for amd64, resolves bug 73224.
diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 43fc58bb7f77..38a2e160ca3b 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 19d6eac2dab1da0e1585f8379645609c libmpeg2-0.4.0.ebuild 1139
-MD5 1a46043bdedd93880a6ce3dd0e841854 libmpeg2-0.4.0b.ebuild 1654
+MD5 29d469a88cbaea45191503ece9ec3f39 ChangeLog 3982
 MD5 0e77dde2120847ccb980d905cff77bd1 libmpeg2-0.2.1.ebuild 1282
-MD5 6d5b592df599a4a9763938769c8fc863 libmpeg2-0.3.2_pre20030625.ebuild 1365
 MD5 d934d630d1aa33687310af33307797ee libmpeg2-0.3.1.ebuild 1379
-MD5 381c230af53e56b55d97dc6b0863dd47 ChangeLog 3872
+MD5 6d5b592df599a4a9763938769c8fc863 libmpeg2-0.3.2_pre20030625.ebuild 1365
+MD5 19d6eac2dab1da0e1585f8379645609c libmpeg2-0.4.0.ebuild 1139
+MD5 de50ed734378d9387686e820281e7605 libmpeg2-0.4.0b.ebuild 1583
 MD5 2a17e6b990abf2db666678d21accc928 files/digest-libmpeg2-0.2.1 66
 MD5 ee59810a9eb538c8b6e66e5db9d21399 files/digest-libmpeg2-0.3.1 66
+MD5 a127dad465c6dbf851ee95df74166bc0 files/digest-libmpeg2-0.3.2_pre20030625 73
 MD5 c55e953292f2922558ea3f50f6437581 files/digest-libmpeg2-0.4.0 66
-MD5 c868934aab8fc4ea039b4fb9d3c46d71 files/gcc34-inline-fix-0.4.0b.diff 292
 MD5 c7958c7996a268d8cf161e4b32e70ac0 files/digest-libmpeg2-0.4.0b 67
 MD5 6ed53be491fa83ebc59d0d7b285c5e4f files/altivec-fix-0.4.0b.diff 890
-MD5 a127dad465c6dbf851ee95df74166bc0 files/digest-libmpeg2-0.3.2_pre20030625 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBsKDRCHk4+ZoBpvsRAhovAJ0YyI6kH2/Pq8tk8X0tllXvcACpzACgpmwD
-Of95Xy2mWaV3Apedt2SOkw4=
-=fbfo
------END PGP SIGNATURE-----
+MD5 c868934aab8fc4ea039b4fb9d3c46d71 files/gcc34-inline-fix-0.4.0b.diff 292
diff --git a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
index 86ec405c2ad7..20f3ded328be 100644
--- a/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild
@@ -1,66 +1,62 @@
 # Copyright 1999-2004 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.15 2004/12/03 17:21:21 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg2/libmpeg2-0.4.0b.ebuild,v 1.16 2004/12/17 19:50:08 mr_bones_ Exp $
 
-inherit eutils libtool flag-o-matic
+inherit eutils flag-o-matic
 
 MY_P="${P/libmpeg2/mpeg2dec}"
-S="${WORKDIR}/${MY_P/b/}"
 DESCRIPTION="library for decoding mpeg-2 and mpeg-1 video"
-SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
 HOMEPAGE="http://libmpeg2.sourceforge.net/"
+SRC_URI="http://libmpeg2.sourceforge.net/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64 sparc"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 IUSE="sdl X"
 
-RDEPEND="virtual/libc
+DEPEND="virtual/libc
 	sdl? ( media-libs/libsdl )
 	X? ( virtual/x11 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${MY_P/b/}"
 
 src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
 	use alpha && append-flags -fPIC
 
 	# Resolves bug 73224.
 	# <slarti@gentoo.org> Dec 2004
 	use amd64 && append-flags -fPIC
 
-	unpack ${A}
-
-	# get rid of the -mcpu
-	cd ${S}
-	sed -i \
-		-e 's:OPT_CFLAGS=\"$CFLAGS -mcpu=.*\":OPT_CFLAGS=\"$CFLAGS\":g' \
-			configure || die "sed configure failed"
-
 	# Fix a compilation-error with gcc 3.4. Bug #51964.
-	( cd "${S}" && epatch "${FILESDIR}/gcc34-inline-fix-${PV}.diff" )
-
+	epatch "${FILESDIR}/gcc34-inline-fix-${PV}.diff"
 	epatch "${FILESDIR}/altivec-fix-${PV}.diff"
-	autoreconf
+	# get rid of the -mcpu
+	sed -i \
+		-e '/-mcpu/d' \
+		configure.in \
+		|| die "sed configure failed"
+	aclocal && automake && libtoolize && autoconf || die "autotools failed"
 }
 
 src_compile() {
-	elibtoolize
-
 	# x86 asm + 64bit binary == no worky (fixes bug 69227)
 	use amd64 && myconf="--disable-accel-detect"
 
 	econf \
 		--enable-shared \
 		--disable-dependency-tracking \
-		`use_enable sdl` \
-		`use_with X x` \
+		$(use_enable sdl) \
+		$(use_with X x) \
 		${myconf} \
-			|| die
+		|| die
 	# builds non-pic library by default? (bug #44934)
 	emake LIBMPEG2_CFLAGS= || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }