Source Mage code commit list

[Eric Sandall <scm AT mail.sourcemage.org>]

GIT changes to master games grimoire by Eric Sandall 
<sandalle AT sourcemage.org>:

 ChangeLog                                    |   28 +++++++++---------
 edutainment/celestia/HISTORY                 |    4 +-
 edutainment/tuxmath/HISTORY                  |    6 +--
 edutainment/tuxpaint/HISTORY                 |    4 +-
 edutainment/tuxtype/HISTORY                  |   10 +++---
 edutainment/xpenguins-applet/HISTORY         |    2 -
 edutainment/xpenguins/HISTORY                |    2 -
 edutainment/xpenguins_themes/HISTORY         |    2 -
 games-arcade-2d/abe/HISTORY                  |    6 +--
 games-arcade-2d/abuse_sdl/HISTORY            |    4 +-
 games-arcade-2d/armagetronad/HISTORY         |    2 -
 games-arcade-2d/blobwars/HISTORY             |    2 -
 games-arcade-2d/bumprace/HISTORY             |    4 +-
 games-arcade-2d/chromium/HISTORY             |    4 +-
 games-arcade-2d/circuslinux/HISTORY          |    2 -
 games-arcade-2d/clanbomber/HISTORY           |    2 -
 games-arcade-2d/copter-commander/HISTORY     |    2 -
 games-arcade-2d/crack-attack/HISTORY         |    2 -
 games-arcade-2d/criticalmass/HISTORY         |    6 +--
 games-arcade-2d/cuyo/HISTORY                 |    2 -
 games-arcade-2d/dopewars/HISTORY             |    4 +-
 games-arcade-2d/fbg/HISTORY                  |    8 ++---
 games-arcade-2d/football-manager/HISTORY     |    4 +-
 games-arcade-2d/frozen-bubble/HISTORY        |    8 ++---
 games-arcade-2d/gltron/HISTORY               |    6 +--
 games-arcade-2d/gtetrinet/HISTORY            |   12 +++----
 games-arcade-2d/hedgewars/HISTORY            |    2 -
 games-arcade-2d/jumpnbump/HISTORY            |    4 +-
 games-arcade-2d/kobodeluxe/HISTORY           |    6 +--
 games-arcade-2d/lbreakout2/HISTORY           |   14 ++++-----
 games-arcade-2d/liquidwar/HISTORY            |   12 +++----
 games-arcade-2d/luola/HISTORY                |   22 +++++++-------
 games-arcade-2d/maelstrom/HISTORY            |    6 +--
 games-arcade-2d/moon-lander/HISTORY          |    2 -
 games-arcade-2d/nil/HISTORY                  |    2 -
 games-arcade-2d/njam/HISTORY                 |    2 -
 games-arcade-2d/penguin-command/HISTORY      |    4 +-
 games-arcade-2d/pinball/HISTORY              |    8 ++---
 games-arcade-2d/pingus/HISTORY               |    2 -
 games-arcade-2d/rockdodger/HISTORY           |    6 +--
 games-arcade-2d/rocksndiamonds/HISTORY       |    2 -
 games-arcade-2d/rtts/HISTORY                 |    4 +-
 games-arcade-2d/sdlsasteroids/HISTORY        |    4 +-
 games-arcade-2d/supertux/HISTORY             |    2 -
 games-arcade-2d/tong/HISTORY                 |    4 +-
 games-arcade-2d/toppler/HISTORY              |   32 ++++++++++----------
 games-arcade-2d/tuxpuck/HISTORY              |   16 +++++-----
 games-arcade-2d/vectoroids/HISTORY           |    4 +-
 games-arcade-2d/xbill/HISTORY                |    2 -
 games-arcade-2d/xpilot/HISTORY               |    2 -
 games-arcade-2d/xrally/HISTORY               |    2 -
 games-arcade-2d/xrick/HISTORY                |    8 ++---
 games-arcade-2d/xscorch/HISTORY              |    4 +-
 games-arcade-2d/xtux/HISTORY                 |    4 +-
 games-arcade-3d/asteroids3d/HISTORY          |    2 -
 games-arcade-3d/atr3d/HISTORY                |    4 +-
 games-arcade-3d/d2x-engine/HISTORY           |    4 +-
 games-arcade-3d/gav/HISTORY                  |    8 ++---
 games-arcade-3d/glast/HISTORY                |    6 +--
 games-arcade-3d/neverball/HISTORY            |    2 -
 games-arcade-3d/sc2/HISTORY                  |    6 +--
 games-arcade-3d/scorched3d/HISTORY           |    8 ++---
 games-arcade-3d/si3d/HISTORY                 |    2 -
 games-arcade-3d/slune/HISTORY                |    2 -
 games-arcade-3d/trackballs/HISTORY           |    4 +-
 games-arcade-3d/tuxkart/HISTORY              |    4 +-
 games-arcade-3d/tuxracer/HISTORY             |   12 +++----
 games-board/black-box/HISTORY                |    4 +-
 games-board/cgoban/HISTORY                   |    2 -
 games-board/crafty/HISTORY                   |    2 -
 games-board/gnocatan/HISTORY                 |   16 +++++-----
 games-board/gnuchess/HISTORY                 |    2 -
 games-board/gnugo/HISTORY                    |    2 -
 games-board/gtkatlantic/HISTORY              |   14 ++++-----
 games-board/monopd/HISTORY                   |    4 +-
 games-board/pioneers/HISTORY                 |   16 +++++-----
 games-board/tuxmathscrabble/HISTORY          |   10 +++---
 games-board/xboard/HISTORY                   |    4 +-
 games-board/xigc/HISTORY                     |    2 -
 games-board/xscrabble/HISTORY                |    2 -
 games-cards/pysol/HISTORY                    |   14 ++++-----
 games-cards/pysol/pysol                      |    2 -
 games-cards/xskat/HISTORY                    |    4 +-
 games-data/acorn-music/HISTORY               |    2 -
 games-data/crossfire-client-data/HISTORY     |   10 +++---
 games-data/crossfire-data/HISTORY            |    8 ++---
 games-data/fgfs-base/HISTORY                 |    8 ++---
 games-data/freedoom/HISTORY                  |    2 -
 games-data/luola-nostalgia/HISTORY           |    2 -
 games-data/luola-stdlevels/HISTORY           |    2 -
 games-data/mason-media/HISTORY               |    6 +--
 games-data/sear-media/HISTORY                |    2 -
 games-emulators/dgen-sdl/HISTORY             |    2 -
 games-emulators/dosbox/HISTORY               |    2 -
 games-emulators/e-uae/HISTORY                |    2 -
 games-emulators/frotz/HISTORY                |    2 -
 games-emulators/gens/HISTORY                 |    2 -
 games-emulators/gnuboy/HISTORY               |    2 -
 games-emulators/grustibus/HISTORY            |    2 -
 games-emulators/kaf/HISTORY                  |   10 +++---
 games-emulators/scummvm/HISTORY              |    6 +--
 games-emulators/scummvm_tools/HISTORY        |    2 -
 games-emulators/tuxnes/HISTORY               |    4 +-
 games-emulators/uae/HISTORY                  |    2 -
 games-emulators/visualboyadvance/HISTORY     |    2 -
 games-emulators/xmame/HISTORY                |   26 ++++++++--------
 games-emulators/xmess/HISTORY                |    6 +--
 games-emulators/zsnes/HISTORY                |    8 ++---
 games-emulators/zx-fuse/HISTORY              |    4 +-
 games-engines/crystalspace/HISTORY           |    2 -
 games-engines/cyphesis/HISTORY               |   40 ++++++++++++-------------
 games-engines/duke3d-engine/HISTORY          |    2 -
 games-engines/entityforge/HISTORY            |   10 +++---
 games-engines/exult/HISTORY                  |    4 +-
 games-engines/prboom/HISTORY                 |   10 +++---
 games-engines/quake2/HISTORY                 |   10 +++---
 games-engines/quakeforge/HISTORY             |    4 +-
 games-engines/stratagus/HISTORY              |    4 +-
 games-fps/alephone/HISTORY                   |    2 -
 games-fps/bzflag/HISTORY                     |   10 +++---
 games-fps/cube/HISTORY                       |    6 +--
 games-fps/cube/cube_client_bin               |    2 -
 games-fps/cube/cube_server_bin               |    2 -
 games-fps/sauerbraten/HISTORY                |    2 -
 games-fps/sauerbraten/sauerbraten_client_bin |    2 -
 games-fps/sauerbraten/sauerbraten_server_bin |    2 -
 games-ggz/ggz-docs/HISTORY                   |    2 -
 games-ggz/ggz-grubby/HISTORY                 |    2 -
 games-ggz/ggz-gtk-client/HISTORY             |    4 +-
 games-ggz/ggz-gtk-games/HISTORY              |    4 +-
 games-ggz/ggz-kde-client/HISTORY             |    6 +--
 games-ggz/ggz-kde-games/HISTORY              |    6 +--
 games-ggz/ggz-python/HISTORY                 |    2 -
 games-ggz/ggz-sdl-games/HISTORY              |    2 -
 games-ggz/ggz-server/HISTORY                 |    2 -
 games-ggz/ggz-txt-client/HISTORY             |    2 -
 games-ggz/ggz-utils/HISTORY                  |    2 -
 games-libs/allegro/HISTORY                   |   10 +++---
 games-libs/atlas-c++-transitional/HISTORY    |   12 +++----
 games-libs/atlas-c++/HISTORY                 |   32 ++++++++++----------
 games-libs/atlas-python/HISTORY              |    4 +-
 games-libs/blender2cal3d/HISTORY             |    4 +-
 games-libs/cal3d/HISTORY                     |   10 +++---
 games-libs/cal3d_converter/HISTORY           |    2 -
 games-libs/cal3d_data/HISTORY                |    6 +--
 games-libs/cal3d_miniviewer/HISTORY          |    2 -
 games-libs/cel/HISTORY                       |    2 -
 games-libs/clanlib-devel/HISTORY             |   12 +++----
 games-libs/clanlib/HISTORY                   |   14 ++++-----
 games-libs/clanlib6/HISTORY                  |   12 +++----
 games-libs/coal/HISTORY                      |    8 ++---
 games-libs/ember-media/HISTORY               |    2 -
 games-libs/eris-transitional/HISTORY         |   12 +++----
 games-libs/eris/HISTORY                      |   42 
+++++++++++++--------------
 games-libs/grapevine/HISTORY                 |    2 -
 games-libs/janus/HISTORY                     |   10 +++---
 games-libs/libmodelfile/HISTORY              |    4 +-
 games-libs/mercator/HISTORY                  |   18 +++++------
 games-libs/opentnl/HISTORY                   |    2 -
 games-libs/paragui-doc/HISTORY               |    2 -
 games-libs/paragui/HISTORY                   |   14 ++++-----
 games-libs/plib/HISTORY                      |    2 -
 games-libs/sage/HISTORY                      |   14 ++++-----
 games-libs/sdlmm/HISTORY                     |    4 +-
 games-libs/simgear/HISTORY                   |   10 +++---
 games-libs/skstream/HISTORY                  |   20 ++++++------
 games-libs/skstream2/HISTORY                 |    4 +-
 games-libs/varconf/HISTORY                   |    6 +--
 games-libs/varconf2/HISTORY                  |   12 +++----
 games-libs/wfmath/HISTORY                    |   26 ++++++++--------
 games-libs/wfmath2/HISTORY                   |    6 +--
 games-libs/wftk/HISTORY                      |   12 +++----
 games-puzzles/enigma2/HISTORY                |    2 -
 games-rpg-mp/crossfire-client/HISTORY        |    8 ++---
 games-rpg-mp/crossfire/HISTORY               |    8 ++---
 games-rpg-mp/ember/HISTORY                   |   24 +++++++--------
 games-rpg-mp/gnome-mud/HISTORY               |    8 ++---
 games-rpg-mp/sear/HISTORY                    |   28 +++++++++---------
 games-rpg-mp/tinyfugue/HISTORY               |    2 -
 games-rpg-sp/adonthell/HISTORY               |    6 +--
 games-rpg-sp/falconseye/HISTORY              |    6 +--
 games-rpg-sp/freedroidrpg/HISTORY            |    2 -
 games-rpg-sp/glhack/HISTORY                  |   14 ++++-----
 games-rpg-sp/openglad/HISTORY                |    4 +-
 games-rpg-sp/uqm/HISTORY                     |    6 +--
 games-rpg-sp/wastesedge/HISTORY              |    4 +-
 games-rpg-sp/xu4/HISTORY                     |    6 +--
 games-simulation/csmash/HISTORY              |    4 +-
 games-simulation/flightgear/HISTORY          |   12 +++----
 games-simulation/foobillard/HISTORY          |    8 ++---
 games-simulation/searchandrescue/HISTORY     |    8 ++---
 games-simulation/torcs/HISTORY               |   12 +++----
 games-simulation/vegastrike/HISTORY          |    6 +--
 games-strategy-rts/bos/HISTORY               |    2 -
 games-strategy-rts/globulation2/HISTORY      |    6 +--
 games-strategy-rts/openttd/HISTORY           |    4 +-
 games-strategy-tbs/asc/HISTORY               |   10 +++---
 games-strategy-tbs/castle-combat/HISTORY     |    4 +-
 games-strategy-tbs/crimson/HISTORY           |   14 ++++-----
 games-strategy-tbs/freeciv/HISTORY           |   32 ++++++++++----------
 games-strategy-tbs/freelords/HISTORY         |   26 ++++++++--------
 games-strategy-tbs/teg/HISTORY               |    4 +-
 games-strategy-tbs/wesnoth/HISTORY           |    2 -
 games-strategy-tbs/xfrisk/HISTORY            |    4 +-
 games-terminal/beer/HISTORY                  |    2 -
 games-terminal/bsd-games/HISTORY             |    2 -
 games-terminal/fortune/HISTORY               |    2 -
 games-terminal/nethack/HISTORY               |    8 ++---
 games-unmaintained/glants/HISTORY            |    4 +-
 games-unmaintained/ksirk/HISTORY             |    2 -
 games-unmaintained/nij/HISTORY               |    4 +-
 games-unmaintained/nij/README                |    2 -
 games-unmaintained/ssystem/HISTORY           |    4 +-
 games-unmaintained/ttoa/HISTORY              |    4 +-
 games-unmaintained/xpenguins_applet/HISTORY  |    2 -
 games-utils/pstreamer/HISTORY                |    2 -
 games-utils/psychoquery/HISTORY              |    4 +-
 games-utils/psychostats/HISTORY              |    4 +-
 games-utils/qstat/HISTORY                    |   10 +++---
 games-utils/xqf/HISTORY                      |   18 +++++------
 220 files changed, 736 insertions(+), 736 deletions(-)

New commits:
commit 2aa4182bce6d9480dee1810aec83719f1c80df45
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    Change my e-mail address to my @sourcemage.org one

diff --git a/ChangeLog b/ChangeLog
index 81af033..71b3bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -172,13 +172,13 @@
 2006-01-23 Neuron <vlmarek AT volny.cz>
        * games-strategy-rts/singularity: new spell
 
-2005-12-30 Eric Sandall <eric AT sandall.us>
+2005-12-30 Eric Sandall <sandalle AT sourcemage.org>
        * games-rpg-mp/crossfire{,-client}-data: Moved to games-data
 
-2005-12-22 Eric Sandall <eric AT sandall.us>
+2005-12-22 Eric Sandall <sandalle AT sourcemage.org>
        * games-libs/sear-media: Moved to games-data/sear-media
 
-2005-12-21 Eric Sandall <eric AT sandall.us>
+2005-12-21 Eric Sandall <sandalle AT sourcemage.org>
        * games-data/luola-{stdlevels,nostalgia}: Added level packs for luola
 
 2005-12-16 Neuron <vlmarek AT volny.cz>
@@ -206,10 +206,10 @@
        * games-libs/clanlib-devel: to clanlib
        * games-libs/clanlib: branched from clanlib
 
-2005-11-15 Eric Sandall <eric AT sandall.us>
+2005-11-15 Eric Sandall <sandalle AT sourcemage.org>
        * accounts, groups: Sync with test
 
-2005-11-13 Eric Sandall <eric AT sandall.us>
+2005-11-13 Eric Sandall <sandalle AT sourcemage.org>
        * accounts: Sync with test
        * groups: Sync with test
          Added disk:6:, cdrom:24:, and floppy:25:
@@ -217,10 +217,10 @@
 2005-11-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * games-board/quarry: new spell
 
-2005-11-02 Eric Sandall <eric AT sandall.us>
+2005-11-02 Eric Sandall <sandalle AT sourcemage.org>
        * gurus.gpg: Revoked my sha1 E08D7131 key and added rsa 38D489C7 key
 
-2005-10-30 Eric Sandall <eric AT sandall.us>
+2005-10-30 Eric Sandall <sandalle AT sourcemage.org>
        * FUNCTIONS: Added invoke_gcc() from test/FUNCTIONS
 
 2005-10-17 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -228,14 +228,14 @@
        * games-rpg-mp/gMOO: lo-case deprecation
        * games-arcade-2d/asteroids3D: lo-case deprecation
 
-2005-08-17 Eric Sandall <eric AT sandall.us>
+2005-08-17 Eric Sandall <sandalle AT sourcemage.org>
        * gurus.gpg: Integrated from test grimoire (forced integrate)
 
 2005-06-20 Andrew Stitt <astitt AT sourcemage.org>
        * FUNCTIONS: Add a compatibility unpack_file function in case someone
          uses an early adopter but has not updated sorcery.
 
-2005-06-12 Eric Sandall <eric AT sandall.us>
+2005-06-12 Eric Sandall <sandalle AT sourcemage.org>
        * games-rpg-sp/{ember,sear}: Moved to games-rpg-mp
 
 2005-05-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -262,10 +262,10 @@
        * board/*: moved to games-board/*
        * go/*: moved to games-board/*
 
-2005-04-08 Eric Sandall <eric AT sandall.us>
+2005-04-08 Eric Sandall <sandalle AT sourcemage.org>
        * libaccount, accounts, groups: Branched from devel
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * FUNCTIONS: Branched from devel so games has up-to-date FUNCTIONS
 
 2005-03-31 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -278,11 +278,11 @@
        * shooters/AlephOne-minf: Renamed to shooters/alephone-minf
        * strategy/ASC: Removed deprecated
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * arcade/CriticalMass: Renamed to arcade/criticalmass
        * arcade/Maelstrom: Removed deprecated spell
 
-2005-02-23 Eric Sandall <eric AT sandall.us>
+2005-02-23 Eric Sandall <sandalle AT sourcemage.org>
        * 3D/TORCS: Renamed to 3D/torcs
 
 2005-02-13 Neuron <vlmarek AT volny.cz>
@@ -310,7 +310,7 @@
        * games-libs/ClanLib: Rename to games-libs/clanlib
        * games-libs/ClanLib-unstable: Rename to games-libs/clanlib-devel
 
-2004-10-30 Eric Sandall <eric AT sandall.us>
+2004-10-30 Eric Sandall <sandalle AT sourcemage.org>
        * strategy/ASC: Renamed to strategy/asc
 
 2004-07-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/edutainment/celestia/HISTORY b/edutainment/celestia/HISTORY
index ba96dda..dea2949 100644
--- a/edutainment/celestia/HISTORY
+++ b/edutainment/celestia/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-10-30 Eric Sandall <eric AT sandall.us>
+2005-10-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Changed to GPG verification
          Added GCC_VERSION=3.3 (fails with 3.4.4)
        * CONFIGURE: Added query for Xinerama support and --enable-final
@@ -26,7 +26,7 @@
        * DETAILS: 1.3.2
        * DETAILS, BUILD: BUILD_API=2
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Shortened SHORT
 
diff --git a/edutainment/tuxmath/HISTORY b/edutainment/tuxmath/HISTORY
index 1186126..14b26df 100644
--- a/edutainment/tuxmath/HISTORY
+++ b/edutainment/tuxmath/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
@@ -17,10 +17,10 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-19 Eric Sandall <eric AT sandall.us>
+2002-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1417
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/edutainment/tuxpaint/HISTORY b/edutainment/tuxpaint/HISTORY
index 2564da1..289903e 100644
--- a/edutainment/tuxpaint/HISTORY
+++ b/edutainment/tuxpaint/HISTORY
@@ -11,13 +11,13 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer, and SDL_ttf renamed to sdl*
          Removed SDL as the above depend on sdl
          Removed TABs
          Formatted to Guru Handbook
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
          Shortened SHORT
diff --git a/edutainment/tuxtype/HISTORY b/edutainment/tuxtype/HISTORY
index 67b2211..b62eccc 100644
--- a/edutainment/tuxtype/HISTORY
+++ b/edutainment/tuxtype/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
@@ -24,7 +24,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-05-26 Eric Sandall <eric AT sandall.us>
+2003-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Website now hosted on SourceForge
 
 2003-05-19 hgg <hgreig AT bigpond.net.au>
@@ -33,13 +33,13 @@
 2003-04-19 Seth Woolley <seth AT tautology.org>
        * DETAILS: FUZZ fix .gz to .bz2
 
-2002-08-28 Eric Sandall <eric AT sandall.us>
+2002-08-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated VERSION to 1.0.3
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated MAINTAINER
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 1.0.2
          Added MAINTAINER, MD5 and LICENSE
          Changed SOURCE_URL to use $SOURCEFORGE_URL
diff --git a/edutainment/xpenguins-applet/HISTORY 
b/edutainment/xpenguins-applet/HISTORY
index b72274f..3a8d541 100644
--- a/edutainment/xpenguins-applet/HISTORY
+++ b/edutainment/xpenguins-applet/HISTORY
@@ -1,7 +1,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
diff --git a/edutainment/xpenguins/HISTORY b/edutainment/xpenguins/HISTORY
index da27676..6c8172e 100644
--- a/edutainment/xpenguins/HISTORY
+++ b/edutainment/xpenguins/HISTORY
@@ -7,7 +7,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-06-08 Eric Schabell <eric AT schabell.com>
diff --git a/edutainment/xpenguins_themes/HISTORY 
b/edutainment/xpenguins_themes/HISTORY
index 25b875b..43a4064 100644
--- a/edutainment/xpenguins_themes/HISTORY
+++ b/edutainment/xpenguins_themes/HISTORY
@@ -16,7 +16,7 @@
 2003-05-06 hgg <hgreig AT bigpond.net.au>
        * Updated to 1.0
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-06-08 Eric Schabell <eric AT schabell.com>
diff --git a/games-arcade-2d/abe/HISTORY b/games-arcade-2d/abe/HISTORY
index 62fa196..379c042 100644
--- a/games-arcade-2d/abe/HISTORY
+++ b/games-arcade-2d/abe/HISTORY
@@ -8,7 +8,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.1
          SOURCE and SOURCE_DIRECTORY now use $VERSION
        * BUILD: Setup to use default_build and use OPTS for games directories
@@ -18,11 +18,11 @@
 2005-01-16 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updated for BUILD_API=2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          SDL removed as sdl_mixer depends on sdl
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
 
diff --git a/games-arcade-2d/abuse_sdl/HISTORY 
b/games-arcade-2d/abuse_sdl/HISTORY
index 4b5c9c2..cdb9971 100644
--- a/games-arcade-2d/abuse_sdl/HISTORY
+++ b/games-arcade-2d/abuse_sdl/HISTORY
@@ -13,10 +13,10 @@
        * BUILD: removed unpack resolves bug #9442
        * BUILD: Made it to install into proper locations
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
          Shortened SHORT
diff --git a/games-arcade-2d/armagetronad/HISTORY 
b/games-arcade-2d/armagetronad/HISTORY
index b6ff8fb..90a3de7 100644
--- a/games-arcade-2d/armagetronad/HISTORY
+++ b/games-arcade-2d/armagetronad/HISTORY
@@ -19,7 +19,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer renamed to sdl*
          Removed SDL as sdl_image depends on sdl
          Formatted to Guru Handbook
diff --git a/games-arcade-2d/blobwars/HISTORY 
b/games-arcade-2d/blobwars/HISTORY
index 993b6a3..3dcdf28 100644
--- a/games-arcade-2d/blobwars/HISTORY
+++ b/games-arcade-2d/blobwars/HISTORY
@@ -8,7 +8,7 @@
        * DETAILS: Updated to 1.04-1, sha512
        * DEPENDS: added missing &&
 
-2005-04-12 Eric Sandall <eric AT sandall.us>
+2005-04-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.03-2
          BUILD_DIRECTORY now should work on version updates
 
diff --git a/games-arcade-2d/bumprace/HISTORY 
b/games-arcade-2d/bumprace/HISTORY
index 3c5f08f..393ca16 100644
--- a/games-arcade-2d/bumprace/HISTORY
+++ b/games-arcade-2d/bumprace/HISTORY
@@ -7,7 +7,7 @@
 2005-01-16 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Changes for BUILD API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Renamed SDL_mixer to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -18,7 +18,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
 2002-10-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-arcade-2d/chromium/HISTORY 
b/games-arcade-2d/chromium/HISTORY
index da4e1e2..4169b47 100644
--- a/games-arcade-2d/chromium/HISTORY
+++ b/games-arcade-2d/chromium/HISTORY
@@ -11,11 +11,11 @@
        * chromium: added launcher script bug #9161
        * INSTALL: installs the launcher script
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
          Shortened SHORT
diff --git a/games-arcade-2d/circuslinux/HISTORY 
b/games-arcade-2d/circuslinux/HISTORY
index ca2ab83..6856a6d 100644
--- a/games-arcade-2d/circuslinux/HISTORY
+++ b/games-arcade-2d/circuslinux/HISTORY
@@ -8,7 +8,7 @@
        * BUILD, DETAILS: Updated to BUILD API 2
        * DETAILS: Removed MAINTAINER field
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
diff --git a/games-arcade-2d/clanbomber/HISTORY 
b/games-arcade-2d/clanbomber/HISTORY
index 8c2bbde..2859b01 100644
--- a/games-arcade-2d/clanbomber/HISTORY
+++ b/games-arcade-2d/clanbomber/HISTORY
@@ -10,7 +10,7 @@
 2005-11-20 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DEPENDS: Hermes -> libhermes, clanlib -> clanlib6
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards
 
diff --git a/games-arcade-2d/copter-commander/HISTORY 
b/games-arcade-2d/copter-commander/HISTORY
index ee97a8f..89f0662 100644
--- a/games-arcade-2d/copter-commander/HISTORY
+++ b/games-arcade-2d/copter-commander/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
diff --git a/games-arcade-2d/crack-attack/HISTORY 
b/games-arcade-2d/crack-attack/HISTORY
index 57d460d..fdff797 100644
--- a/games-arcade-2d/crack-attack/HISTORY
+++ b/games-arcade-2d/crack-attack/HISTORY
@@ -14,7 +14,7 @@
        * BUILD, DETAILS: Updated for BUILD API 2
        * DETAILS: Version bump
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-2d/criticalmass/HISTORY 
b/games-arcade-2d/criticalmass/HISTORY
index 1a58bb1..6f04973 100644
--- a/games-arcade-2d/criticalmass/HISTORY
+++ b/games-arcade-2d/criticalmass/HISTORY
@@ -11,11 +11,11 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.11
        * BUILD: Pass NOCONFIGURE to ./autogen.sh so ./configure isn't run 
twice
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from CriticalMass
        * DETAILS: Renamed to criticalmass
          Updated to 0.9.10
@@ -27,7 +27,7 @@
        * BUILD: Converted to build_api 2
          Use OPTS for game options and default_build
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
diff --git a/games-arcade-2d/cuyo/HISTORY b/games-arcade-2d/cuyo/HISTORY
index 56f2259..77d279d 100644
--- a/games-arcade-2d/cuyo/HISTORY
+++ b/games-arcade-2d/cuyo/HISTORY
@@ -21,7 +21,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 1.7.0
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.6.1 (Bug #2381, thanks to Snakebyte)
        * BUILD: Modifed BUILD to install binary into /usr/bin and
          data into /usr/share/games, again, the binary cannot
diff --git a/games-arcade-2d/dopewars/HISTORY 
b/games-arcade-2d/dopewars/HISTORY
index f906640..411cbd0 100644
--- a/games-arcade-2d/dopewars/HISTORY
+++ b/games-arcade-2d/dopewars/HISTORY
@@ -21,13 +21,13 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update for ${INSTALL_ROOT}
 
-2002-10-21 Eric Sandall <eric AT sandall.us>
+2002-10-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.5.8
 
 2002-08-28 Gareth Clay <g.clay AT warwick.ac.uk>
        * DETAILS: Changed to use $SOURCEFORGE_URL, Changed maintainer
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 1.5.7, Added MD5 and LICENSE
 
 2002-05-02 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-arcade-2d/fbg/HISTORY b/games-arcade-2d/fbg/HISTORY
index a8e804e..6d9d455 100644
--- a/games-arcade-2d/fbg/HISTORY
+++ b/games-arcade-2d/fbg/HISTORY
@@ -7,14 +7,14 @@
 2005-01-16 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updated for Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
 2004-02-25 hgg <hgreig AT bigpond.net.au>
        * DETAILS: website changed, removed maintainer and menu items
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
@@ -24,10 +24,10 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-02 Eric Sandall <eric AT sandall.us>
+2003-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.9 
        * DEPENDS: Added physfs as a dependency
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-arcade-2d/football-manager/HISTORY 
b/games-arcade-2d/football-manager/HISTORY
index 2c85d9c..552a8ed 100644
--- a/games-arcade-2d/football-manager/HISTORY
+++ b/games-arcade-2d/football-manager/HISTORY
@@ -8,7 +8,7 @@
        * DETAILS, BUILD: Updated for Build API 2
        * Removed MAINTAINER field
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
        * HISTORY: Formatted to Guru Handbook
 
@@ -24,7 +24,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-04-15 Eric Sandall <eric AT sandall.us>
+2003-04-15 Eric Sandall <sandalle AT sourcemage.org>
        * Added to games
 
 2003-04-15 Eric Schabell <eschabell AT sourcemage.org>
diff --git a/games-arcade-2d/frozen-bubble/HISTORY 
b/games-arcade-2d/frozen-bubble/HISTORY
index a333133..e5c508f 100644
--- a/games-arcade-2d/frozen-bubble/HISTORY
+++ b/games-arcade-2d/frozen-bubble/HISTORY
@@ -1,4 +1,4 @@
-2006-11-29 Eric Sandall <eric AT sandall.us>
+2006-11-29 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: Set BINDIR to /usr/games
 
 2006-11-24 Pieter Lenaerts <e-type AT sourcemage.org>
@@ -15,14 +15,14 @@
        * BUILD, INSTALL: minor fixes
        * PRE_BUILD: added a sedit on Makefile to fix install path
 
-2005-06-20 Eric Sandall <eric AT sandall.us>
+2005-06-20 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Removed perl
          Renamed SDL-sdlpl to sdl-sdlpl
 
 2005-01-16 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Changes for Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Removed SDL_image and SDL_mixer (SDL-sdlpl depends on them)
        * HISTORY: Formatted to Guru Handbook
 
@@ -32,7 +32,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-02-17 Eric Sandall <eric AT sandall.us>
+2003-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.0
          Changed SOURCE_URL, add a mirror in Europe
 
diff --git a/games-arcade-2d/gltron/HISTORY b/games-arcade-2d/gltron/HISTORY
index e43b8b0..e04270e 100644
--- a/games-arcade-2d/gltron/HISTORY
+++ b/games-arcade-2d/gltron/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_sound renamed to sdl_sound
          Removed SDL, sdl_sound depends on sdl
 
@@ -25,14 +25,14 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
        * BUILD: Also now copies scripts...don't know how this was missed
          as the game won't run without them...and another show-
          stopper is that --datadir wasn't set, so the binary
          was looking in the wrong spot for the data...
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.62 (Bug #2383, thanks to Snakebyte)
        * BUILD: Changed data dir to /usr/lib/games
 
diff --git a/games-arcade-2d/gtetrinet/HISTORY 
b/games-arcade-2d/gtetrinet/HISTORY
index 131052b..a75802f 100644
--- a/games-arcade-2d/gtetrinet/HISTORY
+++ b/games-arcade-2d/gtetrinet/HISTORY
@@ -36,27 +36,27 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-04-14 Eric Sandall <eric AT sandall.us>
+2003-04-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.1
 
-2003-03-17 Eric Sandall <eric AT sandall.us>
+2003-03-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.0
 
-2003-02-07 Eric Sandall <eric AT sandall.us>
+2003-02-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.2 Changed SOURCE_URL to 
          use GNOME_URL, as the newer versions are being hosted by GNOME
        * DEPENDS: Updated to GNOME 2, gtk+2, and esound
 
-2003-01-21 Eric Sandall <eric AT sandall.us>
+2003-01-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.5.2 (Bug #2310)
 
 2002-10-28 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: Updated to 0.4.4
 
-2002-10-22 Eric Sandall <eric AT sandall.us>
+2002-10-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.3
 
-2002-10-17 Eric Sandall <eric AT sandall.us>
+2002-10-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.2
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-arcade-2d/hedgewars/HISTORY 
b/games-arcade-2d/hedgewars/HISTORY
index 2359469..65500f8 100644
--- a/games-arcade-2d/hedgewars/HISTORY
+++ b/games-arcade-2d/hedgewars/HISTORY
@@ -3,7 +3,7 @@
        * PRE_BUILD: removed sedit line for QTfrontend/main.cpp because it's
          not there (was removed by authors)
 
-2006-11-30 Eric Sandall <eric AT sandall.us>
+2006-11-30 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Properly fix install patch of binaries to /usr/games
          (prior fix did not install hedgewars nor hwengine into /usr/games)
 
diff --git a/games-arcade-2d/jumpnbump/HISTORY 
b/games-arcade-2d/jumpnbump/HISTORY
index 798e1cd..1fb9a17 100644
--- a/games-arcade-2d/jumpnbump/HISTORY
+++ b/games-arcade-2d/jumpnbump/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-11-10 Eric Sandall <eric AT sandall.us>
+2004-11-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.55
          SOURCE_DIRECTORY still uses 1.50 for VERSION
          Added BUILD_API=2
@@ -12,7 +12,7 @@
          Now uses ./configure
          Fix DATA_PATH for jumpbump.dat (doesn't use --datadir)
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
diff --git a/games-arcade-2d/kobodeluxe/HISTORY 
b/games-arcade-2d/kobodeluxe/HISTORY
index b0d2910..c0ab0c3 100644
--- a/games-arcade-2d/kobodeluxe/HISTORY
+++ b/games-arcade-2d/kobodeluxe/HISTORY
@@ -19,11 +19,11 @@
        * BUILD, DETAILS: Updates for Build API 2
        * DETAILS: Removed MAINTAINER field
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Removed SDL as sdl_image depends on sdl
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
@@ -39,7 +39,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
        * DETAILS: Tarball extension SOURCE_URL changed
          Updated to 0.4pre8 as 0.3 fails to compile now
diff --git a/games-arcade-2d/lbreakout2/HISTORY 
b/games-arcade-2d/lbreakout2/HISTORY
index 68eee88..5da54ae 100644
--- a/games-arcade-2d/lbreakout2/HISTORY
+++ b/games-arcade-2d/lbreakout2/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-11-14 Eric Sandall <eric AT sandall.us>
+2005-11-14 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added missing '&&'
          Removed trailing '&&'
          Cleaned up formatting
@@ -29,7 +29,7 @@
        * BUILD, DETAILS: Updates for Build API 2
        * Version bump
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
 
@@ -57,20 +57,20 @@
 2003-04-18 Seth Woolley <seth AT tautology.org>
        * DETAILS: fix md5 for SOURCE[0].
 
-2003-03-08 Eric Sandall <eric AT sandall.us>
+2003-03-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.4.1
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v2.4
 
 2002-10-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * BUILD: now uses /var/games to save the global highscores
          instead of /var/lib/games
 
-2002-09-21 Eric Sandall <eric AT sandall.us>
+2002-09-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New version: 2.3.5
 
 2002-09-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
@@ -83,7 +83,7 @@
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: changed MAINTAINER
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 2.3.2
          Added MD5 and LICENSE
          Changed SOURCE_URL to use $SOURCEFORGE_URL
diff --git a/games-arcade-2d/liquidwar/HISTORY 
b/games-arcade-2d/liquidwar/HISTORY
index da539cd..7c090b0 100644
--- a/games-arcade-2d/liquidwar/HISTORY
+++ b/games-arcade-2d/liquidwar/HISTORY
@@ -9,17 +9,17 @@
        * BUILD: removed as it was default
        * DEPENDS: removed empty line
 
-2004-09-06 Eric Sandall <eric AT sandall.us>
+2004-09-06 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: teTeX renamed to tetex
          Formatted to Guru Handbook
 
 2004-02-16 hgg <hgreig AT bigpond.net.au>
        * DETAILS: update to 5.6.2
 
-2004-01-11 Eric Sandall <eric AT sandall.us>
+2004-01-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 5.6.1
 
-2003-12-30 Eric Sandall <eric AT sandall.us>
+2003-12-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 5.6.0
          SOURCE_URL changed (no longer available at FSF)
        * BUILD: Do not apply gcc 3.3.x patch
@@ -36,10 +36,10 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-03-06 Eric Sandall <eric AT sandall.us>
+2003-03-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 5.5.9
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 5.5.8 (Bug #2386, thanks to Snakebyte)
        * BUILD: Modifed BUILD to install data into /usr/share/games,
          can't have the binary in only /usr/games, same
@@ -50,7 +50,7 @@
          changed MAINTAINER
        * removed patch.* PRE_BUILD and POST_BUILD (not needed anymore)
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New version: 5.5.6
          Added MD5 and LICENSE
 
diff --git a/games-arcade-2d/luola/HISTORY b/games-arcade-2d/luola/HISTORY
index 4662a58..102d564 100644
--- a/games-arcade-2d/luola/HISTORY
+++ b/games-arcade-2d/luola/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-12-21 Eric Sandall <eric AT sandall.us>
+2005-12-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.3.1
          Use GPG checking
          New website: http://www.luolamies.org/software/luola/
@@ -19,24 +19,24 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-04-12 Eric Sandall <eric AT sandall.us>
+2005-04-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.7
 
-2005-02-01 Eric Sandall <eric AT sandall.us>
+2005-02-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.6
          stdlevels.tar.gz updated as well
        * INSTALL: Install all of the level files...
 
-2005-01-10 Eric Sandall <eric AT sandall.us>
+2005-01-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.5
          stdlevels.tar.gz updated as well
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer, and SDL_gfx renamed to sdl*
          Removed SDL as sdl_image depends on sdl
          Formatted to Guru Handbook
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
@@ -60,7 +60,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-05-04 Eric Sandall <eric AT sandall.us>
+2003-05-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.1.1
        * BUILD: now copies the stdlevel files
        * PRE_BUILD: now uses default_pre_build for some
@@ -72,18 +72,18 @@
 2003-01-30 Seth Woolley <seth AT tautology.org>
        * DETAILS: Modified DETAILS to correct MD5
 
-2002-12-06 Eric Sandall <eric AT sandall.us>
+2002-12-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.0.2
 
-2002-12-02 Eric Sandall <eric AT sandall.us>
+2002-12-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.0.1
 
-2002-10-22 Eric Sandall <eric AT sandall.us>
+2002-10-22 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1344
        * DETAILS: And updated to v0.9.9 (I'm sure I did this before, must 
          not have committed), still needs work. :(
 
-2002-10-12 Eric Sandall <eric AT sandall.us>
+2002-10-12 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer is an optional_depends
          Cleaned up DEPENDS
        * BUILD: Added more from default_build to BUILD
diff --git a/games-arcade-2d/maelstrom/HISTORY 
b/games-arcade-2d/maelstrom/HISTORY
index af1273c..a197718 100644
--- a/games-arcade-2d/maelstrom/HISTORY
+++ b/games-arcade-2d/maelstrom/HISTORY
@@ -8,7 +8,7 @@
        * POST_INSTALL: added default post install.. it can't use
          the one from the games grimoire.
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * CONFLICTS: Removed as Maelstrom was removed
 
 2005-01-17 Adam Clark <adamsgl AT dhbit.ca>
@@ -16,7 +16,7 @@
        * BUILD: Security + gcc 3.4 patches added
        * Renamed spell from Maelstrom to maelstrom
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_net renamed to sdl_net
          Removed SDL as sdl_net depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -27,7 +27,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Added to install data files into /usr/share/games
          rather than /usr/games, since I don't know configure
          all that well, the path has to be set to /usr/bin, so 
diff --git a/games-arcade-2d/moon-lander/HISTORY 
b/games-arcade-2d/moon-lander/HISTORY
index 7e85aa9..19bfac6 100644
--- a/games-arcade-2d/moon-lander/HISTORY
+++ b/games-arcade-2d/moon-lander/HISTORY
@@ -7,7 +7,7 @@
 2005-01-17 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS, INSTALL: Updated/Added for Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer and SDL_image renamed to sdl*
          Removed SDL as the above depend on sdl
 
diff --git a/games-arcade-2d/nil/HISTORY b/games-arcade-2d/nil/HISTORY
index 0e85a3d..f82fea2 100644
--- a/games-arcade-2d/nil/HISTORY
+++ b/games-arcade-2d/nil/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer, SDL_ttf, and SDL_image renamed to sdl*
          Removed SDL as the above depend on sdl
          Removed zlib as SDL_image depends on libpng which depends on zlib
diff --git a/games-arcade-2d/njam/HISTORY b/games-arcade-2d/njam/HISTORY
index e6c6b32..73ee443 100644
--- a/games-arcade-2d/njam/HISTORY
+++ b/games-arcade-2d/njam/HISTORY
@@ -7,7 +7,7 @@
 2005-01-18 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updates for Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_net, and SDL_mixer renamed to sdl*
          SDL removed as the above depend on sdl
          Formatted to Guru Handbook
diff --git a/games-arcade-2d/penguin-command/HISTORY 
b/games-arcade-2d/penguin-command/HISTORY
index f5bd5f8..17b45c6 100644
--- a/games-arcade-2d/penguin-command/HISTORY
+++ b/games-arcade-2d/penguin-command/HISTORY
@@ -11,7 +11,7 @@
 2005-01-19 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAINS: Build API 2 updates
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          SDL removed as sdl_mixer depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -25,7 +25,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 1.6.6
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-arcade-2d/pinball/HISTORY b/games-arcade-2d/pinball/HISTORY
index 61c9db9..ac23f1f 100644
--- a/games-arcade-2d/pinball/HISTORY
+++ b/games-arcade-2d/pinball/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards
 
@@ -12,7 +12,7 @@
        * DETAILS: added BUILD_API=2
        * BUILD: removed the C_FIFO and items in install etc.
        
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
@@ -20,7 +20,7 @@
        * DETAILS: update to 0.3.1
        * HISTORY: reformat
 
-2003-07-23 Eric Sandall <eric AT sandall.us>
+2003-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fails with multiple jobs
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
@@ -32,7 +32,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.2.0a
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.1.2 (Bug #2389, thanks to Snakebyte)
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-arcade-2d/pingus/HISTORY b/games-arcade-2d/pingus/HISTORY
index 955fbef..65711f7 100644
--- a/games-arcade-2d/pingus/HISTORY
+++ b/games-arcade-2d/pingus/HISTORY
@@ -22,7 +22,7 @@
 2004-12-13 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: source changed to bz2
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
 
diff --git a/games-arcade-2d/rockdodger/HISTORY 
b/games-arcade-2d/rockdodger/HISTORY
index 66ab7c4..2072338 100644
--- a/games-arcade-2d/rockdodger/HISTORY
+++ b/games-arcade-2d/rockdodger/HISTORY
@@ -8,7 +8,7 @@
        * BUILD, DETAILS: Updated to Build API 2
        * DETAILS: Removed MAINTAINER field
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -16,10 +16,10 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated MAINTAINER
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 0.6
          Added MAINTAINER, MD5 and LICENSE
          Changed SOURCE_URL to use $SOURCEFORGE_URL
diff --git a/games-arcade-2d/rocksndiamonds/HISTORY 
b/games-arcade-2d/rocksndiamonds/HISTORY
index 289dad8..cfb95e4 100644
--- a/games-arcade-2d/rocksndiamonds/HISTORY
+++ b/games-arcade-2d/rocksndiamonds/HISTORY
@@ -25,7 +25,7 @@
 2004-10-14 Arjan Bouter <abouter AT sourcemage.org>
        * added desktop files
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
diff --git a/games-arcade-2d/rtts/HISTORY b/games-arcade-2d/rtts/HISTORY
index cf28c42..28e0b95 100644
--- a/games-arcade-2d/rtts/HISTORY
+++ b/games-arcade-2d/rtts/HISTORY
@@ -12,10 +12,10 @@
        * BUILD: removed what belongs in INSTALL
        * INSTALL: added from BUILD what belongs here
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-2d/sdlsasteroids/HISTORY 
b/games-arcade-2d/sdlsasteroids/HISTORY
index 4978d56..247f476 100644
--- a/games-arcade-2d/sdlsasteroids/HISTORY
+++ b/games-arcade-2d/sdlsasteroids/HISTORY
@@ -10,7 +10,7 @@
        * DETAILS: Removed MAINTAINER field
        * BUILD, DETAILS: Updated to Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_ttf and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -21,6 +21,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-arcade-2d/supertux/HISTORY 
b/games-arcade-2d/supertux/HISTORY
index 078625e..255d5d8 100644
--- a/games-arcade-2d/supertux/HISTORY
+++ b/games-arcade-2d/supertux/HISTORY
@@ -32,7 +32,7 @@
 2004-08-25 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: updated to 0.1.2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer and SDL_image renamed to sdl*
 
 2004-06-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/games-arcade-2d/tong/HISTORY b/games-arcade-2d/tong/HISTORY
index f81183d..32f12ce 100644
--- a/games-arcade-2d/tong/HISTORY
+++ b/games-arcade-2d/tong/HISTORY
@@ -1,13 +1,13 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-08-10 Eric Sandall <eric AT sandall.us>
+2006-08-10 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: Owner is root, not games, and group is games, not root
          (Bug #10642)
 
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-06 Eric Sandall <eric AT sandall.us>
+2005-01-06 Eric Sandall <sandalle AT sourcemage.org>
        * Created for SweetPotato. :)
 
diff --git a/games-arcade-2d/toppler/HISTORY b/games-arcade-2d/toppler/HISTORY
index 52ef42e..1a31df8 100644
--- a/games-arcade-2d/toppler/HISTORY
+++ b/games-arcade-2d/toppler/HISTORY
@@ -8,27 +8,27 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.1.1
          Added BUILD_API=2
          Shortened SHORT
        * DEPENDS: Added optional dependency on gettext
        * BUILD: Converted to build_api 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
 
-2004-02-08 Eric Sandall <eric AT sandall.us>
+2004-02-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.6
 
-2004-01-26 Eric Sandall <eric AT sandall.us>
+2004-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.5
 
-2004-01-19 Eric Sandall <eric AT sandall.us>
+2004-01-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.4
 
-2003-10-09 Eric Sandall <eric AT sandall.us>
+2003-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 1.0.3
        * HISTORY: Update to follow Guru Handbook
 
@@ -45,34 +45,34 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update for ${INSTALL_ROOT}
 
-2003-04-15 Eric Sandall <eric AT sandall.us>
+2003-04-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.1
 
-2003-03-09 Eric Sandall <eric AT sandall.us>
+2003-03-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.0
 
-2003-02-24 Eric Sandall <eric AT sandall.us>
+2003-02-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.99.1
 
-2003-01-21 Eric Sandall <eric AT sandall.us>
+2003-01-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.98.4 (Bug #2310)
 
-2003-01-02 Eric Sandall <eric AT sandall.us>
+2003-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.98.3 (Bug #2077)
 
-2002-11-26 Eric Sandall <eric AT sandall.us>
+2002-11-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.98.2
 
-2002-11-24 Eric Sandall <eric AT sandall.us>
+2002-11-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.98.1
 
-2002-11-20 Eric Sandall <eric AT sandall.us>
+2002-11-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.98.0
 
-2002-10-19 Eric Sandall <eric AT sandall.us>
+2002-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fixed Bug #1417
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-arcade-2d/tuxpuck/HISTORY b/games-arcade-2d/tuxpuck/HISTORY
index 2f20589..9ccd480 100644
--- a/games-arcade-2d/tuxpuck/HISTORY
+++ b/games-arcade-2d/tuxpuck/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
          Shortened SHORT
        * BUILD: Run make_single before make
@@ -14,29 +14,29 @@
        * HISTORY, INSTALL, DETAILS: Updated to Build API 2
        * DETAILS: Removed MAINTAINER field
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
        * HISTORY: Formatted to Guru Handbook
 
-2003-07-23 Eric Sandall <eric AT sandall.us>
+2003-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fails with multiple jobs
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-01-02 Eric Sandall <eric AT sandall.us>
+2003-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.8.2 (Bug #2076)
 
-2002-10-15 Eric Sandall <eric AT sandall.us>
+2002-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.8.1
 
-2002-10-07 Eric Sandall <eric AT sandall.us>
+2002-10-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.8.0
 
-2002-09-21 Eric Sandall <eric AT sandall.us>
+2002-09-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.7.118
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-arcade-2d/vectoroids/HISTORY 
b/games-arcade-2d/vectoroids/HISTORY
index 283619f..502a323 100644
--- a/games-arcade-2d/vectoroids/HISTORY
+++ b/games-arcade-2d/vectoroids/HISTORY
@@ -10,7 +10,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          SDL removed as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -21,7 +21,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-04-26 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-arcade-2d/xbill/HISTORY b/games-arcade-2d/xbill/HISTORY
index 16c2dcb..8a1bcf1 100644
--- a/games-arcade-2d/xbill/HISTORY
+++ b/games-arcade-2d/xbill/HISTORY
@@ -12,7 +12,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-arcade-2d/xpilot/HISTORY b/games-arcade-2d/xpilot/HISTORY
index 553b909..d6609b3 100644
--- a/games-arcade-2d/xpilot/HISTORY
+++ b/games-arcade-2d/xpilot/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
diff --git a/games-arcade-2d/xrally/HISTORY b/games-arcade-2d/xrally/HISTORY
index 6d1288b..5b92165 100644
--- a/games-arcade-2d/xrally/HISTORY
+++ b/games-arcade-2d/xrally/HISTORY
@@ -24,7 +24,7 @@
 2003-05-14 Seth Woolley <seth AT tautology.org>
        * PRE_BUILD: Added unpack
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE, SOURCEFORGE_URL
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-arcade-2d/xrick/HISTORY b/games-arcade-2d/xrick/HISTORY
index 95d7da2..2306d7c 100644
--- a/games-arcade-2d/xrick/HISTORY
+++ b/games-arcade-2d/xrick/HISTORY
@@ -10,24 +10,24 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-02-02 Eric Sandall <eric AT sandall.us>
+2004-02-02 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Creates /usr/games if it doesn't exist (Bug #5634)
        * HISTORY: Formatted to Guru Handbook
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-01-05 Eric Sandall <eric AT sandall.us>
+2003-01-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v021212
        * xrick: Added script to correctly run
        * BUILD: Fixed to copy data files now
          Binaries now install as user 'games'
          Added SMGL optimizations to Makefile
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-04-15 Joel Mayes <bluebird AT optushome.com.au>
diff --git a/games-arcade-2d/xscorch/HISTORY b/games-arcade-2d/xscorch/HISTORY
index f487d89..2751e41 100644
--- a/games-arcade-2d/xscorch/HISTORY
+++ b/games-arcade-2d/xscorch/HISTORY
@@ -8,7 +8,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-03-25 Eric Sandall <eric AT sandall.us>
+2004-03-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.0
          Added new site
          Moved old site as mirror
@@ -22,7 +22,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-06-19 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-arcade-2d/xtux/HISTORY b/games-arcade-2d/xtux/HISTORY
index 8d3030d..1a82bae 100644
--- a/games-arcade-2d/xtux/HISTORY
+++ b/games-arcade-2d/xtux/HISTORY
@@ -26,10 +26,10 @@
 2003-05-08 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 20030306 and removed exploit warning
 
-2003-02-07 Eric Sandall <eric AT sandall.us>
+2003-02-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 20030207
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-03-20 Kyle Sallee <anonymous AT sourcemage.org>
diff --git a/games-arcade-3d/asteroids3d/HISTORY 
b/games-arcade-3d/asteroids3d/HISTORY
index 6ff67f0..24daec8 100644
--- a/games-arcade-3d/asteroids3d/HISTORY
+++ b/games-arcade-3d/asteroids3d/HISTORY
@@ -7,7 +7,7 @@
 2005-05-09 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * Renamed from asteroids3D
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-3d/atr3d/HISTORY b/games-arcade-3d/atr3d/HISTORY
index 79e4f6a..519953b 100644
--- a/games-arcade-3d/atr3d/HISTORY
+++ b/games-arcade-3d/atr3d/HISTORY
@@ -7,11 +7,11 @@
 2005-01-15 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updated for BUILD API 2
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-3d/d2x-engine/HISTORY 
b/games-arcade-3d/d2x-engine/HISTORY
index 8aa641e..42f8398 100644
--- a/games-arcade-3d/d2x-engine/HISTORY
+++ b/games-arcade-3d/d2x-engine/HISTORY
@@ -7,10 +7,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
          Removed TAB
diff --git a/games-arcade-3d/gav/HISTORY b/games-arcade-3d/gav/HISTORY
index e6bc38a..9a1caa9 100644
--- a/games-arcade-3d/gav/HISTORY
+++ b/games-arcade-3d/gav/HISTORY
@@ -7,10 +7,10 @@
 2005-01-17 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updates for Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_net renamed to sdl*
 
-2004-04-10 Eric Sandall <eric AT sandall.us>
+2004-04-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.0
        * DEPENDS: Depends on SDL_net
 
@@ -26,10 +26,10 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.7.2
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.0 (Bug #2382, thanks to Snakebyte)
 
-2002-11-27 Eric Sandall <eric AT sandall.us>
+2002-11-27 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
          Added to games
 
diff --git a/games-arcade-3d/glast/HISTORY b/games-arcade-3d/glast/HISTORY
index 64d8989..1216115 100644
--- a/games-arcade-3d/glast/HISTORY
+++ b/games-arcade-3d/glast/HISTORY
@@ -7,17 +7,17 @@
 2005-01-15 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updated for BUILD API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer renamed to sdl*
          SDL removed as both sdl_mixer and sdl_image depend on sdl
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-arcade-3d/neverball/HISTORY 
b/games-arcade-3d/neverball/HISTORY
index 23f9c40..3d7ec4b 100644
--- a/games-arcade-3d/neverball/HISTORY
+++ b/games-arcade-3d/neverball/HISTORY
@@ -31,7 +31,7 @@
 2004-09-04 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD: missing a Makefile && at end of sedit line
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer, SDL_ttf renamed to sdl*
          Removed SDL as the above depend on sdl
 
diff --git a/games-arcade-3d/sc2/HISTORY b/games-arcade-3d/sc2/HISTORY
index f0c8b9a..676be55 100644
--- a/games-arcade-3d/sc2/HISTORY
+++ b/games-arcade-3d/sc2/HISTORY
@@ -16,7 +16,7 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.0
          SOURCE is .tar.gz instead of .tgz
          SOURCE2 is now a .uqm instead of .zip
@@ -30,7 +30,7 @@
          Converted to build_api 2
          Install_rootify symlink
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
          Removed libogg as libvorbis depends on it
@@ -45,6 +45,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-01-07 Eric Sandall <eric AT sandall.us>
+2003-01-07 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-arcade-3d/scorched3d/HISTORY 
b/games-arcade-3d/scorched3d/HISTORY
index a9225c1..6484eda 100644
--- a/games-arcade-3d/scorched3d/HISTORY
+++ b/games-arcade-3d/scorched3d/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-12-29 Eric Sandall <eric AT sandall.us>
+2005-12-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated VERSION to 39.1
          Shortened SHORT
        * DEPENDS: Added dependencies based on the FAQ (sdl, autoconf, 
openal):
@@ -26,7 +26,7 @@
        * Updated to version 38
        * Fixed WEB_SITE
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_net and SDL_mixer renamed to sdl*
          Formatted to Guru Handbook
 
@@ -41,13 +41,13 @@
        * BUILD: droped sedit
        * BUILD: change the mv dir from to
 
-2004-01-28 Eric Sandall <eric AT sandall.us>
+2004-01-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 36.2 (thanks to Rycee)
          Removed MAINTAINER
        * BUILD, *.patch: Removed gcc-3.3 patch
        * BUILD: Change ./autogen to ./configure
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-3d/si3d/HISTORY b/games-arcade-3d/si3d/HISTORY
index a3d2d24..3972f46 100644
--- a/games-arcade-3d/si3d/HISTORY
+++ b/games-arcade-3d/si3d/HISTORY
@@ -13,7 +13,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * Update for ${INSTALL_ROOT}
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-arcade-3d/slune/HISTORY b/games-arcade-3d/slune/HISTORY
index d70de27..24bb48c 100644
--- a/games-arcade-3d/slune/HISTORY
+++ b/games-arcade-3d/slune/HISTORY
@@ -12,7 +12,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
          Formatted to Guru Handbook
 
diff --git a/games-arcade-3d/trackballs/HISTORY 
b/games-arcade-3d/trackballs/HISTORY
index c4ceaab..3af3fa3 100644
--- a/games-arcade-3d/trackballs/HISTORY
+++ b/games-arcade-3d/trackballs/HISTORY
@@ -8,7 +8,7 @@
 2005-01-20 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS: Updated to Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_ttf, SDL_mixer, and SDL_image renamed to sdl*
          Removed SDL as the above depend on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -28,7 +28,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-02-22 Eric Sandall <eric AT sandall.us>
+2003-02-22 Eric Sandall <sandalle AT sourcemage.org>
        * Added Robert's improved spell, as mine wouldn't compile
 
 2003-02-21 Robert Helgesson <rycee AT home.se>
diff --git a/games-arcade-3d/tuxkart/HISTORY b/games-arcade-3d/tuxkart/HISTORY
index 693db06..19f2733 100644
--- a/games-arcade-3d/tuxkart/HISTORY
+++ b/games-arcade-3d/tuxkart/HISTORY
@@ -4,14 +4,14 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-06-29 Eric Sandall <eric AT sandall.us>
+2004-06-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.0
        Removed MAINTAINER
        BUILD_API=2
        Reworded SHORT to be shorter and more descriptive
        * DEPENDS: Removed dependency on GLUT as plib already has that
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
diff --git a/games-arcade-3d/tuxracer/HISTORY 
b/games-arcade-3d/tuxracer/HISTORY
index 4f76997..ac70d67 100644
--- a/games-arcade-3d/tuxracer/HISTORY
+++ b/games-arcade-3d/tuxracer/HISTORY
@@ -7,18 +7,18 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Use spell_ok instead of spell_installed
          Cleaned up formatting
 
 2005-01-21 Adam Clark <adamsgl AT dhbit.ca>
        * BUILD, DETAILS, INSTALL: Updated to Build API 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
 
-2004-07-18 Eric Sandall <eric AT sandall.us>
+2004-07-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: NVIDIA_headers renamed to nvidia_headers
        * BUILD: NVIDIA_headers renamed to nvidia_headers
 
@@ -26,7 +26,7 @@
        * DETAILS: URL changed to the old site since that's the proper one...
        * PROVIDES: removed even though it's a fun game....
 
-2003-11-24 Eric Sandall <eric AT sandall.us>
+2003-11-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on GLUT, not glut specifically
        * HISTORY: Formatted to Guru Handbook
 
@@ -45,10 +45,10 @@
 2003-05-05 hgg <hgreig AT bigpond.net>
        * Fixed Bug 3267 - added config.patch
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-07 Julian v. Bock <julian AT wongr.net>
diff --git a/games-board/black-box/HISTORY b/games-board/black-box/HISTORY
index a495ed4..2dbd9d1 100644
--- a/games-board/black-box/HISTORY
+++ b/games-board/black-box/HISTORY
@@ -9,7 +9,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -30,7 +30,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Fixed Bug #2443
 
 2002-10-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-board/cgoban/HISTORY b/games-board/cgoban/HISTORY
index 758a184..d53e04f 100644
--- a/games-board/cgoban/HISTORY
+++ b/games-board/cgoban/HISTORY
@@ -22,7 +22,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
 2002-08-27 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-board/crafty/HISTORY b/games-board/crafty/HISTORY
index 9936262..ea7e70c 100644
--- a/games-board/crafty/HISTORY
+++ b/games-board/crafty/HISTORY
@@ -22,7 +22,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-04-13 Eric Sandall <eric AT sandall.us>
+2003-04-13 Eric Sandall <sandalle AT sourcemage.org>
        * Added to games
 
 2003-04-13 Marc Greene <marcg AT phreaker.net>
diff --git a/games-board/gnocatan/HISTORY b/games-board/gnocatan/HISTORY
index 32470cd..80c535c 100644
--- a/games-board/gnocatan/HISTORY
+++ b/games-board/gnocatan/HISTORY
@@ -4,35 +4,35 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-31 Eric Sandall <eric AT sandall.us>
+2005-03-31 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.59
 
-2005-03-15 Eric Sandall <eric AT sandall.us>
+2005-03-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.54
 
-2005-02-22 Eric Sandall <eric AT sandall.us>
+2005-02-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.53
 
-2005-02-01 Eric Sandall <eric AT sandall.us>
+2005-02-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.51
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.50
 
 2004-12-03 David Braaten <xiticix47 AT hotmail.com>
        * DETAILS: version 0.8.1.43.
 
-2004-07-09 Eric Sandall <eric AT sandall.us>
+2004-07-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.30
          BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
 
-2004-02-06 Eric Sandall <eric AT sandall.us>
+2004-02-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.16
          Removed MAINTAINER
 
-2003-10-23 Eric Sandall <eric AT sandall.us>
+2003-10-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: After hearing people talking about this on
          IRC, I figured I'd try it, but what do I find? It
          doesn't even run (segfaults) because it can't find
diff --git a/games-board/gnuchess/HISTORY b/games-board/gnuchess/HISTORY
index 92d1a22..a77a929 100644
--- a/games-board/gnuchess/HISTORY
+++ b/games-board/gnuchess/HISTORY
@@ -24,7 +24,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to v#5.06
 
-2002-11-29 Eric Sandall <eric AT sandall.us>
+2002-11-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v5.05, changed SOURCE_DIRECTORY to match
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-board/gnugo/HISTORY b/games-board/gnugo/HISTORY
index fa90b57..f770a7b 100644
--- a/games-board/gnugo/HISTORY
+++ b/games-board/gnugo/HISTORY
@@ -8,7 +8,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-09-25 Eric Sandall <eric AT sandall.us>
+2005-09-25 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Removed as it'll lead to a circular dependency (possibly)
          when first casting cgoban
 
diff --git a/games-board/gtkatlantic/HISTORY b/games-board/gtkatlantic/HISTORY
index aded456..41edf71 100644
--- a/games-board/gtkatlantic/HISTORY
+++ b/games-board/gtkatlantic/HISTORY
@@ -10,13 +10,13 @@
        * DEPENDS: changed gtk+ to gtk+2
        * BUILD: converted to build api 2
 
-2004-01-05 Eric Sandall <eric AT sandall.us>
+2004-01-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.3.2
 
-2003-11-07 Eric Sandall <eric AT sandall.us>
+2003-11-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.3.1
 
-2003-10-30 Eric Sandall <eric AT sandall.us>
+2003-10-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.3.0
        * HISTORY: Formatted to Guru Handbook
 
@@ -35,16 +35,16 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-05-15 Eric Sandall <eric AT sandall.us>
+2003-05-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.8
          Removed erroneous descriptor from DETAILS
 
-2003-02-17 Eric Sandall <eric AT sandall.us>
+2003-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.7
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fixed website (Bug #2384, thanks to Snakebyte)
 
-2003-01-08 Eric Sandall <eric AT sandall.us>
+2003-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-board/monopd/HISTORY b/games-board/monopd/HISTORY
index e45b1ec..c2887ec 100644
--- a/games-board/monopd/HISTORY
+++ b/games-board/monopd/HISTORY
@@ -12,7 +12,7 @@
 2004-02-28 hgg <hgreig AT bigpond.net.au>
        * DETAILS: update to 0.9.0
 
-2003-11-14 Eric Sandall <eric AT sandall.us>
+2003-11-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.8.3
        * HISTORY: Formatted to Guru Handbook
 
@@ -38,6 +38,6 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-08 Eric Sandall <eric AT sandall.us>
+2003-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-board/pioneers/HISTORY b/games-board/pioneers/HISTORY
index 0652c1f..f60f4dc 100644
--- a/games-board/pioneers/HISTORY
+++ b/games-board/pioneers/HISTORY
@@ -10,35 +10,35 @@
        * BUILD: converted to default_games_build
        * CONFLICTS: added to conflict with gnocatan
 
-2005-03-31 Eric Sandall <eric AT sandall.us>
+2005-03-31 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.59
 
-2005-03-15 Eric Sandall <eric AT sandall.us>
+2005-03-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.54
 
-2005-02-22 Eric Sandall <eric AT sandall.us>
+2005-02-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.53
 
-2005-02-01 Eric Sandall <eric AT sandall.us>
+2005-02-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.51
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.50
 
 2004-12-03 David Braaten <xiticix47 AT hotmail.com>
        * DETAILS: version 0.8.1.43.
 
-2004-07-09 Eric Sandall <eric AT sandall.us>
+2004-07-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.30
          BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
 
-2004-02-06 Eric Sandall <eric AT sandall.us>
+2004-02-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.1.16
          Removed MAINTAINER
 
-2003-10-23 Eric Sandall <eric AT sandall.us>
+2003-10-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: After hearing people talking about this on
          IRC, I figured I'd try it, but what do I find? It
          doesn't even run (segfaults) because it can't find
diff --git a/games-board/tuxmathscrabble/HISTORY 
b/games-board/tuxmathscrabble/HISTORY
index 4de62b6..5d84d07 100644
--- a/games-board/tuxmathscrabble/HISTORY
+++ b/games-board/tuxmathscrabble/HISTORY
@@ -10,22 +10,22 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer, SDL_image, and SDL_ttf renamed to sdl*
 
-2004-04-19 Eric Sandall <eric AT sandall.us>
+2004-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.7
 
-2004-03-12 Eric Sandall <eric AT sandall.us>
+2004-03-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.6a
 
 2003-12-02 hgg <hgreig AT bigpond.net.au>
        * BUILD: sedit setup.py to install binary to /usr/games not 
/usr/local/bin
 
-2003-11-30 Eric Sandall <eric AT sandall.us>
+2003-11-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.6
 
-2003-11-18 Eric Sandall <eric AT sandall.us>
+2003-11-18 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games/board
 
diff --git a/games-board/xboard/HISTORY b/games-board/xboard/HISTORY
index 732f34d..d3a5e73 100644
--- a/games-board/xboard/HISTORY
+++ b/games-board/xboard/HISTORY
@@ -8,7 +8,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-11-30 Eric Sandall <eric AT sandall.us>
+2003-11-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.2.7
 
 2003-10-09 hgg <hgreig AT bigpond.net.au>
@@ -20,7 +20,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-02 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-board/xigc/HISTORY b/games-board/xigc/HISTORY
index eaec6ce..8fb7765 100644
--- a/games-board/xigc/HISTORY
+++ b/games-board/xigc/HISTORY
@@ -12,7 +12,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-03-20 Kyle Sallee <anonymous AT sourcemage.org>
diff --git a/games-board/xscrabble/HISTORY b/games-board/xscrabble/HISTORY
index 62b5c0c..dfa2ff5 100644
--- a/games-board/xscrabble/HISTORY
+++ b/games-board/xscrabble/HISTORY
@@ -16,7 +16,7 @@
 2003-12-07 hgg <hgreig AT bigpond.net.au>
        * BUILD: make the /etc/X11/app-defaults/ dir prior to install
 
-2003-11-18 Eric Sandall <eric AT sandall.us>
+2003-11-18 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games/board
 
diff --git a/games-cards/pysol/HISTORY b/games-cards/pysol/HISTORY
index e979e31..1b1d531 100644
--- a/games-cards/pysol/HISTORY
+++ b/games-cards/pysol/HISTORY
@@ -7,10 +7,10 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-03-29 Eric Sandall <eric AT sandall.us>
+2005-03-29 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Needs tk and python built against tk
 
-2005-03-04 Eric Sandall <eric AT sandall.us>
+2005-03-04 Eric Sandall <sandalle AT sourcemage.org>
        * Thought process that lead to this thanks to Ben Ford :)
        * PREPARE: Don't use persistent_add for versions ;)
          Default to 'y' for cardsets, sound, and music
@@ -26,7 +26,7 @@
        * Makefile,Makefile.patch,pysol-compile.sh: Removed
        * pysol: Added wrapper script
 
-2005-01-19 Eric Sandall <eric AT sandall.us>
+2005-01-19 Eric Sandall <sandalle AT sourcemage.org>
        * Thanks to
          http://www.fedoraforum.org/forum/archive/index.php/t-2543.html
          I've found the pysol source files (Markus no longer distributes, or
@@ -50,17 +50,17 @@
        * Makefile.patch: Added (smaller than copying the whole Makefile)
        * Makefile.sound: Updated python version to 2.4
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: SDL renamed to sdl
          Added "&&" for depends
 
 2003-11-26 hgg <hgreig AT bigpond.net.au>
        * BUILD: needs to make a dir if it doesn't exist
 
-2003-09-03 Eric Sandall <eric AT sandall.us>
+2003-09-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.82
          Removed extra SOURCE_URL[0], not sure how this ever worked
          with two of them listed
@@ -76,7 +76,7 @@
        * DETAILS: temporarily changed to SOURCE_URL as authors server not
          uptodate
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 4.81
          Added MD5 and LICENSE
 
diff --git a/games-cards/pysol/pysol b/games-cards/pysol/pysol
index 8b2dd19..91e3aa2 100644
--- a/games-cards/pysol/pysol
+++ b/games-cards/pysol/pysol
@@ -2,7 +2,7 @@
 #
 # PySol wrapper script
 #
-# Written by Eric Sandall <eric AT sandall.us> 2005-03-04
+# Written by Eric Sandall <sandalle AT sourcemage.org> 2005-03-04
 # for Source Mage GNU/Linux <http://www.sourcemage.org/>
 #
 # Licensed under the GNU General Public License
diff --git a/games-cards/xskat/HISTORY b/games-cards/xskat/HISTORY
index c6fa354..66277af 100644
--- a/games-cards/xskat/HISTORY
+++ b/games-cards/xskat/HISTORY
@@ -9,7 +9,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-05-27 Eric Sandall <eric AT sandall.us>
+2004-05-27 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.0
        SOURCE_URL and WEB_SITE moved to xskat.de
        Removed MAINTAINER
@@ -17,7 +17,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * HISTORY: Created
 
 2002-05-17 Anonymous? <anonymous AT sourcemage.org>
diff --git a/games-data/acorn-music/HISTORY b/games-data/acorn-music/HISTORY
index e0d914e..fce8c1a 100644
--- a/games-data/acorn-music/HISTORY
+++ b/games-data/acorn-music/HISTORY
@@ -9,7 +9,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-10-14 Eric Sandall <eric AT sandall.us>
+2003-10-14 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games-libs
 
diff --git a/games-data/crossfire-client-data/HISTORY 
b/games-data/crossfire-client-data/HISTORY
index 5fa5cdc..2922e0d 100644
--- a/games-data/crossfire-client-data/HISTORY
+++ b/games-data/crossfire-client-data/HISTORY
@@ -5,7 +5,7 @@
        * INSTALL: removed I_DIR
        * DETAILS: API2 converted
 
-2005-12-30 Eric Sandall <eric AT sandall.us>
+2005-12-30 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Removed (games-data default_build runs `true`)
        * INSTALL: Cannot chown to games:games (no games user)
 
@@ -17,7 +17,7 @@
        * DETAILS: updated VERSION to 1.7.1
          added SOUND_VERSION
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * Moved binary files out of crossfire-client and into here
        * DETAILS: Set ARCHIVE to "off"
        * BUILD: Run only `true`
@@ -29,7 +29,7 @@
        * DETAILS: Version update 1.7.0 bug #7261
        * DETAILS: Build api 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Formatted to Guru Handbook
        * HISTORY: Formatted to Guru Handbook
@@ -45,7 +45,7 @@
        * BUILD: Fixed linking error due to errno.h which allows the gtk 
client to compile
        * Sounds unchanged since 1.4.0
 
-2002-10-15 Eric Sandall <eric AT sandall.us>
+2002-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.4.0
        * Sounds now are at the same version as the rest
 
@@ -54,7 +54,7 @@
          Changed maintainer
        * HISTORY: Fixed HISTORY file standards compliance
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 1.3.0
          Added MD5 and LICENSE
          Added -images source as SOURCE3
diff --git a/games-data/crossfire-data/HISTORY 
b/games-data/crossfire-data/HISTORY
index 4e9f2e3..1aadccc 100644
--- a/games-data/crossfire-data/HISTORY
+++ b/games-data/crossfire-data/HISTORY
@@ -7,7 +7,7 @@
        * INSTALL: removed I_DIR
        * DETAILS: API2 converted
 
-2005-12-30 Eric Sandall <eric AT sandall.us>
+2005-12-30 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Removed (games-data default_build runs `true`)
        * INSTALL: Cannot chown to games:games (no games user)
 
@@ -21,7 +21,7 @@
        * DETAILS: updated VERSION to 1.7.0
          added BIG_VERSION and SMALL_VERSION
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * Moved binaries from crossfire to crossfire-data  (Bug #7605)
        * DETAILS: Set ARCHIVE to "off"
        * INSTALL: Install to /usr/share/games/crossfire  (Bug #7605)
@@ -43,7 +43,7 @@
          Added big maps for server
          Allowed bz2 files if available (many megs saved)
 
-2002-10-15 Eric Sandall <eric AT sandall.us>
+2002-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.4.0 (and changed to .gz as they don't use 
.bz2
          anymore :()
 
@@ -52,7 +52,7 @@
          Changed maintainer
        * HISTORY: Fixed for standard compliance :)
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.3.0
          Modified to use $SOURCEFORGE_URL
          Added MD5 and LICENSE
diff --git a/games-data/fgfs-base/HISTORY b/games-data/fgfs-base/HISTORY
index 108d41b..c4d67fd 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -17,7 +17,7 @@
 2004-12-11 Adam Clark <adamsgl AT dhbit.ca>
        * DETAILS: Updated to 0.9.6, fixes #7628
 
-2004-07-23 Eric Sandall <eric AT sandall.us
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org
        * DETAILS: Updated to 0.9.4
          BUILD_API=2
          Shortened SHORT
@@ -42,14 +42,14 @@
 2003-06-06 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 0.9.2
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.1a (Bug #2377, thanks to Eric 
Sesterhenn/Snakebyte)
        * BUILD: Now installs to /usr/share/games
 
-2002-12-05 Eric Sandall <eric AT sandall.us>
+2002-12-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.9.0
 
-2002-09-21 Eric Sandall <eric AT sandall.us>
+2002-09-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New version: 0.8.0
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-data/freedoom/HISTORY b/games-data/freedoom/HISTORY
index 83410e6..b5192e1 100644
--- a/games-data/freedoom/HISTORY
+++ b/games-data/freedoom/HISTORY
@@ -10,7 +10,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-10-03 Eric Sandall <eric AT sandall.us>
+2005-10-03 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: Make sure usr/share/games/doom is a directory before 
installing
          to it.
 
diff --git a/games-data/luola-nostalgia/HISTORY 
b/games-data/luola-nostalgia/HISTORY
index 8a4976a..05b2718 100644
--- a/games-data/luola-nostalgia/HISTORY
+++ b/games-data/luola-nostalgia/HISTORY
@@ -5,6 +5,6 @@
 2005-12-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD: not needed... default is true for data
 
-2005-12-21 Eric Sandall <eric AT sandall.us>
+2005-12-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS,PRE_BUILD,BUILD,INSTALL: Created version 1.1
 
diff --git a/games-data/luola-stdlevels/HISTORY 
b/games-data/luola-stdlevels/HISTORY
index 548df1a..8627530 100644
--- a/games-data/luola-stdlevels/HISTORY
+++ b/games-data/luola-stdlevels/HISTORY
@@ -5,7 +5,7 @@
 2005-12-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD: not needed as default for data is true
 
-2005-12-21 Eric Sandall <eric AT sandall.us>
+2005-12-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS,PRE_BUILD,BUILD,PRE_INSTALL,INSTALL,POST_INSTALL:
          Created version 5.2
 
diff --git a/games-data/mason-media/HISTORY b/games-data/mason-media/HISTORY
index ca731f4..925b1f5 100644
--- a/games-data/mason-media/HISTORY
+++ b/games-data/mason-media/HISTORY
@@ -9,13 +9,13 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-10-14 Eric Sandall <eric AT sandall.us>
+2003-10-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fixed a typo
 
-2003-10-07 Eric Sandall <eric AT sandall.us>
+2003-10-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added ARCHIVE="off", thanks to Arwed
 
-2003-10-06 Eric Sandall <eric AT sandall.us>
+2003-10-06 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games-libs
 
diff --git a/games-data/sear-media/HISTORY b/games-data/sear-media/HISTORY
index b3f3e7b..9b7e657 100644
--- a/games-data/sear-media/HISTORY
+++ b/games-data/sear-media/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-11 Eric Sandall <eric AT sandall.us>
+2005-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * Branched from sear
          Modified to only grab and install the media
 
diff --git a/games-emulators/dgen-sdl/HISTORY 
b/games-emulators/dgen-sdl/HISTORY
index 7397eb1..04c15e8 100644
--- a/games-emulators/dgen-sdl/HISTORY
+++ b/games-emulators/dgen-sdl/HISTORY
@@ -5,7 +5,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
 2004-05-09 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-emulators/dosbox/HISTORY b/games-emulators/dosbox/HISTORY
index a4a8649..cf910e7 100644
--- a/games-emulators/dosbox/HISTORY
+++ b/games-emulators/dosbox/HISTORY
@@ -28,7 +28,7 @@
 2004-10-01 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: Version update 0.62
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
 2004-02-06 hgg <hgreig AT bigpond.net.au>
diff --git a/games-emulators/e-uae/HISTORY b/games-emulators/e-uae/HISTORY
index 78411d4..8de4521 100644
--- a/games-emulators/e-uae/HISTORY
+++ b/games-emulators/e-uae/HISTORY
@@ -12,7 +12,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
diff --git a/games-emulators/frotz/HISTORY b/games-emulators/frotz/HISTORY
index 3622906..2e386f7 100644
--- a/games-emulators/frotz/HISTORY
+++ b/games-emulators/frotz/HISTORY
@@ -13,6 +13,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-emulators/gens/HISTORY b/games-emulators/gens/HISTORY
index f64a081..d05decd 100644
--- a/games-emulators/gens/HISTORY
+++ b/games-emulators/gens/HISTORY
@@ -1,7 +1,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
diff --git a/games-emulators/gnuboy/HISTORY b/games-emulators/gnuboy/HISTORY
index 54dd57f..7b223f5 100644
--- a/games-emulators/gnuboy/HISTORY
+++ b/games-emulators/gnuboy/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
        * HISTORY: Formatted to Guru Handbook
diff --git a/games-emulators/grustibus/HISTORY 
b/games-emulators/grustibus/HISTORY
index bb03348..94afbd1 100644
--- a/games-emulators/grustibus/HISTORY
+++ b/games-emulators/grustibus/HISTORY
@@ -20,7 +20,7 @@
        * Added CPPFLAGS to build as gdk-pixbuf is one dir 
          lower in /usr/include
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-emulators/kaf/HISTORY b/games-emulators/kaf/HISTORY
index beb56d3..a9e408d 100644
--- a/games-emulators/kaf/HISTORY
+++ b/games-emulators/kaf/HISTORY
@@ -8,20 +8,20 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make
        * INSTALL: Run make_normal before installation
 
-2005-02-22 Eric Sandall <eric AT sandall.us>
+2005-02-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.3.6
 
-2004-10-18 Eric Sandall <eric AT sandall.us>
+2004-10-18 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.3.5
        * qt.patch, path.patch: Updated to 1.3.5
        * BUILD: Uses default_build now
 
-2004-08-02 Eric Sandall <eric AT sandall.us>
+2004-08-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.3.2
          BUILD_API=2
          MAKE_NJOBS=1
@@ -36,7 +36,7 @@
 2004-02-25 hgg <hgreig AT bigpond.net.au>
        * DETAILS: bug 6164
 
-2003-12-11 Eric Sandall <eric AT sandall.us>
+2003-12-11 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games/emulators
 
diff --git a/games-emulators/scummvm/HISTORY b/games-emulators/scummvm/HISTORY
index da006f6..53f040e 100644
--- a/games-emulators/scummvm/HISTORY
+++ b/games-emulators/scummvm/HISTORY
@@ -39,7 +39,7 @@
        * Removed /etc/scummvmrc ( scummvm creates all necessary files on the
          fly )
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.0
          SOURCE no longer has -src in the name
          Shortened SHORT
@@ -57,7 +57,7 @@
 2004-09-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: MD5 fix
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
          Use any provider of CVS
@@ -100,7 +100,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Changed DETAILS to show current subversion
 
-2003-03-19 Eric Sandall <eric AT sandall.us>
+2003-03-19 Eric Sandall <sandalle AT sourcemage.org>
        * Added to games
 
 2002-12-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-emulators/scummvm_tools/HISTORY 
b/games-emulators/scummvm_tools/HISTORY
index ee75791..f19f6fb 100644
--- a/games-emulators/scummvm_tools/HISTORY
+++ b/games-emulators/scummvm_tools/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.0
          SOURCE no longer uses -src
          SOURCE_DIRECTORY now has -tools before $VERSION
diff --git a/games-emulators/tuxnes/HISTORY b/games-emulators/tuxnes/HISTORY
index 36442c3..5b1496b 100644
--- a/games-emulators/tuxnes/HISTORY
+++ b/games-emulators/tuxnes/HISTORY
@@ -18,10 +18,10 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * Update for ${INSTALL_ROOT}
 
-2002-10-19 Eric Sandall <eric AT sandall.us>
+2002-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1417
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 Kyle Sallee <anonymous AT sourcemage.org>
diff --git a/games-emulators/uae/HISTORY b/games-emulators/uae/HISTORY
index 9c3aacd..2010f85 100644
--- a/games-emulators/uae/HISTORY
+++ b/games-emulators/uae/HISTORY
@@ -13,7 +13,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
diff --git a/games-emulators/visualboyadvance/HISTORY 
b/games-emulators/visualboyadvance/HISTORY
index 214dff9..279c288 100644
--- a/games-emulators/visualboyadvance/HISTORY
+++ b/games-emulators/visualboyadvance/HISTORY
@@ -20,7 +20,7 @@
 2005-05-03 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: lo-casing of spell... also fixes bug #8797
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
 2004-08-01 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/games-emulators/xmame/HISTORY b/games-emulators/xmame/HISTORY
index 241ded4..dcdb199 100644
--- a/games-emulators/xmame/HISTORY
+++ b/games-emulators/xmame/HISTORY
@@ -16,10 +16,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.94
 
-2005-01-11 Eric Sandall <eric AT sandall.us>
+2005-01-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.89
          Added BUILD_API=2
          Shortened SHORT
@@ -50,23 +50,23 @@
        * DETAILS: Updated to 0.83.1
          Removed MAINTAINER.
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.78.1
          Removed MAKE_NJOBS=1
 
-2003-12-14 Eric Sandall <eric AT sandall.us>
+2003-12-14 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Create some default directories
          ctrlr needs to have it's permissions set as well
 
-2003-12-11 Eric Sandall <eric AT sandall.us>
+2003-12-11 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Install some configuration files to /usr/share/games/xmame
        * DETAILS: Updated to 0.77.1
 
-2003-11-03 Eric Sandall <eric AT sandall.us>
+2003-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.76.1, updated LICENSE
        * HISTORY: Formatted to Guru Handbook
 
-2003-09-26 Eric Sandall <eric AT sandall.us>
+2003-09-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.74.1
          Added MAKE_NJOBS=1
 
@@ -76,28 +76,28 @@
 2003-06-06 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 0.69.1
 
-2003-05-26 Eric Sandall <eric AT sandall.us>
+2003-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.68.1
 
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update for ${INSTALL_ROOT}
 
-2003-04-14 Eric Sandall <eric AT sandall.us>
+2003-04-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.67.2
 
-2003-04-05 Eric Sandall <eric AT sandall.us>
+2003-04-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.66.2 (Bug #3030, thanks to Gabriel Devenyi)
 
-2003-02-17 Eric Sandall <eric AT sandall.us>
+2003-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.65.1 (Bug #2569, thanks to Joel Mayes)
        * BUILD: Fixed permission problems, again (should always
          work, now)
 
-2002-11-29 Eric Sandall <eric AT sandall.us>
+2002-11-29 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Cleaned up
          Fixed permission problem on some boxes during installation
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-08-02 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-emulators/xmess/HISTORY b/games-emulators/xmess/HISTORY
index e636fef..983c3ab 100644
--- a/games-emulators/xmess/HISTORY
+++ b/games-emulators/xmess/HISTORY
@@ -16,10 +16,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.94
 
-2005-01-11 Eric Sandall <eric AT sandall.us>
+2005-01-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.89
          Added BUILD_API=2
          Shortened SHORT
@@ -40,7 +40,7 @@
 2004-05-03 Seth Woolley <seth AT tautology.org>
        * DETAILS: to fix md5 for SOURCE.
 
-2003-12-11 Eric Sandall <eric AT sandall.us>
+2003-12-11 Eric Sandall <sandalle AT sourcemage.org>
        * Forked from the xmame spell
        * TODO: Should combine this with xmame, perhaps have it
          install both, or give the option for one or the other, but
diff --git a/games-emulators/zsnes/HISTORY b/games-emulators/zsnes/HISTORY
index e237bef..326f09c 100644
--- a/games-emulators/zsnes/HISTORY
+++ b/games-emulators/zsnes/HISTORY
@@ -24,13 +24,13 @@
        * Makefile.in.FIX.BROKENESS.patch: added
        * Makefile.in.FIX.BROKENESS-plain.patch: added
 
-2005-03-16 Eric Sandall <eric AT sandall.us>
+2005-03-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.42
 
 2005-01-16 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: Minor bugfix of SOURCE_DIRECTORY bug #7963
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.40
          SOURCE_DIRECTORY changed
          Removed MAINTAINER
@@ -42,7 +42,7 @@
          Converted to build_api 2
          Removed TABS
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Removed zlib as libpng depends on it
          Formatted to Guru Handbook
@@ -54,7 +54,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
          Added SOURCEFORGE_URL
 
diff --git a/games-emulators/zx-fuse/HISTORY b/games-emulators/zx-fuse/HISTORY
index e76b231..1645f11 100644
--- a/games-emulators/zx-fuse/HISTORY
+++ b/games-emulators/zx-fuse/HISTORY
@@ -12,10 +12,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * CONFIGURE: Use spell_ok instead of spell_installed
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
 2004-08-01 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/games-engines/crystalspace/HISTORY 
b/games-engines/crystalspace/HISTORY
index 690259e..a6daab3 100644
--- a/games-engines/crystalspace/HISTORY
+++ b/games-engines/crystalspace/HISTORY
@@ -49,7 +49,7 @@
          Handles Jam install, copying of crystalspace.sh, and creating 
symlink
        * POST_INSTALL: Removed; functionality taken over by INSTALL
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
          Formatted to Guru Handbook
 
diff --git a/games-engines/cyphesis/HISTORY b/games-engines/cyphesis/HISTORY
index f0bb62c..cf41324 100644
--- a/games-engines/cyphesis/HISTORY
+++ b/games-engines/cyphesis/HISTORY
@@ -1,12 +1,12 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-12-22 Eric Sandall <eric AT sandall.us>
+2005-12-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.5.5
        * DEPENDS: Added optional dependency on adns
        * BUILD: Use default_games_build
 
-2005-11-02 Eric Sandall <eric AT sandall.us>
+2005-11-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.5.2
          Changed to GPG verification
          Added check for autoupdate of CVS
@@ -15,46 +15,46 @@
        * DEPENDS: Depends on devel branch of atlas-c++ now
        * BUILD,PRE_BUILD: Move ./autogen.sh code into PRE_BUILD
 
-2005-07-03 Eric Sandall <eric AT sandall.us>
+2005-07-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.12
 
-2005-06-12 Eric Sandall <eric AT sandall.us>
+2005-06-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.11
 
-2005-05-11 Eric Sandall <eric AT sandall.us>
+2005-05-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.10
 
-2005-04-04 Eric Sandall <eric AT sandall.us>
+2005-04-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.9
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.8
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2005-01-04 Eric Sandall <eric AT sandall.us>
+2005-01-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.7
        * PREPARE,DETAILS,BUILD: CVS renamed to CYPHESIS_CVS
 
-2004-11-19 Eric Sandall <eric AT sandall.us>
+2004-11-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.6
        * DEPENDS: Stable and CVS version now both use howl
 
-2004-11-11 Eric Sandall <eric AT sandall.us>
+2004-11-11 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: CVS version can use howl for Zeroconf networking
 
-2004-10-25 Eric Sandall <eric AT sandall.us>
+2004-10-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.5
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.4
        * DEPENDS: Depends on atlas-c++-transitional now, not atlas-c++
 
-2004-07-22 Eric Sandall <eric AT sandall.us>
+2004-07-22 Eric Sandall <sandalle AT sourcemage.org>
        * Added to games/games-engines
        * DETAILS: Updated to 0.3.1
          BUILD_API=2
@@ -63,30 +63,30 @@
        * BUILD: Use config_query response for CVS
        * PREPARE: Converted to config_query
 
-2004-05-27 Eric Sandall <eric AT sandall.us>
+2004-05-27 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.0
          Removed MAINTAINER
        * BUILD: Disable postgresql test
          Remove patch application
        * overload.patch: Removed
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
          Depends on skstream not skstream2
 
-2004-05-19 Eric Sandall <eric AT sandall.us>
+2004-05-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Now installs either cvs or stable version
        * DEPENDS: Depends on mercator
        * PREPARE: Added to query for cvs
        * HISTORY: Formatted to Guru Handbook
 
-2003-10-05 Eric Sandall <eric AT sandall.us>
+2003-10-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.4
        * DEPENDS: Needs older skstream2 but newer varconf2
        * overload.patch: Added to fix ambiguous overloading
        * BUILD: Added to apply patch
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
        * HISTORY: Created
 
diff --git a/games-engines/duke3d-engine/HISTORY 
b/games-engines/duke3d-engine/HISTORY
index e678b36..c1cb890 100644
--- a/games-engines/duke3d-engine/HISTORY
+++ b/games-engines/duke3d-engine/HISTORY
@@ -24,7 +24,7 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
 
 2004-04-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/games-engines/entityforge/HISTORY 
b/games-engines/entityforge/HISTORY
index 76ebd82..831141a 100644
--- a/games-engines/entityforge/HISTORY
+++ b/games-engines/entityforge/HISTORY
@@ -11,14 +11,14 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-10-21 Eric Sandall <eric AT sandall.us>
+2004-10-21 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Don't apply patches to CVS version
        * DEPENDS: Depends on libmodelfile
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.1
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added CVS check and 0.2 stable release
          Added SOURCEFORGE mirror for stable release
          Added BUILD_API=2
@@ -28,10 +28,10 @@
        * entityforge-0.2.gtkmm2.patch: Added to work with gtkmm2 2.4+
        * entityforge-0.2.gtkglextmm.patch: Added to work with gtkglextmm 1.1+
 
-2004-05-21 Eric Sandall <eric AT sandall.us>
+2004-05-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Renamed to entityforge
          Removed MAINTAINER
          Entered long and short descriptions
 
-2003-10-18 Eric Sandall <eric AT sandall.us>
+2003-10-18 Eric Sandall <sandalle AT sourcemage.org>
        * Created
diff --git a/games-engines/exult/HISTORY b/games-engines/exult/HISTORY
index 6820767..97c04af 100644
--- a/games-engines/exult/HISTORY
+++ b/games-engines/exult/HISTORY
@@ -21,7 +21,7 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
          Formatted to Guru Handbook
@@ -42,7 +42,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-11-07 Eric Sandall <eric AT sandall.us>
+2002-11-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.00
 
 2002-08-28 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-engines/prboom/HISTORY b/games-engines/prboom/HISTORY
index 1a77a7a..ef4d505 100644
--- a/games-engines/prboom/HISTORY
+++ b/games-engines/prboom/HISTORY
@@ -5,7 +5,7 @@
        * DETAILS: PATCHLEVEL++
        * PRE_BUILD: added for proper docs installation
 
-2006-11-25 Eric Sandall <eric AT sandall.us>
+2006-11-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.4.7
 
 2006-11-04 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -33,11 +33,11 @@
        * added INSTALL
        * DEPENDS: added gcc34, optional depends freedoom
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer and SDL_net renamed to sdl*
        * HISTORY: Formatted to Guru Handbook
 
-2003-09-26 Eric Sandall <eric AT sandall.us>
+2003-09-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 2.3.0
        * BUILD: Seems to have hardcoded 'prboom.wad' to the current
          directory, so I moved the binary prboom from /usr/games
@@ -51,7 +51,7 @@
          additional gunzip -c to put the uncompressed doom wad
          (which the game wants named as doom1.wad) in SOURCE_DIRECTORY
 
-2003-09-20 Eric Sandall <eric AT sandall.us>
+2003-09-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 2.2.4
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
@@ -64,7 +64,7 @@
        * DETAILS: added LICENSE[1]
        * Changelog, HISTORY: moved content of Changelog to HISTORY file
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Version updated to 2.2.3
          Added MD5 and LICENSE
          Changed SOURCE_URL[1] to use $SOURCEFORGE_URL
diff --git a/games-engines/quake2/HISTORY b/games-engines/quake2/HISTORY
index 92b77c8..051d7df 100644
--- a/games-engines/quake2/HISTORY
+++ b/games-engines/quake2/HISTORY
@@ -20,10 +20,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * PRE_BUILD: unpack api update
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Use spell_ok instead of spell_installed
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
        * HISTORY: Formatted to Guru Handbook
@@ -34,7 +34,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-06-06 Eric Sandall <eric AT sandall.us>
+2003-06-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated LICENSE to GPL
 
 2003-05-19 hgg <hgreig AT bigpond.net.au>
@@ -48,10 +48,10 @@
        * BUILD: Added arts sound compilation to Makefile
        * Added maxpak.pak for fancier GL rendering
 
-2002-09-18 Eric Sandall <eric AT sandall.us>
+2002-09-18 Eric Sandall <sandalle AT sourcemage.org>
        * POST_INSTALL, POST_REMOVE: Added thanks to Chris Brian (fixes Bug 
#876)
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-06-16 Chris Brien <christopher_brien AT hotmail.com>
diff --git a/games-engines/quakeforge/HISTORY 
b/games-engines/quakeforge/HISTORY
index d93b311..c60dfc6 100644
--- a/games-engines/quakeforge/HISTORY
+++ b/games-engines/quakeforge/HISTORY
@@ -10,7 +10,7 @@
        * PRE_BUILD: let's keep all the unpacking in PRE_BUILD
        * DEPENDS: added enable and disable options...
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
 
@@ -31,7 +31,7 @@
 2002-10-06 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: New version: 0.5.2
 
-2002-10-02 Eric Sandall <eric AT sandall.us>
+2002-10-02 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added libtool as a dependency
 
 2002-06-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-engines/stratagus/HISTORY b/games-engines/stratagus/HISTORY
index 82ba6d9..b05d109 100644
--- a/games-engines/stratagus/HISTORY
+++ b/games-engines/stratagus/HISTORY
@@ -14,14 +14,14 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-03-08 Eric Sandall <eric AT sandall.us>
+2006-03-08 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Fails with multiple make jobs, use make_single for BUILD
          default_games_build seems to do the same as default_build for 
this...
 
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Removed zlib as libpng depends on it
          Formatted to Guru Handbook
diff --git a/games-fps/alephone/HISTORY b/games-fps/alephone/HISTORY
index 62e294a..1895535 100644
--- a/games-fps/alephone/HISTORY
+++ b/games-fps/alephone/HISTORY
@@ -19,7 +19,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_net and SDL_image renamed to sdl*
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
diff --git a/games-fps/bzflag/HISTORY b/games-fps/bzflag/HISTORY
index 7b9a5c8..4693384 100644
--- a/games-fps/bzflag/HISTORY
+++ b/games-fps/bzflag/HISTORY
@@ -25,7 +25,7 @@
        * BUILD: removed some redundant stuff and replaced default_build
          with default_games_build
 
-2005-05-02 Eric Sandall <eric AT sandall.us>
+2005-05-02 Eric Sandall <sandalle AT sourcemage.org>
        * CONFIGURE: Added options for threading, client, server, robots
          and snapping
          Query for curl and sdl usage
@@ -33,7 +33,7 @@
          curl (if wanted in CONFIGURE), adns, and kerberos
        * BUILD: Add CONFIGURE options to OPTS
 
-2005-03-18 Eric Sandall <eric AT sandall.us>
+2005-03-18 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.0.2.20050318
          Moved SFX to part of VERSION
          Removed SFX from SOURCE and SOURCE_DIRECTORY
@@ -53,13 +53,13 @@
 2004-10-05 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: Updated to 1.10.8
 
-2004-05-16 Eric Sandall <eric AT sandall.us>
+2004-05-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.10.6
 
 2004-01-26 hgg <hgreig AT bigpond.net.au>
        * DETAILS: update to 1.10.4
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
 
 2004-01-06 hgg <hgreig AT bigpond.net.au>
@@ -75,7 +75,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-12-09 Eric Sandall <eric AT sandall.us>
+2002-12-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.7g0
 
 2002-07-27 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-fps/cube/HISTORY b/games-fps/cube/HISTORY
index d6199bc..129ddf8 100644
--- a/games-fps/cube/HISTORY
+++ b/games-fps/cube/HISTORY
@@ -7,7 +7,7 @@
        * PRE_BUILD: removed I_DIR
        * DETAILS: API2 converted
 
-2005-09-25 Eric Sandall <eric AT sandall.us>
+2005-09-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2005_08_29
          Using GPG verification (Level 1)
          SOURCEs now split into data (unix) and source
@@ -30,9 +30,9 @@
        * 20050829-gentoo-paths.patch: Added from
          http://bugs.gentoo.org/show_bug.cgi?id=104292
 
-2004-09-06 Eric Sandall <eric AT sandall.us>
+2004-09-06 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: Install docs to /usr/share/doc not /usr/share/docs
 
-2004-08-28 Eric Sandall <eric AT sandall.us>
+2004-08-28 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell (with some hints from Gentoo's ebuild)
 
diff --git a/games-fps/cube/cube_client_bin b/games-fps/cube/cube_client_bin
index 5db8fbe..236737c 100644
--- a/games-fps/cube/cube_client_bin
+++ b/games-fps/cube/cube_client_bin
@@ -2,7 +2,7 @@
 #
 # Cube client binary loader
 #
-# Written for Source Mage GNU/Linux by Eric Sandall <eric AT sandall.us>
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
 # Copyright (C) Source mage GNU/Linux 2004
 # Licensed under the GPL
 #
diff --git a/games-fps/cube/cube_server_bin b/games-fps/cube/cube_server_bin
index 0bc41bf..a277e29 100644
--- a/games-fps/cube/cube_server_bin
+++ b/games-fps/cube/cube_server_bin
@@ -2,7 +2,7 @@
 #
 # Cube server binary loader
 #
-# Written for Source Mage GNU/Linux by Eric Sandall <eric AT sandall.us>
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
 # Copyright (C) Source mage GNU/Linux 2004
 # Licensed under the GPL
 #
diff --git a/games-fps/sauerbraten/HISTORY b/games-fps/sauerbraten/HISTORY
index fd0d301..9c4f5ca 100644
--- a/games-fps/sauerbraten/HISTORY
+++ b/games-fps/sauerbraten/HISTORY
@@ -3,7 +3,7 @@
        * PRE_BUILD: removed I_DIR
        * DETAILS: API2 converted
 
-2005-10-03 Eric Sandall <eric AT sandall.us>
+2005-10-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS,CONFIGURE,DEPENDS,PRE_BUILD,BUILD,INSTALL,
          20050815-addfullpath-rendergl.cpp.patch,
          20050815-addfullpath-tools.cpp.patch,
diff --git a/games-fps/sauerbraten/sauerbraten_client_bin 
b/games-fps/sauerbraten/sauerbraten_client_bin
index b87e8bd..5eafc69 100644
--- a/games-fps/sauerbraten/sauerbraten_client_bin
+++ b/games-fps/sauerbraten/sauerbraten_client_bin
@@ -2,7 +2,7 @@
 #
 # Sauerbraten client binary loader
 #
-# Written for Source Mage GNU/Linux by Eric Sandall <eric AT sandall.us>
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
 # Copyright (C) Source mage GNU/Linux 2005
 # Licensed under the GPL
 #
diff --git a/games-fps/sauerbraten/sauerbraten_server_bin 
b/games-fps/sauerbraten/sauerbraten_server_bin
index 08ae75a..52276cd 100644
--- a/games-fps/sauerbraten/sauerbraten_server_bin
+++ b/games-fps/sauerbraten/sauerbraten_server_bin
@@ -2,7 +2,7 @@
 #
 # Sauerbraten server binary loader
 #
-# Written for Source Mage GNU/Linux by Eric Sandall <eric AT sandall.us>
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
 # Copyright (C) Source mage GNU/Linux 2005
 # Licensed under the GPL
 #
diff --git a/games-ggz/ggz-docs/HISTORY b/games-ggz/ggz-docs/HISTORY
index b1e033a..e21d86b 100644
--- a/games-ggz/ggz-docs/HISTORY
+++ b/games-ggz/ggz-docs/HISTORY
@@ -25,6 +25,6 @@
 2003-06-05 hgg <hgreig AT bigpond.net.au>
        * Update for 0.0.7
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-grubby/HISTORY b/games-ggz/ggz-grubby/HISTORY
index 4528e69..b0a1af0 100644
--- a/games-ggz/ggz-grubby/HISTORY
+++ b/games-ggz/ggz-grubby/HISTORY
@@ -31,6 +31,6 @@
 2003-05-28 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: Updated DEPENDS to reflect easysock's absorption into 
libggz
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-gtk-client/HISTORY 
b/games-ggz/ggz-gtk-client/HISTORY
index f741d5b..3974c1e 100644
--- a/games-ggz/ggz-gtk-client/HISTORY
+++ b/games-ggz/ggz-gtk-client/HISTORY
@@ -29,9 +29,9 @@
 2003-06-05 hgg <hgreig AT bigpond.net.au>
        * Update for 0.0.7
 
-2003-03-11 Eric Sandall <eric AT sandall.us>
+2003-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2659
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-gtk-games/HISTORY b/games-ggz/ggz-gtk-games/HISTORY
index 5aaf24e..382a135 100644
--- a/games-ggz/ggz-gtk-games/HISTORY
+++ b/games-ggz/ggz-gtk-games/HISTORY
@@ -27,9 +27,9 @@
 2003-06-05 hgg <hgreig AT bigpond.net.au>
        * Update for 0.0.7
 
-2003-03-11 Eric Sandall <eric AT sandall.us>
+2003-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2659
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-kde-client/HISTORY 
b/games-ggz/ggz-kde-client/HISTORY
index 5cfa79e..40371e5 100644
--- a/games-ggz/ggz-kde-client/HISTORY
+++ b/games-ggz/ggz-kde-client/HISTORY
@@ -6,7 +6,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-03-10 Eric Sandall <eric AT sandall.us>
+2006-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on arts
 
 2005-12-07 Robin Cook <rcook AT wyrms.net>
@@ -28,9 +28,9 @@
 2003-06-05 hgg <hgreig AT bigpond.net.au>
        * Update for 0.0.7
 
-2003-03-11 Eric Sandall <eric AT sandall.us>
+2003-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2659
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-kde-games/HISTORY b/games-ggz/ggz-kde-games/HISTORY
index 7a88ef1..b28740e 100644
--- a/games-ggz/ggz-kde-games/HISTORY
+++ b/games-ggz/ggz-kde-games/HISTORY
@@ -6,7 +6,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-03-10 Eric Sandall <eric AT sandall.us>
+2006-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Optionally depends on arts
 
 2005-12-07 Robin Cook <rcook AT wyrms.net>
@@ -28,9 +28,9 @@
 2003-06-05 hgg <hgreig AT bigpond.net.au>
        * Update for 0.0.7
 
-2003-03-11 Eric Sandall <eric AT sandall.us>
+2003-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2659
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-python/HISTORY b/games-ggz/ggz-python/HISTORY
index db9b3e5..2b8857e 100644
--- a/games-ggz/ggz-python/HISTORY
+++ b/games-ggz/ggz-python/HISTORY
@@ -35,6 +35,6 @@
 2003-05-28 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: Updated DEPENDS to reflect easysock's absorption into 
libggz
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-sdl-games/HISTORY b/games-ggz/ggz-sdl-games/HISTORY
index 01cb5e6..ba041e1 100644
--- a/games-ggz/ggz-sdl-games/HISTORY
+++ b/games-ggz/ggz-sdl-games/HISTORY
@@ -15,7 +15,7 @@
          converted and added SOURCE_URLs
        * BUILD: added to call default_games_build
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_ttf renamed to sdl*
          Removed SDL as the above depend on sdl
          Formatted to Guru Handbook
diff --git a/games-ggz/ggz-server/HISTORY b/games-ggz/ggz-server/HISTORY
index f2f94fd..869f5dd 100644
--- a/games-ggz/ggz-server/HISTORY
+++ b/games-ggz/ggz-server/HISTORY
@@ -36,6 +36,6 @@
 2003-05-28 hgg <hgreig AT bigpond.net.au>
        * Updated DEPENDS to reflect easysock's absorption into libggz
 
-2002-11-29 Eric Sandall <eric AT sandall.us>
+2002-11-29 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-txt-client/HISTORY 
b/games-ggz/ggz-txt-client/HISTORY
index 92228e0..d945607 100644
--- a/games-ggz/ggz-txt-client/HISTORY
+++ b/games-ggz/ggz-txt-client/HISTORY
@@ -33,6 +33,6 @@
 2003-05-28 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: Updated DEPENDS to reflect easysock's absorption into 
libggz
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-ggz/ggz-utils/HISTORY b/games-ggz/ggz-utils/HISTORY
index fc97bb7..b328060 100644
--- a/games-ggz/ggz-utils/HISTORY
+++ b/games-ggz/ggz-utils/HISTORY
@@ -33,6 +33,6 @@
 2003-05-28 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: Updated DEPENDS to reflect easysock's absorption into 
libggz
 
-2002-12-17 Eric Sandall <eric AT sandall.us>
+2002-12-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/allegro/HISTORY b/games-libs/allegro/HISTORY
index b17be44..2022320 100644
--- a/games-libs/allegro/HISTORY
+++ b/games-libs/allegro/HISTORY
@@ -17,13 +17,13 @@
        * BUILD: make_single added also used default_build
          fixes bug #9054 invalid infodir location
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.1.16  (Bug #7593)
          Added BUILD_API=2
        * BUILD: Converted to build_api 2
        * INSTALL: Added
 
-2004-04-27 Eric Sandall <eric AT sandall.us>
+2004-04-27 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.1.14
          Removed MAINTAINER
          Removed single make job (MAKE_NJOBS=1)
@@ -38,7 +38,7 @@
 2003-05-05 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 4.1.9
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.1.8 (Bug #2380, thanks to Snakebyte)
        * BUILD: Modified to actually install documentation,
          both info and man (both are compressed .gz)
@@ -47,7 +47,7 @@
        * DETAILS: Updated to version 4.1.4
          Changed to use $SOURCEFORGE_URL
 
-2002-10-23 Eric Sandall <eric AT sandall.us>
+2002-10-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Cleaned up
        * POST_BUILD: Removed (redundant)
 
@@ -58,7 +58,7 @@
        * DETAILS: Changed maintainer
        * HISTORY: Fixed file standard compliance
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 4.0.2
          Added MD5 and LICENSE
 
diff --git a/games-libs/atlas-c++-transitional/HISTORY 
b/games-libs/atlas-c++-transitional/HISTORY
index 97352ec..27fc50f 100644
--- a/games-libs/atlas-c++-transitional/HISTORY
+++ b/games-libs/atlas-c++-transitional/HISTORY
@@ -4,28 +4,28 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.5.0 (supposedly same as 0.4.95)
          SOURCE uses .bz2
        * CONFLICTS: Removed (Atlas-C++-transitional has been gone a while)
 
-2005-05-23 Eric Sandall <eric AT sandall.us>
+2005-05-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.95
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
          SOURCE changed to .gz
 
-2004-07-21 Eric Sandall <eric AT sandall.us>
+2004-07-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.94
          BUILD_API=2
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from Atlas-C++-transitional
        * DETAILS: Changed SPELL to atlas-c++-transitional
          SOURCEs and SOURCE_DIRECTORY use Atlas-C++-transitional
        * CONFLICTS: Conflicts with Atlas-C++-transitional
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * Created for new uclient version (0.16)
 
diff --git a/games-libs/atlas-c++/HISTORY b/games-libs/atlas-c++/HISTORY
index 4e21332..da3d073 100644
--- a/games-libs/atlas-c++/HISTORY
+++ b/games-libs/atlas-c++/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-11-02 Eric Sandall <eric AT sandall.us>
+2005-11-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel branch to 0.5.98
          Changed to GPG verification
          Added check for autoupdate of CVS
@@ -9,19 +9,19 @@
        * PREPARE: Added query for autoupdate of CVS
        * BUILD,PRE_BUILD: Move autogen.sh code into PRE_BUILD
 
-2005-06-10 Eric Sandall <eric AT sandall.us>
+2005-06-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 0.5.96
 
-2005-05-11 Eric Sandall <eric AT sandall.us>
+2005-05-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 0.5.95
 
-2005-04-19 Eric Sandall <eric AT sandall.us>
+2005-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 0.5.94
 
-2005-01-11 Eric Sandall <eric AT sandall.us>
+2005-01-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 0.5.92
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Use config_query_list to ask for stable, devel, or cvs
          config_query variable renamed to ATLAS_CPP_BRANCH from CVS
        * DETAILS: Added "devel" 0.5.91 version (uses SOURCEFORGE_URL)
@@ -30,22 +30,22 @@
        * DEPENDS: Check ATLAS_CPP_BRANCH
          If "cvs" is set, depend on some CVS
 
-2004-07-21 Eric Sandall <eric AT sandall.us>
+2004-07-21 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: CVS version depends on atlas-python
 
-2004-07-19 Eric Sandall <eric AT sandall.us>
+2004-07-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          SOURCE_DIRECTORY is different for release and cvs
          Use config_query response
        * BUILD: Use config_query response
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from Atlas-C++
        * DETAILS: Changed SPELL to atlas-c++
          SOURCEs and SOURCE_DIRECTORY use Atlas-C++
        * CONFLICTS: Conflicts with Atlas-C++
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
          Removed MAINTAINER
@@ -53,17 +53,17 @@
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2003-10-09 Eric Sandall <eric AT sandall.us>
+2003-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added dependency on cppsocket
        * HISTORY: Updated to follow Guru Handbook
 
-2003-10-05 Eric Sandall <eric AT sandall.us>
+2003-10-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Released under the LGPL, not GPL
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Victor is no more, moved to new server
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
@@ -72,9 +72,9 @@
 2003-05-10 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.4.6
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * HISTORY: Created
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created Atlas-C++ and added to grimoire
 
diff --git a/games-libs/atlas-python/HISTORY b/games-libs/atlas-python/HISTORY
index cdf8f38..4fe046f 100644
--- a/games-libs/atlas-python/HISTORY
+++ b/games-libs/atlas-python/HISTORY
@@ -4,9 +4,9 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 IGNORE to SOURCE_HASH unversioned
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2004-07-21 Eric Sandall <eric AT sandall.us>
+2004-07-21 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/blender2cal3d/HISTORY 
b/games-libs/blender2cal3d/HISTORY
index 75cfc6f..585af5d 100644
--- a/games-libs/blender2cal3d/HISTORY
+++ b/games-libs/blender2cal3d/HISTORY
@@ -7,9 +7,9 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2003-10-09 Eric Sandall <eric AT sandall.us>
+2003-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/cal3d/HISTORY b/games-libs/cal3d/HISTORY
index 902c780..ad06b33 100644
--- a/games-libs/cal3d/HISTORY
+++ b/games-libs/cal3d/HISTORY
@@ -11,11 +11,11 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-17 Eric Sandall <eric AT sandall.us>
+2005-06-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.10.0
          SOURCE now has 'full' in its name
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.1 (was released last November...)
          This version also now installs a cal3d.pc :)
          SOURCE now compressed with bzip2 instead
@@ -27,16 +27,16 @@
          Optionally depends on doxygen
        * HISTORY: Formatted to Guru Handbook
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Update to 0.9
        * BUILD: Needs ./autogen.sh run to generate ./configure
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * HISTORY: Created
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created cal3d and added to grimoire
 
diff --git a/games-libs/cal3d_converter/HISTORY 
b/games-libs/cal3d_converter/HISTORY
index 152288f..d7e5b08 100644
--- a/games-libs/cal3d_converter/HISTORY
+++ b/games-libs/cal3d_converter/HISTORY
@@ -7,6 +7,6 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-10-09 Eric Sandall <eric AT sandall.us>
+2003-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/cal3d_data/HISTORY b/games-libs/cal3d_data/HISTORY
index f202a9f..c19ffea 100644
--- a/games-libs/cal3d_data/HISTORY
+++ b/games-libs/cal3d_data/HISTORY
@@ -7,15 +7,15 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * Update to 0.9
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * Created HISTORY file
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created cal3d_data and added to grimoire
 
diff --git a/games-libs/cal3d_miniviewer/HISTORY 
b/games-libs/cal3d_miniviewer/HISTORY
index 8a6b253..c955472 100644
--- a/games-libs/cal3d_miniviewer/HISTORY
+++ b/games-libs/cal3d_miniviewer/HISTORY
@@ -10,6 +10,6 @@
 2003-12-07 hgg <hgreig AT bigpond.net.au>
        * BUILD: reorder flags for LIBS or libGLU isn't found
 
-2003-10-09 Eric Sandall <eric AT sandall.us>
+2003-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/cel/HISTORY b/games-libs/cel/HISTORY
index 123d8d1..1f97d8d 100644
--- a/games-libs/cel/HISTORY
+++ b/games-libs/cel/HISTORY
@@ -11,7 +11,7 @@
        * DETAILS, BUILD, INSTALL, POST_INSTALL: build api 2 ocnversion
        * POST_INSTALL,FINAL: moved to FINAL
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
 2004-01-07 hgg <hgreig AT bigpond.net.au>
diff --git a/games-libs/clanlib-devel/HISTORY 
b/games-libs/clanlib-devel/HISTORY
index 3be511c..4ecfb17 100644
--- a/games-libs/clanlib-devel/HISTORY
+++ b/games-libs/clanlib-devel/HISTORY
@@ -14,22 +14,22 @@
        * CONFIGURE: plenty of configure options
        * DEPENDS: some go some come in :)
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Use spell_ok instead of spell_installed
 
 2004-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, DEPENDS, BUILD: Some minor fixes
        * Renamed spell to clanlib-devel
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD, DEPENDS: Remove check for NVIDIA_driver/NVIDIA_headers
        * BUILD: Converted to BUILD_API 2
        * DETAILS: BUILD_API=2
 
-2004-07-18 Eric Sandall <eric AT sandall.us>
+2004-07-18 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Just in case they're on the stable grimoire with 
NVIDIA_headers
 
-2004-07-17 Eric Sandall <eric AT sandall.us>
+2004-07-17 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on nvidia_header if nvidia_driver is installed
          Remove same entries for NVIDIA_header and NVIDIA_driver once the
          renames make it into stable grimoire
@@ -74,11 +74,11 @@
 2003-06-12 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update to 0.7.2-1
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
        * BUILD: No longer required
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.5-1 (Bug #2376, thanks to Snakebyte)
 
 2002-08-27 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-libs/clanlib/HISTORY b/games-libs/clanlib/HISTORY
index 45cf860..09600e3 100644
--- a/games-libs/clanlib/HISTORY
+++ b/games-libs/clanlib/HISTORY
@@ -8,7 +8,7 @@
        * DETAILS: license changed to clanli license, still Free(BSD like)
        * DEPENDS: cleaned out nvidia_headers is derpecated
 
-2006-07-14 Eric Sandall <eric AT sandall.us>
+2006-07-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.0RC2
          Removed UPDATED and BUILD_API=2 (grimoire-wide)
        * CONFIGURE: Added option for debug mode (default enable)
@@ -21,22 +21,22 @@
        * DEPENDS: some go some come in :)
        * Renamed to clanlib from clanlib-devel
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Use spell_ok instead of spell_installed
 
 2004-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS, DEPENDS, BUILD: Some minor fixes
        * Renamed spell to clanlib-devel
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD, DEPENDS: Remove check for NVIDIA_driver/NVIDIA_headers
        * BUILD: Converted to BUILD_API 2
        * DETAILS: BUILD_API=2
 
-2004-07-18 Eric Sandall <eric AT sandall.us>
+2004-07-18 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Just in case they're on the stable grimoire with 
NVIDIA_headers
 
-2004-07-17 Eric Sandall <eric AT sandall.us>
+2004-07-17 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on nvidia_header if nvidia_driver is installed
          Remove same entries for NVIDIA_header and NVIDIA_driver once the
          renames make it into stable grimoire
@@ -81,11 +81,11 @@
 2003-06-12 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update to 0.7.2-1
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
        * BUILD: No longer required
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.5-1 (Bug #2376, thanks to Snakebyte)
 
 2002-08-27 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-libs/clanlib6/HISTORY b/games-libs/clanlib6/HISTORY
index 95d020f..aed2763 100644
--- a/games-libs/clanlib6/HISTORY
+++ b/games-libs/clanlib6/HISTORY
@@ -9,7 +9,7 @@
        * DETAILS: SPELL=clanlib6, sha512
        * DEPENDS: Hermes to libhermes
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD,DEPENDS: Use spell_ok instead of spell_installed
 
 2005-01-16 Adam Clark <adamsgl AT dhbit.ca>
@@ -27,16 +27,16 @@
 2004-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * Renamed to clanlib
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD, DEPENDS: Remove check for NVIDIA_driver/NVIDIA_headers
        * BUILD: Converted to BUILD_API 2
        * DETAILS: BUILD_API=2
          Removed MAINTAINER
 
-2004-07-18 Eric Sandall <eric AT sandall.us>
+2004-07-18 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Just in case they're on the stable grimoire with 
NVIDIA_headers
 
-2004-07-17 Eric Sandall <eric AT sandall.us>
+2004-07-17 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on nvidia_header if nvidia_driver is installed
          Remove same entries for NVIDIA_header and NVIDIA_driver once the
          renames make it into stable grimoire
@@ -77,11 +77,11 @@
 2003-06-12 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update to 0.7.2-1
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
        * BUILD: No longer required
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.5-1 (Bug #2376, thanks to Snakebyte)
 
 2002-08-27 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-libs/coal/HISTORY b/games-libs/coal/HISTORY
index c7c9b05..1697a3e 100644
--- a/games-libs/coal/HISTORY
+++ b/games-libs/coal/HISTORY
@@ -14,7 +14,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Removed MAINTAINER
        * PREPARE: Added to query for cvs version
@@ -24,15 +24,15 @@
 2003-11-26 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: add libxml
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * Created HISTORY file
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created coal and added to grimoire
 
diff --git a/games-libs/ember-media/HISTORY b/games-libs/ember-media/HISTORY
index fa70ec7..fd07d22 100644
--- a/games-libs/ember-media/HISTORY
+++ b/games-libs/ember-media/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-10 Eric Sandall <eric AT sandall.us>
+2005-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * Branched from ember
        * DETAILS: Added ARCHIVE="off"
        * INSTALL: Install to /usr/share/games/ember/data
diff --git a/games-libs/eris-transitional/HISTORY 
b/games-libs/eris-transitional/HISTORY
index d61401a..58f3ad3 100644
--- a/games-libs/eris-transitional/HISTORY
+++ b/games-libs/eris-transitional/HISTORY
@@ -1,22 +1,22 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-12 Eric Sandall <eric AT sandall.us>
+2005-01-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.2
 
-2004-11-09 Eric Sandall <eric AT sandall.us>
+2004-11-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.1
        * DEPENDS,CONFIGURE: Can now use either libsigc++2 or libsigc++3
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++-transitional renamed to atlas-c++-transitional
 
-2004-05-19 Eric Sandall <eric AT sandall.us>
+2004-05-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.0
 
-2004-04-10 Eric Sandall <eric AT sandall.us>
+2004-04-10 Eric Sandall <sandalle AT sourcemage.org>
        * Created for uclient 0.16
 
diff --git a/games-libs/eris/HISTORY b/games-libs/eris/HISTORY
index 3b83745..66770fe 100644
--- a/games-libs/eris/HISTORY
+++ b/games-libs/eris/HISTORY
@@ -1,10 +1,10 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-01-04 Eric Sandall <eric AT sandall.us>
+2006-01-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.10
 
-2005-11-02 Eric Sandall <eric AT sandall.us>
+2005-11-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.9
          Added GPG checking
          Added code to autoupdate CVS if wanted
@@ -13,26 +13,26 @@
          Formatted message to <80 columns
        * BUILD,PRE_BUILD: Moved ./autogen.sh code into PRE_BUILD
 
-2005-07-02 Eric Sandall <eric AT sandall.us>
+2005-07-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.7
 
-2005-06-13 Eric Sandall <eric AT sandall.us>
+2005-06-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.6
 
-2005-05-11 Eric Sandall <eric AT sandall.us>
+2005-05-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.5
 
-2005-04-19 Eric Sandall <eric AT sandall.us>
+2005-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel to 1.3.4
 
-2005-01-31 Eric Sandall <eric AT sandall.us>
+2005-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated devel version to 1.3.3
          Added SOURCEFORGE_URL for devel version
 
-2005-01-12 Eric Sandall <eric AT sandall.us>
+2005-01-12 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: devel and cvs want libsigc++3
 
-2005-01-11 Eric Sandall <eric AT sandall.us>
+2005-01-11 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Query for devel, stable, or cvs version now
          CVS renamed to ERIS_BRANCH
        * DETAILS: Check for devel or cvs version
@@ -42,16 +42,16 @@
        * DEPENDS: CVS renamed to ERIS_BRANCH
          devel and cvs depend on atlas-c++ devel
 
-2004-10-25 Eric Sandall <eric AT sandall.us>
+2004-10-25 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Missed a "$"
 
-2004-10-19 Eric Sandall <eric AT sandall.us>
+2004-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Mention that CVS eris needs CVS atlas-c++
 
-2004-07-21 Eric Sandall <eric AT sandall.us>
+2004-07-21 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Missed a closing }
 
-2004-07-19 Eric Sandall <eric AT sandall.us>
+2004-07-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Ummm...checkout libs/eris, not libs/skstream, for cvs
          BUILD_API=2
          Use config_query response for CVS
@@ -61,10 +61,10 @@
          Added message saying eris-cvs needs atlas-c++-cvs
        * PREPARE: Converted to config_query
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
 
-2004-04-12 Eric Sandall <eric AT sandall.us>
+2004-04-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
        * PREPARE: Added to query for cvs version
@@ -77,15 +77,15 @@
        * DEPENDS: add pkgconfig
        * HISTORY: reformat
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
-2003-09-30 Eric Sandall <eric AT sandall.us>
+2003-09-30 Eric Sandall <sandalle AT sourcemage.org>
        * Added skstream2 (0.2.0) for eris and eris now
          depends on it (skstream 0.3.0 is for devel version
          of eris, which also require other new libraries)
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * Update to 0.9.8
          Depends upon libsigc++2 (libsigc++ >= 1.2)
          Uses .bz2 compressed tarball instead of .gz
@@ -102,13 +102,13 @@
        * BUILD: Added build as Current Atlas-C++ install to different 
          dir and CPPFLAGS needed to build
 
-2003-03-11 Eric Sandall <eric AT sandall.us>
+2003-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.6
        * BUILD: Removed BUILD as it is no longer needed
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * HISTORY: Created HISTORY file
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created eris and added to grimoire
 
diff --git a/games-libs/grapevine/HISTORY b/games-libs/grapevine/HISTORY
index a7f0f86..91698e9 100644
--- a/games-libs/grapevine/HISTORY
+++ b/games-libs/grapevine/HISTORY
@@ -4,6 +4,6 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-03-17 Eric Sandall <eric AT sandall.us>
+2005-03-17 Eric Sandall <sandalle AT sourcemage.org>
        * Created
 
diff --git a/games-libs/janus/HISTORY b/games-libs/janus/HISTORY
index a66f1d1..4c8e52c 100644
--- a/games-libs/janus/HISTORY
+++ b/games-libs/janus/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
          Removed MAINTAINER
@@ -16,14 +16,14 @@
        * DEPENDS: Conditionally depend upon cvs
        * HISTORY: Formatted to Guru Handbook
 
-2003-10-05 Eric Sandall <eric AT sandall.us>
+2003-10-05 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added dependency on libuta, even though it is only
          optional, the only thing which depends on janus (uclient) needs
          the libuta bindings, so...
        * gcc-3.3.patch: Added for assert.h
        * BUILD: Applies gcc-3.3.patch
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
 2003-07-29 hgg <hgreig AT bigpond.net.au>
@@ -38,9 +38,9 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-02-03 Eric Sandall <eric AT sandall.us>
+2003-02-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.6
 
-2002-09-19 Eric Sandall <eric AT sandall.us>
+2002-09-19 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/libmodelfile/HISTORY b/games-libs/libmodelfile/HISTORY
index d25f82c..885f177 100644
--- a/games-libs/libmodelfile/HISTORY
+++ b/games-libs/libmodelfile/HISTORY
@@ -4,9 +4,9 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-16 Eric Sandall <eric AT sandall.us>
+2005-06-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.1.92
 
-2004-10-21 Eric Sandall <eric AT sandall.us>
+2004-10-21 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell for entityforge
 
diff --git a/games-libs/mercator/HISTORY b/games-libs/mercator/HISTORY
index a3fa291..c85a0f5 100644
--- a/games-libs/mercator/HISTORY
+++ b/games-libs/mercator/HISTORY
@@ -7,23 +7,23 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-16 Eric Sandall <eric AT sandall.us>
+2005-06-16 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.4
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.3
 
-2005-05-10 Eric Sandall <eric AT sandall.us>
+2005-05-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.2
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
          SOURCE changed to .gz
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.1
 
-2004-07-19 Eric Sandall <eric AT sandall.us>
+2004-07-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Use config_query response for CVS
          BUILD_API=2
        * BUILD: Use config_query response for CVS
@@ -32,11 +32,11 @@
        * PREPARE: Converted to config_query
        * CONFLICTS: Removed (no longer conflicts with eris)
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Ummm, checkout mercator, not skstream, for CVS
        * DEPENDS: Atlas-C++ renamed to atlas-c++
 
-2004-05-19 Eric Sandall <eric AT sandall.us>
+2004-05-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Install either cvs or 0.2.0 release
          Removed MAINTAINER
          Added long and short descriptions
@@ -45,5 +45,5 @@
        * PREPARE: Added to query for cvs
        * Copied from mercator-cvs
 
-2003-10-12 Eric Sandall <eric AT sandall.us>
+2003-10-12 Eric Sandall <sandalle AT sourcemage.org>
        * Created eris
diff --git a/games-libs/opentnl/HISTORY b/games-libs/opentnl/HISTORY
index 9c324f0..8429a75 100644
--- a/games-libs/opentnl/HISTORY
+++ b/games-libs/opentnl/HISTORY
@@ -5,6 +5,6 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-06-22 Eric Sandall <eric AT sandall.us>
+2004-06-22 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/paragui-doc/HISTORY b/games-libs/paragui-doc/HISTORY
index b0ceadd..58c0ec1 100644
--- a/games-libs/paragui-doc/HISTORY
+++ b/games-libs/paragui-doc/HISTORY
@@ -10,7 +10,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-02-04 Eric Sandall <eric AT sandall.us>
+2003-02-04 Eric Sandall <sandalle AT sourcemage.org>
        * Added to games
          Created spell
 
diff --git a/games-libs/paragui/HISTORY b/games-libs/paragui/HISTORY
index b9b9490..cd947c3 100644
--- a/games-libs/paragui/HISTORY
+++ b/games-libs/paragui/HISTORY
@@ -4,10 +4,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Formatted to Guru Handbook
 
@@ -17,22 +17,22 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-06-06 Eric Sandall <eric AT sandall.us>
+2003-06-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Unpacks into paragui-1.0.4, no beta postfix
 
 2003-06-04 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 1.0.4-beta2
          especially for freerails
 
-2003-02-05 Eric Sandall <eric AT sandall.us>
+2003-02-05 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2500, thanks to Christian Sonne
 
-2003-02-04 Eric Sandall <eric AT sandall.us>
+2003-02-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.3
 
-2002-10-24 Eric Sandall <eric AT sandall.us>
+2002-10-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Fixed typo
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Added paragui to games
 
diff --git a/games-libs/plib/HISTORY b/games-libs/plib/HISTORY
index ff3dfe7..6675435 100644
--- a/games-libs/plib/HISTORY
+++ b/games-libs/plib/HISTORY
@@ -19,7 +19,7 @@
        * DETAILS: updated to 1.8.4.
        * BUILD: added flag to configure to find our GL files.
 
-2004-06-29 Eric Sandall <eric AT sandall.us>
+2004-06-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.8.3
        Removed MAINTAINER
        BUILD_API=2
diff --git a/games-libs/sage/HISTORY b/games-libs/sage/HISTORY
index f9289ba..861d81c 100644
--- a/games-libs/sage/HISTORY
+++ b/games-libs/sage/HISTORY
@@ -1,10 +1,10 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2005-11-04 Eric Sandall <eric AT sandall.us>
+2005-11-04 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Use prior choice of old CVS variable, if set
 
-2005-11-03 Eric Sandall <eric AT sandall.us>
+2005-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.1.2
          Added GPG verification of source
          Renamed CVS to SAGE_CVS
@@ -16,21 +16,21 @@
          Added query for autoupdating CVS
        * BUILD,PRE_BUILD: Moved ./autogen.sh code into PRE_BUILD
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
        * DEPENDS: Pass --disable-sdltest to OPTS
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
        * PREPARE: Added to query for cvs version
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2004-03-22 Eric Sandall <eric AT sandall.us>
+2004-03-22 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.1.1
          Removed MAINTAINER
 
@@ -40,6 +40,6 @@
 2003-11-22 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: big letters for x11-libs
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/sdlmm/HISTORY b/games-libs/sdlmm/HISTORY
index 69410c3..3e55347 100644
--- a/games-libs/sdlmm/HISTORY
+++ b/games-libs/sdlmm/HISTORY
@@ -5,10 +5,10 @@
        * CONFLICTS: added
        * renamed from SDLmm
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-07-12 Eric Sandall <eric AT sandall.us>
+2004-07-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAINTAINER
          Cleaned up spacing
          Shortened SHORT
diff --git a/games-libs/simgear/HISTORY b/games-libs/simgear/HISTORY
index 5927314..df119a2 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -13,7 +13,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards
 
@@ -21,10 +21,10 @@
        * Migrated from SimGear
        * DETAILS: Updated to 0.3.7, squashes #7627
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.5
 
-2004-07-13 Eric Sandall <eric AT sandall.us>
+2004-07-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          MAKE_NJOBS=1
          Shortened SHORT
@@ -42,10 +42,10 @@
 2003-06-04 hgg <hgreig AT gibpond.net.au>
        * DETAILS: Update to 0.3.2, ready for FlightGear 0.9.2
 
-2002-12-05 Eric Sandall <eric AT sandall.us>
+2002-12-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.3.1 (for FlightGear and fgfs-base v0.9.0)
 
-2002-09-21 Eric Sandall <eric AT sandall.us>
+2002-09-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New version: 0.2.0 (for FlightGear and fgfs-base v0.8.0)
 
 2002-08-29 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-libs/skstream/HISTORY b/games-libs/skstream/HISTORY
index 5b28ad9..a449307 100644
--- a/games-libs/skstream/HISTORY
+++ b/games-libs/skstream/HISTORY
@@ -7,38 +7,38 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-11-30 Eric Sandall <eric AT sandall.us>
+2004-11-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.3
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.2
          Added BUILD_API=2
          Use config_query response
        * PREPARE: Converted to config_query
        * BUILD: Use config_query response
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
        * PREPARE: Added to query for cvs version
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2004-03-25 Eric Sandall <eric AT sandall.us>
+2004-03-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Forgot md5sum!
          Removed MAINTAINER
 
-2003-12-19 Eric Sandall <eric AT sandall.us>
+2003-12-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.1
        * HISTORY: Formatted to Guru Handbook
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Can optionally use zip and cppunit
        * DETAILS: 0.3.0 just now released
          Tested Atlas-C++, wfmath, and eris against the update
@@ -54,10 +54,10 @@
 2003-02-09 Seth Woolley <seth AT tautology.org>
        * DETAILS: Reautomake'd so remd5'd
 
-2002-09-25 Eric Sandall <eric AT sandall.us>
+2002-09-25 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Removed BUILD, as was only needed on _my_ broken box.
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Added spell
        * Created spell
 
diff --git a/games-libs/skstream2/HISTORY b/games-libs/skstream2/HISTORY
index 05851b9..e949c7a 100644
--- a/games-libs/skstream2/HISTORY
+++ b/games-libs/skstream2/HISTORY
@@ -4,10 +4,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
-2003-09-30 Eric Sandall <eric AT sandall.us>
+2003-09-30 Eric Sandall <sandalle AT sourcemage.org>
        * Branched from skstream to keep as v0.2.0 for eris
          (and other packages which don't work with skstream
          0.3.0)
diff --git a/games-libs/varconf/HISTORY b/games-libs/varconf/HISTORY
index 189a515..2938cc0 100644
--- a/games-libs/varconf/HISTORY
+++ b/games-libs/varconf/HISTORY
@@ -7,7 +7,7 @@
 2003-11-26 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: 0.5.4 only needs libsigc++ not v2 of that
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
        * DETAILS: Downgraded to 0.5.4, 0.6.0 doesn't build varconf-config
          needed by other packages (e.g. stage)
@@ -21,9 +21,9 @@
 2003-05-10 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.6.0
 
-2002-09-23 Eric Sandall <eric AT sandall.us>
+2002-09-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.5.4
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-libs/varconf2/HISTORY b/games-libs/varconf2/HISTORY
index c8b5f5f..a9ec6a6 100644
--- a/games-libs/varconf2/HISTORY
+++ b/games-libs/varconf2/HISTORY
@@ -7,18 +7,18 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-23 Eric Sandall <eric AT sandall.us>
+2005-04-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.3
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror first
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.2
          Added BUILD_API=2
        * DEPENDS: Depends on libsigc++3 now instead of libsigc++2
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
          Removed MAINTAINER
@@ -26,13 +26,13 @@
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2003-12-19 Eric Sandall <eric AT sandall.us>
+2003-12-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.6.1
          Changed SOURCE_URL to use ftp.worldforge.org
 
 2003-11-26 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: add pkgconfig
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * Forked from varconf for sear
 
diff --git a/games-libs/wfmath/HISTORY b/games-libs/wfmath/HISTORY
index 44eff89..32f20eb 100644
--- a/games-libs/wfmath/HISTORY
+++ b/games-libs/wfmath/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-01-03 Eric Sandall <eric AT sandall.us>
+2006-01-03 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Shorten query (and fix bug of variable in literal quotes)
 
 2005-12-01 Seth Woolley <seth AT tautology.org>
@@ -10,48 +10,48 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.4
          SOURCE uses .bz2 now
          Renamed CVS to WFMATH_CVS
        * DEPENDS: Depends on CVS if using cvs version
        * PREPARE,BUILD: Renamed CVS to WFMATH_CVS
 
-2005-03-10 Eric Sandall <eric AT sandall.us>
+2005-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added message about needing atlas-c++/devel
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Add SourceForge mirror first
 
-2004-08-01 Eric Sandall <eric AT sandall.us>
+2004-08-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: I had the wrong md5sum for 0.3.3
 
-2004-07-19 Eric Sandall <eric AT sandall.us>
+2004-07-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.3
          BUILD_API=2
          Use config_query response
        * BUILD: Converted to config_query response
        * PREPARE: Use config_query
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Store the cvs version as .bz2
        * PREPARE: Added to query for cvs version
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2004-02-17 Eric Sandall <eric AT sandall.us>
+2004-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.2
          Removed MAINTAINER
        * HISTORY: Formatted to Guru Handbook
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
 
-2003-09-29 Eric Sandall <eric AT sandall.us>
+2003-09-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Changed website to not use victor, but instead the normal 
website
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
@@ -60,10 +60,10 @@
 2003-05-10 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.2.11
 
-2002-10-11 Eric Sandall <eric AT sandall.us>
+2002-10-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v2.10
        * HISTORY: Added
 
-2002-09-16 Eric Sandall <eric AT sandall.us>
+2002-09-16 Eric Sandall <sandalle AT sourcemage.org>
        * Created wfmath and included in grimoire
 
diff --git a/games-libs/wfmath2/HISTORY b/games-libs/wfmath2/HISTORY
index 5629f48..c156107 100644
--- a/games-libs/wfmath2/HISTORY
+++ b/games-libs/wfmath2/HISTORY
@@ -4,12 +4,12 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
 
-2004-04-11 Eric Sandall <eric AT sandall.us>
+2004-04-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Wrong md5sum
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * Created for eris
 
diff --git a/games-libs/wftk/HISTORY b/games-libs/wftk/HISTORY
index 910e050..7b149ea 100644
--- a/games-libs/wftk/HISTORY
+++ b/games-libs/wftk/HISTORY
@@ -7,15 +7,15 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards
 
-2004-10-09 Eric Sandall <eric AT sandall.us>
+2004-10-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added MAKE_NJOBS=1
          Added BUILD_API=2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl
          Removed SDL as sdl_mixer depends on sdl
          Removed zlib as libpng depends on it
@@ -24,7 +24,7 @@
        * BUILD: Converted to using config_query responses
        * DETAILS: Converted to using config_query responses
 
-2004-04-09 Eric Sandall <eric AT sandall.us>
+2004-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added conditional cvs version
          Updated stable version to 0.7.1
          Store the cvs version as .bz2
@@ -32,14 +32,14 @@
        * BUILD: Added to build cvs or standard version
        * DEPENDS: Conditionally depend upon cvs
 
-2004-02-17 Eric Sandall <eric AT sandall.us>
+2004-02-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.0
          Removed MAINTAINER
 
 2003-12-07 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: libsigc++2 not yee olde versionne
 
-2003-10-12 Eric Sandall <eric AT sandall.us>
+2003-10-12 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Uses freetype2, not freetype1
        * Created wftk, added to games
 
diff --git a/games-puzzles/enigma2/HISTORY b/games-puzzles/enigma2/HISTORY
index cfc5f1e..f0ad088 100644
--- a/games-puzzles/enigma2/HISTORY
+++ b/games-puzzles/enigma2/HISTORY
@@ -8,7 +8,7 @@
        * DETAILS: updated to 0.91
        * DEPENDS: added dependency on sdl_ttf
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer and SDL_image renamed to sdl*
          Removed SDL as the above depend on sdl
          Formatted to Guru Handbook
diff --git a/games-rpg-mp/crossfire-client/HISTORY 
b/games-rpg-mp/crossfire-client/HISTORY
index 2062a8f..490a7b8 100644
--- a/games-rpg-mp/crossfire-client/HISTORY
+++ b/games-rpg-mp/crossfire-client/HISTORY
@@ -26,7 +26,7 @@
        * INSTALL: fix to check for building gtk-client
        * DEPENDS: actually use the configure flags for optional depends
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * Moved data files to crossfire-client-data
        * DETAILS: Added BUILD_API=2  (Bug #7608)
        * INSTALL: Setup proper permissions for binaries in /usr/games
@@ -38,7 +38,7 @@
        * DETAILS: Version update 1.7.0 bug #7261
        * DETAILS: Build api 2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Formatted to Guru Handbook
        * HISTORY: Formatted to Guru Handbook
@@ -55,7 +55,7 @@
          to compile
        * Sounds unchanged since 1.4.0
 
-2002-10-15 Eric Sandall <eric AT sandall.us>
+2002-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.4.0
        * Sounds now are at the same version as the rest
 
@@ -64,7 +64,7 @@
          Changed maintainer
        * HISTORY: Fixed HISTORY file standards compliance
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 1.3.0
          Added MD5 and LICENSE
          Added -images source as SOURCE3
diff --git a/games-rpg-mp/crossfire/HISTORY b/games-rpg-mp/crossfire/HISTORY
index c709996..a3324a7 100644
--- a/games-rpg-mp/crossfire/HISTORY
+++ b/games-rpg-mp/crossfire/HISTORY
@@ -2,7 +2,7 @@
        * DETAILS: Updating spell to 1.9.1
        * FINAL: crossedit is deprecated, not installed anymore
 
-2005-12-30 Eric Sandall <eric AT sandall.us>
+2005-12-30 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Use default_games_build
        * INSTALL: Cannot chown games:games (no games user)
          Files are installed to INSTALL_ROOT, modify those
@@ -21,7 +21,7 @@
        * BUILD: added invoke_gcc
        * DEPENDS: added python
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed data sources, moved to crossfire-data  (Bug #7605)
          Shortened SHORT
        * INSTALL: Modified to set correct permissions
@@ -45,7 +45,7 @@
          Added big maps for server
          Allowed bz2 files if available (many megs saved)
 
-2002-10-15 Eric Sandall <eric AT sandall.us>
+2002-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.4.0 (and changed to .gz as they don't use 
.bz2
          anymore :()
 
@@ -54,7 +54,7 @@
          Changed maintainer
        * HISTORY: Fixed for standard compliance :)
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.3.0
          Modified to use $SOURCEFORGE_URL
          Added MD5 and LICENSE
diff --git a/games-rpg-mp/ember/HISTORY b/games-rpg-mp/ember/HISTORY
index 5b3d06d..bb366e1 100644
--- a/games-rpg-mp/ember/HISTORY
+++ b/games-rpg-mp/ember/HISTORY
@@ -11,14 +11,14 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards for 
CVS
 
-2005-03-14 Eric Sandall <eric AT sandall.us>
+2005-03-14 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: False dependency on boost fixed in CVS
 
-2005-03-10 Eric Sandall <eric AT sandall.us>
+2005-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE: Query for CVS release (default 'y')
        * DETAILS: Added 0.2.0 stable release
          Updated UPDATED
@@ -37,10 +37,10 @@
          Use default_build
        * malloc.diff: Removed as it no longer is needed
 
-2004-11-19 Eric Sandall <eric AT sandall.us>
+2004-11-19 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Added dependencies on openal and xerces-c
 
-2004-11-17 Eric Sandall <eric AT sandall.us>
+2004-11-17 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from dime to ember
        * DETAILS: Added BUILD_API=2
        * BUILD: Converted to BUILD_API=2
@@ -48,26 +48,26 @@
        * CONFLICTS: Default to 'y' for conflicting with dime
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
          All -cvs spells were renamed
 
-2004-05-21 Eric Sandall <eric AT sandall.us>
+2004-05-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Renamed to dime
          Removed MAINTAINER
          Entered long and short descriptions
 
-2003-10-27 Eric Sandall <eric AT sandall.us>
+2003-10-27 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Doesn't need boost anymore
 
-2003-10-18 Eric Sandall <eric AT sandall.us>
+2003-10-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on ogre fixed in CVS
 
-2003-10-15 Eric Sandall <eric AT sandall.us>
+2003-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * ConfigService.cpp.overload.patch,Font.cpp.assert.patch: Removed
          I have CVS access now to WF, so these patches are in.  :)
 
-2003-10-14 Eric Sandall <eric AT sandall.us>
+2003-10-14 Eric Sandall <sandalle AT sourcemage.org>
        * ConfigService.cpp.overload.patch: Added to fix an ambiguous overload
        * Font.cpp.assert.patch: Added to fix an ambiguous overload
        * malloc.diff: Added to fix a mis-configuration from Sorcery
@@ -76,6 +76,6 @@
          ./configure has generated config.h)
        * DEPENDS: Depends on freetype2, jpeg, wftk-cvs, boost, cal3d and 
openal
 
-2003-10-13 Eric Sandall <eric AT sandall.us>
+2003-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * Created wfmath
 
diff --git a/games-rpg-mp/gnome-mud/HISTORY b/games-rpg-mp/gnome-mud/HISTORY
index d109a58..fdc949a 100644
--- a/games-rpg-mp/gnome-mud/HISTORY
+++ b/games-rpg-mp/gnome-mud/HISTORY
@@ -32,23 +32,23 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * ALL: New Games grimoire is born!
 
-2003-06-10 Eric Sandall <eric AT sandall.us>
+2003-06-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.10.1
 
 2003-06-07 hgg <hgreig AT bigpond.net.au>
        * DEPENDS: Update depends as developers ported to gtk+2 between 
releases
 
-2003-06-05 Eric Sandall <eric AT sandall.us>
+2003-06-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.10.0
        * DEPENDS: Added pygtk2 as a dependency
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Fixed Bug #2443 (Removed BUILD, no longer needed)
 
 2002-09-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: changed MAINTAINER, changed SOURCE_URL to use 
$SOURCEFORGE_URL
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Version to 0.9.1, added MD5 and LICENSE
 
 2002-05-02 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-rpg-mp/sear/HISTORY b/games-rpg-mp/sear/HISTORY
index 5b70925..a576ed8 100644
--- a/games-rpg-mp/sear/HISTORY
+++ b/games-rpg-mp/sear/HISTORY
@@ -11,32 +11,32 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-17 Eric Sandall <eric AT sandall.us>
+2005-06-17 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Updated depencies for CVS version
          Thanks to Simon Goodall <sg02r AT ecs.soton.ac.uk>
        * BUILD: Need to set LDFLAGS to find -lGLU
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make and make_normal afterwards for 
CVS
 
-2005-03-11 Eric Sandall <eric AT sandall.us>
+2005-03-11 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE,DETAILS,BUILD: Added CVS option
        * DEPENDS: Depends on sear-media
        * INSTALL,PRE_BUILD: Removed (sear-media is now in separate spell)
 
-2004-10-13 Eric Sandall <eric AT sandall.us>
+2004-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added SourceForge mirror for both sources first
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
 
-2004-07-21 Eric Sandall <eric AT sandall.us>
+2004-07-21 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on eris-transitional (not eris cvs)
          Depends on sage still
        * PREPARE: Removed
 
-2004-07-19 Eric Sandall <eric AT sandall.us>
+2004-07-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.5.0
          Media updated to 20040719
          BUILD_API=2
@@ -46,31 +46,31 @@
          depends
        * PREPARE: Add message about needing cvs version of eris
 
-2004-05-26 Eric Sandall <eric AT sandall.us>
+2004-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Atlas-C++ renamed to atlas-c++
 
-2004-04-10 Eric Sandall <eric AT sandall.us>
+2004-04-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.7
        * BUILD: Remove sedits
          media.script is now in the right location
 
-2003-11-03 Eric Sandall <eric AT sandall.us>
+2003-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Changed requires to depends, uppercase provides
 
-2003-10-08 Eric Sandall <eric AT sandall.us>
+2003-10-08 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Fix a problem with an animation that doesn't like cal3d 0.9
 
-2003-10-07 Eric Sandall <eric AT sandall.us>
+2003-10-07 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Removed fix for run_script and permissions
        * DETAILS: New media out with permission and media.script fixes
 
-2003-10-04 Eric Sandall <eric AT sandall.us>
+2003-10-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added mirror, main site should be back up soon
        * DEPENDS: Depends on SDL_mixer, sage (not stage), and varconf2
        * PRE_BUILD: Added to check md5sum of SOURCE2
        * BUILD: Installs proper script to load textures
        * TODO: Install to /usr/share/games with a script in /usr/games
 
-2002-09-15 Eric Sandall <eric AT sandall.us>
+2002-09-15 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-rpg-mp/tinyfugue/HISTORY b/games-rpg-mp/tinyfugue/HISTORY
index fbb0278..84b2672 100644
--- a/games-rpg-mp/tinyfugue/HISTORY
+++ b/games-rpg-mp/tinyfugue/HISTORY
@@ -32,7 +32,7 @@
 2002-11-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * changed SOURCE_URL to use http instead of ftp (fixes bug #1748)
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-rpg-sp/adonthell/HISTORY b/games-rpg-sp/adonthell/HISTORY
index 7e4ed69..e90204b 100644
--- a/games-rpg-sp/adonthell/HISTORY
+++ b/games-rpg-sp/adonthell/HISTORY
@@ -9,10 +9,10 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Formatted to Guru Handbook
        * HISTORY: Formatted to Guru Handbook
@@ -33,7 +33,7 @@
        * DETAILS: updated the MD5SUM (they updated the source tarball without
          changing the version number)
 
-2002-10-07 Eric Sandall <eric AT sandall.us>
+2002-10-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.3.3
          Updated SOURCE_URL to use new location (added src/ before $SOURCE)
        * BUILD: Fixed (no space in LDFLAGS between -L and directory)
diff --git a/games-rpg-sp/falconseye/HISTORY b/games-rpg-sp/falconseye/HISTORY
index 041f3ba..3367434 100644
--- a/games-rpg-sp/falconseye/HISTORY
+++ b/games-rpg-sp/falconseye/HISTORY
@@ -12,7 +12,7 @@
 2005-05-03 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD:fixes bug #8797 was an extra &&
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1 and MAINTAINER
          Shortened SHORT
          Added BUILD_API=2
@@ -23,7 +23,7 @@
          Run make_normal before installation
        * POST_INSTALL, FINAL: POST_INSTALL renamed to FINAL
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
        * HISTORY: Formatted to Guru Handbook
 
@@ -39,7 +39,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-30 Eric Sandall <eric AT sandall.us>
+2003-01-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added MAKE_NJOBS=1, as it fails with multiple jobs.
 
 2002-08-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-rpg-sp/freedroidrpg/HISTORY 
b/games-rpg-sp/freedroidrpg/HISTORY
index 1109428..ea76c7a 100644
--- a/games-rpg-sp/freedroidrpg/HISTORY
+++ b/games-rpg-sp/freedroidrpg/HISTORY
@@ -17,7 +17,7 @@
        * DEPENDS: explicitcly depends on sdl since that's how we want it iirc
        * HISTORY: had to fix a history entry for proper name... :)
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_net renamed to sdl*
          Removed SDL as the above depend on sdl
          Formatted to Guru Handbook
diff --git a/games-rpg-sp/glhack/HISTORY b/games-rpg-sp/glhack/HISTORY
index 7302485..98ee4cc 100644
--- a/games-rpg-sp/glhack/HISTORY
+++ b/games-rpg-sp/glhack/HISTORY
@@ -11,26 +11,26 @@
        * INSTALL,BUILD: Cleanup and make it install to share/games/glhack
        * DEPENDS: this seems to not depend on nethack anymore
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make
        * INSTALL: Run make_normal before make install
 
-2004-11-08 Eric Sandall <eric AT sandall.us>
+2004-11-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Fixed md5sum  (Bug #7606)
          Added BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to build_api 2
        * INSTALL: Added
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
        * HISTORY: Formatted to Guru Handbook
 
 2004-07-19 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: version update 1.2
 
-2003-08-23 Eric Sandall <eric AT sandall.us>
+2003-08-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: One make job
        * BUILD: Installs into nethackdir (Bug #4130)
        * DEPENDS: Added dependency on nethack (Bug #4130)
@@ -39,17 +39,17 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-01-12 Eric Sandall <eric AT sandall.us>
+2003-01-12 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Now installs data into /usr/share/games
 
-2003-01-12 Eric Sandall <eric AT sandall.us>
+2003-01-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.1
 
 2002-12-08 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * BUILD: added a sedit to really make it use /var/games/glhack
          (fixes bug #1928)
 
-2002-10-13 Eric Sandall <eric AT sandall.us>
+2002-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v1.0
 
 2002-10-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-rpg-sp/openglad/HISTORY b/games-rpg-sp/openglad/HISTORY
index 526ff44..accb237 100644
--- a/games-rpg-sp/openglad/HISTORY
+++ b/games-rpg-sp/openglad/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Removed SDL as sdl_mixer depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -18,7 +18,7 @@
 2003-06-06 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 0.98
 
-2003-01-26 Eric Sandall <eric AT sandall.us>
+2003-01-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.97 (Bug #2387, thanks to Snakebyte)
 
 2002-12-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-rpg-sp/uqm/HISTORY b/games-rpg-sp/uqm/HISTORY
index 5f9c25d..6955be5 100644
--- a/games-rpg-sp/uqm/HISTORY
+++ b/games-rpg-sp/uqm/HISTORY
@@ -22,7 +22,7 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.4.0
          SOURCE is .tar.gz instead of .tgz
          SOURCE2 is now a .uqm instead of .zip
@@ -36,7 +36,7 @@
          Converted to build_api 2
          Install_rootify symlink
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
          Removed SDL as the above depend on sdl
          Removed libogg as libvorbis depends on it
@@ -51,6 +51,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-01-07 Eric Sandall <eric AT sandall.us>
+2003-01-07 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-rpg-sp/wastesedge/HISTORY b/games-rpg-sp/wastesedge/HISTORY
index 21302b4..8923fa6 100644
--- a/games-rpg-sp/wastesedge/HISTORY
+++ b/games-rpg-sp/wastesedge/HISTORY
@@ -11,11 +11,11 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-07 Eric Sandall <eric AT sandall.us>
+2002-10-07 Eric Sandall <sandalle AT sourcemage.org>
        * Updated to v0.3.3
          Fixed SOURCE_URL to use new location (added /src before /$SOURCE)
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-17 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-rpg-sp/xu4/HISTORY b/games-rpg-sp/xu4/HISTORY
index 195982f..21ec432 100644
--- a/games-rpg-sp/xu4/HISTORY
+++ b/games-rpg-sp/xu4/HISTORY
@@ -21,7 +21,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * PRE_BUILD: unpack api update
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          SDL removed as sdl_mixer depends on sdl
 
@@ -48,11 +48,11 @@
          POST_INSTALL,PRE_REMOVE: Change POST_INSTALL and added PRE_REMOVE 
so 
          Ultima4.zip is tracked
 
-2003-01-27 Eric Sandall <eric AT sandall.us>
+2003-01-27 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.09 (Bug #2392, thanks to Snakebyte)
        * BUILD: Made binary install into /usr/games
          and data into /usr/share/games, not /usr/lib
 
-2002-11-20 Eric Sandall <eric AT sandall.us>
+2002-11-20 Eric Sandall <sandalle AT sourcemage.org>
        * Spell created
 
diff --git a/games-simulation/csmash/HISTORY b/games-simulation/csmash/HISTORY
index 93eed23..9d4471b 100644
--- a/games-simulation/csmash/HISTORY
+++ b/games-simulation/csmash/HISTORY
@@ -15,7 +15,7 @@
        * BUILD: Changed for BUILD_API 2
        * DETAILS: Added BUILD_API=2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image, SDL_mixer renamed to sdl*
          Removed SDL as both sdl_image and sdl_mixer depend on sdl
 
@@ -35,7 +35,7 @@
 2003-05-10 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 0.6.5
 
-2002-10-19 Eric Sandall <eric AT sandall.us>
+2002-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1417
 
 2002-08-28 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-simulation/flightgear/HISTORY 
b/games-simulation/flightgear/HISTORY
index cad2273..19b335b 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -25,12 +25,12 @@
        * Moved from FlightGear to flightgear
        * Updated to 0.9.6, fixes #7626
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.4
        * BUILD: No longer apply plib.patch
        * plib.patch: Removed
 
-2004-07-13 Eric Sandall <eric AT sandall.us>
+2004-07-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
@@ -50,16 +50,16 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.1 (Bug #2377, thanks to Snakebyte)
 
-2002-12-05 Eric Sandall <eric AT sandall.us>
+2002-12-05 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.9.0
 
-2002-09-21 Eric Sandall <eric AT sandall.us>
+2002-09-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New version: 0.8.0
 
 2002-08-28 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-simulation/foobillard/HISTORY 
b/games-simulation/foobillard/HISTORY
index a52f327..262b179 100644
--- a/games-simulation/foobillard/HISTORY
+++ b/games-simulation/foobillard/HISTORY
@@ -11,26 +11,26 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Use spell_ok instead of spell_installed
 
 2004-12-13 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS, BUILD: build_api2
        * BUILD: added fix for openglut
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
 2004-07-19 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: version update 3.0a
 
-2004-07-18 Eric Sandall <eric AT sandall.us>
+2004-07-18 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: NVIDIA_headers renamed to nvidia_headers
 
 2004-02-25 hgg <hgreig AT bigpond.net.au>
        * DETAILS: emove maintainer and one of the two short lines bug 6124
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
 
 2003-07-10 hgg <hgreig AT bigpond.net.au>
diff --git a/games-simulation/searchandrescue/HISTORY 
b/games-simulation/searchandrescue/HISTORY
index e781797..fa4831b 100644
--- a/games-simulation/searchandrescue/HISTORY
+++ b/games-simulation/searchandrescue/HISTORY
@@ -1,7 +1,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-03-10 Eric Sandall <eric AT sandall.us>
+2006-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * PRE_BUILD: Make the directory before `cd`ing to it
          Apply namespace-fix.patch
        * namespace-fix.patch: Fix namespace issues (e.g. stderr -> 
std::stderr)
@@ -23,7 +23,7 @@
        * CONFLICTS: added
        * Lo-case rename of SearchAndRescue
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
          Removed MAINTAINER
@@ -32,7 +32,7 @@
        * INSTALL: Added
          Removed TABs
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
@@ -45,7 +45,7 @@
 2003-04-18 Seth Woolley <seth AT tautology.org>
        * DETAILS: Modified to fix md5 for SOURCE[0].
 
-2003-02-24 Eric Sandall <eric AT sandall.us>
+2003-02-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.7.21
 
 2002-08-29 Gareth Clay <g.clay AT warwick.ac.uk>
diff --git a/games-simulation/torcs/HISTORY b/games-simulation/torcs/HISTORY
index f73f9a3..4af7f0b 100644
--- a/games-simulation/torcs/HISTORY
+++ b/games-simulation/torcs/HISTORY
@@ -12,7 +12,7 @@
 2006-09-17 Alexander Tsamutali <astsmtl AT gmail.com>
        * INSTALL: fixed, added "make datainstall"
 
-2006-03-10 Eric Sandall <eric AT sandall.us>
+2006-03-10 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.2.4
          Removed deprecated FUZZ variable
          Use single .tar.bz2 package
@@ -30,12 +30,12 @@
 2005-11-28 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * PRE_BUILD: unpack api update
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
        * BUILD: Run make_single before make
        * INSTALL: Run make_normal before default_install
 
-2005-02-23 Eric Sandall <eric AT sandall.us>
+2005-02-23 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from 3D/TORCS
        * DETAILS: Renamed to torcs
          Updated to 1.2.3
@@ -55,7 +55,7 @@
 2004-02-16 hgg <hgreig AT bigpond.net.au>
        * DETAILS: update to 1.2.2
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Depends on any provider of GLUT now
        * HISTORY: Formatted to Guru Handbook
 
@@ -76,7 +76,7 @@
 2003-01-30 Seth Woolley <seth AT tautology.org>
        * DETAILS: Modified DETAILS to correct MD5
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.1.0 (Bug #2379, thanks to Snakebyte)
        * DETAILS,BUILD: Had to modify DETAILS and BUILD, as there is no
          longer a -src-all. :(
@@ -85,7 +85,7 @@
 2002-10-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: Added MD5 and LICENSE fields
 
-2002-10-19 Eric Sandall <eric AT sandall.us>
+2002-10-19 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1417
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-simulation/vegastrike/HISTORY 
b/games-simulation/vegastrike/HISTORY
index df9664e..86ff42a 100644
--- a/games-simulation/vegastrike/HISTORY
+++ b/games-simulation/vegastrike/HISTORY
@@ -25,13 +25,13 @@
        * removed gl_state.cpp.diff, added vsinstall and FINAL
        * DEPENDS: added perl
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Python renamed to python in stable
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
 
-2004-07-23 Eric Sandall <eric AT sandall.us>
+2004-07-23 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
          Shortened SHORT
        * BUILD: Converted to BUILD_API 2
diff --git a/games-strategy-rts/bos/HISTORY b/games-strategy-rts/bos/HISTORY
index 6f8ea0a..4613010 100644
--- a/games-strategy-rts/bos/HISTORY
+++ b/games-strategy-rts/bos/HISTORY
@@ -12,7 +12,7 @@
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: [automated] Removed BUILD_API=2.
 
-2006-03-06 Eric Sandall <eric AT sandall.us>
+2006-03-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Have some relevant long description
 
 2005-12-01 Seth Woolley <seth AT tautology.org>
diff --git a/games-strategy-rts/globulation2/HISTORY 
b/games-strategy-rts/globulation2/HISTORY
index d6ff4e1..20e009e 100644
--- a/games-strategy-rts/globulation2/HISTORY
+++ b/games-strategy-rts/globulation2/HISTORY
@@ -1,4 +1,4 @@
-2006-08-15 Eric Sandall <eric AT sandall.us>
+2006-08-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.21
          Removed BUILD_API=2 (grimoire-wide) and UPDATED (deprecated)
 
@@ -29,11 +29,11 @@
 2005-02-20 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: SOURCE_URL fixed, version update
 
-2005-01-29 Eric Sandall <eric AT sandall.us>
+2005-01-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: New WEB_SITE URL
          We're now listed on their Download page. ;)
 
-2005-01-28 Eric Sandall <eric AT sandall.us>
+2005-01-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.8.11
          Added BUILD_API=2
          Shortened SHORT
diff --git a/games-strategy-rts/openttd/HISTORY 
b/games-strategy-rts/openttd/HISTORY
index 03bcddd..2fa12a8 100644
--- a/games-strategy-rts/openttd/HISTORY
+++ b/games-strategy-rts/openttd/HISTORY
@@ -41,7 +41,7 @@
        * INSTALL: removed make_normal, changed directory for shared 
          data to /usr/share/games/openttd
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
          Shortened SHORT
        * BUILD: Run make_single before make
@@ -49,7 +49,7 @@
        * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
          Use only one call to message
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL renamed to sdl
          Removed zlib as libpng depends on it
          Formatted to Guru Handbook
diff --git a/games-strategy-tbs/asc/HISTORY b/games-strategy-tbs/asc/HISTORY
index 78f8fb5..b214fdb 100644
--- a/games-strategy-tbs/asc/HISTORY
+++ b/games-strategy-tbs/asc/HISTORY
@@ -4,18 +4,18 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-06-11 Eric Sandall <eric AT sandall.us>
+2005-06-11 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.16.0.0
          SOURCE changed to .bz2 from .gz
        * DEPENDS: SDLmm renamed to sdlmm
 
-2005-02-24 Eric Sandall <eric AT sandall.us>
+2005-02-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.15.3.0
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.15.2.1
 
-2004-10-30 Eric Sandall <eric AT sandall.us>
+2004-10-30 Eric Sandall <sandalle AT sourcemage.org>
        * Renamed from ASC
        * DETAILS: Updated to 1.15.1.0
          Removed TABs
@@ -27,7 +27,7 @@
        * DEPENDS: Depends on libsigc++2
        * CONFLICTS: Conflicts with ASC
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image and SDL_mixer renamed to sdl*
 
 2004-07-18 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/games-strategy-tbs/castle-combat/HISTORY 
b/games-strategy-tbs/castle-combat/HISTORY
index 493e980..2210e03 100644
--- a/games-strategy-tbs/castle-combat/HISTORY
+++ b/games-strategy-tbs/castle-combat/HISTORY
@@ -9,7 +9,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer and SDL_net renamed to sdl*
          Removed SDL as the above depend on sdl
          Formatted to Guru Handbook
@@ -31,7 +31,7 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-01-31 Eric Sandall <eric AT sandall.us>
+2003-01-31 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #2443
 
 2002-10-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-strategy-tbs/crimson/HISTORY 
b/games-strategy-tbs/crimson/HISTORY
index 76e9351..9eaefb6 100644
--- a/games-strategy-tbs/crimson/HISTORY
+++ b/games-strategy-tbs/crimson/HISTORY
@@ -8,7 +8,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_ttf and SDL_mixer renamed to sdl*
          Removed SDL as sdl_ttf depends on sdl
          Formatted to Guru Handbook
@@ -43,22 +43,22 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * ALL: New Games grimoire is born!
 
-2003-05-29 Eric Sandall <eric AT sandall.us>
+2003-05-29 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.3
 
 2003-05-19hgg <hgreig AT bigpond.net.au>
  * DETAILS: Update for ${INSTALL_ROOT}
 
-2003-05-07 Eric Sandall <eric AT sandall.us>
+2003-05-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.2
 
-2003-03-28 Eric Sandall <eric AT sandall.us>
+2003-03-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.1
 
-2003-02-06 Eric Sandall <eric AT sandall.us>
+2003-02-06 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.0
 
-2002-11-01 Eric Sandall <eric AT sandall.us>
+2002-11-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.2.8
        * BUILD: Removed TABs from BUILD, add && after $OPTS
        * DEPENDS: Cleaned up DEPENDS
@@ -67,7 +67,7 @@
        * DETAILS: Changed maintainer, tidied up long description
        * HISTORY: Fixed HISTORY compliance
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.7, Added MD5 and LICENSE
 
 2002-06-19 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-strategy-tbs/freeciv/HISTORY 
b/games-strategy-tbs/freeciv/HISTORY
index 5df2b28..30faa4b 100644
--- a/games-strategy-tbs/freeciv/HISTORY
+++ b/games-strategy-tbs/freeciv/HISTORY
@@ -2,7 +2,7 @@
        * DETAILS: Updated to 2.0.9
          Removed UPDATED
 
-2007-01-04 Eric Sandall <eric AT sandall.us>
+2007-01-04 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: alsa-lib provides sound through ALSA, not SDL
 
 2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
@@ -15,20 +15,20 @@
        * CONFIGURE: expanded
        * DEPENDS: expanded
 
-2005-11-28 Eric Sandall <eric AT sandall.us>
+2005-11-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.0.7
          SOURCE2_GPG was using SOURCE instead of SOURCE2
 
-2005-09-09 Eric Sandall <eric AT sandall.us>
+2005-09-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed all SOURCE_URL[0]'s as they are no longer kept
          up-to-date. Replaced with one URL to SourceForge
 
-2005-09-07 Eric Sandall <eric AT sandall.us>
+2005-09-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.0.5
          Updated to GPG authentication
        * PRE_BUILD: Converted to use unpack_file for SOURCE2
 
-2005-06-20 Eric Sandall <eric AT sandall.us>
+2005-06-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.0.2
          Updated stdsounds (SOURCE2) to v3
 
@@ -36,23 +36,23 @@
        * DETAILS: Bugfixes... the tarball changed and the version
          didn't
 
-2005-04-26 Eric Sandall <eric AT sandall.us>
+2005-04-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.0.1
 
-2005-04-19 Eric Sandall <eric AT sandall.us>
+2005-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated stable to 2.0.0
          Removed beta option
          SOURCE_URL now uses /stable
        * PREPARE: Removed (2.0.0 is now stable)
 
-2005-04-12 Eric Sandall <eric AT sandall.us>
+2005-04-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated beta to 2.0.0-rc1
          Use $SOURCE for SOURCE_URL[0]
 
-2005-03-15 Eric Sandall <eric AT sandall.us>
+2005-03-15 Eric Sandall <sandalle AT sourcemage.org>
        * PREPARE,DETAILS: Added option for beta version
 
-2005-03-14 Eric Sandall <eric AT sandall.us>
+2005-03-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added BUILD_API=2
          Removed MAINTAINER
          Shortened SHORT
@@ -65,17 +65,17 @@
          Renamed CLIENT to FREECIV_CLIENT
        * INSTALL: Use default_install and copy media files over
 
-2005-01-23 Eric Sandall <eric AT sandall.us>
+2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
        * CONFIGURE: Use spell_ok instead of spell_installed
 
 2004-09-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: updated to 1.14.2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_mixer renamed to sdl_mixer
          Formatted to Guru Handbook
 
-2003-12-13 Eric Sandall <eric AT sandall.us>
+2003-12-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.14.1
 
 2003-12-07 hgg <hgreig AT bigpond.net.au>
@@ -87,10 +87,10 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2003-04-29 Eric Sandall <eric AT sandall.us>
+2003-04-29 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS Fixed DEPENDS flow control, thanks to Dufflebunk (Bug #3241)
 
-2003-03-03 Eric Sandall <eric AT sandall.us>
+2003-03-03 Eric Sandall <sandalle AT sourcemage.org>
        * Added standard sounds (Bug #441, the fix of which somehow got lost)
          Decided to just add stdsounds to current freeciv spell instead of
          having separate spell just for sounds. Now sound will always be
@@ -107,7 +107,7 @@
        * DETAILS: changed the long description
          (there's now three X clients instead of two)
 
-2002-10-22 Eric Sandall <eric AT sandall.us>
+2002-10-22 Eric Sandall <sandalle AT sourcemage.org>
        * Fixed Bug #1344
 
 2002-08-02 Jerome Zago <jerome.zago AT insalien.org>
diff --git a/games-strategy-tbs/freelords/HISTORY 
b/games-strategy-tbs/freelords/HISTORY
index d3ddcb9..84cc990 100644
--- a/games-strategy-tbs/freelords/HISTORY
+++ b/games-strategy-tbs/freelords/HISTORY
@@ -4,30 +4,30 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Removed Python (paragui depends on it)
 
-2004-11-03 Eric Sandall <eric AT sandall.us>
+2004-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.4
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Removed SDL as sdl_image depends on sdl
 
-2004-07-15 Eric Sandall <eric AT sandall.us>
+2004-07-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3.3
          BUILD_API=2
        * BUILD: Converted to BUILD_API 2
        * INSTALL: Added
 
-2004-02-24 Eric Sandall <eric AT sandall.us>
+2004-02-24 Eric Sandall <sandalle AT sourcemage.org>
        * freelordsrc: Removed savepatch as freelords cannot parse ${HOME}
        * DETAILS: Updated to 0.3.2
 
 2004-01-06 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 0.3.1
 
-2003-10-15 Eric Sandall <eric AT sandall.us>
+2003-10-15 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.3
        * BUILD: gcc 3.3 check no longer needed, cleaned up spacing
        * HISTORY: Cleaned up to follow Guru Handbook
@@ -54,28 +54,28 @@
 2003-05-14 Seth Woolley <seth AT tautology.org>
        * DETAILS: Modified DETAILS to fix md5 for SOURCE.
 
-2003-05-07 Eric Sandall <eric AT sandall.us>
+2003-05-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.3
        * freelordssrc: Added for configuration information
        * Their makefile still doesn't work right, but perhaps
          it just needs a little tweaking with ./configure?
 
-2003-03-29 Eric Sandall <eric AT sandall.us>
+2003-03-29 Eric Sandall <sandalle AT sourcemage.org>
        * freelords: Script now runs bin/freelords, since that
          is where the binary expects to be
 
-2003-03-21 Eric Sandall <eric AT sandall.us>
+2003-03-21 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.1 (Bug #2853)
          Updated SOURCE_URL[0] to use SOURCEFORGE_URL
        * BUILD,freelords: Cleaned up
 
-2003-02-04 Eric Sandall <eric AT sandall.us>
+2003-02-04 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.2.0 (stable, not CVS snapshots)
        * DEPENDS: Added libsigc++2, expat, and cppsocket
          Fails to find paragui, even if it's installed, so I
          disabled the test with "--disable-paraguitest"
 
-2002-11-01 Eric Sandall <eric AT sandall.us>
+2002-11-01 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v20021101, and renamed VERSION
          and SOURCE to fit new name with temporary
          fix for wrong untar directory from VERSION
@@ -83,12 +83,12 @@
        * DEPENDS: Added SDL and SDL_image as dependencies
        * BUILD: Removed old, invalid patches
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * BUILD: Updated to install into /usr/share/games intead
          of /usr/lib/games, modified to change group ownership to
          "games"
 
-2002-10-13 Eric Sandall <eric AT sandall.us>
+2002-10-13 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to grimoire
 
diff --git a/games-strategy-tbs/teg/HISTORY b/games-strategy-tbs/teg/HISTORY
index 38751ec..feef4ec 100644
--- a/games-strategy-tbs/teg/HISTORY
+++ b/games-strategy-tbs/teg/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-28 Eric Sandall <eric AT sandall.us>
+2005-01-28 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Added BUILD_API=2
        * CONFIGURE: Converted to config_query
        * DEPENDS: Added dependency on ggz-client-libs
@@ -30,6 +30,6 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * Update for ${INSTALL_ROOT}
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-strategy-tbs/wesnoth/HISTORY 
b/games-strategy-tbs/wesnoth/HISTORY
index b532aef..5f14cea 100644
--- a/games-strategy-tbs/wesnoth/HISTORY
+++ b/games-strategy-tbs/wesnoth/HISTORY
@@ -105,7 +105,7 @@
 2004-08-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: updated to 0.8.2
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_ttf, SDL_image, SDL_mixer, and SDL_net renamed to sdl*
 
 2004-07-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
diff --git a/games-strategy-tbs/xfrisk/HISTORY 
b/games-strategy-tbs/xfrisk/HISTORY
index 75841cc..98d16df 100644
--- a/games-strategy-tbs/xfrisk/HISTORY
+++ b/games-strategy-tbs/xfrisk/HISTORY
@@ -5,7 +5,7 @@
        * DETAILS: Version bump, updated urls, api2 conversion
        * BUILD: Convert to api2 default_games_build
 
-2006-03-08 Eric Sandall <eric AT sandall.us>
+2006-03-08 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Xaw3d renamed to xaw3d
          Formatted to Guru Handbook
 
@@ -27,6 +27,6 @@
 2002-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * added DEPENDS file, depends Xaw3d (fixes bug #1725)
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-terminal/beer/HISTORY b/games-terminal/beer/HISTORY
index f2419c4..c77135d 100644
--- a/games-terminal/beer/HISTORY
+++ b/games-terminal/beer/HISTORY
@@ -15,6 +15,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-10-02 Eric Sandall <eric AT sandall.us>
+2002-10-02 Eric Sandall <sandalle AT sourcemage.org>
        * Spell submitted by Richard Brauer on 2002-04-19
 
diff --git a/games-terminal/bsd-games/HISTORY 
b/games-terminal/bsd-games/HISTORY
index 63f9453..2dfcb2c 100644
--- a/games-terminal/bsd-games/HISTORY
+++ b/games-terminal/bsd-games/HISTORY
@@ -32,7 +32,7 @@
 2003-05-08 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Updated to 2.14
 
-2003-01-25 Eric Sandall <eric AT sandall.us>
+2003-01-25 Eric Sandall <sandalle AT sourcemage.org>
        * Added to grimoire
          Fixed Bug #2396, thanks to Arwed v. Merkatz
 
diff --git a/games-terminal/fortune/HISTORY b/games-terminal/fortune/HISTORY
index 00aa5c1..6e8d383 100644
--- a/games-terminal/fortune/HISTORY
+++ b/games-terminal/fortune/HISTORY
@@ -14,7 +14,7 @@
 2004-10-14 Arjan Bouter <abouter AT sourcemage.org>
        * added desktop files
 
-2004-06-17 Eric Sandall <eric AT sandall.us>
+2004-06-17 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: BUILD_API=2
        Removed MAINTAINER
        Made SHORT shorter
diff --git a/games-terminal/nethack/HISTORY b/games-terminal/nethack/HISTORY
index e2d449e..50f5d90 100644
--- a/games-terminal/nethack/HISTORY
+++ b/games-terminal/nethack/HISTORY
@@ -18,7 +18,7 @@
        * BUILD: Typo in the BUILD file Bug #9169.
        * BUILD: Another typo...
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1
          Added BUILD_API=2
        * CONFIGURE: Converted to config_query
@@ -47,7 +47,7 @@
        * DETAILS,BUILD: Update to 3.4.2 and finish qt-x11 and gnome windowing
          builds
 
-2003-08-24 Eric Sandall <eric AT sandall.us>
+2003-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS:One make job
          Now installs to appropriate locations (Bug #4131)
          Permissions for games
@@ -69,14 +69,14 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-10-24 Eric Sandall <eric AT sandall.us>
+2002-10-24 Eric Sandall <sandalle AT sourcemage.org>
        * POST_INSTALL: Fixed POST_INSTALL to create /usr/games if it doesn't
          exist
 
 2002-09-10 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DEPENDS: removed dependency on xfree86 (fixes bug #930)
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * Added nethack spell from nealbirch
          Added MD5 and LICENSE
 
diff --git a/games-unmaintained/glants/HISTORY 
b/games-unmaintained/glants/HISTORY
index ff87fdf..b247089 100644
--- a/games-unmaintained/glants/HISTORY
+++ b/games-unmaintained/glants/HISTORY
@@ -7,7 +7,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-01-24 Eric Sandall <eric AT sandall.us>
+2004-01-24 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Now depends on any provisor of GLUT
        * HISTORY: Formatted to Guru Handbook
 
@@ -17,6 +17,6 @@
 2003-05-19 hgg <hgreig AT bigpond.net.au>
        * BUILD: Update for ${INSTALL_ROOT}
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-unmaintained/ksirk/HISTORY 
b/games-unmaintained/ksirk/HISTORY
index a8946ff..5bd6b3f 100644
--- a/games-unmaintained/ksirk/HISTORY
+++ b/games-unmaintained/ksirk/HISTORY
@@ -16,6 +16,6 @@
 2003-06-10 hgg <hgreig AT bigpond.net.au>
        * Update spell to 1.1 and added to grimoire
 
-2002-11-01 Eric Sandall <eric AT sandall.us>
+2002-11-01 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-unmaintained/nij/HISTORY b/games-unmaintained/nij/HISTORY
index a43ae27..c62be32 100644
--- a/games-unmaintained/nij/HISTORY
+++ b/games-unmaintained/nij/HISTORY
@@ -14,7 +14,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Removed SDL as sdl_image depends on sdl
        * HISTORY: Formatted to Guru Handbook
@@ -35,7 +35,7 @@
        * nij: fixed the start script
        * BUILD: fixed some paths (to binary and docs)
 
-2002-10-31 Eric Sandall <eric AT sandall.us>
+2002-10-31 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Created README from config.h
 
diff --git a/games-unmaintained/nij/README b/games-unmaintained/nij/README
index cc8d890..b0223ee 100644
--- a/games-unmaintained/nij/README
+++ b/games-unmaintained/nij/README
@@ -8,5 +8,5 @@ SHOOT: 'a'
 JUMP: 'space_bar'
 QUIT: 'q'
 
-README written by:  Eric Sandall <eric AT sandall.us>  -- 2002-10-31  v1.0
+README written by:  Eric Sandall <sandalle AT sourcemage.org>  -- 2002-10-31  
v1.0
         edited by:  John Harding <johnh AT kuberaconsulting.com>  -- 2006-07-07 
v1.1
diff --git a/games-unmaintained/ssystem/HISTORY 
b/games-unmaintained/ssystem/HISTORY
index 2c8bdbb..1916a4e 100644
--- a/games-unmaintained/ssystem/HISTORY
+++ b/games-unmaintained/ssystem/HISTORY
@@ -4,7 +4,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-07 Eric Sandall <eric AT sandall.us>
+2005-04-07 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Removed MAKE_NJOBS=1 and MAINTAINER
          Added BUILD_API=2
          Shortened SHORT
@@ -34,7 +34,7 @@
 2002-11-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DETAILS: changed SOURCE_URL to a working one (fixes bug #1774)
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-unmaintained/ttoa/HISTORY b/games-unmaintained/ttoa/HISTORY
index a8b7bbe..0a2292d 100644
--- a/games-unmaintained/ttoa/HISTORY
+++ b/games-unmaintained/ttoa/HISTORY
@@ -9,7 +9,7 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2004-08-03 Eric Sandall <eric AT sandall.us>
+2004-08-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: SDL_image renamed to sdl_image
          Removed SDL as sdl_image depends on sdl
 
@@ -19,7 +19,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-11-27 Eric Sandall <eric AT sandall.us>
+2002-11-27 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
        * Added to games
 
diff --git a/games-unmaintained/xpenguins_applet/HISTORY 
b/games-unmaintained/xpenguins_applet/HISTORY
index ca5194c..93effc0 100644
--- a/games-unmaintained/xpenguins_applet/HISTORY
+++ b/games-unmaintained/xpenguins_applet/HISTORY
@@ -13,7 +13,7 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * Updated/added MAINTAINER, MD5, LICENSE
 
 2002-05-11 David Pradier <pradierdavid AT yahoo.fr>
diff --git a/games-utils/pstreamer/HISTORY b/games-utils/pstreamer/HISTORY
index 2a0cbd3..d51952b 100644
--- a/games-utils/pstreamer/HISTORY
+++ b/games-utils/pstreamer/HISTORY
@@ -13,6 +13,6 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-02-27 Eric Sandall <eric AT sandall.us>
+2003-02-27 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-utils/psychoquery/HISTORY b/games-utils/psychoquery/HISTORY
index 5e9967f..739f427 100644
--- a/games-utils/psychoquery/HISTORY
+++ b/games-utils/psychoquery/HISTORY
@@ -12,13 +12,13 @@
 2005-11-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: license is GPL and added sha512
 
-2003-11-03 Eric Sandall <eric AT sandall.us>
+2003-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Changed requires to depends, uppercase provides
        * HISTORY: Formatted to Guru Handbook
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-02-26 Eric Sandall <eric AT sandall.us>
+2003-02-26 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-utils/psychostats/HISTORY b/games-utils/psychostats/HISTORY
index 74b2fa1..3d3b14e 100644
--- a/games-utils/psychostats/HISTORY
+++ b/games-utils/psychostats/HISTORY
@@ -13,13 +13,13 @@
 2005-11-22 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
        * DETAILS: license is GPL and added sha512
 
-2003-11-03 Eric Sandall <eric AT sandall.us>
+2003-11-03 Eric Sandall <sandalle AT sourcemage.org>
        * DEPENDS: Changed requires to depends, uppercase provides
        * HISTORY: Formatted to Guru Handbook
 
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2003-02-26 Eric Sandall <eric AT sandall.us>
+2003-02-26 Eric Sandall <sandalle AT sourcemage.org>
        * Created spell
 
diff --git a/games-utils/qstat/HISTORY b/games-utils/qstat/HISTORY
index 03b832f..f9fe496 100644
--- a/games-utils/qstat/HISTORY
+++ b/games-utils/qstat/HISTORY
@@ -10,12 +10,12 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.7
        * BUILD: Autoconfized (uses ./configure now)
        * INSTALL: Removed
 
-2004-08-20 Eric Sandall <eric AT sandall.us>
+2004-08-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 2.6
          SOURCE name changed
          SOURCE_DIRECTORY name changed
@@ -28,14 +28,14 @@
 2003-06-18 hgg <hgreig AT bigpond.net.au>
        * New Games grimoire is born!
 
-2002-11-12 Eric Sandall <eric AT sandall.us>
+2002-11-12 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v2.5c
        * BUILD: Modified to use optimizations and use 'install'
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated/added MAINTAINER
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated version to 2.5b
          Added MD5 and LICENSE
 
diff --git a/games-utils/xqf/HISTORY b/games-utils/xqf/HISTORY
index 3bb9543..32f68e7 100644
--- a/games-utils/xqf/HISTORY
+++ b/games-utils/xqf/HISTORY
@@ -11,15 +11,15 @@
 2005-12-01 Seth Woolley <seth AT tautology.org>
        * DETAILS: MD5 -> SHA512
 
-2005-04-09 Eric Sandall <eric AT sandall.us>
+2005-04-09 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.3
 
-2005-01-08 Eric Sandall <eric AT sandall.us>
+2005-01-08 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0.2
        * DEPENDS: Optionally depends on geoip
        * BUILD: Added to install binary to /usr/games
 
-2004-08-20 Eric Sandall <eric AT sandall.us>
+2004-08-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 1.0
          Added BUILD_API=2
          List more of the supported games in the long description
@@ -29,7 +29,7 @@
          Added code from CONFIGURE for using gtk+2
        * CONFIGURE: Ask user if they want the gtk+2 interface
 
-2004-03-30 Eric Sandall <eric AT sandall.us>
+2004-03-30 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.9.14
          Removed MAINTAINER
 
@@ -43,19 +43,19 @@
 2003-06-14 hgg <hgreig AT bigpond.net.au>
        * DETAILS: Update to 0.9.12
 
-2003-06-13 Eric Sandall <eric AT sandall.us>
+2003-06-13 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated dependencies (and cleaned up erroneous '&')
 
-2003-01-02 Eric Sandall <eric AT sandall.us>
+2003-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.9.11 (Bug #2075)
 
-2002-11-20 Eric Sandall <eric AT sandall.us>
+2002-11-20 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to v0.9.10
 
-2002-08-26 Eric Sandall <eric AT sandall.us>
+2002-08-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated MAINTAINER
 
-2002-08-24 Eric Sandall <eric AT sandall.us>
+2002-08-24 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Version updated to 0.9.9
          Added MD5 and LICENSE
          Changed SOURCE_URL to use $SOURCEFORGE_URL