dont try to run autotools #54423

5 files changed, 31 insertions, 97 deletions

diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index 7f48dc12238a..102b9a814576 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/smpeg
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.14 2004/06/07 22:58:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.15 2004/06/24 00:03:16 vapier Exp $
+
+  23 Jun 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/smpeg-0.4.4-gcc-3.1.patch, -smpeg-0.4.4-r2.ebuild,
+  smpeg-0.4.4-r4.ebuild:
+  Clean up ebuild to remove issues with autotools #54423 by Ludootje.
 
   07 Jun 2004; Aron Griffis <agriffis@gentoo.org> smpeg-0.4.4-r2.ebuild,
   smpeg-0.4.4-r4.ebuild:
diff --git a/media-libs/smpeg/files/digest-smpeg-0.4.4-r2 b/media-libs/smpeg/files/digest-smpeg-0.4.4-r2
deleted file mode 100644
index 9aa5597db6c8..000000000000
--- a/media-libs/smpeg/files/digest-smpeg-0.4.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59c76ac704088ef5539210190c4e1fe3 smpeg-0.4.4.tar.gz 315054
diff --git a/media-libs/smpeg/files/smpeg-0.4.4-gcc-3.1.patch b/media-libs/smpeg/files/smpeg-0.4.4-gcc-3.1.patch
deleted file mode 100644
index 2eb589ab2592..000000000000
--- a/media-libs/smpeg/files/smpeg-0.4.4-gcc-3.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- smpeg-0.4.4/Makefile.am.gcc3	Mon Jan  7 17:21:03 2002
-+++ smpeg-0.4.4/Makefile.am	Mon Jan  7 17:21:17 2002
-@@ -38,7 +38,8 @@
- 
- libsmpeg_la_LIBADD =		\
- 	audio/libaudio.la	\
--	video/libvideo.la
-+	video/libvideo.la       \
-+        -lsupc++
- 
- EXTRA_DIST =		\
- 	CHANGES		\
diff --git a/media-libs/smpeg/smpeg-0.4.4-r2.ebuild b/media-libs/smpeg/smpeg-0.4.4-r2.ebuild
deleted file mode 100644
index 1a708b178546..000000000000
--- a/media-libs/smpeg/smpeg-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r2.ebuild,v 1.14 2004/06/07 22:58:18 agriffis Exp $
-
-IUSE="X gtk opengl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="SDL MPEG Player Library"
-SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz"
-HOMEPAGE="http://www.lokigames.com/development/smpeg.php3"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND=">=media-libs/libsdl-1.2.0
-	opengl? ( virtual/opengl virtual/glu )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-src_compile() {
-
-	local myconf
-# --enable-mmx causes test apps to crash on startup .. smpeg bug?
-# bugzilla bug #470 -- azarah (03/02/2002)
-#	if use mmx ; then
-#		myconf="--enable-mmx"
-#	fi
-	if ! use gtk ; then
-		myconf="${myconf} --disable-gtk-player"
-	fi
-	if ! use X ; then
-		myconf="${myconf} --disable-gtk-player --without-x"
-	fi
-	if ! use opengl ; then
-		myconf="${myconf} --disable-opengl-player"
-	fi
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		${myconf} || die
-
-	emake CCLD="g++" || die
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-
-	dodoc CHANGES COPYING README* TODO
-}
-
diff --git a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild b/media-libs/smpeg/smpeg-0.4.4-r4.ebuild
index 50b25ad3a14f..2890401de614 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r4.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r4.ebuild,v 1.13 2004/06/07 22:58:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r4.ebuild,v 1.14 2004/06/24 00:03:16 vapier Exp $
+
+inherit eutils gcc
 
 DESCRIPTION="SDL MPEG Player Library"
 HOMEPAGE="http://www.lokigames.com/development/smpeg.php3"
@@ -8,49 +10,41 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~mips"
-IUSE="X gtk opengl"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64"
+IUSE="X gtk opengl debug"
 
 DEPEND=">=media-libs/libsdl-1.2.0
 	opengl? ( virtual/opengl virtual/glu )
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+	X? ( virtual/x11 )"
 
 src_unpack() {
-	unpack ${P}.tar.gz
-
-	## GCC 3.1 fix from bug #5558 (cardoe 08/03/02)
+	unpack ${A}
 	cd ${S}
-	if [ `gcc -dumpversion | cut -d"." -f1` == "3" ] ; then
-		patch -p1 < ${FILESDIR}/${P}-gcc-3.1.patch || die
-	fi
+	sed -i \
+		-e 's:-mcpu=ev4 -Wa,-mall::' \
+		-e 's:-march=486::' \
+		-e 's:-march=pentium -mcpu=pentiumpro::' \
+		configure || die "sed failed"
+	# GCC 3.1 fix from bug #5558 (cardoe 08/03/02)
+	sed -i '/^libsmpeg_la_LIBADD =/s:$: -lsupc++:' Makefile.in
 }
 
 src_compile() {
-	local myconf
-# --enable-mmx causes test apps to crash on startup .. smpeg bug?
-# bugzilla bug #470 -- azarah (03/02/2002)
-#	if use mmx ; then
-#		myconf="--enable-mmx"
-#	fi
-	if ! use gtk ; then
-		myconf="${myconf} --disable-gtk-player"
-	fi
-	if ! use X ; then
-		myconf="${myconf} --disable-gtk-player --without-x"
-	fi
-	if ! use opengl ; then
-		myconf="${myconf} --disable-opengl-player"
-	fi
-
-	export CC=g++
-	export CXX=g++
-
-	econf ${myconf} || die "configure failed"
+	# --enable-mmx causes test apps to crash on startup #470
+	#	`use_enable mmx` \
+	econf \
+		`use_enable debug` \
+		`use_enable debug assertions` \
+		`use_enable gtk gtk-player` \
+		`use_with X x` \
+		`use_enable opengl opengl-player` \
+		${myconf} || die "configure failed"
 
 	emake || die "parallel make failed"
 }
 
 src_install() {
-	einstall || die "make install failed"
+	make install DESTDIR=${D} || die "make install failed"
 	dodoc CHANGES README* TODO
 }