EAPI=2; add use-deps for libsdl (bug #312505)

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-action/maelstrom/ChangeLog b/games-action/maelstrom/ChangeLog
index 25b0f4d58414f8363b69e0cb53214c0c28cc3f34..ba4203aff0d52deb5224b4e18a3afa093b0a35e6 100644 (file)
--- a/games-action/maelstrom/ChangeLog
+++ b/games-action/maelstrom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/maelstrom
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.19 2008/02/29 18:07:44 carlo Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.20 2010/03/31 20:51:08 mr_bones_ Exp $
+
+  31 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  maelstrom-3.0.6-r1.ebuild:
+  EAPI=2; add use-deps for libsdl (bug #312505)
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> maelstrom-3.0.6-r1.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.

diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest
index 705ffd58ededf0449e8db9e9807b8f7f9b8967ba..4980c1c7f38edb79d8e88d0317f5b43d3a53e37d 100644 (file)
--- a/games-action/maelstrom/Manifest
+++ b/games-action/maelstrom/Manifest
@@ -2,6 +2,6 @@ AUX maelstrom-3.0.6-64bits.patch 499 RMD160 6d2d4e10f2f0dd68d175becdc876b472d1bd
 AUX maelstrom-3.0.6-r1-security.patch 14189 RMD160 7509c96a2ee3f91f32824e640bec00c11019adfd SHA1 9bbb7d90620551cdebafb51cf548660e8e153372 SHA256 977d7558b094037ad82177d56ac897e376714e939568b0925ad28708aad6099f
 AUX maelstrom-gcc34.patch 878 RMD160 dfa90264cbd1f3cb4aca724c7b566b7d96169971 SHA1 60ebcb0e541fe6d3fe9fbd12f32f7b31c68de913 SHA256 38a0a869c60e32d2873f536badd28e45f1908027d4e40936f533da2c0741dc3a
 DIST Maelstrom-3.0.6.tar.gz 1007421 RMD160 9415324e96fdccfc5ff5c453e886d0ce28956c13 SHA1 28b273615d1c375e532d375a4a407a99af63e283 SHA256 bb6ca1952d1080e25f8716a2d08a4241614ee72d54f13c8a60eecadf7ea6198d
-EBUILD maelstrom-3.0.6-r1.ebuild 1907 RMD160 a182e1480671afd3417612a09665f9fef58ac853 SHA1 ce4042ec0b244b68efa0e4f6335c46b1cdc483c6 SHA256 fd9c2072ca115dbfdcb1c6e85d15a74ba9ad8b90faf94f1187a997ec1203772b
-MISC ChangeLog 2751 RMD160 306fd2432a2bdeedcb45d5c5b2d928b1d02c677a SHA1 212125cd6114e51dc9a7dc27ee2c228d3b8bde5a SHA256 d10ad5b6ea09a98887979731d7cfac6814d2eeb665c31cf89ec79ef3e156591a
+EBUILD maelstrom-3.0.6-r1.ebuild 1901 RMD160 e4babe795f020c71e23d18c70a1568dce46cf2ea SHA1 a2195612d92c8f852ed0d4b8e751b6d32840af41 SHA256 990249525c9ddb37e4e7dca594427ca5315dae8488602d83c8b24477372a1250
+MISC ChangeLog 2888 RMD160 7aa66da8c024d3388b574788b9399fc94fad0ca9 SHA1 b7ffb5ba19d684169d3940b7c0257f926c8a1fe4 SHA256 4f987f6aac3dfad7065c469c4bc654549206f5d6baf8f1f4f61d639db4bc5906
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild
index 1a64c427b1d9c27026acf18a2bbd920d72b4ed1e..2bdd3363ac492280dc8deb40c7ef3b57a411adc6 100644 (file)
--- a/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild,v 1.10 2008/02/29 18:07:44 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.6-r1.ebuild,v 1.11 2010/03/31 20:51:08 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils games
 
 MY_P=Maelstrom-${PV}
@@ -14,15 +15,12 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.1.5
-       >=media-libs/sdl-net-1.2.2"
+DEPEND="media-libs/libsdl[audio,joystick,video]
+       media-libs/sdl-net"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        epatch \
                "${FILESDIR}"/${PF}-security.patch \
                "${FILESDIR}"/${P}-64bits.patch \
@@ -44,7 +42,7 @@ src_unpack() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
        dodoc Changelog README* Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*}
        newicon "${D}${GAMES_DATADIR}"/Maelstrom/icon.xpm maelstrom.xpm
        make_desktop_entry Maelstrom "Maelstrom" maelstrom