Block games-misc/bsd-games because they collide on /usr/games/bin/canfield

Package-Manager: portage-2.1.2.9

3 files changed, 27 insertions, 14 deletions

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index 570a7866c635..ee0c2078a9e7 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/ace
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.14 2006/12/01 20:51:58 wolf31o2 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.15 2007/06/10 14:58:56 nyhm Exp $
+
+  10 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ace-1.2-r1.ebuild:
+  Block games-misc/bsd-games because they collide on /usr/games/bin/canfield
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> ace-1.2-r1.ebuild:
   Removing old virtual/x11 dependency.
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 30ddc8d855c5..822825854ffe 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ace-1.2-check_for_end_of_game.patch 262 RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 SHA1 c4d7d9b32f0de8882a2b9c59c0873497c7194586 SHA256 16c841454ac9c3552b4aa70c3ec3bafbb8db33fb1e2a85e0f36de1623e09179e
 MD5 1dbc44808235a583afa1158ba19cb5a6 files/ace-1.2-check_for_end_of_game.patch 262
 RMD160 f39618a843461e4e8f1d139b87e808b163f071d1 files/ace-1.2-check_for_end_of_game.patch 262
@@ -7,14 +10,14 @@ MD5 1c026702258fd964e05176934ce40faa files/ace-1.2-gcc41.patch 2020
 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 files/ace-1.2-gcc41.patch 2020
 SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60 files/ace-1.2-gcc41.patch 2020
 DIST ace-1.2.tar.gz 309289 RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d SHA1 c0bf8e4eaee3128b0f41e7832723a0660146278a SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
-EBUILD ace-1.2-r1.ebuild 886 RMD160 5db68cadfda367582dec7ad69b023a1bf23f9d6b SHA1 b4cc14e5bfd0f94ae4745f61540945d977ce2292 SHA256 4e0998e12dbbf4871bbc8d650ba3eb1d9419b9580e4152caf8316f6fef826a6f
-MD5 c1f6d550e4f451f0d0edd1f6efe15048 ace-1.2-r1.ebuild 886
-RMD160 5db68cadfda367582dec7ad69b023a1bf23f9d6b ace-1.2-r1.ebuild 886
-SHA256 4e0998e12dbbf4871bbc8d650ba3eb1d9419b9580e4152caf8316f6fef826a6f ace-1.2-r1.ebuild 886
-MISC ChangeLog 1784 RMD160 c95b60cbda2f62970c0e27fa80bb39fecdd438f6 SHA1 ec20edbd5b2a1d1cd575a680eddbbce33c0e990f SHA256 8ef9bd06f14bc8ea62280b8e2ee90a9d9938779ff455f5d6260d0b56d9421982
-MD5 abaca083941cfe28bfb64a0eb1ff4a32 ChangeLog 1784
-RMD160 c95b60cbda2f62970c0e27fa80bb39fecdd438f6 ChangeLog 1784
-SHA256 8ef9bd06f14bc8ea62280b8e2ee90a9d9938779ff455f5d6260d0b56d9421982 ChangeLog 1784
+EBUILD ace-1.2-r1.ebuild 892 RMD160 921f4a4478c15a49e8805911ea44d267f73f0e25 SHA1 de7e9aaf70c1f61de6d65fe25a1e459b6c1f81cc SHA256 78f3ab6101ed7ccf256b575e3af27adee846811290afa7bf4cfede482662c895
+MD5 41e03f2b74262d0761a62e798da6ba90 ace-1.2-r1.ebuild 892
+RMD160 921f4a4478c15a49e8805911ea44d267f73f0e25 ace-1.2-r1.ebuild 892
+SHA256 78f3ab6101ed7ccf256b575e3af27adee846811290afa7bf4cfede482662c895 ace-1.2-r1.ebuild 892
+MISC ChangeLog 1925 RMD160 a1ae6d2a619d8d32840f594e718c1aa3eca82d6a SHA1 7d0f4d35e3eb69f03b17b9f4366218e57e9b7704 SHA256 ebcbeada77d165973434c0e99b2957d8bc0e0e9c77de592db7547fd5c19eabfb
+MD5 ba7518664dcf91646e298e8e18e7c3b8 ChangeLog 1925
+RMD160 a1ae6d2a619d8d32840f594e718c1aa3eca82d6a ChangeLog 1925
+SHA256 ebcbeada77d165973434c0e99b2957d8bc0e0e9c77de592db7547fd5c19eabfb ChangeLog 1925
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,3 +25,10 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 0a155fa22b0e899cfa547a0a4f9bb1dd files/digest-ace-1.2-r1 223
 RMD160 46d8a92e87e3315634b204dcefa6048fe97c3ab6 files/digest-ace-1.2-r1 223
 SHA256 23a6708f7879df16da14cdf8a5f8e19808558e584edc276bf596af714445f2bd files/digest-ace-1.2-r1 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGbBG3dz7hIScOURERAtmPAJ9v5LIvOj+XnvDI9EwwEpTIsi81oQCgonSY
+wkHJFeR74TnPf1xo8udXpD8=
+=SpbA
+-----END PGP SIGNATURE-----
diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r1.ebuild
index 6139151bc48e..e928bce0dea3 100644
--- a/games-board/ace/ace-1.2-r1.ebuild
+++ b/games-board/ace/ace-1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.17 2006/12/01 20:51:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.18 2007/06/10 14:58:56 nyhm Exp $
 
 inherit eutils games
 
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="x11-libs/libXpm
 	media-libs/libpng
-	sys-libs/zlib"
+	!games-misc/bsd-games"
 
 src_unpack() {
 	unpack ${A}
@@ -28,7 +28,7 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 	dohtml docs/*
 	prepgamesdirs