From 3e44b681236b61ef4a7876f7e9e718d6be23bcdd Mon Sep 17 00:00:00 2001
From: Michael Sterrett <mr_bones_@gentoo.org>
Date: Sun, 18 Mar 2007 06:47:06 +0000
Subject: [PATCH] media is under MIT license; stable for x86 Package-Manager:
 portage-2.1.2.2

---
 games-arcade/funnyboat/ChangeLog            |  5 +++-
 games-arcade/funnyboat/Manifest             | 26 +++++++--------------
 games-arcade/funnyboat/funnyboat-1.4.ebuild |  6 ++---
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/games-arcade/funnyboat/ChangeLog b/games-arcade/funnyboat/ChangeLog
index cdc9389e7fc0..94aa4320cf3e 100644
--- a/games-arcade/funnyboat/ChangeLog
+++ b/games-arcade/funnyboat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/funnyboat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/ChangeLog,v 1.6 2007/02/08 10:17:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/ChangeLog,v 1.7 2007/03/18 06:47:06 mr_bones_ Exp $
+
+  18 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org> funnyboat-1.4.ebuild:
+  media is under MIT license; stable for x86
 
 *funnyboat-1.4 (08 Feb 2007)
 
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 7d0db7c64554..ae7184370f19 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,20 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST funnyboat-1.3.tar.gz 3831643 RMD160 c701b6f7b56838576fb4541338fae02c3ba348c0 SHA1 73c30bd808a0ad3419ebead123781855c4d8e314 SHA256 44957e4ffb4a11f0fea4ac992fb0df00e6b6f7dc90df97285911046ab3a3c6f5
 DIST funnyboat-1.4.tar.gz 3823121 RMD160 caab90e7a4292df45fc249609109175334cccaa7 SHA1 d1284d0cb2f72d219d4866934dadc4857c8080b3 SHA256 df7873e57419f3ab64ab8073c884de3b38ebcb191bb25ce5254579f96ba7b032
 EBUILD funnyboat-1.3.ebuild 879 RMD160 b6e165c9fb3bf6739b73319b9d9a2c8f8e3582da SHA1 9e403f58ed0ab49cf2235ffac40d9eea850a77b0 SHA256 b58f805e2a98812999a23912526931e2165d4fde486b4b883c5325834e4b317d
 MD5 21f3fb3ae8a11de39ae754c915f6ab0a funnyboat-1.3.ebuild 879
 RMD160 b6e165c9fb3bf6739b73319b9d9a2c8f8e3582da funnyboat-1.3.ebuild 879
 SHA256 b58f805e2a98812999a23912526931e2165d4fde486b4b883c5325834e4b317d funnyboat-1.3.ebuild 879
-EBUILD funnyboat-1.4.ebuild 872 RMD160 7f54242a27a53f9142e0b59103fc59ebf23e3cc7 SHA1 20f51564aa02c12293c6866e214899fb0902887b SHA256 ef2d15188e64f4cda9c8c8015aed2ff0e9ccd463a9e190818d01bf41324cc451
-MD5 662981138891c59b95814c46aa74e9b6 funnyboat-1.4.ebuild 872
-RMD160 7f54242a27a53f9142e0b59103fc59ebf23e3cc7 funnyboat-1.4.ebuild 872
-SHA256 ef2d15188e64f4cda9c8c8015aed2ff0e9ccd463a9e190818d01bf41324cc451 funnyboat-1.4.ebuild 872
-MISC ChangeLog 1029 RMD160 c397256076968a33aa9e99bd6b4e595b794ef237 SHA1 08431d8a604b51377e5fad41eb1172843bb74f22 SHA256 55adfcb1df21241586b5587e4dc1a73cb1a7b773698b6f04034bc4cabc7830ae
-MD5 fb54c1a5ec76aa775593dba26c52a947 ChangeLog 1029
-RMD160 c397256076968a33aa9e99bd6b4e595b794ef237 ChangeLog 1029
-SHA256 55adfcb1df21241586b5587e4dc1a73cb1a7b773698b6f04034bc4cabc7830ae ChangeLog 1029
+EBUILD funnyboat-1.4.ebuild 815 RMD160 c147627e76c439b45e5a685f39a196823c5a7df9 SHA1 f20d83ce6bc8143f994bd993c47a5a5ad1e5ef0e SHA256 2adda7c71f790d4b5bb9d8076e94fd1ac4bedc076d4961c23fade0bfd26070a6
+MD5 28f08a5a919391c9aa77f82819a079a3 funnyboat-1.4.ebuild 815
+RMD160 c147627e76c439b45e5a685f39a196823c5a7df9 funnyboat-1.4.ebuild 815
+SHA256 2adda7c71f790d4b5bb9d8076e94fd1ac4bedc076d4961c23fade0bfd26070a6 funnyboat-1.4.ebuild 815
+MISC ChangeLog 1157 RMD160 30502200ab6aa9ee41b74efcd2aba25eaf9d4bda SHA1 1f81a492779554f19b7db026a619bc4de2f726a3 SHA256 324c854c87590d475fb16f5001f867386e85ec6d877cab4ae739e82419e69353
+MD5 4e902119064c5b78da2a3923bfc5c511 ChangeLog 1157
+RMD160 30502200ab6aa9ee41b74efcd2aba25eaf9d4bda ChangeLog 1157
+SHA256 324c854c87590d475fb16f5001f867386e85ec6d877cab4ae739e82419e69353 ChangeLog 1157
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +22,3 @@ SHA256 88a5cca30697debaee1b240ca6afcc4789414393666aa18766df69027cd6a472 files/di
 MD5 0bd1ca5f14e5548e77ea905a72008f6f files/digest-funnyboat-1.4 244
 RMD160 cae23541f500ffd5c5cd4621f8276dc5b777d42c files/digest-funnyboat-1.4 244
 SHA256 cc98f6714d26cf5654877448ec8adb4ba0a7fa3935dad97850ecd36251333e18 files/digest-funnyboat-1.4 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFyvjLdz7hIScOURERAiX8AKCl9PfsXIWq2+wlJcJbx+tmTXrbfACg9n+/
-y46wGkVPbEyQvAmPOmut1tE=
-=Kqe0
------END PGP SIGNATURE-----
diff --git a/games-arcade/funnyboat/funnyboat-1.4.ebuild b/games-arcade/funnyboat/funnyboat-1.4.ebuild
index 8ef939ebfacf..76efa729572d 100644
--- a/games-arcade/funnyboat/funnyboat-1.4.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/funnyboat-1.4.ebuild,v 1.1 2007/02/08 10:17:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/funnyboat/funnyboat-1.4.ebuild,v 1.2 2007/03/18 06:47:06 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -8,9 +8,9 @@ DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
 HOMEPAGE="http://funnyboat.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2 CCPL-Attribution-2.5 CCPL-Attribution-NonCommercial-NoDerivs-2.0"
+LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pygame-1.6.2"
-- 
2.26.2