Bump eapi, punt static libs and libtool archives.

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

2 files changed, 18 insertions, 16 deletions

diff --git a/media-libs/smpeg/ChangeLog b/media-libs/smpeg/ChangeLog
index 7f8f37c666ee..7fb2e003df74 100644
--- a/media-libs/smpeg/ChangeLog
+++ b/media-libs/smpeg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/smpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.57 2011/02/06 12:11:58 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/ChangeLog,v 1.58 2011/10/23 11:49:12 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> smpeg-0.4.4-r9.ebuild:
+  Bump eapi, punt static libs and libtool archives.
 
   06 Feb 2011; Mart Raudsepp <leio@gentoo.org> smpeg-0.4.4-r9.ebuild:
   Drop to ~mips
diff --git a/media-libs/smpeg/smpeg-0.4.4-r9.ebuild b/media-libs/smpeg/smpeg-0.4.4-r9.ebuild
index 8cdfb5f86214..4fcd8bd7b87a 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r9.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r9.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r9.ebuild,v 1.12 2011/02/06 12:11:58 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smpeg/smpeg-0.4.4-r9.ebuild,v 1.13 2011/10/23 11:49:12 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils toolchain-funcs autotools
 
@@ -12,21 +14,20 @@ SRC_URI="ftp://ftp.lokigames.com/pub/open-source/smpeg/${P}.tar.gz
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="X debug mmx opengl"
+IUSE="X debug mmx opengl static-libs"
 
 DEPEND=">=media-libs/libsdl-1.2.0
-	opengl? (
-		virtual/opengl
-		virtual/glu )
+	opengl? ( virtual/opengl )
 	X? (
 		x11-libs/libXext
 		x11-libs/libXi
 		x11-libs/libX11
 	)"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+DOCS=( CHANGES README README.SDL_mixer TODO )
+
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-m4.patch \
 		"${FILESDIR}"/${P}-gnu-stack.patch \
 		"${FILESDIR}"/${P}-config.patch \
@@ -46,7 +47,7 @@ src_unpack() {
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX RANLIB AR
 
 	# the debug option is bogus ... all it does is add extra
@@ -54,16 +55,14 @@ src_compile() {
 	econf \
 		--enable-debug \
 		--disable-gtk-player \
+		$(use_enable static-libs static) \
 		$(use_enable debug assertions) \
 		$(use_with X x) \
 		$(use_enable opengl opengl-player) \
-		$(use_enable mmx) \
-		|| die
-
-	emake || die "emake failed"
+		$(use_enable mmx)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGES README* TODO
+	default
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }