Stopped using useless bootstrap scripts, made ebuild saner, thanks to patch from flameeyes

(Portage version: 2.0.54-r2)

3 files changed, 22 insertions, 30 deletions

diff --git a/media-libs/libmp4v2/ChangeLog b/media-libs/libmp4v2/ChangeLog
index e132b36f8b68..a46a69b255ae 100644
--- a/media-libs/libmp4v2/ChangeLog
+++ b/media-libs/libmp4v2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmp4v2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.15 2006/05/16 12:29:00 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/ChangeLog,v 1.16 2006/05/25 00:33:31 tester Exp $
+
+  25 May 2006; Olivier Crête <tester@gentoo.org> libmp4v2-1.5.ebuild:
+  Stopped using useless bootstrap scripts, made ebuild saner, thanks to patch
+  from flameeyes
 
   16 May 2006; Thomas Cort <tcort@gentoo.org> libmp4v2-1.4.1.ebuild:
   Stable on alpha.
diff --git a/media-libs/libmp4v2/Manifest b/media-libs/libmp4v2/Manifest
index e129adcb96b5..a8a4a9879d96 100644
--- a/media-libs/libmp4v2/Manifest
+++ b/media-libs/libmp4v2/Manifest
@@ -4,5 +4,5 @@ MD5 ad9863188af26572c12950453a42d2f3 files/digest-libmp4v2-1.5 64
 MD5 22a76c68f55b131dfc602a61ededb699 files/mpeg4ip-1.4.1-disable-faac-test.patch 1149
 MD5 1482d9be9ab5b360c7fbf51e0e3c8213 files/mpeg4ip-1.4.1-disable-sdl-test.patch 519
 MD5 3312aa9797c8aa18ec759077552080bd libmp4v2-1.4.1.ebuild 2076
-MD5 ef56e83223ce27ed8dc85a764c4b1bc3 libmp4v2-1.5.ebuild 2076
+MD5 93bdf16530023f6465516fdc32d2782c libmp4v2-1.5.ebuild 1759
 MD5 3e22c883db32384466af4a4db61aca02 metadata.xml 222
diff --git a/media-libs/libmp4v2/libmp4v2-1.5.ebuild b/media-libs/libmp4v2/libmp4v2-1.5.ebuild
index 72a0221e5ac2..5bef1923a165 100644
--- a/media-libs/libmp4v2/libmp4v2-1.5.ebuild
+++ b/media-libs/libmp4v2/libmp4v2-1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.5.ebuild,v 1.1 2006/05/12 00:09:17 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmp4v2/libmp4v2-1.5.ebuild,v 1.2 2006/05/25 00:33:32 tester Exp $
 
-inherit multilib eutils
+inherit libtool
 
 DESCRIPTION="libmp4v2 extracted from mpeg4ip"
 HOMEPAGE="http://www.mpeg4ip.net/"
@@ -17,28 +17,18 @@ DEPEND=""
 RDEPEND="!<media-video/mpeg4ip-1.4.1
 	!<media-libs/faad2-2.0-r9"
 
-S=${WORKDIR}/mpeg4ip-${PV}
+S="${WORKDIR}/mpeg4ip-${PV}"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-faac-test.patch
-	epatch ${FILESDIR}/mpeg4ip-1.4.1-disable-sdl-test.patch
+	elibtoolize
 }
 
 src_compile() {
-
-	cd ${S}
-
-	./bootstrap --prefix=/usr \
-		--host=${CHOST} \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var/lib \
+	touch bootstrapped
+	econf \
 		--disable-warns-as-err \
 		--disable-server \
 		--disable-player \
@@ -53,10 +43,9 @@ src_compile() {
 		--disable-faac \
 		--disable-ffmpeg \
 		--disable-x264 \
-		--with-pic \
-		${EXTRA_ECONF} || die "configure failed"
+		|| die "econf failed"
 
-	cd ${S}/lib/mp4v2
+	cd "${S}/lib/mp4v2"
 
 	sed -i -e 's:SUBDIRS = . test util:SUBDIRS = .:' Makefile \
 		 || die "sed failed"
@@ -66,23 +55,22 @@ src_compile() {
 
 src_install() {
 
-	cd ${S}/lib/mp4v2
+	cd "${S}/lib/mp4v2"
 
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc README INTERNALS API_CHANGES TODO
 
 	sed -i -e 's:"mpeg4ip.h":<libmp4v2/mpeg4ip.h>:' \
-		${D}/usr/include/mp4.h || die "sed failed"
+		"${D}/usr/include/mp4.h" || die "sed failed"
 
 	dodir /usr/include/libmp4v2
 
-	cp ${S}/include/mpeg4ip.h  ${D}/usr/include/libmp4v2/
+	cp "${S}/include/mpeg4ip.h"  "${D}/usr/include/libmp4v2/"
 	sed -i -e 's:mpeg4ip_config.h:libmp4v2/mpeg4ip_config.h:' \
 		-e 's:"mpeg4ip_version.h":<libmp4v2/mpeg4ip_version.h>:' \
-		 ${D}/usr/include/libmp4v2/mpeg4ip.h  || die "sed failed"
-
-	cp ${S}/include/mpeg4ip_version.h  ${D}/usr/include/libmp4v2/
-	cp ${S}/mpeg4ip_config.h ${D}/usr/include/libmp4v2/
+		 "${D}/usr/include/libmp4v2/mpeg4ip.h"  || die "sed failed"
 
+	cp "${S}/include/mpeg4ip_version.h" "${D}/usr/include/libmp4v2/"
+	cp "${S}/mpeg4ip_config.h" "${D}/usr/include/libmp4v2/"
 }