Fix libsdl dependency, thanks to John Moe (bug #373527).

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 21 insertions, 15 deletions

diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index 79c98f711d9f..c72f4984a4e2 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/nwn
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.76 2010/12/16 19:17:52 mr_bones_ Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.77 2011/12/11 01:16:01 calchan Exp $
+
+  11 Dec 2011; Denis Dupeyron <calchan@gentoo.org> nwn-1.68-r5.ebuild,
+  nwn-1.69-r1.ebuild:
+  Fix libsdl dependency, thanks to John Moe (bug #373527).
 
   16 Dec 2010; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.68-r5.ebuild:
   GAMES_LICENSE_CHECK is deprecated. The license checking is handled by the
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index 35b899562b91..5797ef4747a2 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -18,7 +18,7 @@ DIST Spanish_linuxclient168_orig.tar.gz 132704890 RMD160 699c5bdf5b020a91f3f1b86
 DIST Spanish_linuxclient168_xp1.tar.gz 143415370 RMD160 897b862f8baa392e733413f847a5e2ebabd17bbf SHA1 e1a3e13a5cf05c742d004fd76bd14a3d6b17c541 SHA256 c74faed185b87a0f187f4e1bcf873ec3810a1fd8dba026b81bcf421e1ca121d9
 DIST Spanish_linuxclient168_xp2.tar.gz 133862305 RMD160 25d36239aa9bb3e685f24c3e031128bbcbd1d1d6 SHA1 b14f3229529618ddf12b497d17421f753898e279 SHA256 b4d4efb0eb5d3395e42e665b518f3cec19c690b0f7f57783ecaa2e6aa8b70a5e
 DIST nwn-libs-1.tar.bz2 250395 RMD160 e1a9514be1c6ea57363327837f67a39ea4e7316e SHA1 609aa18298c9254502be4a7af6991a67be9f341e SHA256 8cf73b69f5c254125713b0bf8dcb89e3320eee5a3339df11d6d18d8381b36f31
-EBUILD nwn-1.68-r5.ebuild 6642 RMD160 9dd42b7c761c3b0b3986c20b299c06d7091e753c SHA1 4b5a85bafc409088fd14dcef8662849c917eab31 SHA256 137e801b264e3a21ad19c7875683c2202f338a5dbf6a49f23cdb5864df807d07
-EBUILD nwn-1.69-r1.ebuild 3271 RMD160 45aa7eec03d856618ce3af4ec62924f6dcefb9d2 SHA1 9fe070ac7035b7a2e3a1cd7b7a64b9647a04b464 SHA256 d4da1e2270afc24289235ea561a29af7c15a24d22a40cadb5b8c4f9034dd940f
-MISC ChangeLog 13479 RMD160 b929edaa3b85af2a0fb8acb632036db9f19ad41b SHA1 003257780e2749bce4c4005562e9dd3f98f11846 SHA256 ec7995a5ca0754c97725e6ee835542de8d84d5c531d0f9a0654721c329c7f5a3
+EBUILD nwn-1.68-r5.ebuild 6668 RMD160 c5ef004c9701269884e76d923a5ed589f635047a SHA1 affeea0c49a4a39ad1763f3c1e5e147cf77714fe SHA256 65067c3cb7efa74e20da2816c8a5eb825369e2e9e9ecbe985b309dd6bc71042e
+EBUILD nwn-1.69-r1.ebuild 3297 RMD160 7ae81b016d1fb5fd9f14a4ec352f492f18421857 SHA1 328ac3a04b41b923b5bf9e6ea1e2dd3758c6b540 SHA256 6a3ee51fadc4bf7a2469080449f773de2d67be5c4becb4da67db8b67e4b44cf2
+MISC ChangeLog 13630 RMD160 e5490cecb2512e7e617a95e0ec303797ad7e90ee SHA1 cb3cde7cef49b583177541b0b801b7d1decf1ea0 SHA256 7bb4d46b885d218596ad51b8186576afeefbce3219731aa8522dfe535142191e
 MISC metadata.xml 435 RMD160 57ca0a3136e9c0edf3c1cc5e13f0661f38d4879c SHA1 3e0e513cd5b6910cc4c1bb2bc8556753c4dda722 SHA256 1548515a46157153d708117cfe4fb01d2ba73a5f32a49967d2b70b4702b95604
diff --git a/games-rpg/nwn/nwn-1.68-r5.ebuild b/games-rpg/nwn/nwn-1.68-r5.ebuild
index 58147793b27b..3415efaf5ff4 100644
--- a/games-rpg/nwn/nwn-1.68-r5.ebuild
+++ b/games-rpg/nwn/nwn-1.68-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.3 2010/12/16 19:17:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.68-r5.ebuild,v 1.4 2011/12/11 01:16:01 calchan Exp $
 
 inherit eutils games
 
@@ -53,16 +53,17 @@ RESTRICT="mirror strip"
 
 RDEPEND=">=games-rpg/nwn-data-1.29-r3
 	virtual/opengl
-	>=media-libs/libsdl-1.2.5
 	!<games-rpg/nwmouse-0.1-r1
 	x86? (
 		=virtual/libstdc++-3.3
 		x11-libs/libXext
-		x11-libs/libX11 )
+		x11-libs/libX11
+		media-libs/libsdl )
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs )"
+		app-emulation/emul-linux-x86-xlibs
+		app-emulation/emul-linux-x86-sdl )"
 DEPEND="app-arch/unzip"
 
 S=${WORKDIR}/nwn
diff --git a/games-rpg/nwn/nwn-1.69-r1.ebuild b/games-rpg/nwn/nwn-1.69-r1.ebuild
index 05889bc736c9..e68bcf353011 100644
--- a/games-rpg/nwn/nwn-1.69-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.69-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.4 2010/09/09 16:55:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.69-r1.ebuild,v 1.5 2011/12/11 01:16:01 calchan Exp $
 
 EAPI=2
 inherit eutils games
@@ -32,16 +32,17 @@ RDEPEND="
 		${NWN_DATA},-linguas_fr,-linguas_de,-linguas_es,-linguas_it]
 	)
 	virtual/opengl
-	>=media-libs/libsdl-1.2.5
 	!<games-rpg/nwmouse-0.1-r1
 	x86? (
 		=virtual/libstdc++-3.3
 		x11-libs/libXext
-		x11-libs/libX11 )
+		x11-libs/libX11
+		media-libs/libsdl )
 	amd64? (
 		app-emulation/emul-linux-x86-baselibs
 		app-emulation/emul-linux-x86-compat
-		app-emulation/emul-linux-x86-xlibs )"
+		app-emulation/emul-linux-x86-xlibs
+		app-emulation/emul-linux-x86-sdl )"
 DEPEND=""
 
 S=${WORKDIR}/nwn