Fix collision with games-misc/bsd-games. Bug #301003

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

diff --git a/games-puzzle/hangman/ChangeLog b/games-puzzle/hangman/ChangeLog
index 1e8e31ef57db66bafec16ee72398f3e1f800e54c..57883841a486ef2fd83d9d31d3c4f3bd0e1f8115 100644 (file)
--- a/games-puzzle/hangman/ChangeLog
+++ b/games-puzzle/hangman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/hangman
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/ChangeLog,v 1.9 2009/08/11 06:44:11 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/ChangeLog,v 1.10 2010/05/28 14:54:04 tupone Exp $
+
+  28 May 2010; Tupone Alfredo <tupone@gentoo.org> hangman-0.9.2.ebuild:
+  Fix collision with games-misc/bsd-games. Bug #301003
 
   11 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> hangman-0.9.2.ebuild:
   EAPI=2; build with gcc43

diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
index 5caab06cad1a9274a8f45d92d85229e79f7eef74..6474aa4a59174c509bc544fdeafbcdd670d64ed1 100644 (file)
--- a/games-puzzle/hangman/Manifest
+++ b/games-puzzle/hangman/Manifest
@@ -1,4 +1,4 @@
 DIST hangman-0.9.2.tar.gz 1023712 RMD160 47f1f41b2ed2949e6b9b4db6d75735d49b34d8c4 SHA1 70fe78f2c0e4c725895ec68d50cf0d5f96ee9323 SHA256 5fa60699112895848b390b98f84ebb3dc4abaca431fd5c0cb25bf4d09824da2d
-EBUILD hangman-0.9.2.ebuild 904 RMD160 27432c5112e3618fe1454e2f89ec9b3464d4c12c SHA1 924554babc46d0d22df5f126cbdbac66a680223f SHA256 22957ae525bfd5dfb026077c9c4cdeba94bd6cb7e0b814b8e64d10fbbdfd328d
-MISC ChangeLog 1058 RMD160 191629b75bd69d9eec94a4445480cf7a4b2aa1fa SHA1 05a47a364b5266d802b06f99a56d788778c37798 SHA256 63c16c62801b1c6648960781b7a8add4755b78d2b53c8c3122bae4bf574b0797
+EBUILD hangman-0.9.2.ebuild 924 RMD160 5c403b48de71fd349a33478eb41debaedbe3c09a SHA1 bd0407703491da5d733078445056ce5f673192e5 SHA256 a1a01aa0cdb090783f2ee0dbc81071ec6181c82e32b81482c8a7b8203931425b
+MISC ChangeLog 1184 RMD160 d44e23ec058429013243620e4629515bc3161248 SHA1 29c65e5b347c1f9b55be652c3e60912aa2588968 SHA256 62c3d1b6f5a4212e0c7abf03cb21d58126431abae51a184dacab7f3ac4a0a266
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2.ebuild
index da7d3b8e14b0ce951822beac6a41b4cb39925b70..bb949dfe0c577f15f8ce5a65502860c48946ff99 100644 (file)
--- a/games-puzzle/hangman/hangman-0.9.2.ebuild
+++ b/games-puzzle/hangman/hangman-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/hangman-0.9.2.ebuild,v 1.11 2009/08/11 06:44:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/hangman/hangman-0.9.2.ebuild,v 1.12 2010/05/28 14:54:04 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl
+DEPEND="!games-misc/bsd-games
+       media-libs/libsdl
        media-libs/sdl-mixer
        media-libs/sdl-image
        media-libs/sdl-ttf"