more KEYWORDS and misc cleanups

Package-Manager: portage-2.1.1_pre2-r8

44 files changed, 236 insertions, 234 deletions

diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
index 09d8ae403150..1b443ddbb81f 100644
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild,v 1.8 2006/02/13 13:21:38 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild,v 1.9 2006/07/17 04:55:20 vapier Exp $
 
 MY_P="fortune-mod-at.linux-${PV}"
-
 DESCRIPTION="Quotes from at.linux"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-src_install () {
-	cd "${S}"
+src_install() {
 	insinto /usr/share/fortune
-	doins at.linux at.linux.dat
+	doins at.linux at.linux.dat || die
 }
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
index eab85e054cfd..6942fba59282 100644
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild,v 1.9 2005/08/27 17:57:57 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild,v 1.10 2006/07/17 04:55:38 vapier Exp $
 
 DESCRIPTION="Excuses from Bastard Operator from Hell"
 HOMEPAGE="http://www.stlim.net/staticpages/index.php?page=20020814005536450"
@@ -8,14 +8,14 @@ SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${PN/mod-/}"
+S=${WORKDIR}/${PN/mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins bofh-excuses.dat bofh-excuses
+	doins bofh-excuses.dat bofh-excuses || die
 }
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
index 54e6b161d6bc..51799c1b35b2 100644
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild,v 1.9 2005/08/27 17:58:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild,v 1.10 2006/07/17 04:55:55 vapier Exp $
 
 DESCRIPTION="Quotes from Calvin and Hobbes Comic Books"
 HOMEPAGE="http://www.netmeister.org/misc.html"
@@ -8,12 +8,12 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
 src_install() {
 	insinto /usr/share/fortune
-	doins calvin calvin.dat
+	doins calvin calvin.dat || die
 }
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
index 277ab7ac9f70..51477aca2b63 100644
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild,v 1.3 2006/02/11 20:24:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild,v 1.4 2006/07/17 04:56:12 vapier Exp $
 
 DESCRIPTION="Chuck Norris Facts"
 HOMEPAGE="http://www.k-lug.org/~kessler/cn.html"
@@ -8,14 +8,14 @@ SRC_URI="http://www.k-lug.org/~kessler/chucknorris.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${PN/mod-/}"
+S=${WORKDIR}/${PN/mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins chucknorris chucknorris.dat
+	doins chucknorris chucknorris.dat || die
 }
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
index 43fab86f38fb..2f5a411b2500 100644
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild,v 1.5 2005/08/27 17:59:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild,v 1.6 2006/07/17 04:56:29 vapier Exp $
 
 DESCRIPTION="Database of the Czech and Slovak cookies for the fortune(6) program"
 HOMEPAGE="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/"
@@ -8,12 +8,12 @@ SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${P/-mod/}"
+S=${WORKDIR}/${P/-mod/}
 
 src_unpack() {
 	unpack ${A}
@@ -23,9 +23,7 @@ src_unpack() {
 
 src_compile() {
 	local f
-
-	for f in [[:lower:]]*
-	do
+	for f in [[:lower:]]* ; do
 		strfile -s ${f} || die "strfile ${f} failed"
 	done
 }
diff --git a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
index fe5453038cf1..9869ae597f80 100644
--- a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
+++ b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild,v 1.6 2005/08/27 17:59:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild,v 1.7 2006/07/17 04:56:47 vapier Exp $
 
 MY_PN=${PN/mod-/}
 DESCRIPTION="Quotation's by several people (mostly from Slovakia)"
@@ -9,14 +9,14 @@ SRC_URI="http://megac.info/fortune-debilneho.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${MY_PN}"
+S=${WORKDIR}/${MY_PN}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins debilneho debilneho.dat
+	doins debilneho debilneho.dat || die
 }
diff --git a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
index a33806930d29..bb52e64d7138 100644
--- a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
+++ b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild,v 1.4 2005/08/27 18:00:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild,v 1.5 2006/07/17 04:57:04 vapier Exp $
 
 DESCRIPTION="Quotes from George W. Bush"
 HOMEPAGE="http://dubya.seiler.us/"
@@ -8,14 +8,14 @@ SRC_URI="http://seiler.us/wiki/images/8/8c/Dubya-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${PN/fortune-mod-/}"
+S=${WORKDIR}/${PN/fortune-mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins dubya dubya.dat
+	doins dubya dubya.dat || die
 }
diff --git a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
index bbb497ded351..36297d9983a3 100644
--- a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
+++ b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild,v 1.6 2005/08/27 18:00:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild,v 1.7 2006/07/17 04:57:21 vapier Exp $
 
 MY_P=${PN}-quotes.${PV}
 DESCRIPTION="Quotes from Frank Herbert's Dune Chronicles"
@@ -9,14 +9,14 @@ SRC_URI="http://dune.s31.pl/${MY_P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins *
+	doins * || die
 }
diff --git a/games-misc/fortune-mod-familyguy/files/digest-fortune-mod-familyguy-0.1 b/games-misc/fortune-mod-familyguy/files/digest-fortune-mod-familyguy-0.1
index 16e822dd9e23..49e927bfd839 100644
--- a/games-misc/fortune-mod-familyguy/files/digest-fortune-mod-familyguy-0.1
+++ b/games-misc/fortune-mod-familyguy/files/digest-fortune-mod-familyguy-0.1
@@ -1 +1,3 @@
 MD5 caa4b7f9d5fbad9a8678032e85c94bae fortune-mod-familyguy-0.1.tar.gz 37591
+RMD160 b55a15815f153bbc395fa4b70e2e4c9a0f0ddd8f fortune-mod-familyguy-0.1.tar.gz 37591
+SHA256 fd0c99589e1744bfb05d8bae28123e655f1f4030aa6b434d6abb577979bcdd11 fortune-mod-familyguy-0.1.tar.gz 37591
diff --git a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild
index 308f85a20629..6114681eea5c 100644
--- a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild
+++ b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild,v 1.3 2005/08/27 18:01:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.1.ebuild,v 1.4 2006/07/17 04:57:38 vapier Exp $
 
 DESCRIPTION="Quotes from the TV-Series -Family Guy-"
 HOMEPAGE="http://jon.oberheide.org/projects/familyguy/"
@@ -8,12 +8,12 @@ SRC_URI="http://jon.oberheide.org/projects/familyguy/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
 src_install() {
 	insinto /usr/share/fortune
-	doins familyguy familyguy.dat
+	doins familyguy familyguy.dat || die
 }
diff --git a/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-1.5 b/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-1.5
index 9c082c0f1d5c..1b469adc6b4e 100644
--- a/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-1.5
+++ b/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-1.5
@@ -1 +1,3 @@
 MD5 9af2a89158cd340dd0986d77e10e5b37 fortune-mod-firefly-1.5.tgz 20738
+RMD160 688339f442f89f9e4ab0a46c598a8ca49f67c046 fortune-mod-firefly-1.5.tgz 20738
+SHA256 c848992f57e3768b37c9776022ce7fb3a1a063df78ec1abeb908a1f0d153a36b fortune-mod-firefly-1.5.tgz 20738
diff --git a/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-2.0 b/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-2.0
index e8c300416848..bbd72b791dc5 100644
--- a/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-2.0
+++ b/games-misc/fortune-mod-firefly/files/digest-fortune-mod-firefly-2.0
@@ -1 +1,3 @@
 MD5 4d414a71d11bcf5927430a65920416b0 fortune-firefly-2.0.zip 37616
+RMD160 93d4578546bbdd5685a7910504952f17db3691b3 fortune-firefly-2.0.zip 37616
+SHA256 79929b81ae930659683f0230bb17f3f4b7bf13bdbf4a14b0267d8f8fc7daf135 fortune-firefly-2.0.zip 37616
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild
index 04debedb4aa2..3156396aa0ef 100644
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild
+++ b/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild,v 1.1 2005/10/03 22:31:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-firefly/fortune-mod-firefly-1.5.ebuild,v 1.2 2006/07/17 04:57:58 vapier Exp $
 
 DESCRIPTION="Quotes from FireFly"
 HOMEPAGE="http://www.daughtersoftiresias.org/progs/firefly/"
@@ -8,14 +8,14 @@ SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P}.tgz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins firefly firefly.dat
+	doins firefly firefly.dat || die
 }
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild
index 77168a1db49e..00e2df08a263 100644
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild
+++ b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild,v 1.1 2005/11/15 00:10:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.0.ebuild,v 1.2 2006/07/17 04:57:58 vapier Exp $
 
 DESCRIPTION="Quotes from FireFly"
 HOMEPAGE="http://www.daughtersoftiresias.org/progs/firefly/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P/mod-}.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
index ac787fa98646..1338a7ffa69f 100644
--- a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
+++ b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild,v 1.9 2005/08/27 18:01:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild,v 1.10 2006/07/17 04:58:15 vapier Exp $
 
 DESCRIPTION="Quotes from the TV-Series -Futurama-"
 HOMEPAGE="http://www.netmeister.org/misc.html"
@@ -8,12 +8,12 @@ SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
 src_install() {
 	insinto /usr/share/fortune
-	doins futurama futurama.dat
+	doins futurama futurama.dat || die
 }
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
index 646278719bd2..d3638b6a555f 100644
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild,v 1.9 2006/07/08 08:13:51 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild,v 1.10 2006/07/17 04:58:33 vapier Exp $
 
 DESCRIPTION="Quotes from Felix von Leitner (fefe)"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
@@ -8,12 +8,12 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins fvl fvl.dat
+	doins fvl fvl.dat || die
 }
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild
index 37338068cad6..eddd364bb386 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild,v 1.3 2006/05/28 16:01:15 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050106.ebuild,v 1.4 2006/07/17 04:58:51 vapier Exp $
 
 DESCRIPTION="Fortune database of #gentoo-dev quotes"
 HOMEPAGE="http://oppresses.us/~avenj/index.html"
@@ -8,20 +8,19 @@ SRC_URI="http://raider.blackcobalt.net/~avenj/files/gentoo-dev-${PV}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_compile () {
-	mv gentoo-dev-${PV} gentoo-dev
-	strfile gentoo-dev
+src_compile() {
+	mv gentoo-dev-${PV} gentoo-dev || die
+	strfile gentoo-dev || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins gentoo-dev gentoo-dev.dat
+	doins gentoo-dev gentoo-dev.dat || die
 }
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild
index 3540608e314e..fb6e9f3c3b69 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild,v 1.4 2006/05/28 16:01:15 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20050503.ebuild,v 1.5 2006/07/17 04:58:51 vapier Exp $
 
 DESCRIPTION="Fortune database of #gentoo-dev quotes"
 HOMEPAGE="http://oppresses.us/~avenj/index.html"
@@ -8,20 +8,19 @@ SRC_URI="http://raider.blackcobalt.net/~avenj/files/gentoo-dev-${PV}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_compile () {
-	mv gentoo-dev-${PV} gentoo-dev
-	strfile gentoo-dev
+src_compile() {
+	mv gentoo-dev-${PV} gentoo-dev || die
+	strfile gentoo-dev || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins gentoo-dev gentoo-dev.dat
+	doins gentoo-dev gentoo-dev.dat || die
 }
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild
index 166ab02ad3c6..98a79f203163 100644
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild
+++ b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild,v 1.2 2006/05/28 16:01:15 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20051222.ebuild,v 1.3 2006/07/17 04:58:51 vapier Exp $
 
 DESCRIPTION="Fortune database of #gentoo-dev quotes"
 HOMEPAGE="http://oppresses.us/~avenj/index.html"
@@ -8,20 +8,19 @@ SRC_URI="http://raider.blackcobalt.net/~avenj/files/gentoo-dev-${PV}.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_compile () {
-	mv gentoo-dev-${PV} gentoo-dev
-	strfile gentoo-dev
+src_compile() {
+	mv gentoo-dev-${PV} gentoo-dev || die
+	strfile gentoo-dev || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins gentoo-dev gentoo-dev.dat
+	doins gentoo-dev gentoo-dev.dat || die
 }
diff --git a/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20040922 b/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20040922
index 9731d9e7fa37..73067c622cef 100644
--- a/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20040922
+++ b/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20040922
@@ -1,2 +1,4 @@
 MD5 8e580d3dcfca5898f9970b4e0055ccfe gentoo-forums-20040922.gz 7904
+RMD160 ee550d8f4b112f598ca2958341d4170c14781378 gentoo-forums-20040922.gz 7904
+SHA256 2749ad39ea6eef35f3e26553e5db5143089908ffc71b7c6bde61b382fe28992a gentoo-forums-20040922.gz 7904
 MD5 155978e482259ab1fcbab903f72c37c4 gentoo-forums-offensive-20040922.gz 1416
diff --git a/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20041207 b/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20041207
index b231dfd97a5c..e166fad2d87a 100644
--- a/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20041207
+++ b/games-misc/fortune-mod-gentoo-forums/files/digest-fortune-mod-gentoo-forums-20041207
@@ -1,2 +1,4 @@
 MD5 cdffecfdf95dbe7572dcef25ee865881 gentoo-forums-20041207.gz 8809
+RMD160 004d4b9f335a6df6924c5b23815a57bf98d5d190 gentoo-forums-20041207.gz 8809
+SHA256 d6cababfefde07a250d043416488bcb4a0298c4aae1ecc4fc4f55755653c5f72 gentoo-forums-20041207.gz 8809
 MD5 3cd369dc54648eaad6ab27e033a82ae5 gentoo-forums-offensive-20041207.gz 1510
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild
index aff975b6081b..9f37c5456ee3 100644
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild
+++ b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild,v 1.8 2005/01/09 10:51:34 swegener Exp $
-
-IUSE="offensive"
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20040922.ebuild,v 1.9 2006/07/17 04:59:11 vapier Exp $
 
 DESCRIPTION="Fortune database of quotes from forums.gentoo.org"
 HOMEPAGE="http://forums.gentoo.org/"
@@ -11,19 +9,20 @@ SRC_URI="http://dev.gentoo.org/~squinky86/files/gentoo-forums-${PV}.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64 hppa sparc mips alpha"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_compile () {
-	mv gentoo-forums-${PV} gentoo-forums
+src_compile() {
+	mv gentoo-forums-${PV} gentoo-forums || die
 	use offensive && cat gentoo-forums-offensive-${PV} >> gentoo-forums
-	strfile gentoo-forums
+	strfile gentoo-forums || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins gentoo-forums gentoo-forums.dat
+	doins gentoo-forums gentoo-forums.dat || die
 }
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
index 8930fe88575a..a1280251cb93 100644
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
+++ b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild,v 1.5 2005/09/11 05:20:45 agriffis Exp $
-
-IUSE="offensive"
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild,v 1.6 2006/07/17 04:59:11 vapier Exp $
 
 DESCRIPTION="Fortune database of quotes from forums.gentoo.org"
 HOMEPAGE="http://forums.gentoo.org/"
@@ -11,19 +9,20 @@ SRC_URI="http://dev.gentoo.org/~squinky86/files/gentoo-forums-${PV}.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_compile () {
-	mv gentoo-forums-${PV} gentoo-forums
+src_compile() {
+	mv gentoo-forums-${PV} gentoo-forums || die
 	use offensive && cat gentoo-forums-offensive-${PV} >> gentoo-forums
-	strfile gentoo-forums
+	strfile gentoo-forums || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins gentoo-forums gentoo-forums.dat
+	doins gentoo-forums gentoo-forums.dat || die
 }
diff --git a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
index 8fc18914c557..9272cf77d272 100644
--- a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
+++ b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild,v 1.9 2005/08/27 18:03:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild,v 1.10 2006/07/17 04:59:29 vapier Exp $
 
 MY_P=${PN/-mod/}
 DESCRIPTION="Quotes from Hitchhikers Guide to the Galaxy"
@@ -9,14 +9,14 @@ SRC_URI="http://www.splitbrain.org/Fortunes/hitchhiker/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins hitchhiker hitchhiker.dat
+	doins hitchhiker hitchhiker.dat || die
 }
diff --git a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
index 7a32542bd781..419ff2e8cd0c 100644
--- a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
+++ b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild,v 1.9 2005/08/27 18:03:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild,v 1.10 2006/07/17 04:59:48 vapier Exp $
 
 DESCRIPTION="Quotes from Homer Simpson"
 HOMEPAGE="http://www.cs.indiana.edu/~crcarter/homer/homer.html"
@@ -8,14 +8,14 @@ SRC_URI="http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${PN/mod-/}"
+S=${WORKDIR}/${PN/mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins homer homer.dat
+	doins homer homer.dat || die
 }
diff --git a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
index 69afafa1bcb8..7b71862f40d6 100644
--- a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
+++ b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild,v 1.9 2005/08/27 18:04:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild,v 1.10 2006/07/17 05:00:05 vapier Exp $
 
 MY_P=${P/fortune-mod-/}
 DESCRIPTION="Extra fortune cookies for fortune"
@@ -9,15 +9,15 @@ SRC_URI="http://humorix.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins humorix-misc humorix-misc.dat
-	doins humorix-stories humorix-stories.dat
+	doins humorix-misc humorix-misc.dat || die
+	doins humorix-stories humorix-stories.dat || die
 }
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild
index e3ff31ffd2cb..5b67dbb433b1 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild,v 1.3 2004/10/03 21:31:42 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-it/fortune-mod-it-1.51.ebuild,v 1.4 2006/07/17 05:00:23 vapier Exp $
 
 DESCRIPTION="Database of the Italian cookies for the fortune program"
 HOMEPAGE="http://www.orson.it/~fedeliallalinea/"
@@ -8,29 +8,28 @@ SRC_URI="http://www.orson.it/~fedeliallalinea/files/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${P}/src"
+S=${WORKDIR}/${P}/src
 
 src_unpack() {
 	unpack ${A}
-	use offensive || rm -f "${S}/zozzital"
+	cd "${S}"
+	use offensive || rm -f zozzital
 }
 
 src_compile() {
 	local f
-
-	for f in *
-	do
+	for f in * ; do
 		strfile -s ${f} || die "strfile ${f} failed"
 	done
 }
 
 src_install() {
-	dodir /usr/share/fortune
-	cp * "${D}/usr/share/fortune" || die "cp failed"
+	insinto /usr/share/fortune
+	doins * || die "cp failed"
 	dodoc ../README
 }
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
index 19703704dc42..210d420582cd 100644
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild,v 1.4 2005/08/27 18:04:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild,v 1.5 2006/07/17 05:00:23 vapier Exp $
 
 DESCRIPTION="Database of the Italian cookies for the fortune program"
 HOMEPAGE="http://www.fortune-it.net/"
@@ -8,12 +8,12 @@ SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/fortune-it-${PVR}"
+S=${WORKDIR}/fortune-it-${PVR}
 
 src_unpack() {
 	unpack ${A}
@@ -28,7 +28,7 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/share/fortune
-	cp ${S}/testi/* "${D}"/usr/share/fortune || die "cp failed"
+	insinto /usr/share/fortune
+	doins testi/* || die "cp failed"
 	dodoc README
 }
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild
index b2ec4eb65a39..437be46754d6 100644
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild
+++ b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild,v 1.5 2005/08/27 18:05:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-8.ebuild,v 1.6 2006/07/17 05:00:40 vapier Exp $
 
 inherit eutils
 
@@ -10,12 +10,12 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/kernelcookies-${PV}"
+S=${WORKDIR}/kernelcookies-${PV}
 
 src_unpack() {
 	unpack ${A}
@@ -23,12 +23,12 @@ src_unpack() {
 	# bug #64985
 	if ! use offensive ; then
 		rm -f *.dat
-		epatch "${FILESDIR}/${PV}-offensive.patch"
-		strfile -s kernelcookies
+		epatch "${FILESDIR}"/${PV}-offensive.patch
+		strfile -s kernelcookies || die
 	fi
 }
 
 src_install() {
 	insinto /usr/share/fortune
-	doins kernelcookies.dat kernelcookies
+	doins kernelcookies.dat kernelcookies || die
 }
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
index 87aa89c83922..c3fc6a80512e 100644
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild,v 1.11 2005/08/27 18:06:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild,v 1.12 2006/07/17 05:01:01 vapier Exp $
 
 inherit eutils
 
@@ -10,20 +10,20 @@ SRC_URI="http://www.dibona.com/opensources/osfortune.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/spelling.patch"
-	strfile osfortune
+	epatch "${FILESDIR}"/spelling.patch
+	strfile osfortune || die
 }
 
 src_install() {
 	insinto /usr/share/fortune
-	doins osfortune osfortune.dat
+	doins osfortune osfortune.dat || die
 }
diff --git a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
index 7905c233621f..56ffd27b57a9 100644
--- a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
+++ b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild,v 1.1 2005/12/20 21:45:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild,v 1.2 2006/07/17 05:01:19 vapier Exp $
 
 MY_PN=powerpuff
 DESCRIPTION="Quotes taken from the Power Puff Girls series from Cartoon Network"
@@ -9,14 +9,14 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
 S=${WORKDIR}/${MY_PN}-${PV}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins powerpuff powerpuff.dat
+	doins powerpuff powerpuff.dat || die
 }
diff --git a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
index ccdbc789ecec..fc63bb192a73 100644
--- a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
+++ b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild,v 1.4 2005/10/17 16:02:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild,v 1.5 2006/07/17 05:01:37 vapier Exp $
 
 DESCRIPTION="Fortune database of Terry Pratchett's Discworld related quotes"
 HOMEPAGE="http://www.lspace.org/"
@@ -8,25 +8,25 @@ SRC_URI="http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
-src_unpack () {
-	cp "${DISTDIR}/${A}" "${S}/pqf-${PV}"
+src_unpack() {
+	cp "${DISTDIR}"/${A} "${S}"/pqf-${PV}
 }
 
-src_compile () {
+src_compile() {
 	uniq "pqf-${PV}" | sed 's/^$/\%/g' > pqf
 	echo "%" >> pqf
 	rm "pqf-${PV}"
-	strfile -r pqf
+	strfile -r pqf || die
 }
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins pqf pqf.dat
+	doins pqf pqf.dat || die
 }
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
index b6c9a4c361e7..7b014d025575 100644
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild,v 1.5 2005/07/31 14:36:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild,v 1.6 2006/07/17 05:01:54 vapier Exp $
 
 DESCRIPTION="Fortune database of Robin S. Socha quotes"
 HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
@@ -8,12 +8,12 @@ SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha hppa ppc ~ppc64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-src_install () {
+src_install() {
 	insinto /usr/share/fortune
-	doins rss rss.dat
+	doins rss rss.dat || die
 }
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
index 01695af542dc..d00f4f0b257f 100644
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild,v 1.9 2005/08/27 18:06:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild,v 1.10 2006/07/17 05:02:13 vapier Exp $
 
 DESCRIPTION="Quotes from Bart Simpson's Chalkboard, shown at the opening of each Simpsons episode"
 HOMEPAGE="http://www.splitbrain.org/index.php?x=.%2FFortunes%2Fsimpsons"
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/Fortunes/simpsons/fortune-simpsons-chalkboard
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
@@ -17,5 +17,5 @@ S=${WORKDIR}/${PN/mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins chalkboard chalkboard.dat
+	doins chalkboard chalkboard.dat || die
 }
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild
index 1861116f5ee8..1deb6c6b04a5 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild,v 1.1 2005/10/11 07:17:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.10.ebuild,v 1.2 2006/07/17 05:02:30 vapier Exp $
 
 MY_PN=slack-fortunes-all
 DESCRIPTION="This fortune mod is a collection of quotes seen on AOLS (Slackware)"
@@ -9,10 +9,10 @@ SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
 S=${WORKDIR}
 
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild
index bd371504e054..1c1c2e1e5700 100644
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild
+++ b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild,v 1.1 2006/03/15 20:42:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.12.ebuild,v 1.2 2006/07/17 05:02:30 vapier Exp $
 
 # this ebuild now uses the offensive flag since AOLS
 # is not exactly 'G' rated :)
@@ -12,18 +12,18 @@ SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE="offensive"
 
-DEPEND="games-misc/fortune-mod"
+RDEPEND="games-misc/fortune-mod"
 
 S=${WORKDIR}
 
 pkg_setup() {
 	if ! use offensive ; then
-	  einfo "These fortunes have offensive content. Enable offensive USE Flag"
-	  einfo "ex: USE=\"offensive\" emerge ${PN}"
-	  exit 1
+		einfo "These fortunes have offensive content. Enable offensive USE Flag"
+		einfo "ex: USE=\"offensive\" emerge ${PN}"
+		exit 1
 	fi
 }
 
diff --git a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
index e219145d7464..09c681e52f4a 100644
--- a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
+++ b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild,v 1.10 2005/08/27 18:07:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild,v 1.11 2006/07/17 05:02:48 vapier Exp $
 
 DESCRIPTION="Quotes from the Alpha Centauri: Alien Crossfire tech tree"
 HOMEPAGE="http://homepages.ihug.com.au/~alana/"
@@ -8,12 +8,12 @@ SRC_URI="http://homepages.ihug.com.au/~alana/files/fortune-mod-smac/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
 src_install() {
 	insinto /usr/share/fortune
-	doins smac smac.dat
+	doins smac smac.dat || die
 }
diff --git a/games-misc/fortune-mod-sp-fortunes/files/digest-fortune-mod-sp-fortunes-0.2 b/games-misc/fortune-mod-sp-fortunes/files/digest-fortune-mod-sp-fortunes-0.2
index ac09e094b660..cd71fdf62aa7 100644
--- a/games-misc/fortune-mod-sp-fortunes/files/digest-fortune-mod-sp-fortunes-0.2
+++ b/games-misc/fortune-mod-sp-fortunes/files/digest-fortune-mod-sp-fortunes-0.2
@@ -1 +1,3 @@
 MD5 1eed67e6ff7513d1f28369b66d551ada SP-0.2.tar.gz 11093
+RMD160 61349cd93f6540cad98d771519c7d7786f74ff69 SP-0.2.tar.gz 11093
+SHA256 697a6d937d6674304fcb180e07c4801d2cb98d0e866c38091e10940c3a9f74d3 SP-0.2.tar.gz 11093
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild
index ab8bc06e7716..87c8c834948e 100644
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild
+++ b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild,v 1.10 2005/08/27 18:07:53 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.1.ebuild,v 1.11 2006/07/17 05:03:06 vapier Exp $
 
 MY_P=${P/fortune-mod-sp-fortunes/SP}
 MY_PN=${PN/fortune-mod-sp-fortunes/SP}
@@ -10,7 +10,7 @@ SRC_URI="http://eol.init1.nl/img/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
@@ -19,5 +19,5 @@ S=${WORKDIR}/${MY_PN}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins SP SP.dat
+	doins SP SP.dat || die
 }
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
index 9d7ba2ffee32..25d38ec333df 100644
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
+++ b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild,v 1.1 2005/10/13 00:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild,v 1.2 2006/07/17 05:03:06 vapier Exp $
 
 MY_P=${P/fortune-mod-sp-fortunes/SP}
 MY_PN=${PN/fortune-mod-sp-fortunes/SP}
@@ -10,7 +10,7 @@ SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
diff --git a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
index be548ef147dc..b0ac4bd8a5ce 100644
--- a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
+++ b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild,v 1.9 2005/08/27 18:08:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild,v 1.10 2006/07/17 05:03:24 vapier Exp $
 
 DESCRIPTION="Quotes from StarWars, The Empire Strikes Back, and Return of the Jedi"
 HOMEPAGE="http://www.splitbrain.org/index.php?x=.%2FFortunes%2Fstarwars"
@@ -8,7 +8,7 @@ SRC_URI="http://www.splitbrain.org/Fortunes/starwars/fortune-starwars.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
@@ -17,5 +17,5 @@ S=${WORKDIR}/${PN/mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins starwars starwars.dat
+	doins starwars starwars.dat || die
 }
diff --git a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
index 6bd075c7187a..e643102ccbf9 100644
--- a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
+++ b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild,v 1.4 2005/08/27 18:09:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild,v 1.5 2006/07/17 05:03:41 vapier Exp $
 
 DESCRIPTION="Quotes from Dr. Strangelove"
 HOMEPAGE="http://seiler.us/wiki/index.php/Strangelove"
@@ -8,14 +8,14 @@ SRC_URI="http://seiler.us/wiki/images/4/48/Strangelove_${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
-S="${WORKDIR}/${PN/fortune-mod-/}"
+S=${WORKDIR}/${PN/fortune-mod-/}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins strangelove strangelove.dat
+	doins strangelove strangelove.dat || die
 }
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
index 5e4356ce8fae..2d855d044966 100644
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild,v 1.10 2005/08/27 18:09:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild,v 1.11 2006/07/17 05:03:59 vapier Exp $
 
 MY_PN=${PN/mod-/}
 DESCRIPTION="set of fortunes based on the Tao-Teh-Ching"
@@ -9,7 +9,7 @@ SRC_URI="http://aboleo.net/software/misc/${MY_PN}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
@@ -18,5 +18,5 @@ S=${WORKDIR}/${MY_PN}
 
 src_install() {
 	insinto /usr/share/fortune
-	doins tao tao.dat
+	doins tao tao.dat || die
 }
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
index def396a31991..7d2823ab1e9d 100644
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
+++ b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild,v 1.4 2005/08/27 18:10:11 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild,v 1.5 2006/07/17 05:04:17 vapier Exp $
 
 MY_P="fortunes-zx-error-${PV}"
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Sinclair ZX Spectrum BASIC error Fortunes"
 HOMEPAGE="http://melkor.dnp.fmph.uniba.sk/~garabik/fortunes-zx-error.html"
 SRC_URI="http://melkor.dnp.fmph.uniba.sk/~garabik/fortunes-zx-error/${MY_P}.tar.gz"
 
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND="games-misc/fortune-mod"
 
+S=${WORKDIR}/${MY_P}
+
 src_install() {
-	cp zx/error zx-error
-	cp zx/error.dat zx-error.dat
 	insinto /usr/share/fortune
-	doins zx-error zx-error.dat
+	newins zx/error zx-error || die
+	newins zx/error.dat zx-error.dat || die
 	dodoc README
 }