Bump eapi, punt static libs and libtool archives.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

3 files changed, 40 insertions, 18 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/Manifest b/media-libs/smpeg/Manifest
index a3f3c8c625a4..483e8e631278 100644
--- a/media-libs/smpeg/Manifest
+++ b/media-libs/smpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX smpeg-0.4.4-PIC.patch 9472 RMD160 c0ee00ca02c1ed2f5ce1890065864175f6cb8eb1 SHA1 ca210893cfd50554730918e572dc6d48192aa3f4 SHA256 a9fd3b892e06a00e31fedf719df0ff2bccac0542da9d1008d90712086ccc310f
 AUX smpeg-0.4.4-automake.patch 320 RMD160 702a601b3dfc925b29d5c11926af56d6c9fa2578 SHA1 1c97efec70a88db7fe5498eab1f408fe203a758c SHA256 2d6d8fbc92e9f040d56ae597282385b5bd68d308931228dfe3a1a453b6c18eda
 AUX smpeg-0.4.4-config.patch 472 RMD160 4f4d726cfb127b5fa1de977f205e20ed14ef5947 SHA1 88a099bfa49f65e4c0006d7c8e2acfeb16f414f8 SHA256 e64c070d1e69900c76515bd79130473847a407bab14990862aeb2b84ac58848a
@@ -10,6 +13,23 @@ AUX smpeg-0.4.4-missing-init.patch 266 RMD160 1f53a986425b9b5aeaf1cd8e6e5e5d273e
 AUX smpeg-0.4.4-mmx.patch 352 RMD160 b0be5ec35a0b3bfce513285bc346b70b1989e4a8 SHA1 23c5a0cb58952998fc8507406459703de742aac2 SHA256 2dbcce8253b16b8882e491787d28a3410eb8e0ec29a300fed258bd899ac24248
 DIST smpeg-0.4.4-gtkm4.patch.bz2 3894 RMD160 fbef70da1b1a9f5d482c9506286c9f8e7ce764d8 SHA1 d899fc56c4f67459e8bb01a8313955804b821b45 SHA256 85c1c2126bd0e405092f3f08caace3503997fd0447989fdd175c7f39c3f6091b
 DIST smpeg-0.4.4.tar.gz 315054 RMD160 d55249ad53417fa0df3d925aed0e83d2204e28b7 SHA1 6d7f4449472e6270ab435b2224f3fad951c35259 SHA256 1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57
-EBUILD smpeg-0.4.4-r9.ebuild 1735 RMD160 7f86ec3a2bb5eb2008d3584da0e3173fae8844fa SHA1 580cb3717d963c4970d5976ae1392b6994390e80 SHA256 192bbe5de241382fa29efce90436cff008613fc02aecb162d8fea0a304dd776e
-MISC ChangeLog 7782 RMD160 a8d4b7eddfff7aa1d48f5016fc5fa5d9b73a0cac SHA1 f8adb98a8349629aa1af984c21b9d86d6e8b1920 SHA256 0222b5f7017ebb7c8f2f803c826c101863dfda9656316499c5c4eb6e04c9e6ca
+EBUILD smpeg-0.4.4-r9.ebuild 1771 RMD160 c00d6cfed035a12ca233d31755204ffcd8a1333c SHA1 c62c865cf56741104ab339c7891194fcded5b258 SHA256 fea309421253afb91bfd8a01a08c23540c9bf91d91ccb64acedc55668ee2d9e3
+MISC ChangeLog 7918 RMD160 dc352e22c54477eaddbadeafa0a9deb90f6d8691 SHA1 d190a21ede08a698440a1bb5b8fa663b959501da SHA256 3abd449268697ae3b22a0f206f1d1ca27e9d28652bd25bf7f618cdbf0aef7a22
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOo/7pAAoJEOSiRoyO7jvoEKsP/2w4QmmAaFAULOsstdDfgpo6
+yy9j3JpelQTTuWKwfOND+mZk2VP5NyhKdinWKiLmciqV2UDTdTA73UuCB3c0mbn0
+62A+17W8fE+aELAGgs/iqxYMN1TOGQbYFuwMLQyr43bEniwA5uq9kSBcRyHiTuyR
+TnMW7fWbParu/oXnhWFXnfNFVb5CXqdi7hC3hTv1K4ZAHRt4Hl2rqdMyNFmvcqlY
+lEbdbkJ6E7npIM9dPQ8CPqGUbWW/g864HtPR70e3R6l4zU2In/a34jBF7noqZUZy
+zKQRM2fBTZPkbMttW5yYfYYoVwN5XHikECOaci77ghjNNe+l8Z5nPcUi7u6g47iP
+ONTHWnrSK/DcwwqZJseiVQavbt9jvvVRfaASpYuH+2rwF+558b0nihDNUCEJ8OYB
+jv/5NcRXfuaA6kdnZQo6gRxu1BeukdR3nyAVFrl3t4Sd70e5uRcALkjjBTKsLCDk
+AwPGUCn7cuTbHxr+Hdbhmf3jgi4T5ECTij2uL2S8+A2sb+rCtlGFLQf0kULa4sDR
+4Wu0MC4ILS3OpnlwbyF7FfSbOcjSYPDdo0DJ4l8HLD5zwL+vaXj6rvpoydJi+9pl
+FRQA1HMH6mZIBqqIrivrJ/t8isKBbKbWl/PbJ7acBP6yPodlTqLnVLqxBb9QB0uP
+WNyRiVFSjqNZI1UdvUTe
+=Dp2E
+-----END PGP SIGNATURE-----
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 {} +
 }