Move external modules and man pages into the "extern" subdirectory.

svn path=/trunk/; revision=646

31 files changed, 17 insertions, 5185 deletions

diff --git a/AUTHORS b/AUTHORS
index e10ddc9..ac79da7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
 Ciaran McCreesh <ciaranm@gentoo.org>
     Main code
-    Modules:    config, cow, kernel, vi
+    Modules:    config, cow, kernel
     Libraries:  core, output
 
 Danny van Dyk <kugelfang@gentoo.org>
@@ -11,28 +11,9 @@ Danny van Dyk <kugelfang@gentoo.org>
 Aaron Walker <ka0ttic@gentoo.org>
     Modules:    bashcomp, profile
 
-Tom Martin <slarti@gentoo.org>
-    Modules:    mailer
-
-Jeremy Huddleston <eradicator@gentoo.org>
-    Modules:    compiler, opengl
-
-Michael Kohl <citizen428@gentoo.org>
-    Modules:    ruby
-
-Tobias Scherbaum <dertobi123@gentoo.org>
-    Modules:    oracle
-
 Donnie Berkholz <dberkholz@gentoo.org>
-    Modules:    blas, cblas, lapack
     Libraries:  skel
 
-Timothy Redaelli <drizzt@gentoo.org>
-    Modules:    whois
-
-Christian Faulhammer <fauli@gentoo.org>
-    Modules:    emacs
-
 Ulrich Mueller <ulm@gentoo.org>
-    Modules:    ctags, editor, emacs, news, pager, visual
+    Modules:    editor, news, pager, visual
     Libraries:  editor-variable
diff --git a/ChangeLog b/ChangeLog
index 52a3cb6..d2a9c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,11 +122,6 @@
 
 2009-07-03  Ulrich Mueller  <ulm@gentoo.org>
 
-	* modules-other, man-other: New directories. Modules that are
-	distributed with eselect stay in the modules and man directories,
-	all others are moved to the new locations.
-	* modules-other/README: New file.
-
 	* modules/news-tng.eselect (do_list, do_read): Ignore all
 	whitespace after the colon in header lines.
 
@@ -247,10 +242,6 @@
 	* modules/kernel.eselect: Fix quoting, simplify syntax for array
 	arguments, declare local variables, and other stylistic tweaks.
 
-	* modules/ruby.eselect: Remove outdated ruby module, as discussed
-	with Alex Legler <a3li@gentoo.org>. Current version is maintained
-	at <git://git.overlays.gentoo.org/proj/ruby-scripts.git>.
-
 2009-05-15  Ulrich Mueller  <ulm@gentoo.org>
 
 	* libs/package-manager.bash.in (envvar, best_version, has_version)
@@ -278,13 +269,6 @@
 	* libs/package-manager.bash.in (arch): Add case patterns for
 	ppc-macos. Taken from patch in Prefix overlay.
 
-2009-05-11  Ulrich Mueller  <ulm@gentoo.org>
-
-	* modules/emacs.eselect, modules/ctags.eselect:
-	* man/emacs.eselect.5, man/ctags.eselect.5: Sync the emacs and
-	ctags modules from the Emacs SVN repository (r1275), corresponding
-	to the eselect-emacs-1.10 release.
-
 2009-05-05  Ulrich Mueller  <ulm@gentoo.org>
 
 	* modules/news-tng.eselect (do_list): Display fallback values if
@@ -336,9 +320,6 @@
 
 2009-04-27  Ulrich Mueller  <ulm@gentoo.org>
 
-	* modules/opengl.eselect (check_version): Don't call portageq
-	directly, use generic has_version function instead.
-
 	* libs/package-manager.bash.in (get_repositories): In the Portage
 	case, use "portageq get_repos".
 	(get_repo_news_dir): Use "portageq get_repo_path".
@@ -356,11 +337,7 @@
 2009-04-25  Ulrich Mueller  <ulm@gentoo.org>
 
 	* man/binutils.eselect.5:
-	* man/blas.eselect.5:
-	* man/cblas.eselect.5:
-	* man/lapack.eselect.5:
 	* man/mailer.eselect.5:
-	* man/opengl.eselect.5:
 	* man/profile.eselect.5: Use man macros.
 
 	* modules/news-tng.eselect: Yet another module for reading GLEP 42
@@ -411,8 +388,6 @@
 
 	* modules/modules.eselect (do_list, do_has): Fix quoting.
 
-	* modules/compiler.eselect.in: Remove dead module.
-
 	* modules/rc.eselect (do_show): Add --all option. No need for an
 	extra subshell; do_action already calls us from one.
 	(describe_show_options): Document it.
@@ -443,11 +418,6 @@
 	* modules/Makefile.am (safe_scripts):
 	* man/Makefile.am (man_MANS): Add the new files.
 
-2009-04-19  Thomas Anderson <gentoofan23@gentoo.org>
-
-	* modules/opengl.eselect: Fix removal of symlinks when the symlink is
-	broken. Thanks to Maximilian Grothusmann in bug #228547. Fixes: #228547
-
 2009-04-18  Ulrich Mueller  <ulm@gentoo.org>
 
 	* modules/rc.eselect (do_delete): Don't die if the script is no
@@ -455,8 +425,6 @@
 	(describe_add_parameters, describe_delete_parameters): Suppress
 	newlines.
 
-	* AUTHORS: Add fauli and myself for the ctags and emacs modules.
-
 	* bin/eselect.in: Remove all alias definitions. Unset functions
 	and variables that are known to cause trouble. Fixes bug 155814.
 
@@ -539,13 +507,6 @@
 
 	* man/eselect.1: Fix man section, bug 172636.
 
-2008-03-24  Ulrich Mueller  <ulm@gentoo.org>
-
-	* modules/emacs.eselect, modules/ctags.eselect:
-	* man/emacs.eselect.5, man/ctags.eselect.5: Import the emacs and
-	ctags modules from the Emacs SVN repository (r1030), corresponding
-	to the eselect-emacs-1.3 release.
-
 2008-01-28 Piotr Jaroszyński <peper@gentoo.org>
 
 	* configure.ac, libs/paludis.bash.in: Check for paludis binary at
@@ -562,21 +523,14 @@
 
 2007-11-30 Piotr Jaroszyński <peper@gentoo.org>
 
-	* libs/config.bash.in, modules/env.eselect, modules/esd.eselect,
-	+modules/timidity.eselect, NEWS: Merge various changes from 1.0.x
-	branch.
+	* libs/config.bash.in, modules/env.eselect, NEWS: Merge various
+	changes from 1.0.x branch.
 
 2007-11-27 Piotr Jaroszyński <peper@gentoo.org>
 
 	* libs/package-manager.bash.in, libs/paludis.bash.in,
 	libs/portage.bash.in: Add stuff to be used by new eselect-news.
 
-2007-10-27 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Cleaned out old cruft which supported the
-	2004.3 amd64 profile.  Improved support for cleaning up after
-	switching away from newer nvidia drivers.
-
 2007-09-21 Donnie Berkholz <dberkholz@gentoo.org>
 
 	* libs/skel.bash.in: (#189942) Allow resetting to the current
@@ -590,10 +544,6 @@
 
 	* bin/Makefile.am, man/Makefile.am: Undo the most recent "fix".
 
-2007-02-28 Mike Kelly <pioto@gentoo.org>
-
-	* modules/vi.eselect: Clean up vi.eselect a bit.
-
 2007-02-27 Danny van Dyk <kugelfang@gentoo.org>
 
 	* bin/Makefile.am, man/Makefile.am: Fix symlink creation for real now.
@@ -612,18 +562,6 @@
 
 	+ Fixes: #162008
 
-2006-11-24 Diego Pettenò <flameeyes@gentoo.org>
-
-	* modules/esd.eselect: Add the esound selection module, that I
-	forgot to add before.
-
-2006-11-17 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Allow more than one dictionary file for
-	a language to be entered into OOo's dictionary list.
-	* modules/myspell.eselect: As for oodict.eselect; also add a
-	command "default" for setting system-wide default dictionary.
-
 2006-11-13 Mike Kelly <pioto@gentoo.org>
 
 	* configure.ac, libs/Makefile.am, Makefile.am, modules/Makefile.am:
@@ -646,17 +584,6 @@
 	* modules/modules.eselect: Add a new module, for listing, querying,
 	and installing eselect modules.
 
-2006-10-26 Timothy Redaelli <drizzt@gentoo.org>
-
-	* modules/whois.eselect: Make a missing man page just cause a
-	warning (to work with folks who use FEATURES=noman,
-	etc). (modifications taken from vi.eselect)
-
-2006-10-26 Mike Kelly <pioto@gentoo.org>
-
-	* modules/vi.eselect: Make a missing man page just cause a warning (to
-	work with folks who use FEATURES=noman, etc).
-
 2006-10-24 Danny van Dyk <kugelfang@gentoo.org>
 
 	* libs/core.bash.in: Fix bug #152662. Thanks to Roy Marples
@@ -665,20 +592,11 @@
 	* modules/env.eselect: Fix bug #152318. Thanks to Jason Stubbs
 	<jstubbs@gentoo.org> for report and patch.
 
-2006-10-23 Timothy Redaelli <drizzt@gentoo.org>
-
-	* modules/whois.eselect: Added whois module.
-
 2006-10-22 Danny van Dyk <kugelfang@gentoo.org>
 
 	* configure.ac: Changed version to 1.1.0. (development branch)
 	* libs/config.bash.in: Fix quotation in load_config().
 
-2006-10-22 Mike Kelly <pioto@gentoo.org>
-
-	* modules/vi.eselect: Clean up and add proper support for non-gzip- or
-	bzip2-compressed man pages.
-
 2006-10-21 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/env.eselect: Clean up and fix bug #151701.
@@ -687,20 +605,6 @@
 	* doc/developer-guide.txt: Update developer documentation to reflect
 	API changes.
 
-2006-10-17 Mike Kelly <pioto@gentoo.org>
-
-	* modules/vi.eselect: Make sure that the return value of
-	remove_symlinks() is meaningful.
-
-2006-10-09 Joshua Nichols <nichoj@gentoo.org>
-
-	* modules/java.eselect: Removed obsolete module, in favor of
-	java-vm.eselect.
-
-2006-10-09 Donnie Berkholz <dberkholz@gentoo.org>
-
-	* modules/opengl.eselect: Fix when ROOT != /.
-
 2006-10-03 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/binutils.eselect: Finally fixed bug #149627.
@@ -709,11 +613,7 @@
 	* libs/core.bash.in: Tweaked die function to have a nicer output.
 	* Tagged 1.0.6 release.
 
-2006-10-02 Mike Kelly <pioto@gentoo.org>
-
-	* modules/vi.eselect: Apply fix from bug #147857.
-
-2006-01-10 Danny van Dyk <kugelfang@gentoo.org>
+2006-10-01 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/binutils.eselect: Fixed bug #149627. Thanks to
 	Charlie Shepherd for finding this.
@@ -731,7 +631,6 @@
 
 2006-09-19 Mike Kelly <pioto@gentoo.org>
 
-	* modules/vi.eselect: Add support for vile, xvile, and elvis.
 	* modules/Makefile.am: Remove the vi.eselect module, so it isn't
 	distributed with the main eselect code.
 
@@ -749,11 +648,6 @@
 
 	* Tagged 1.0.5 release.
 
-2006-08-21 Danny van Dyk <kugelfang@gentoo.org>
-
-	* modules/compiler.eselect.in: Fix previous accidental commit of local
-	changes. Reverted to r271.
-
 2006-08-17 Donnie Berkholz <dberkholz@gentoo.org>
 
 	* libs/skel.bash.in: Small usability tweak -- change printed
@@ -767,19 +661,6 @@
 	can take a little time to parse.
 	* ChangeLog: Change a couple references to my old nick.
 
-2006-08-06 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Modify to install all dictionaries files for
-	a language where the language has more than one - bug #139669
-
-2006-08-04 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/myspell.eselect: Initial version of combined myspell
-	eselect module, to support all applications that have their own
-	directory for myspell dictionaries via symlinks to the shared
-	installation area.  Bug #139422
-	Set properties, cleaned up help text.
-
 2006-08-04 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/kernel.eselect: Fix Bug #141106: list action doesn't
@@ -811,26 +692,6 @@
 	available before attempting to switch to them. This fixes
 	switching based on name rather than number.
 
-2006-07-07 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/tbirddict.eselect: Fixed default thunderbird;
-	directory; bug #139422 - thanks Rodolphe Rocca
-
-2006-07-07 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/tbirddict.eselect: new module to support dictionary
-	installation for Mozilla Thunderbird; bug #139422
-
-2006-07-06 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: support --libdir option to
-	support multilib, in particular 32-bit binary builds
-	used on amd64; bug #139228
-
-2006-07-06 Danny van Dyk <kugelfang@gentoo.org>
-
-	* modules/opengl.eselect: Updated ebuild version number.
-
 2006-07-03 Danny van Dyk <kugelfang@gentoo.org>
 
 	* Tagged 1.0.3 release.
@@ -845,42 +706,23 @@
 
 	* modules/profile.eselect: Marked as portage-only module.
 
-	* modules/opengl.eselect, modules/binutils.eselect: Change from
-	inherit portage to inherit package-manager.
+	* modules/binutils.eselect: Change from inherit portage to inherit
+	package-manager.
 
 	* modules/rc.eselect: Fix bug in list_runlevels(). Respect setting of
 	${svcdir} in /etc/rc.conf. Add support to show() runlevels other than
 	the current.
 
-2006-06-21 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Fix update action (variable name typo), and
-	handle missing OOo dictionary.lst properly.
-
-2006-06-19 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Align description with other modules.
-
 2006-06-18 Donnie Berkholz <dberkholz@gentoo.org>
 
 	* libs/skel.bash.in, libs/Makefile.am, doc/developer-guide.txt:
 	Add a new skel.bash library for easy implementation of the simpler
 	cases of switching, and document it.
 
-	* modules/blas.eselect, modules/cblas.eselect, modules/lapack.eselect,
-	man/blas.eselect.5, man/cblas.eselect.5, man/lapack.eselect.5:
-	Use the skel.bash library to create new eselect modules for blas,
-	cblas and lapack. Update documentation to reflect this.
-
 	* modules/Makefile.am, man/Makefile.am:
 	The new blas/cblas/lapack modules will be installed as standalone
 	packages, so remove them from Makefile.am files.
 
-2006-06-13 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Clean up output when dictionaries are
-	installed outside of myspell ebuilds. See bug #135520 comment 4.
-
 2006-06-11 Danny van Dyk <kugelfang@gentoo.org>
 
 	* modules/env.eselect: Fixed handling of files in /etc/env.d/ which
@@ -888,21 +730,6 @@
 	#130098). Fixed generation of /etc/profile.csh (see bug #136111).
 	Thanks to Patrick MacLean <chutzpah@gentoo.org> for both fixes.
 
-2006-06-10 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Added env update, added inherit config
-	* modules/compiler.eselect.in: Added env update
-
-2006-06-03 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: Tidy up info messages, clean up handling of
-	nothing-installed and configured cases.
-
-2006-05-31 Kevin F. Quinn <kevquinn@gentoo.org>
-
-	* modules/oodict.eselect: New module for managing dictionaries with
-	OpenOffice.org.  See bug #132247.
-
 2006-04-14 Danny van Dyk <kugelfang@gentoo.org>
 
 	* libs/config.bash: Fixed creation of empty configfile.
@@ -935,17 +762,11 @@
 	configure.ac: Added support for the canonicalise function, a wrapper
 	to either GNU readlink or realpath.
 	* modules/binutils.eselect, modules/blas.eselect,
-	modules/config.eselect, modules/env.eselect, modules/kernel.eselect,
-	modules/lapack.eselect, modules/mailer.eselect,
-	modules/oracle.eselect, modules/profile.eselect, modules/rc.eselect,
-	modules/ruby.eselect, modules/vi.eselect: Converted to use
-	canonicalise() instead of readlink -f. This ensure portability of
-	eselect to *BSD.
-
-2006-03-25 Tobias Scherbaum <dertobi123@gentoo.org>
-
-	* modules/oracle.eselect: Added oracle module.  Not adding to
-	Makefile.am as it's not going to be installed with the base package.
+	modules/config.eselect, modules/env.eselect,
+	modules/kernel.eselect, modules/lapack.eselect,
+	modules/mailer.eselect, modules/profile.eselect,
+	modules/rc.eselect: Converted to use canonicalise() instead of
+	readlink -f. This ensure portability of eselect to *BSD.
 
 2006-03-09 Danny van Dyk <kugelfang@gentoo.org>
 
@@ -1024,16 +845,6 @@
 	append a ' ' onto the end of lines, displays the value on the next
 	line if key is too long.
 
-2005-10-29 Thomas Matthijs <axxo@gentoo.org>
-
-	* modules/java.eselect: Don't assume uid 0 has super powers,
-	* modules/java.eselect: Added simple java module, for configuring
-	system and user vm.
-
-2005-10-19 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Added missing inherit config
-
 2005-10-19 Aaron Walker <ka0ttic@gentoo.org>
 
 	* libs/output.bash.in: Use ${#indent} instead of a literal '28'.
@@ -1091,20 +902,10 @@
 	* bin/eselect.in: Bail if user specifies an invalid global option
 	instead of just ignoring it.
 
-2005-10-16 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Added describe_*_{parameters,options}
-
 2005-10-16 Ciaran McCreesh <ciaranm@gentoo.org>
 
 	* modules/vi.eselect: Tidy up.
 
-2005-10-16 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Added describe_set_{parameters,options}
-
-2005-10-16 Ciaran McCreesh <ciaranm@gentoo.org>
-
 	* doc/developer-guide.txt: Documentation for options and parameters.
 	* modules/bashcomp.eselect, modules/profile.eselect,
 	modules/cow.eselect: Implement actions and parameters.
@@ -1118,13 +919,6 @@
 
 	* modules/rc.eselect: Fixed Bug #106540.
 
-2005-10-06 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Ignore symlinks in the binpath.  Fixed
-	  a bug where selecting a non-native compiler removed the native
-	  binaries.  Use bin_prefix to determine reference file for timestamp
-	  which is needed for the alternate targets of multilib crosscompilers.
-
 2005-10-05 Aaron Walker <ka0ttic@gentoo.org>
 
 	* modules/profile.eselect: Add a --force option to 'set' sub-command
@@ -1132,62 +926,21 @@
 	recognized as valid.
 	* man/profile.eselect.5: Document --force.
 
-2005-10-05 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Support .s in CTARGET.  Made logic
-	  smarter when determining reference file for timestamp for crossdev.
-	  Fixed a bug in migrate using spec instead of specs.  Fixed a bug in
-	  get_bins on crosscompilers.
-
-2005-10-01 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Added getval action to query configs
-	  and give backwards support for -X, -L, and -B in gcc-config.
-
-2005-09-30 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Added migrate action to migrate from
-	  1.x configs.
-
-2005-09-24 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Added show and unset actions.
-
-2005-09-16 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Some cleanup and added update action.
-
-2005-09-13 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: fixed ACTION->action
-
 2005-09-11 Aaron Walker <ka0ttic@gentoo.org>
 
 	* libs/multilib.bash.in: Don't use absolute paths to executables!
 
-2005-09-11 Danny van Dyk <kugelfang@gentoo.org>
-
-	* modules/ruby.eselect: Added ruby module, written by Michael Kohl
-	<citizen428@gentoo.org>.
-
 2005-09-10 Danny van Dyk <kugelfang@gentoo.org>
 
 	* bin/eselect.in: Fixed Bug in usage of has(). Thanks to Sven Wegener
 	<swegener@gentoo.org> for spotting this.
-	* man/opengl.eselect: Added manpage for opengl module.
-	* libs/portage.bash.in, libs/Makefile.am,
-	configure.ac, modules/binutils.eselect, modules/config.eselect,
-	modules/opengl.eselect, modules/profile.eselect: Added portage
-	library, moved profile.eselect:get_arch() to portage.bash:arch().
+	* libs/portage.bash.in, libs/Makefile.am, configure.ac,
+	modules/binutils.eselect, modules/config.eselect,
+	modules/profile.eselect: Added portage library,
+	moved profile.eselect:get_arch() to portage.bash:arch().
 	* doc/developer-guide.txt: Changed documentation according to API
 	changes (inherit / core.bash-split).
 
-2005-09-05 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Cleaned up code to conform to eselect
-	coding style.  Make better use of the eselect API.  Fixed a bug with
-	--impl-headers.  Many thanks to Danny van Dyk <kugelfang@gentoo.org>.
-
 2005-09-05 Danny van Dyk <kugelfang@gentoo.org>
 
 	* libs/core.bash.in: Added inherit() function that allows dynamic
@@ -1199,8 +952,7 @@
 	* libs/core.bash.in, libs/test.bash.in: moved has() and is_function()
 	to tests library.
 	* modules/binutils.eselect, modules/blas.eselect, modules/env.eselect,
-	modules/lapack.eselect, modules/opengl.eselect: Added necessary
-	inherit lines.
+	modules/lapack.eselect: Added necessary inherit lines.
 
 2005-09-04 Danny van Dyk <kugelfang@gentoo.org>
 
@@ -1218,22 +970,6 @@
 	only for linux-kernel directories w/o listing source directories of
 	additional drivers.
 
-2005-08-23 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/compiler.eselect.in: Added eselect module for the
-	forthcoming compiler-config-2.0 (formerly gcc-config).  It is alpha
-	code and currently only supports set and list actions.
-
-2005-08-23 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Fixed a bug in creating symlinks to header
-	files.
-
-2005-08-17 Jeremy Huddleston <eradicator@gentoo.org>
-
-	* modules/opengl.eselect: Added opengl module.  Not adding to
-	Makefile.am as it's not going to be installed with the base package.
-
 2005-08-08 Aaron Walker <ka0ttic@gentoo.org>
 
 	* man/bashcomp.eselect.5: Add missing description of --global flag.
diff --git a/NEWS b/NEWS
index 3f1131f..44141ec 100644
--- a/NEWS
+++ b/NEWS
@@ -93,15 +93,11 @@ ChangeLog file for a more detailed listing of changes/bug fixes.
 
 1.0.7:
     Bug fixes:
-    - Fixed bug in modules/opengl.eselect: Fix when ROOT != /.
     - Fixed bug #151701: Generate {SPACE,COLON}_SEPARATED vars in update.
     - Fixed bug #152318: Fix env.eselect for envvar values containing '='.
     - Fixed bug #152662: Fixed new die() function on *BSD.
     - Updated developer documentation.
 
-    Removed modules:
-    - java.eselect is now superseded by java-{vm,nsplugin}.eselect.
-
 1.0.6:
     Bug fixes:
     - Fixed bug #144152: Added reload action to rc module.
diff --git a/man-other/blas.eselect.5 b/man-other/blas.eselect.5
deleted file mode 100644
index 97d9c03..0000000
--- a/man-other/blas.eselect.5
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright 2006-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH blas.eselect 5 "May 2009" "Gentoo Linux" eselect
-.SH NAME
-blas.eselect \- The BLAS management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect blas
-.RB [ help | usage | version ]
-.br
-.B eselect blas list
-.RI [ options ]
-.br
-.B eselect blas add
-.br
-.B eselect blas set
-.I implementation
-.RI [ options ]
-.br
-.B eselect blas show
-.RI [ options ]
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect blas list
-.RI [ options ]
-.br
-Display an ordered list of installed BLAS implementations.
-It distinguishes between versions with different Application Binary
-Interfaces (e.g. x86/AMD64).  Furthermore, it also distinguishes
-between interfaces to high-level programming languages.  Each line
-holds a number and the implementation's name.  An asterisk next to one
-of the list elements denotes an active implementation.
-
-# eselect blas list
-.br
-Installed BLAS for libdir lib
-.br
-  [1]   atlas *
-  [2]   reference
-
-Possible
-.I options
-to the
-.B list
-action are restrictions to handle only certain ABI\-specific library
-directories. For example,
-
-.B eselect blas list lib64
-
-lists only BLAS implementations found in
-.BR /usr/lib64 .
-
-.SH ACTION: SHOW
-.B eselect blas show
-.RI [ options ]
-.br
-Show your system's currently active BLAS implementations.
-
-# eselect blas show
-.br
-lib: atlas
-.br
-lib64: reference
-
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B show
-action to restrict it to given ABIs.
-.SH ACTION: SET
-.B eselect blas set
-.I implementation
-.RI [ options ]
-.br
-Set your system's currently active BLAS implementations to
-.IR implementation .
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B set
-action to restrict it to given ABIs.
-
-# eselect blas set atlas
-.SH AUTHOR
-Danny van Dyk <kugelfang@gentoo.org>
-.br
-Donnie Berkholz <dberkholz@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1)
-.SH REVISION
-$Id$
diff --git a/man-other/cblas.eselect.5 b/man-other/cblas.eselect.5
deleted file mode 100644
index a153d4a..0000000
--- a/man-other/cblas.eselect.5
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright 2006-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH cblas.eselect 5 "May 2009" "Gentoo Linux" eselect
-.SH NAME
-cblas.eselect \- The CBLAS management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect cblas
-.RB [ help | usage | version ]
-.br
-.B eselect cblas list
-.RI [ options ]
-.br
-.B eselect cblas add
-.br
-.B eselect cblas set
-.I implementation
-.RI [ options ]
-.br
-.B eselect cblas show
-.RI [ options ]
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect cblas list
-.RI [ options ]
-.br
-Display an ordered list of installed CBLAS implementations.
-It distinguishes between versions with different Application Binary
-Interfaces (e.g. x86/AMD64).  Furthermore, it also distinguishes
-between interfaces to high-level programming languages.  Each line
-holds a number and the implementation's name.  An asterisk next to one
-of the list elements denotes an active implementation.
-
-# eselect cblas list
-.br
-Installed CBLAS for libdir lib
-.br
-  [1]   atlas *
-  [2]   reference
-
-Possible
-.I options
-to the
-.B list
-action are restrictions to handle only certain ABI\-specific library
-directories. For example,
-
-.B eselect cblas list lib64
-
-lists only CBLAS implementations found in
-.BR /usr/lib64 .
-
-.SH ACTION: SHOW
-.B eselect cblas show
-.RI [ options ]
-.br
-Show your system's currently active CBLAS implementations.
-
-# eselect cblas show
-.br
-lib: atlas
-.br
-lib64: reference
-
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B show
-action to restrict it to given ABIs.
-.SH ACTION: SET
-.B eselect cblas set
-.I implementation
-.RI [ options ]
-.br
-Set your system's currently active CBLAS implementations to
-.IR implementation .
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B set
-action to restrict it to given ABIs.
-
-# eselect cblas set atlas
-.SH AUTHOR
-Danny van Dyk <kugelfang@gentoo.org>
-.br
-Donnie Berkholz <dberkholz@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1)
-.SH REVISION
-$Id$
diff --git a/man-other/ctags.eselect.5 b/man-other/ctags.eselect.5
deleted file mode 100644
index 0165343..0000000
--- a/man-other/ctags.eselect.5
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright 2007-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH ctags.eselect 5 "May 2009" "Gentoo Linux" eselect
-.SH NAME
-ctags.eselect, etags.eselect \- The ctags and etags management module
-for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect ctags
-.RB [ help | usage | version ]
-.br
-.B eselect ctags list
-.br
-.B eselect ctags set
-.I target
-.br
-.B eselect ctags show
-.br
-.B eselect ctags update
-.RB [ ifunset ]
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-
-The
-.B ctags
-and
-.B etags
-eselect modules share a common syntax, therefore this man page
-collectively refers to them as
-.BR ctags .
-.SH ACTION: LIST
-.B eselect ctags list
-.br
-List all installed ctags versions.
-
-# eselect ctags list
-.br
-Available ctags symlink targets:
-.br
-  [1]   ctags-emacs-22 *
-  [2]   exuberant-ctags
-.SH ACTION: SET
-.B eselect ctags set
-.I target
-.br
-Activate the selected ctags version.
-.I target
-can be either an identification number given by
-.B eselect ctags list
-or the name of one installed version.
-
-# eselect ctags set 2
-.br
-Switching ctags to exuberant-ctags ...
-.SH ACTION: SHOW
-.B eselect ctags show
-.br
-Print the currently activated ctags version.
-
-# eselect ctags show
-.br
-Current target of symlink:
-.br
-  exuberant-ctags
-.SH ACTION: UPDATE
-.B eselect ctags update
-.RB [ ifunset ]
-.br
-Update the ctags symlink.  For an update only the version is changed,
-but not the provider (i.e. Emacs vs Exuberant).  At the moment only
-(X)Emacs offers several concurrent versions.  If option
-.B ifunset
-is given, an existing implementation is not overridden.
-
-# eselect ctags update
-.br
-Switching ctags to exuberant-ctags ...
-.br
-Switching etags to etags-emacs-22 ...
-.SH BUGS
-Under FreeBSD,
-.B eselect ctags
-does not work since
-.B ctags
-is a real binary, owned by package freebsd-ubin.
-.RB ( "eselect etags"
-does work though.)
-
-.B eselect etags
-does not display any valid targets if there is no Emacs variant
-installed.  This is a feature.
-.SH AUTHOR
-Ulrich Mueller <ulm@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1),
-.BR emacs.eselect (5)
-.SH REVISION
-$Id$
diff --git a/man-other/emacs.eselect.5 b/man-other/emacs.eselect.5
deleted file mode 100644
index b242867..0000000
--- a/man-other/emacs.eselect.5
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" Copyright 2007-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH emacs.eselect 5 "April 2009" "Gentoo Linux" eselect
-.SH NAME
-emacs.eselect \- The Emacs management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect emacs
-.RB [ help | usage | version ]
-.br
-.B eselect emacs list
-.br
-.B eselect emacs set
-.I target
-.br
-.B eselect emacs show
-.br
-.B eselect emacs update
-.RB [ ifunset ]
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect emacs list
-.br
-List all installed Emacs versions and even informs you if XEmacs has
-been found on your system.
-
-# eselect emacs list
-.br
-Available GNU Emacs symlink targets:
-.br
-  [1]   emacs-18
-  [2]   emacs-21 *
-  [3]   emacs-22
-.SH ACTION: SET
-.B eselect emacs set
-.I target
-.br
-Activate the selected Emacs version.
-.I target
-can be either an identification number given by
-.B eselect emacs list
-or the name of one installed version.  To avoid runtime issues with
-incompatible byte-code from the previously selected Emacs version, run
-.B emacs-updater -a rebuild
-to remerge all needed packages.
-
-# eselect emacs set 3
-.br
-Switching emacs to emacs-22 ...
-.br
-Switching ctags to ctags-emacs-22 ...
-.br
-Switching etags to etags-emacs-22 ...
-.SH ACTION: SHOW
-.B eselect emacs show
-.br
-Print the currently activated Emacs version.
-
-# eselect emacs show
-.br
-Current target of GNU Emacs symlink:
-.br
-  emacs-22
-.SH ACTION: UPDATE
-.B eselect emacs update
-.RB [ ifunset ]
-.br
-Update the emacs symlink to the last available version.  If option
-.B ifunset
-is given, an existing implementation is not overridden.
-
-# eselect emacs update
-.br
-Switching emacs to emacs-22 ...
-.br
-Switching ctags to ctags-emacs-22 ...
-.br
-Switching etags to etags-emacs-22 ...
-.SH AUTHORS
-Christian Faulhammer <fauli@gentoo.org>
-.br
-Ulrich Mueller <ulm@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1),
-.BR ctags.eselect (5)
-.SH REVISION
-$Id$
diff --git a/man-other/lapack.eselect.5 b/man-other/lapack.eselect.5
deleted file mode 100644
index afe1e57..0000000
--- a/man-other/lapack.eselect.5
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright 2006-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH lapack.eselect 5 "May 2009" "Gentoo Linux" eselect
-.SH NAME
-lapack.eselect \- The LAPACK management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect lapack
-.RB [ help | usage | version ]
-.br
-.B eselect lapack list
-.RI [ options ]
-.br
-.B eselect lapack add
-.br
-.B eselect lapack set
-.I implementation
-.RI [ options ]
-.br
-.B eselect lapack show
-.RI [ options ]
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect lapack list
-.RI [ options ]
-.br
-Display an ordered list of installed LAPACK implementations.
-It distinguishes between versions with different Application Binary
-Interfaces (e.g. x86/AMD64).  Furthermore, it also distinguishes
-between interfaces to high-level programming languages.  Each line
-holds a number and the implementation's name.  An asterisk next to one
-of the list elements denotes an active implementation.
-
-# eselect lapack list
-.br
-Installed LAPACK for libdir lib
-.br
-  [1]   atlas *
-  [2]   reference
-
-Possible
-.I options
-to the
-.B list
-action are restrictions to handle only certain ABI\-specific library
-directories. For example,
-
-.B eselect lapack list lib64
-
-lists only LAPACK implementations found in
-.BR /usr/lib64 .
-
-.SH ACTION: SHOW
-.B eselect lapack show
-.RI [ options ]
-.br
-Show your system's currently active LAPACK implementations.
-
-# eselect lapack show
-.br
-lib: atlas
-.br
-lib64: reference
-
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B show
-action to restrict it to given ABIs.
-.SH ACTION: SET
-.B eselect lapack set
-.I implementation
-.RI [ options ]
-.br
-Set your system's currently active LAPACK implementations to
-.IR implementation .
-The same
-.I options
-that apply to the
-.B list
-action can be used with the
-.B set
-action to restrict it to given ABIs.
-
-# eselect lapack set atlas
-.SH AUTHOR
-Danny van Dyk <kugelfang@gentoo.org>
-.br
-Donnie Berkholz <dberkholz@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1)
-.SH REVISION
-$Id$
diff --git a/man-other/opengl.eselect.5 b/man-other/opengl.eselect.5
deleted file mode 100644
index 7451bad..0000000
--- a/man-other/opengl.eselect.5
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" Copyright 2005-2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH opengl.eselect 5 "April 2009" "Gentoo Linux" eselect
-.SH NAME
-opengl.eselect \- The OpenGL management module for Gentoo's eselect
-.SH SYNOPSIS
-.B eselect opengl
-.RB [ help | usage | version ]
-.br
-.B eselect opengl list
-.br
-.B eselect opengl set
-.RI [ options ]
-.I implementation
-.br
-.B eselect opengl show
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect opengl list
-.br
-Display a numbered list of all available OpenGL implementations.
-The currently actived implementation is highlighted by a '*'.
-
-# eselect opengl list
-.br
-Available OpenGL implementations:
-  [1]   ati *
-  [2]   xfree
-  [3]   xorg\-x11
-.SH ACTION: SHOW
-.B eselect opengl show
-.br
-Show your system's currently active OpenGL implementation.
-
-# eselect opengl show
-.br
-ati
-.SH ACTION: SET
-.B eselect opengl set
-.RI [ options ]
-.I implementation
-.br
-Set your system's currently active OpenGL implementation to 
-.IR implementation .
-.br
-Extra options:
-.TP
-.B \-\-use\-old
-If an implementation is already set, use that one.
-.TP
-.BI \-\-prefix =value
-Set the source prefix to
-.I value
-(defaults to
-.BR /usr ).
-.TP
-.BI \-\-dst\-prefix =value
-Set the destination prefix to
-.I value
-(defaults to
-.BR /usr ).
-.TP
-.B \-\-impl\-headers
-Use headers provided by this implementation to override golbal ones
-provided by opengl\-update.  This was default in <opengl\-update\-2.2.
-.SH AUTHOR
-Danny van Dyk <kugelfang@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1)
-.SH REVISION
-$Id$
diff --git a/man-other/package-manager.eselect.5 b/man-other/package-manager.eselect.5
deleted file mode 100644
index d6cbf78..0000000
--- a/man-other/package-manager.eselect.5
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright 2009 Gentoo Foundation
-.\" Distributed under the terms of the GNU General Public License v2
-.\" $Id$
-.\"
-.TH package-manager.eselect 5 "June 2009" "Gentoo Linux" eselect
-.SH NAME
-package-manager.eselect \- The PACKAGE_MANAGER management module for
-Gentoo's eselect
-.SH SYNOPSIS
-.B eselect package-manager
-.RB [ help | usage | version ]
-.br
-.B eselect package-manager list
-.br
-.B eselect package-manager set
-.I target
-.br
-.B eselect package-manager show
-.br
-.B eselect package-manager update
-.SH DESCRIPTION
-.B eselect
-is Gentoo's configuration and management tool.  It features modules
-that care for the individual administrative tasks.
-.SH ACTION: LIST
-.B eselect package-manager list
-.br
-List available targets for the
-.I PACKAGE_MANAGER
-variable.
-
-# eselect package-manager list
-.br
-Available targets for the PACKAGE_MANAGER variable:
-.br
-  [1]   portage
-  [2]   pkgcore
-.SH ACTION: SET
-.B eselect package-manager set
-.I target
-.br
-Set the
-.I PACKAGE-MANAGER
-variable in the system profile.
-.I target
-can be either an identification number given by
-.B eselect package-manager list
-or the corresponding package manager's name.
-
-# eselect package-manager set pkgcore
-.br
-Setting PACKAGE_MANAGER to pkgcore ...
-.br
-Run "source /etc/profile" to update the variable in your shell.
-.SH ACTION: SHOW
-.B eselect package-manager show
-.br
-Show the value of the
-.I PACKAGE_MANAGER
-variable in the system profile.
-
-# eselect package-manager show
-.br
-PACKAGE_MANAGER variable in profile:
-.br
-  pkgcore
-.SH ACTION: UPDATE
-.B eselect package-manager update
-.br
-Update the
-.I PACKAGE_MANAGER
-variable if it is unset or invalid.
-.SH FILES
-.TP
-.B /etc/env.d/50package-manager
-Configuration file where the variable is stored.
-.SH AUTHOR
-Ulrich Mueller <ulm@gentoo.org>
-.SH SEE ALSO
-.BR eselect (1),
-.BR environ (7)
-.SH REVISION
-$Id$
diff --git a/modules-other/README b/modules-other/README
deleted file mode 100644
index 260e43f..0000000
--- a/modules-other/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains eselect modules that are not distributed with
-the main eselect tarball.
diff --git a/modules-other/blas.eselect b/modules-other/blas.eselect
deleted file mode 100644
index f0392f9..0000000
--- a/modules-other/blas.eselect
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit skel
-
-MODULE="BLAS"
-IFACE="blas"
-
-DESCRIPTION="Manage installed $MODULE implementations"
-MAINTAINER="dberkholz@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# vim: set ft=eselect :
diff --git a/modules-other/cblas.eselect b/modules-other/cblas.eselect
deleted file mode 100644
index 2c11ba8..0000000
--- a/modules-other/cblas.eselect
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit skel
-
-MODULE="CBLAS"
-IFACE="cblas"
-
-DESCRIPTION="Manage installed $MODULE implementations"
-MAINTAINER="dberkholz@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# vim: set ft=eselect :
diff --git a/modules-other/ctags.eselect b/modules-other/ctags.eselect
deleted file mode 100644
index 8980475..0000000
--- a/modules-other/ctags.eselect
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2005-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# DOCUMENTATION
-# Following actions possible
-# * show		do_show()
-# * list		do_list()
-# * set			do_set()
-# * update		do_update()
-#
-# Behaviour:
-# do_show():
-#	Checks if /usr/bin/ctags is a link and if the target exists,
-#	if yes, it outputs the currently linked ctags implementation.
-#	If it is no symlink, the user is told so, the same if there is
-#	no /usr/bin/ctags or the target does not exist.
-# do_list(): List all available ctags implementations.
-# do_set(): Set a version to be target of the symlink.
-# do_update(): Set the target to the "best" available version. See below.
-
-# This module is used for ctags and etags.
-# Determine our name from ESELECT_MODULE_NAME, with BASH_SOURCE as fallback.
-#CTAGS=${ESELECT_MODULE_NAME:-$(basename "${BASH_SOURCE[0]%.*}")}
-CTAGS=ctags
-
-bindir=/usr/bin
-man1dir=/usr/share/man/man1
-
-DESCRIPTION="Manage ${bindir}/${CTAGS} implementations"
-MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-find_targets() {
-	# Return the list of available ctags implementations
-
-	# (X)Emacs: offer only one ctags implementation, namely for the
-	# currently active Emacs version (selected by emacs.eselect)
-	# The logic here is the same as in emacs.eselect, don't change it!
-	local emacs
-	if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
-		emacs=$(basename "$(readlink "${ROOT}${bindir}/emacs")")
-		[[ -f ${ROOT}${bindir}/${CTAGS}-${emacs} ]] && echo "${CTAGS}-${emacs}"
-	elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
-		[[ -f ${ROOT}${bindir}/${CTAGS}-xemacs ]] && echo "${CTAGS}-xemacs"
-	elif [[ ${CTAGS} = etags ]]; then
-		# We are called as etags module, but no (X)Emacs is installed.
-		# Return an empty list in this case, because we don't want
-		# exuberant-ctags as default for etags (for ctags it's fine).
-		# Also, vi purists wouldn't want an etags symlink.
-		return
-	fi
-
-	# Exuberant ctags
-	[[ -f ${ROOT}${bindir}/exuberant-ctags ]] && echo exuberant-ctags
-}
-
-remove_symlinks() {
-	# Remove existing symlinks to binary and man page
-	rm -f "${ROOT}${bindir}/${CTAGS}" \
-		"${ROOT}${man1dir}"/${CTAGS}.1*
-}
-
-set_bin_symlinks() {
-	# Set symlink to binary
-	local target=${1}
-	ln -s "${target}" "${ROOT}${bindir}/${CTAGS}" \
-		|| die "Couldn't set ${target} ${ROOT}${bindir}/${CTAGS} symlink"
-}
-
-set_man_symlinks() {
-	# Set symlink to man page
-	local target=${1} extension i
-	for i in "${ROOT}${man1dir}"/${target}.1*; do
-		if [[ -f ${i} ]]; then
-			# target file exists; determine compress extension
-			extension=${i##*/${target}.1}
-			ln -s "${target}.1${extension}" \
-				"${ROOT}${man1dir}/${CTAGS}.1${extension}"
-		fi
-	done
-}
-
-set_symlinks() {
-	# Set symlinks to binary and man page
-	local target=$1 targets
-	# target may be specified by its name or its index
-	if is_number "${target}"; then
-		# numeric index, find the target's name
-		targets=( $(find_targets) )
-		[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[target-1]}
-	fi
-
-	# is the target valid, i.e. does a ctags binary with this name exist?
-	[[ -f ${ROOT}${bindir}/${target} ]] \
-		|| die -q "Target \"$1\" doesn't appear to be valid!"
-
-	echo "Switching ${CTAGS} to ${target} ..."
-	remove_symlinks || die -q "Couldn't remove existing symlink"
-	set_bin_symlinks "${target}"
-	set_man_symlinks "${target}"
-	return 0
-}
-
-test_for_root() {
-	# checks if the user has rights to modify /usr/bin/
-	[[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current target of the ${CTAGS} symlink"
-}
-
-do_show() {
-	[[ $# -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current target of ${CTAGS} symlink:"
-	if [[ -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
-	then
-		write_kv_list_entry \
-			"$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")" ""
-	elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
-		write_kv_list_entry \
-			"(not a symlink or target of symlink does not exist)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available ${CTAGS} symlink targets"
-}
-
-do_list() {
-	[[ $# -gt 0 ]] && die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-
-	write_list_start "Available ${CTAGS} symlink targets:"
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )); do
-			# Display a star to indicate the currently chosen version
-			[[ ${targets[i]} = \
-				$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")") ]] \
-				&& targets[i]="${targets[i]} $(highlight '*')"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new ${CTAGS} symlink"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -e ${ROOT}${bindir}/${CTAGS} && ! -L ${ROOT}${bindir}/${CTAGS} ]]
-	then
-		die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
-	fi
-
-	set_symlinks "$1" || die -q "Couldn't set a new symlink"
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the ${CTAGS} symlink"
-}
-
-describe_update_options() {
-	echo "ifunset : Do not override currently set version"
-}
-
-do_update() {
-	[[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
-	[[ -z $2 || $2 = norecursion ]] || die -q "Usage error"
-	[[ $# -gt 2 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if ! [[ $1 == *if*unset \
-		&& -L ${ROOT}${bindir}/${CTAGS} && -e ${ROOT}${bindir}/${CTAGS} ]]
-	then
-		local current=""
-		if [[ -L ${ROOT}${bindir}/${CTAGS} ]]; then
-			current=$(basename "$(readlink "${ROOT}${bindir}/${CTAGS}")")
-			if [[ ! -e ${ROOT}${bindir}/${CTAGS} ]]; then
-				# clean up dead symlinks
-				remove_symlinks || die -q "Couldn't remove existing symlink"
-			fi
-		elif [[ -e ${ROOT}${bindir}/${CTAGS} ]]; then
-			if ! [[ ${CTAGS} = ctags && $(uname) = FreeBSD ]]; then
-				die -q "${ROOT}${bindir}/${CTAGS} exists but is not a symlink"
-			fi
-			# On FreeBSD ctags is a real file, installed by freebsd-ubin
-			current=nolink
-		fi
-
-		# For an "update" only the version should be changed, but not the
-		# provider (i.e. Emacs vs Exuberant). At the moment only (X)Emacs
-		# offers several concurrent versions.
-
-		local i target targets=( $(find_targets) )
-		if [[ ${#targets[@]} -gt 0 && ${current} != nolink ]]; then
-			target=${targets[0]}
-			[[ ${current} == ${CTAGS}-*emacs* ]] && current=${CTAGS}-*emacs*
-			for i in ${targets[@]}; do
-				[[ ${i} == ${current} ]] && target=${i}
-			done
-			set_symlinks "${target}" || die -q "Couldn't set a new symlink"
-		fi
-	fi
-
-	# Call "eselect etags update" from the ctags module and vice versa
-	[[ $2 = norecursion ]] && return
-	case ${CTAGS} in
-		ctags) CTAGS=etags do_update "$1" norecursion ;;
-		etags) CTAGS=ctags do_update "$1" norecursion ;;
-	esac
-}
diff --git a/modules-other/emacs.eselect b/modules-other/emacs.eselect
deleted file mode 100644
index 9b15d58..0000000
--- a/modules-other/emacs.eselect
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 2005-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-#
-# DOCUMENTATION
-# Following actions possible
-# * show		do_show()
-# * list		do_list()
-# * set			do_set()
-# * update		do_update()
-#
-# Behaviour:
-# do_show():
-#	Checks if /usr/bin/emacs is a link and if the target exists,
-#	if yes, it outputs the currently linked Emacs version.
-#	If it is no symlink, the user is told so, the same if there is
-#	no /usr/bin/emacs or the target does not exist.
-# do_list(): List all available versions of GNU Emacs
-# do_set(): Set a version to be target of the symlink.
-# do_update(): Set the target to the highest version available
-#	(optionally: only if not set)
-
-bindir=/usr/bin
-man1dir=/usr/share/man/man1
-infodir=/usr/share/info
-envdir=/etc/env.d
-
-DESCRIPTION="Manage ${bindir}/emacs version"
-MAINTAINER="emacs@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# ctags and etags are handled in their own module
-BINARYLIST="emacsclient b2m ebrowse rcs-checkin grep-changelog"
-MANPAGELIST="emacs emacsclient ebrowse gfdl"
-
-find_targets() {
-	# Return the list of available Emacs binaries
-	local j
-	for j in "${ROOT}${bindir}"/emacs-[0-9]*; do
-		[[ -f ${j} ]] && basename ${j}
-	done
-}
-
-remove_infopath() {
-	# When cleaning symlinks this takes care of the info documentation settings
-	rm -f "${ROOT}${envdir}/50emacs"
-}
-
-# Define INFOPATH environment variable in env file
-set_infopath() {
-	[[ -d ${ROOT}${infodir}/$1 ]] || return 1
-	echo "INFOPATH=${infodir}/$1" > "${ROOT}${envdir}/50emacs"
-}
-
-remove_symlinks() {
-	# Remove existing symlinks to binaries, man pages,
-	# and the env file (own function)
-	local f
-	rm -f "${ROOT}${bindir}/emacs"
-	for f in ${BINARYLIST}; do
-		rm -f "${ROOT}${bindir}/${f}"
-	done
-	for f in ${MANPAGELIST}; do
-		rm -f "${ROOT}${man1dir}"/${f}.1*
-	done
-	remove_infopath
-}
-
-set_bin_symlinks() {
-	# Set symlinks to binaries in /usr/bin/
-	local target=${1} f
-	for f in ${BINARYLIST}; do
-		# set symlink only if target binary actually exists
-		if [[ -f ${ROOT}${bindir}/${f}-${target} ]]; then
-			ln -s "${f}-${target}" "${ROOT}${bindir}/${f}" || die \
-				"Couldn't set ${f}-${target} ${ROOT}${bindir}/${f} symlink"
-		fi
-	done
-}
-
-set_man_symlinks() {
-	# Set symlinks to man pages
-	local target=${1} extension f i
-	for f in ${MANPAGELIST}; do
-		for i in "${ROOT}${man1dir}"/${f}-${target}.1*; do
-			if [[ -f ${i} ]]; then
-				# target file exists; determine compress extension
-				extension=${i##*/${f}-${target}.1}
-				ln -s "${f}-${target}.1${extension}" \
-					"${ROOT}${man1dir}/${f}.1${extension}"
-			fi
-		done
-	done
-}
-
-set_symlinks() {
-	# Set symlinks to binaries and man pages, update info path
-	local target=$1 nomain=$2 targets
-	# target may be specified by its name or its index
-	if is_number "${target}"; then
-		# numeric index, find the target's name
-		targets=( $(find_targets) )
-		[[ ${target} -ge 1 && ${target} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[target-1]}
-	fi
-
-	# is the target valid, i.e. does an Emacs binary with this name exist?
-	[[ -f ${ROOT}${bindir}/${target} ]] \
-		|| die -q "Target \"${1}\" doesn't appear to be valid!"
-
-	echo "Switching emacs to ${target} ..."
-	remove_symlinks || die -q "Couldn't remove existing symlink"
-	# the main /usr/bin/emacs symlink is only set for Emacs binaries
-	# (but not for other providers of auxiliary programs, e.g., XEmacs)
-	if [[ -z ${nomain} ]]; then
-		ln -s "${target}" "${ROOT}${bindir}/emacs" \
-			|| die "Couldn't set ${target} ${ROOT}${bindir}/emacs symlink"
-	fi
-	set_bin_symlinks "${target}"
-	set_man_symlinks "${target}"
-	set_infopath "${target}"
-
-	# update /etc/profile.env from /etc/env.d files
-	# requires >=eselect-1.0.10 for "noldconfig" option
-	do_action env update noldconfig
-
-	return 0
-}
-
-xemacs_info() {
-	# This is just informational to tell that XEmacs has been found,
-	# a wish from graaff
-	if [[ -e ${ROOT}${bindir}/xemacs ]]; then
-		echo
-		write_list_start "XEmacs is also installed"
-	fi
-}
-
-vim_info() {
-	# Don't take this too serious
-	if [[ -e ${ROOT}${bindir}/vi ]]; then
-		echo
-		write_list_start "Vi found, your system is in real trouble now! ;)"
-	fi
-}
-
-test_for_root() {
-	# checks if the user has rights to modify /usr/bin/
-	[[ -w ${ROOT}${bindir} ]] || die -q "You need root privileges!"
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current target of the Emacs symlink"
-}
-
-do_show() {
-	[[ $# -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current target of Emacs symlink:"
-	if [[ -L ${ROOT}${bindir}/emacs && -e ${ROOT}${bindir}/emacs ]]; then
-		write_kv_list_entry \
-			"$(basename "$(readlink "${ROOT}${bindir}/emacs")")" ""
-	elif [[ -e ${ROOT}${bindir}/emacs ]]; then
-		write_kv_list_entry \
-			"(not a symlink or target of symlink does not exist)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-	xemacs_info
-	#vim_info
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available Emacs symlink targets"
-}
-
-do_list() {
-	[[ $# -gt 0 ]] && die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets) )
-
-	write_list_start "Available Emacs symlink targets:"
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )); do
-			# Display a star to indicate the currently chosen version
-			[[ ${targets[i]} = \
-				$(basename "$(readlink "${ROOT}${bindir}/emacs")") ]] \
-				&& targets[i]="${targets[i]} $(highlight '*')"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-	xemacs_info
-	#vim_info
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new Emacs symlink"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -e ${ROOT}${bindir}/emacs && ! -L ${ROOT}${bindir}/emacs ]]; then
-		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
-	fi
-
-	set_symlinks "${1}" || die -q "Couldn't set a new symlink"
-
-	# ctags symlinks are handled in an own module now
-	do_action ctags update
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the Emacs symlink"
-}
-
-describe_update_options() {
-	echo "ifunset : Do not override currently set version"
-}
-
-do_update() {
-	[[ -z $1 || $1 = ifunset || $1 = --if-unset ]] || die -q "Usage error"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L ${ROOT}${bindir}/emacs ]]; then
-		if [[ $1 == *if*unset && -e ${ROOT}${bindir}/emacs ]]; then
-			do_action ctags update ifunset
-			return
-		fi
-		# this is not redundant: "update" is called in pkg_postrm() of emacs
-		# and should clean up any dead symlinks if no valid target exists
-		remove_symlinks || die -q "Couldn't remove existing symlink"
-	elif [[ -e ${ROOT}${bindir}/emacs ]]; then
-		die -q "${ROOT}${bindir}/emacs exists but is not a symlink"
-	fi
-
-	local targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		set_symlinks "${targets[${#targets[@]}-1]}" \
-			|| die -q "Couldn't set a new symlink"
-	elif [[ -f ${ROOT}${bindir}/xemacs ]]; then
-		# no Emacs target found - link to XEmacs versions
-		set_symlinks xemacs nomain
-	fi
-
-	# ctags and etags symlinks are handled in an own module
-	do_action ctags update
-}
diff --git a/modules-other/esd.eselect b/modules-other/esd.eselect
deleted file mode 100644
index 5a9fa60..0000000
--- a/modules-other/esd.eselect
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Select esound daemon or wrapper"
-MAINTAINER="flameeyes@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of esd symlink targets, best first
-find_targets() {
-	for f in \
-			${ROOT}/usr/bin/esound-esd \
-			${ROOT}/usr/bin/esdcompat \
-		; do
-		if [[ -f ${f} ]] ; then
-			echo $(basename ${f} )
-		fi
-	done
-}
-
-# try to remove the esd symlink
-remove_symlink() {
-	rm "${ROOT}/usr/bin/esd" &>/dev/null
-}
-
-# set the esd symlink
-set_symlink() {
-	target=${1}
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
-		remove_symlink
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/esd" || \
-			die "Couldn't set ${target} symlink"
-	else
-		die -q  "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current ESoundD implementation"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current ESounD implementation:"
-	if [[ -L "${ROOT}/usr/bin/esd" ]] ; then
-		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/esd ) )" ""
-	elif [[ -e "${ROOT}/usr/bin/esd" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available ESounD implementations"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local targetname_esound_esd="ESounD original"
-	local targetname_esdcompat="PulseAudio"
-
-	local i targets
-	targets=( $(find_targets ) )
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			targetname="targetname_${targets[${i}]/-/_}"
-			if [[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/esd ) ) ]]; then
-				targets[${i}]="${!targetname} $(highlight '*' )"
-			else
-				targets[${i}]="${!targetname}"
-			fi
-		done
-		write_list_start "Available ESounD implementations:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new ESounD implementation provider"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a provider name"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/esd" ]] ; then
-		if ! remove_symlink ; then
-			die -q "Can't remove existing provider"
-		elif ! set_symlink "${1}" ; then
-			die -q "Can't set new provider"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/esd" ]] ; then
-		die -q "Sorry, ${ROOT}/usr/bin/esd confuses me"
-
-	else
-		set_symlink "${1}" || die -q "Can't set a new provider"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the ESounD provider"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/esd" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlink || die -q "Can't remove existing link"
-	fi
-	if [[ -e "${ROOT}/usr/bin/esd" ]] ; then
-		die -q "Can't set a new provider"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlink 1 || die -q "Can't set a new provider"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/fontconfig.eselect b/modules-other/fontconfig.eselect
deleted file mode 100644
index 3fad874..0000000
--- a/modules-other/fontconfig.eselect
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-fontconfig/files/fontconfig.eselect-1.0,v 1.1 2007/07/28 02:50:13 dirtyepic Exp $
-
-DESCRIPTION="Manage fontconfig /etc/fonts/conf.d/ symlinks"
-MAINTAINER="cardoe@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}")
-
-find_targets() {
-	local targets bc x i=0
-	bcdirs[i]="${ROOT}/etc/fonts/conf.avail/*.conf"
-
-	if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
-		for x in ${ES_FONTCONFIG_DIRS} ; do
-			bcdirs[$((++i))]="${x}/*"
-		done
-	fi
-
-	for bc in ${bcdirs[@]} ; do
-		[[ -e ${bc} && ${bc} != *~ ]] && targets="${targets}\n$(basename ${bc})"
-	done
-
-	echo -ne ${targets} | sort -u
-}
-
-is_enabled() {
-	bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -e ${bcdir}/${1} ]] || return 1
-	return 0
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available fontconfig .conf files"
-}
-
-do_list() {
-	local opts
-	targets=( $(find_targets) )
-	write_list_start "Available fontconfig .conf files  ( $(highlight '*') is enabled ):"
-
-	if [[ -n "${targets[@]}" ]] ; then
-		for (( n = 0 ; n < ${#targets[@]} ; ++n )) ; do
-			is_enabled ${opts:-} ${targets[${n}]} && \
-				targets[${n}]="${targets[${n}]} $(highlight '*')"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-
-	return 0
-}
-
-### enable action ###
-
-describe_enable() {
-	echo "Enable specified fontconfig .conf file(s)"
-}
-
-describe_enable_parameters() {
-	echo "<target>"
-}
-
-describe_enable_options() {
-	echo "<target> : Target name or number (from 'list' action)"
-}
-
-do_enable() {
-	local bc bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -z ${1} ]] && die -q "You didn't specify any .conf files to enable"
-
-	# create directory if necessary
-	if [[ ! -d ${bcdir} && -w $(dirname ${bcdir}) ]] ; then
-		mkdir ${bcdir} || die -q "Failed to create ${bcdir}"
-	elif [[ ! -d ${bcdir} ]] ; then
-		die -q "You don't have permission to create ${bcdir}"
-	fi
-
-	# make sure we have proper permissions
-	[[ -w ${bcdir} ]] || \
-		die -q "You don't have permission to write to ${bcdir}"
-
-	targets=( $(find_targets) )
-
-	for bc in $@ ; do
-		local file target=${bc}
-
-		is_number "${target}" && \
-			target=${targets[$(( ${target} - 1 ))]}
-
-		[[ -z "${target}" ]] && \
-			die -q "Target \"${bc}\" doesn't appear to be valid!"
-
-		bc=${target}
-
-		# ignore any unrecognized options
-		[[ ${bc} == --* ]] && continue
-
-		# what form is the argument in?
-		case "${bc}" in
-			# absolute path
-			/*)
-				file="${ROOT}/${bc}"
-				;;
-			# relative path
-			*/*)
-				file="${ROOT}/${PWD}/${bc}"
-				;;
-			# no path
-			*)
-				# CWD
-				if [[ -f ${bc} ]] ; then
-					file="${ROOT}/${PWD}/${bc}"
-				# assume /etc/fonts/conf.avail
-				elif [[ -f ${ROOT}/etc/fonts/conf.avail/${bc} ]]
-				then
-					file="${ROOT}/etc/fonts/conf.avail/${bc}"
-				else
-					if [[ -n "${ES_FONTCONFIG_DIRS}" ]] ; then
-						for x in ${ES_FONTCONFIG_DIRS} ; do
-							[[ -f ${x}/${bc} ]] && file="${x}/${bc}"
-						done
-					fi
-
-					[[ -e ${file} ]] || \
-						file="${ROOT}/etc/fonts/conf.avail/${bc}"
-				fi
-				;;
-		esac
-
-		# does it exist?
-		if [[ ! -e ${file} ]] ; then
-			write_error_msg "${file} doesn't exist"
-			continue
-		fi
-
-		# already installed?
-		if [[ -e ${bcdir}/$(basename ${bc}) ]] ; then
-			write_error_msg "$(basename ${bc}) is already installed"
-			continue
-		fi
-
-		# finally, create the symlink
-		ln -s "${file}" "${bcdir}" || \
-			die -q "Failed to create symlink from '${file}' to '${bcdir}'"
-	done
-}
-
-### disable action ###
-
-describe_disable() {
-	echo "Disable specified fontconfig .conf file(s)"
-}
-
-describe_disable_parameters() {
-	echo "<target>"
-}
-
-describe_disable_options() {
-	echo "<target> : Target name or number (from 'list' action)"
-}
-
-
-do_disable() {
-	local bc bcdir="${ROOT}/etc/fonts/conf.d"
-
-	[[ -z ${1} ]] && die -q "You didn't specify any .conf files to disable"
-
-	targets=( $(find_targets) )
-
-	for bc in $@ ; do
-		local file target=${bc}
-
-		is_number "${target}" && \
-			target=${targets[$(( ${target} - 1 ))]}
-
-		[[ -z "${target}" ]] && \
-			die -q "Target \"${bc}\" doesn't appear to be valid!"
-
-		bc=${target}
-		file="${bcdir}/${bc}"
-
-		# ignore any unrecognized options
-		[[ ${bc} == --* ]] && continue
-
-		# is in installed?
-		if [[ ! -e ${file} ]] ; then
-			write_error_msg "${bc} is not installed"
-			continue
-		fi
-
-		# remove it if we have permissions
-		if [[ -w $(dirname ${file}) ]] ; then
-			rm "${file}" || die -q "Failed to remove ${file}"
-		else
-			die -q "You don't have permission to remove ${file}"
-		fi
-	done
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/java-nsplugin.eselect b/modules-other/java-nsplugin.eselect
deleted file mode 100644
index 06a79c1..0000000
--- a/modules-other/java-nsplugin.eselect
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit tests multilib
-
-DESCRIPTION="Manage the Java plugin for Netscape-like Browsers"
-MAINTAINER="java@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
-PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
-SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
-SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
-SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
-SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
-SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-
-libdirs=$(list_libdirs)
-if has lib32 ${libdirs} && has lib64 ${libdirs}; then
-	IS_MULTILIB="true"
-else
-	IS_MULTILIB="false"
-fi
-### show action
-
-## {{{ show stuff
-
-	describe_show() {
-		echo "Show the current Java browser plugin"
-	}
-
-	do_show() {
-		local system_name=$(get_system_plugin_vm)
-		write_list_start "Current Java browser plugin"
-		if [[ -z "${system_name}" ]] ; then
-			write_kv_list_entry "(unset)" ""
-		else
-			write_kv_list_entry "${system_name}" ""
-		fi
-	}
-
-## }}}
-
-### list action
-
-
-
-## {{{ list stuff
-	describe_list() {
-		echo "List available Java browser plugins"
-	}
-
-	tweak_list_item() {
-		local vm=${1}
-		local system_name=${2}
-		local mark=""
-		if [[ ${vm} == ${system_name} ]]; then
-			mark="${mark} $(highlight 'current')"
-		fi
-		echo "${vm} ${mark}"
-	}
-
-	tweak_list() {
-		local targets=( ${@} )
-		system_name=$(get_system_plugin_vm)
-
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			twaek_list_item ${targets[${i}]} ${system_name}
-		done
-	}
-
-	do_list() {
-		if [[ ${IS_MULTILIB} != "true" ]]; then
-			MULTILIB_MODE="none"
-			local system_name=$(get_system_plugin_vm)
-			local targets=( $(get_targets) )
-			for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-				targets[${i}]=$(tweak_list_item ${targets[${i}]} ${system_name})
-			done
-
-			write_list_start "Available Java browser plugins"
-			write_numbered_list "${targets[@]}"
-		else
-			MULTILIB_MODE="32"
-			local system_name_32=$(get_system_plugin_vm)
-			local targets_32=( $(get_targets) )
-			for (( i = 0 ; i < ${#targets_32[@]} ; i = i + 1 )) ; do
-				targets_32[${i}]=$(tweak_list_item ${targets_32[${i}]} ${system_name_32})
-			done
-			write_list_start "Available 32-bit Java browser plugins"
-			write_numbered_list "${targets_32[@]}"
-
-			MULTILIB_MODE="64"
-			local system_name_64=$(get_system_plugin_vm)
-			local targets_64=( $(get_targets) )
-			for (( i = 0 ; i < ${#targets_64[@]} ; i = i + 1 )) ; do
-				targets_64[${i}]=$(tweak_list_item ${targets_64[${i}]} ${system_name_64})
-			done
-			write_list_start "Available 64-bit Java browser plugins"
-			write_numbered_list "${targets_64[@]}"
-		fi
-	}
-## }}}
-
-### set action
-
-## {{{ set stuff
-	describe_set() {
-		echo "Set the system Java browser plugin"
-	}
-
-	do_set() {
-		if [[ ${IS_MULTILIB} != "true" ]]; then
-			if [[ ${#} != 1 ]] ; then
-				die -q "Usage: set [nsplugin-vm]"
-			fi
-			MULTILIB_MODE="none"
-		else
-			if [[ ${#} != 2 ]] ; then
-				die -q "Usage: set [32bit or 64bit] [nsplugin-vm]"
-			fi
-			case ${1} in
-				32bit) ;;
-				64bit) ;;
-				*)
-					die -q "Usage: set [32bit or 64bit] [nsplugin-vm]"
-					;;
-			esac
-			MULTILIB_MODE=${1%bit}
-			shift
-		fi
-
-		local vm=${1}
-
-		if is_number "${vm}" ; then
-			local targets=( $(get_targets) )
-			vm=${targets[$(( ${vm} - 1 ))]}
-		fi
-
-		if [[ -z ${vm} ]] ; then
-			die -q "You didn't specify valid plugin number to set"
-		fi
-
-		local plugin="${PLUGINS_HOME}/${vm}-javaplugin.so"
-
-		if [[ ! -f ${plugin} ]]; then
-			write_error_msg "Expected \"${plugin}\" to exist, but it doesn't."
-			write_error_msg "Perhaps \"${vm}\" isn't a valid name of VM built with nsplugin?"
-			return
-		fi
-
-		local system_plugin
-		case ${MULTILIB_MODE} in
-			32) system_plugin=${SYSTEM_PLUGIN_32} ;;
-			64) system_plugin=${SYSTEM_PLUGIN_64} ;;
-			none) system_plugin=${SYSTEM_PLUGIN} ;;
-		esac
-		mkdir -p $(dirname ${system_plugin}) || die -q "Error creating \"$(dirname ${SYSTEM_PLUGIN})\""
-		if [[ -w $(dirname ${system_plugin}) ]] ; then
-			ln -sf ${plugin} ${system_plugin} || die -q "Error creating nsplugin symlink"
-		else
-			die -q "Sorry, you don't have enough permission to set nsplugin"
-		fi
-	}
-## }}}
-
-get_targets() {
-	for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so 2>/dev/null);
-	do
-		local vm=$(plugin_to_vm ${plugin})
-		local matches=""
-		case ${MULTILIB_MODE} in
-			32)
-				[[ ${vm} = emul-linux-* ]] && matches="true"
-				;;
-			64)
-				[[ ${vm} != emul-linux-* ]] && matches="true"
-				;;
-			none)
-				matches="true"
-				;;
-		esac
-		[[ ${matches} == "true" ]] && echo ${vm}
-	done
-}
-
-plugin_to_vm() {
-	local base=$(basename ${1})
-	echo ${base%-javaplugin.so}
-}
-
-get_system_plugin_vm() {
-	local plugin;
-
-	if [[ ${MULTILIB_MODE} == "32" ]]; then
-		plugin=$(readlink ${SYSTEM_PLUGIN_32})
-	elif [[ ${MULTILIB_MODE} == "64" ]]; then
-		plugin=$(readlink ${SYSTEM_PLUGIN_64})
-	else
-		plugin=$(readlink ${SYSTEM_PLUGIN})
-	fi
-	plugin_to_vm ${plugin}
-}
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/modules-other/java-vm.eselect b/modules-other/java-vm.eselect
deleted file mode 100644
index 3904912..0000000
--- a/modules-other/java-vm.eselect
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Based on kernel.eselect
-
-DESCRIPTION="Manage the Java system and user VM"
-MAINTAINER="java@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-VM_BASE=/usr/lib/jvm/
-VM_SYSTEM="/etc/java-config-2/current-system-vm"
-VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-
-find_targets() {
-	local f
-	for f in ${VM_BASE}/* ; do
-		[[ -L ${f} ]] && echo $(basename ${f})
-	done
-}
-
-sym_to_vm() {
-	basename $(readlink "${1}")
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current vm"
-}
-
-do_show() {
-	if [[ ${1} == "system" ]]; then
-		my_show ${VM_SYSTEM} 'system-vm'
-	elif [[ ${1} == "user" ]]; then
-		my_show ${VM_USER} 'user-vm'
-	else
-		my_show ${VM_SYSTEM} 'system-vm'
-		my_show ${VM_USER} 'user-vm'
-	fi
-}
-
-my_show() {
-	local symlink=${1} vm_type=${2}
-	write_list_start "Current ${vm_type}"
-	if [[ -L "${symlink}" ]] ; then
-		write_kv_list_entry "$(sym_to_vm ${symlink})" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List Available Virtual Machines"
-}
-
-do_list() {
-	targets=( $(find_targets) )
-	write_list_start "Available Java Virtual Machines:"
-	if [[ -n ${targets[@]} ]] ; then
-		local i system_name user_name
-
-		[[ -L ${VM_SYSTEM} ]] && system_name=$(sym_to_vm ${VM_SYSTEM})
-		[[ -L ${VM_USER} ]] && user_name=$(sym_to_vm ${VM_USER})
-
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			local mark=""
-			if [[ ${targets[${i}]} == ${system_name} ]]; then
-				mark="${mark} $(highlight 'system-vm')"
-			fi
-			if [[ ${targets[${i}]} == ${user_name} ]]; then
-				mark="${mark} $(highlight 'user-vm' )"
-			fi
-			targets[${i}]="${targets[${i}]} ${mark}"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new system-vm"
-}
-
-do_set() {
-	if [[ ${#} != 2 ]]; then
-		die -q "Usage [user|system] [vm]"
-
-	elif [[ ${1} == "system" ]]; then
-		if [[ -w $(dirname ${VM_SYSTEM}) ]]; then
-			my_set ${VM_SYSTEM} ${2}
-		else
-			die -q "Sorry, you don't have enough premission to set system"
-		fi
-	elif [[ ${1} == "user" ]]; then
-		if [[ ${UID} != 0 ]]; then
-			my_set ${VM_USER} ${2}
-		else
-			die -q "Sorry, you cannot set a user vm as root. Set the system vm instead"
-		fi
-	fi
-}
-
-my_set() {
-	local target=${2} symlink=${1}
-	if [[ -z ${target} ]] ; then
-		die -q "You didn't tell me what to set the symlink to"
-
-	elif [[ -L "${symlink}" ]] ; then
-		set_symlink "${target}" "${symlink}"  || die -q "Couldn't set a new symlink"
-
-	elif [[ -e "${symlink}" ]] ; then
-		die -q "Target file already exists and is not a symlink: ${symlink}"
-
-	else
-		set_symlink "${target}" "${symlink}" || die -q "Couldn't set a new symlink"
-	fi
-}
-
-set_symlink() {
-	local target=${1} symlink=${2}
-	if is_number "${target}" ; then
-		targets=( $(find_targets) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -z ${target} ]] ; then
-		die -q "Target \"${1}\" doesn't appear to be valid!"
-	elif [[ -d "${VM_BASE}/${target}" ]] ; then
-		local sym_dir=$(dirname ${symlink})
-		if [[ ! -d ${sym_dir} ]]; then
-			mkdir -p ${sym_dir} || die -q "Could not create ${my_dir}"
-		fi
-		ln -snf "${VM_BASE}/${target}" "${symlink}"
-	else
-		die -q "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/lapack.eselect b/modules-other/lapack.eselect
deleted file mode 100644
index 418d5ca..0000000
--- a/modules-other/lapack.eselect
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit skel
-
-MODULE="LAPACK"
-IFACE="lapack"
-
-DESCRIPTION="Manage installed $MODULE implementations"
-MAINTAINER="dberkholz@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# vim: set ft=eselect :
diff --git a/modules-other/myspell.eselect b/modules-other/myspell.eselect
deleted file mode 100644
index dec1780..0000000
--- a/modules-other/myspell.eselect
+++ /dev/null
@@ -1,651 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage the configuration of myspell/hunspell dictionaries for applications"
-MAINTAINER="kevquinn@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-inherit config
-
-MYSPELL_BASE="/usr/share/myspell"
-MYSPELL_LIST="dictionary.lst"
-MYSPELL_CFG="/etc/eselect/myspell"
-VALID_OPTIONS=""
-
-############################################################################
-# COMMON: Help text for option --app
-myspell_describe_option_app() {
-	echo "--app=<app name>: the application to be processed (defaults to all known applications)"
-}
-
-
-############################################################################
-# UTILITY: DISPLAY_LANGS
-# display a heading (indented 4 spaces) and a wrapped list of
-# language codes (indented 6 spaces)
-myspell_display_langs() {
-	local count lang
-	echo "    $1:"
-	shift
-	if [[ $1 == "" ]]; then
-		echo "      (none)"
-	else
-		count=0
-		for lang in $*; do
-			[[ ${count} == 0 ]] && printf "     "
-			printf " %s" ${lang}
-			((count = count+1))
-			[[ ${count} == 22 ]] && printf "\n" && count=0
-		done
-		[[ ${count} == 0 ]] || printf "\n"
-	fi
-}
-
-############################################################################
-# UTILITY: PROCESS_ARGS
-myspell_process_args() {
-	local arg
-	while [[ -n $1 ]]; do
-		arg=$1
-		shift
-		if [[ "--" == ${arg:0:2} ]]; then
-			opt=${arg/=*}
-			value=${arg/*=}
-			[[ ${value} == ${arg} ]] && value="set"
-			# sanitise opt to lowercase letters only (this also removes the leading '--')
-			# to ensure the user hasn't passed anything nasty. value doesn't need to
-			# be santised as it's not used
-			opt=${opt//[^a-z]}
-			has ${opt} ${VALID_OPTIONS} ||
-				die -q "Option ${opt} is not valid for the selected action"
-			export OPTION_${opt}=${value}
-		else
-			[[ -n ${PARAMETER} ]] &&
-				die -q "Syntax error - only one parameter may be supplied; already have ${PARAMETER} so ${arg} cannot be accepted."
-			PARAMETER=${arg}
-		fi
-	done
-}
-
-############################################################################
-# UTILITY: MYSPELL_SET_FIELDS
-# set array "fields" to the elements of $1, separated by $2.
-# This saves having to muck about with IFS all over the place.
-myspell_set_fields() {
-	local old_IFS
-	old_IFS="${IFS}"
-	IFS=$2
-	fields=($1)
-	IFS="${old_IFS}"
-}
-
-############################################################################
-# UTILITY: MYSPELL_GET_LANG
-# dictionary names are <class>-<lang>
-myspell_get_lang() {
-	local fields
-	myspell_set_fields "${P}" "-"
-	echo ${fields[1]}
-}
-
-############################################################################
-# UTILITY: MYSPELL_LOAD_CFG
-myspell_load_cfg() {
-	local item fields
-	APP_DIRECTORY=$(load_config ${MYSPELL_CFG}/${app} "DIRECTORY" ||\
-		die -q "Failed to load DIRECTORY from config file ${MYSPELL_CFG}/${app}")
-	APP_OPTIONS=$(load_config ${MYSPELL_CFG}/${app} "OPTIONS" ||\
-		die -q "Failed to load OPTIONS from config file ${MYSPELL_CFG}/${app}")
-	unset ${!APP_OPTION_*}
-	myspell_set_fields "${APP_OPTIONS}" ","
-	for item in ${fields[@]}; do
-		export APP_OPTION_${item//[-\.]/_}="set"
-	done
-}
-
-############################################################################
-# UTILITY: MYSPELL_GET_SUFFIXES
-# return suffixes for dictionary type; spelling dictionary,
-# hyphenation dictionary and thesaurus.
-myspell_get_suffixes() {
-	case $1 in
-		DICT) echo ".aff .dic" ;;
-		HYPH) echo ".dic" ;;
-		THES) echo ".dat .idx" ;;
-	esac
-}
-
-############################################################################
-# UTILITY: MYSPELL_CREATE_DICTLIST
-# Create OpenOffice.org-style dictionary list file if it does not exist
-myspell_create_dictlist() {
-	local dir lst
-	dir=$1
-	lst=$2
-	[[ -f ${dir}/${lst} ]] && return
-	# Ensure dictionary area exists
-	[[ -d ${dir} ]] || mkdir -p ${dir}
-	touch ${dir}/${lst} ||
-		die -q "Unable to create ${dir}/${lst}"
-	# Format of dictionary.lst files is from OOo standard
-	# dictionary.lst file:
-	cat > ${dir}/${lst} <<EOF
-# List of All Dictionaries to be Loaded by OpenOffice
-# ---------------------------------------------------
-# Each Entry in the list have the following space delimited fields
-#
-# Field 0: Entry Type "DICT" - spellchecking dictionary
-#                     "HYPH" - hyphenation dictionary
-#                     "THES" - thesaurus files
-#
-# Field 1: Language code from Locale "en" or "de" or "pt" ...
-#
-# Field 2: Country Code from Locale "US" or "GB" or "PT"
-#
-# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US"
-#          (do not add extensions to the name)
-
-EOF
-}
-
-# Format of MYSPELL_[SPELLING|HYPHENATION|THESAURUS]_DICTIONARIES:
-#
-# Field 0: Language code
-# Field 1: Country code
-# Field 2: Root name of dictionary files
-# Field 3: Description
-# Field 4: Archive filename
-#
-# This format is from the available.lst, hyphavail.lst and
-# thesavail.lst files on the openoffice.org repository.
-
-############################################################################
-# UTILITY: MYSPELL_CALC_BASENAME
-# myspell_calc_basename <name> <dictionary type>
-# replace _ in between language and country with -
-myspell_calc_basename() {
-	local bn
-	if [[ -n ${APP_OPTION_dashnames} ]]; then
-		case $2 in
-			DICT)
-				# Replace first occurrence
-				echo ${1/_/-} ;;
-			HYPH)
-				# Replace second occurrence - by replacing first then
-				# second, then putting first back.
-				bn=${1/_/-}
-				bn=${bn/_/-}
-				echo ${bn/-/_} ;;
-			THES)
-				# Replace second occurrence - by replacing first then
-				# second, then putting first back.
-				bn=${1/_/-}
-				bn=${bn/_/-}
-				echo ${bn/-/_} ;;
-		esac
-	else
-		echo ${1}
-	fi
-}
-
-
-
-############################################################################
-# ACTION: LIST
-
-describe_list() {
-	echo "List the available dictionaries"
-}
-
-do_list() {
-	local known_langs dict dictlist listn
-	write_list_start "Installed dictionary sources that can be used:"
-	listn=1
-	# myspell dictionary source
-	dictlist=$(ls ${MYSPELL_BASE}/${MYSPELL_LIST}.* 2> /dev/null)
-	if [[ -n ${dictlist} ]]; then
-		write_numbered_list_entry ${listn} "myspell"
-		known_langs=""
-		for dict in ${MYSPELL_BASE}/${MYSPELL_LIST}.*; do
-			known_langs="${known_langs} ${dict/${MYSPELL_BASE}\/${MYSPELL_LIST}.}"
-		done
-		myspell_display_langs "Installed language codes" ${known_langs}
-		(( listn = ${listn} + 1 ))
-	fi
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-
-
-############################################################################
-# ACTION: SHOW
-describe_show() {
-	echo "Show which dictionaries are configured for applications"
-}
-describe_show_options() {
-	myspell_describe_option_app;
-}
-myspell_show() {
-	local app lang myspell_sources direct_sources listn
-	write_list_start "Configured myspell dictionaries"
-	listn=0
-	for app in $*; do
-		(( listn = ${listn} + 1 ))
-
-		myspell_load_cfg ${app}
-		write_numbered_list_entry ${listn} "Application ${app}"
-		if [[ ! -d ${APP_DIRECTORY} ]]; then
-			echo "    (none - directory ${APP_DIRECTORY} missing)"
-			continue
-		fi
-
-		if [[ -n ${APP_OPTION_dictionary_lst} ]]; then
-
-			# Configured dictionaries are those in the dictionary.lst file
-			if [[ ! -f ${APP_DIRECTORY}/dictionary.lst ]]; then
-				echo "    (none - dictionary list ${APP_DIRECTORY}/dictionary.lst missing)"
-				continue
-			fi
-			lang=""
-			myspell_sources=""
-			direct_sources=""
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				lang=${fields[1]}
-				for suffix in $(myspell_get_suffixes ${fields[0]}); do
-					if [[ -h ${APP_DIRECTORY}/${fields[3]}${suffix} ]]; then
-						src=$(canonicalise ${APP_DIRECTORY}/${fields[3]}${suffix})
-						if [[ ${src/${MYSPELL_BASE}} != ${src} ]]; then
-							has ${lang} ${myspell_sources} ||
-								myspell_sources="${myspell_sources} ${lang}"
-						else
-							write_warning_msg "unrecognised link to ${src} ignored"
-						fi
-					else
-						has ${lang} ${direct_sources} ||
-							direct_sources="${direct_sources} ${lang}"
-					fi
-				done
-			done <<-EOF
-				$(sort --key=2 ${APP_DIRECTORY}/dictionary.lst)
-			EOF
-
-		else
-
-			# Configured dictionaries are those that are softlinked in the directory
-			lang=""
-			myspell_sources=""
-			direct_sources=""
-			for dic in ${APP_DIRECTORY}/*.dic; do
-				lang=$(basename ${dic})
-				lang=${lang/-*}
-				lang=${lang/.*}
-				if [[ -h ${dic} ]]; then
-					src=$(canonicalise ${dic})
-					if [[ ${src/${MYSPELL_BASE}} != ${src} ]]; then
-						has ${lang} ${myspell_sources} ||
-							myspell_sources="${myspell_sources} ${lang}"
-					else
-						write_warning_msg "unrecognised link to ${src} ignored"
-					fi
-				else
-					has ${lang} ${direct_sources} ||
-						direct_sources="${direct_sources} ${lang}"
-				fi
-			done
-
-		fi
-
-		[[ -n ${myspell_sources} ]] &&
-			myspell_display_langs "Configured language codes linked from ${MYSPELL_BASE}" ${myspell_sources}
-
-		[[ -n ${direct_sources} ]] &&
-			myspell_display_langs "Language codes installed directly in ${APP_DIRECTORY}" ${direct_sources}
-
-	done
-
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-
-do_show() {
-	local apps
-	VALID_OPTIONS="app"
-	myspell_process_args "$@"
-	[[ -n ${OPTION_app} ]] && apps=${OPTION_app} || apps=$(ls ${MYSPELL_CFG})
-	myspell_show ${apps}
-}
-
-
-############################################################################
-# ACTION: INSTALL
-describe_install() {
-	echo "Configure eselect-myspell for an application (for use by ebuilds in postinst)"
-}
-
-describe_install_parameters() {
-	echo "<application>"
-}
-
-describe_install_options() {
-	echo "application: the application to configure"
-	echo "--directory=<directory>: the directory the application uses for dictionaries"
-	echo "--options={options}: comma-separated list of things the application needs in its dictionary directory; one or more of:"
-	echo "  all-softlinks: soft links from the spelling, hyphenation and thesaurus dictionaries in ${MYSPELL_BASE}"
-	echo "  spelling-softlinks: soft links from just the spelling dictionaries in ${MYSPELL_BASE}"
-	echo "  dictionary.lst: OpenOffice dictionary.lst database file"
-	echo "  dashnames: soft links will separate language and country by '-' instead of '_' (e.g. en-US instead of en_US)"
-}
-
-do_install() {
-	VALID_OPTIONS="directory options"
-	myspell_process_args "$@"
-	[[ -z ${PARAMETER} ]] && die -q "No application name specified"
-
-	store_config ${MYSPELL_CFG}/${PARAMETER} "DIRECTORY" "${OPTION_directory-none}" ||
-		die -q "Unable to write to ${MYSPELL_CFG}/${PARAMETER}"
-
-	store_config ${MYSPELL_CFG}/${PARAMETER} "OPTIONS" "${OPTION_options-none}" ||
-		die -q "Unable to write to ${MYSPELL_CFG}/${PARAMETER}"
-
-	myspell_update ${PARAMETER}
-}
-
-
-############################################################################
-# ACTION: SET
-describe_set() {
-	echo "Configure a dictionary for use with application(s)"
-}
-
-describe_set_parameters() {
-	echo "<dictionary>"
-}
-
-describe_set_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	myspell_describe_option_app;
-}
-myspell_set() {
-	local dict app dir options dlang dictlst lfilen linkfilebase filen entry fields suffix alreadyexists
-	dict=$1
-	shift
-	dlang=${dict/*-}
-	dictlst="${MYSPELL_LIST}.${dlang}"
-	# check for myspell dictionary data file
-	[[ -f ${MYSPELL_BASE}/${dictlst} ]] ||
-		die -q "Dictionary ${dict} not found in ${MYSPELL_BASE}"
-
-	for app in $*; do
-		#echo "setting dictionary ${dict} for application ${app}"
-		myspell_load_cfg ${app}
-
-		# Ensure dictionary area exists
-		if [[ ! -d ${APP_DIRECTORY} ]]; then
-			mkdir -p ${APP_DIRECTORY} || write_error_msg \
-				"Failed to create dictionary directory ${APP_DIRECTORY} for application ${app}."
-			continue
-		fi
-
-		if [[ -n ${APP_OPTION_dictionary_lst} ]]; then
-			# Create OOo dictionary list file if it doesn't already exist
-			myspell_create_dictlist ${APP_DIRECTORY} ${MYSPELL_LIST}
-		fi
-
-		alreadyexists=""
-		# Check for already existing files
-		while read entry; do
-			fields=(${entry})
-			[[ ${fields[0]:0:1} == "#" ]] && continue
-
-			if [[ -n ${APP_OPTION_all_softlinks} || \
-					( -n ${APP_OPTION_spelling_softlinks} && "DICT" == ${fields[0]} ) ]]; then
-
-				# Work out softlink base name
-				linkfilebase=$(myspell_calc_basename ${fields[3]} ${fields[0]})
-
-				# Check whether files exist for given base name
-				for suffix in $(myspell_get_suffixes ${fields[0]}); do
-					lfilen="${linkfilebase}${suffix}"
-					if [[ ! -h ${APP_DIRECTORY}/${lfilen} ]] &&
-					   [[ -f ${APP_DIRECTORY}/${lfilen} ]]; then
-						has ${lfilen} ${alreadyexists} ||
-							alreadyexists="${alreadyexists} ${lfilen}"
-					fi
-				done # next file suffix
-
-			fi # dictionary type is to be softlinked
-
-		done < ${MYSPELL_BASE}/${dictlst}
-		# Warn user about existing files
-		if [[ -n ${alreadyexists} ]]; then
-			write_warning_msg \
-				"Files${alreadyexists} in ${APP_DIRECTORY} already exist." \
-				"Remove them manually and re-run eselect myspell to put them" \
-					"under eselect myspell management."
-			continue
-		fi
-
-		# Clear out any existing entry
-		myspell_unset ${dict} ${app}
-
-		# Install new entry
-		while read entry; do
-
-			fields=(${entry})
-			[[ ${fields[0]:0:1} == "#" ]] && continue
-
-			# Setup dictionary.lst entry unless it's already there
-			if [[ -n ${APP_OPTION_dictionary_lst} ]]; then
-				grep "^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$" \
-					${APP_DIRECTORY}/${MYSPELL_LIST} > /dev/null 2>&1 ||
-						echo "${entry}" >> ${APP_DIRECTORY}/${MYSPELL_LIST}
-			fi # dictionary.lst is to be maintained
-
-			# Setup softlinks
-			if [[ -n ${APP_OPTION_all_softlinks} || \
-					( -n ${APP_OPTION_spelling_softlinks} && "DICT" == ${fields[0]} ) ]]; then
-
-				# Work out softlink base name
-				linkfilebase=$(myspell_calc_basename ${fields[3]} ${fields[0]})
-
-				# Remove old softlinks and install new ones
-				for suffix in $(myspell_get_suffixes ${fields[0]}); do
-					filen="${fields[3]}${suffix}"
-					lfilen="${linkfilebase}${suffix}"
-					# remove old softlink *** shouldn't be necessary with unset called above!
-					if [[ -h ${APP_DIRECTORY}/${lfilen} ]]; then
-						rm -f ${APP_DIRECTORY}/${lfilen} ||
-							write_error_msg "Failed to remove ${APP_DIRECTORY}/${lfilen}"
-					fi
-					# install new softlink
-					if [[ ! -f ${APP_DIRECTORY}/${lfilen} ]]; then
-						ln -s ${MYSPELL_BASE}/${filen} ${APP_DIRECTORY}/${lfilen} ||
-							write_error_msg "Failed to create symlink from ${MYSPELL_BASE}/${filen} to ${APP_DIRECTORY}/${lfilen}"
-					fi
-				done # next file suffix
-
-			fi # dictionary is to be softlinked
-
-		done < ${MYSPELL_BASE}/${dictlst}
-
-	done # next app
-}
-
-do_set() {
-	local apps
-	VALID_OPTIONS="app"
-	myspell_process_args "$@"
-	[[ -z ${PARAMETER} ]] && die -q "Dictionary parameter missing"
-	[[ -n ${OPTION_app} ]] && apps=${OPTION_app} || apps=$(ls ${MYSPELL_CFG})
-	myspell_set ${PARAMETER} ${apps}
-}
-
-
-############################################################################
-# ACTION: UNSET
-describe_unset() {
-	echo "Unconfigure a dictionary from an application"
-}
-
-describe_unset_parameters() {
-	echo "<dictionary>"
-}
-
-describe_unset_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	myspell_describe_option_app;
-}
-
-myspell_unset() {
-	local dict app dlang dclass suffix lfilen linkfilebase dictlst entry fields
-	dict=$1
-	shift
-	for app in $*; do
-		#echo "unsetting dictionary ${dict} from application ${app}"
-		myspell_load_cfg ${app}
-		[[ -d ${APP_DIRECTORY} ]] || continue
-
-		if [[ -n ${APP_OPTION_dictionary_lst} ]]; then
-			[[ -f  ${APP_DIRECTORY}/${MYSPELL_LIST} ]] || continue
-		fi
-
-		dlang=${dict/*-}
-		dclass=${dict/-*}
-		dictlst="${MYSPELL_LIST}.${dlang}"
-		notmyfiles=""
-
-		# Remove softlinks and entries in dictionary.lst - uses
-		# dictionary.<lang>.lst from /usr/share/myspell
-		if [[ -f ${MYSPELL_BASE}/${dictlst} ]]; then
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				[[ ${fields[3]} == "" ]] && continue
-
-				# Remove entry from dictionary.lst
-				if [[ -n ${APP_OPTION_dictionary_lst} ]]; then
-					sed -i -e "/^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$/ { d }" \
-						${APP_DIRECTORY}/${MYSPELL_LIST} ||
-							die "Could not edit ${APP_DIRECTORY}/${MYSPELL_LIST}"
-					# See if any other entries in dictionary.lst match the current
-					# dictionary class and filename
-					grep "^${fields[0]} .* ${fields[3]}$" ${APP_DIRECTORY}/${MYSPELL_LIST} \
-						2>&1 > /dev/null && continue
-				fi
-
-				if [[ -n ${APP_OPTION_all_softlinks} || \
-						( -n ${APP_OPTION_spelling_softlinks} && "DICT" == ${fields[0]} ) ]]; then
-
-					# Work out softlink base name
-					linkfilebase=$(myspell_calc_basename ${fields[3]} ${fields[0]})
-
-					# Remove relevant symlinks
-					for suffix in $(myspell_get_suffixes ${fields[0]}); do
-						lfilen="${linkfilebase}${suffix}"
-						if [[ -f ${APP_DIRECTORY}/${lfilen} ]]; then
-							if [[ -h ${APP_DIRECTORY}/${lfilen} ]]; then
-								rm -f ${APP_DIRECTORY}/${lfilen} ||
-									die -q "Failed to remove ${APP_DIRECTORY}/${lfilen}"
-							else
-								has ${lfilen} ${notmyfiles} ||
-									notmyfiles="${notmyfiles} ${lfilen}"
-							fi
-						fi
-					done
-
-				fi
-
-			done < ${MYSPELL_BASE}/${dictlst}
-
-		else
-			write_warning_msg "source ${dict} is not installed; nothing changed"
-		fi
-
-		# Warn user about files that were skipped; not softlinks
-		[[ -n ${notmyfiles} ]] &&
-			write_warning_msg \
-				"Files ${notmyfiles} in ${APP_DIRECTORY} were not previously " \
-				"installed by eselect myspell.  Remove them manually if you" \
-				"are sure you do not want them."
-
-
-	done
-}
-
-do_unset() {
-	local apps
-	VALID_OPTIONS="app"
-	myspell_process_args "$@"
-	[[ -z ${PARAMETER} ]] && die -q "Dictionary parameter missing"
-	[[ -n ${OPTION_app} ]] && apps=${OPTION_app} || apps=$(ls ${MYSPELL_CFG})
-	myspell_unset ${PARAMETER} ${apps}
-}
-
-
-############################################################################
-# ACTION: UPDATE
-describe_update() {
-	echo "Update application(s) with available dictionaries"
-}
-
-describe_update_options() {
-	myspell_describe_option_app;
-}
-
-myspell_update() {
-	local dictlsts dlang count
-	echo "Updating languages:"
-	count=0
-	dictlsts=$(ls ${MYSPELL_BASE}/${MYSPELL_LIST}.* 2> /dev/null)
-	for dictlst in ${dictlsts}; do
-		if [[ ${count} == "22" ]]; then
-			echo
-			count=0
-		fi
-		dlang=${dictlst/*.lst.}
-		echo -n " ${dlang}"
-		myspell_set myspell-${dlang} $*
-		(( count = ${count} + 1 ))
-	done
-	echo
-}
-
-do_update() {
-	local apps
-	VALID_OPTIONS="app"
-	myspell_process_args "$@"
-	[[ -n ${PARAMETER} ]] && apps=${PARAMETER} || apps=$(ls ${MYSPELL_CFG})
-	myspell_update ${apps}
-}
-
-############################################################################
-# ACTION: DEFAULT
-describe_default() {
-	echo "Set default dictionary for myspell apps"
-}
-
-describe_default_parameters() {
-	echo "<dictionary>"
-}
-
-describe_default_options() {
-	:
-}
-
-do_default() {
-	VALID_OPTIONS=""
-	myspell_process_args "$@"
-	[[ -z ${PARAMETER} ]] && die -q "Dictionary parameter missing"
-	[[ -f ${MYSPELL_BASE}/${PARAMETER}.dic ]] ||
-		die -q "Dictionary ${PARAMATER} does not exist"
-	for suffix in aff dic; do
-		[[ -f ${MYSPELL_BASE}/${PARAMETER}.${suffix} ]] &&
-			ln -sf ${MYSPELL_BASE}/${PARAMETER}.${suffix} ${MYSPELL_BASE}/default.${suffix}
-	done
-}
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/modules-other/oodict.eselect b/modules-other/oodict.eselect
deleted file mode 100644
index 5b09808..0000000
--- a/modules-other/oodict.eselect
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage the configuration of dictionaries for OpenOffice.Org."
-MAINTAINER="kevquinn@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# TODO
-# 1) implement eselect oodict unset direct-<lang>
-# 2) make eselect oodict unset myspell-<lang> abort cleanly if not installed from
-# myspell
-
-# Supports myspell(hunspell) dictionaries; designed to be extensible to
-# manage other classes of dictionaries should they become applicable
-# to OpenOffice.org.
-
-# Base directory where OpenOffice stores its dictionary information.
-# Default is non-multilib /usr/lib - if given, the --libdir option changes
-# this to the supplied library subdirectory name.
-OOO_DICTBASE="/usr/lib/openoffice/share/dict/ooo"
-OOO_DICTLIST="dictionary.lst"
-
-OODICT_CLASSES="myspell"
-
-MYSPELL_BASE="/usr/share/myspell"
-
-# set array "fields" to the elements of $1, separated by $2.
-# This saves having to muck about with IFS all over the place.
-oodict_set_fields() {
-	local old_IFS
-	old_IFS="${IFS}"
-	IFS=$2
-	fields=($1)
-	IFS="${old_IFS}"
-}
-
-# dictionary names are <class>-<lang>
-oodict_get_lang() {
-	local fields
-	oodict_set_fields "${P}" "-"
-	echo ${fields[1]}
-}
-
-# return suffixes for dictionary type; spelling dictionary,
-# hyphenation dictionary and thesaurus.
-oodict_get_myspell_suffixes() {
-	case $1 in
-		DICT) echo ".aff .dic" ;;
-		HYPH) echo ".dic" ;;
-		THES) echo ".dat .idx" ;;
-	esac
-}
-
-# display a heading (indented 4 spaces) and a wrapped list of
-# language codes (indented 6 spaces)
-oodict_display_langs() {
-	local count lang
-	echo "    $1:"
-	shift
-	if [[ $1 == "" ]]; then
-		echo "      (none)"
-	else
-		count=0
-		for lang in $*; do
-			[[ ${count} == 0 ]] && printf "     "
-			printf " %s" ${lang}
-			((count = count+1))
-			[[ ${count} == 22 ]] && printf "\n" && count=0
-		done
-		[[ ${count} == 0 ]] || printf "\n"
-	fi
-}
-
-# Create OpenOffice.org dictionary list file if it does not exist
-oodict_create_dictlist() {
-	[[ -f ${OOO_DICTBASE}/${OOO_DICTLIST} ]] && return
-	# Ensure OOo dictionary area exists
-	[[ -d ${OOO_DICTBASE} ]] || mkdir -p ${OOO_DICTBASE}
-	touch ${OOO_DICTBASE}/${OOO_DICTLIST} ||
-		die "Unable to create ${OOO_DICTBASE}/${OOO_DICTLIST}"
-	# Format of dictionary.lst files is from OOo standard
-	# dictionary.lst file:
-	cat > ${OOO_DICTBASE}/${OOO_DICTLIST} <<EOF
-# List of All Dictionaries to be Loaded by OpenOffice
-# ---------------------------------------------------
-# Each Entry in the list have the following space delimited fields
-#
-# Field 0: Entry Type "DICT" - spellchecking dictionary
-#                     "HYPH" - hyphenation dictionary
-#                     "THES" - thesaurus files
-#
-# Field 1: Language code from Locale "en" or "de" or "pt" ...
-#
-# Field 2: Country Code from Locale "US" or "GB" or "PT"
-#
-# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US"
-#          (do not add extensions to the name)
-
-EOF
-}
-
-# Format of MYSPELL_[SPELLING|HYPHENATION|THESAURUS]_DICTIONARIES:
-#
-# Field 0: Language code
-# Field 1: Country code
-# Field 2: Root name of dictionary files
-# Field 3: Description
-# Field 4: Archive filename
-#
-# This format is from the available.lst, hyphavail.lst and
-# thesavail.lst files on the openoffice.org repository.
-
-
-oodict_describe_options() {
-	echo "--libdir <libdir>: OpenOffice.org library subdirectory is <libdir>, e.g. lib32 (default 'lib')"
-}
-
-# Process options
-# Notes:
-# 1) this dies if it sees an option it doesn't understand.
-# 2) Copy and consume (shift) parameters before calling this, otherwise it
-#    considers extra parameters as potential options.
-oodict_process_options() {
-	while [[ -n $1 && "--" != ${1:0:2} ]]; do
-		shift
-	done
-	while [[ "--" == ${1:0:2} ]]; do
-		if [[ "--libdir" == $1 ]]; then
-			shift
-			OOO_DICTBASE="/usr/$1/openoffice/share/dict/ooo"
-			libdir=$1
-			shift
-		elif [[ "--" == $1 ]]; then
-			break
-		else
-			die -q "Unknown parameter ${1}"
-		fi
-	done
-}
-
-
-### show action
-
-## {{{ show stuff
-describe_show() {
-	echo "Show which dictionaries are configured for use with OpenOffice.org."
-}
-
-describe_show_options() {
-	oodict_describe_options
-}
-
-do_show() {
-	local lang myspell_sources listn suffix
-	oodict_process_options $*
-	write_list_start "OpenOffice.org configured dictionaries"
-	if [[ ! -f ${OOO_DICTBASE}/${OOO_DICTLIST} ]]; then
-		echo "  (none)"
-		return
-	fi
-	listn=1
-	# myspell dictionary source
-	lang=""
-	myspell_sources=""
-	direct_sources=""
-	while read entry; do
-		fields=(${entry})
-		[[ ${fields[0]:0:1} == "#" ]] && continue
-		lang=${fields[1]}
-		for suffix in $(oodict_get_myspell_suffixes ${fields[0]}); do
-			if [[ -h ${OOO_DICTBASE}/${fields[3]}${suffix} ]]; then
-				src=$(canonicalise ${OOO_DICTBASE}/${fields[3]}${suffix})
-				if [[ ${src/${MYSPELL_BASE}} != ${src} ]]; then
-					has ${lang} ${myspell_sources} ||
-						myspell_sources="${myspell_sources} ${lang}"
-				else
-					write_warning_msg "unrecognised link to ${src} ignored"
-				fi
-			else
-				has ${lang} ${direct_sources} ||
-					direct_sources="${direct_sources} ${lang}"
-			fi
-		done
-	done <<-EOF
-		$(sort --key=2 ${OOO_DICTBASE}/${OOO_DICTLIST})
-	EOF
-	if [[ -n ${myspell_sources} ]]; then
-		write_numbered_list_entry ${listn} "myspell"
-		oodict_display_langs "Configured language codes from ${MYSPELL_BASE}" ${myspell_sources}
-		(( listn = ${listn} + 1 ))
-	fi
-	if [[ -n ${direct_sources} ]]; then
-		write_numbered_list_entry ${listn} "direct"
-		oodict_display_langs "Language codes installed directly in ${OOO_DICTBASE}" ${direct_sources}
-		(( listn = ${listn} + 1 ))
-	fi
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-## }}}
-
-
-### list action
-
-## {{{ list stuff
-describe_list() {
-	echo "List the dictionaries that can be configured for use with OpenOffice."
-}
-
-do_list() {
-	local known_langs dict dictlist listn
-	write_list_start "Installed dictionary sources that can be set:"
-	listn=1
-	# myspell dictionary source
-	dictlist=$(ls ${MYSPELL_BASE}/${OOO_DICTLIST}.* 2> /dev/null)
-	if [[ -n ${dictlist} ]]; then
-		write_numbered_list_entry ${listn} "myspell"
-		known_langs=""
-		for dict in ${MYSPELL_BASE}/${OOO_DICTLIST}.*; do
-			known_langs="${known_langs} ${dict/${MYSPELL_BASE}\/${OOO_DICTLIST}.}"
-		done
-		oodict_display_langs "Installed language codes" ${known_langs}
-		(( listn = ${listn} + 1 ))
-	fi
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-## }}}
-
-
-### unset action
-
-## {{{ unset stuff
-describe_unset() {
-	echo "Unconfigure a dictionary from use with OpenOffice.org."
-}
-
-describe_unset_parameters() {
-	echo "<dictionary>"
-}
-
-describe_unset_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	oodict_describe_options
-}
-
-do_unset() {
-	# Check OOo dictionary area exists
-	local dict dlang dclass suffix filen dictlst entry fields
-	oodict_process_options $*
-	[[ -d ${OOO_DICTBASE} ]] || return
-	[[ -f  ${OOO_DICTBASE}/${OOO_DICTLIST} ]] || return
-	dict=$1
-	dlang=${dict/*-}
-	dclass=${dict/-*}
-	dictlst="${OOO_DICTLIST}.${dlang}"
-	notmyfiles=""
-	case ${dclass} in
-	myspell)
-		# Remove softlinks and entries in dictionary.lst - uses
-		# dictionary.<lang>.lst from /usr/share/myspell
-		if [[ -f ${MYSPELL_BASE}/${dictlst} ]]; then
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				[[ ${fields[3]} == "" ]] && continue
-				# Remove entry from dictionary.lst
-				sed -i -e "/^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$/ { d }" \
-					${OOO_DICTBASE}/${OOO_DICTLIST} ||
-						die "Could not edit ${OOO_DICTBASE}/${OOO_DICTLIST}"
-				# See if any other entries in dictionary.lst match the current
-				# dictionary class and filename
-				grep "^${fields[0]} .* ${fields[3]}$" ${OOO_DICTBASE}/${OOO_DICTLIST} \
-					2>&1 > /dev/null && continue
-				# If no other entries match, remove relevant symlinks
-				for suffix in $(oodict_get_myspell_suffixes ${fields[0]}); do
-					filen="${fields[3]}${suffix}"
-					[[ -f ${OOO_DICTBASE}/${filen} ]] &&
-					if [[ -h ${OOO_DICTBASE}/${filen} ]]; then
-						rm -f ${OOO_DICTBASE}/${filen} ||
-						die "Failed to remove ${OOO_DICTBASE}/${filen}"
-					else
-						has ${filen} ${notmyfiles} ||
-							notmyfiles="${notmyfiles} ${filen}"
-					fi
-				done
-			done < ${MYSPELL_BASE}/${dictlst}
-		else
-			write_warning_msg "source ${dict} is not installed; nothing changed"
-		fi
-		[[ -n ${notmyfiles} ]] &&
-			write_warning_msg \
-				"Files ${notmyfiles} in ${OOO_DICTBASE} were not previously " \
-				"installed by eselect oodict.  Remove them manually if you" \
-				"are sure you do not want them."
-		;;
-	direct)
-		write_warning_msg \
-			"eselect oodict does not manage files installed directly to " \
-			"${OOO_DICTBASE}.  Remove them manually."
-		;;
-	*)
-		die "Unknown dictionary class ${dclass}"
-		;;
-	esac
-}
-## }}}
-
-### set action
-
-## {{{ set stuff
-describe_set() {
-	echo "Configure a dictionary for use with OpenOffice.org."
-}
-
-describe_set_parameters() {
-	echo "<dictionary>"
-}
-
-describe_set_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	oodict_describe_options
-}
-
-do_set() {
-	local dict dlang dclass filen dictlst entry fields suffix
-	oodict_process_options $*
-	dict=$1
-	dlang=${dict/*-}
-	dclass=${dict/-*}
-	dictlst="${OOO_DICTLIST}.${dlang}"
-	alreadyexists=""
-	case ${dclass} in
-	myspell)
-		# Set new entries & links
-		[[ -f ${MYSPELL_BASE}/${dictlst} ]] ||
-			die "Dictionary ${dict} not found in ${MYSPELL_BASE}"
-		# Create OOo dictionary list file if it doesn't already exist
-		oodict_create_dictlist
-		# Check for already existing files
-		while read entry; do
-			fields=(${entry})
-			[[ ${fields[0]:0:1} == "#" ]] && continue
-			for suffix in $(oodict_get_myspell_suffixes ${fields[0]}); do
-				filen="${fields[3]}${suffix}"
-				if [[ ! -h ${OOO_DICTBASE}/${filen} ]] &&
-				   [[ -f ${OOO_DICTBASE}/${filen} ]]; then
-					has ${filen} ${alreadyexists} ||
-						alreadyexists="${alreadyexists} ${filen}"
-				fi
-			done
-		done < ${MYSPELL_BASE}/${dictlst}
-		if [[ -n ${alreadyexists} ]]; then
-			write_warning_msg \
-				"Files${alreadyexists} in ${OOO_DICTBASE} already exist." \
-				"Remove them manually and re-run eselect oodict to put them" \
-				"under eselect management."
-		else
-			# Clear out any existing entry
-			do_unset ${dict}
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				grep "^${fields[0]} ${fields[1]} ${fields[2]} ${fields[3]}$" \
-					${OOO_DICTBASE}/${OOO_DICTLIST} > /dev/null 2>&1 ||
-						echo "${entry}" >> ${OOO_DICTBASE}/${OOO_DICTLIST}
-				for suffix in $(oodict_get_myspell_suffixes ${fields[0]}); do
-					filen="${fields[3]}${suffix}"
-					if [[ -h ${OOO_DICTBASE}/${filen} ]]; then
-						rm -f ${OOO_DICTBASE}/${filen} ||
-							die "Failed to remove ${OOO_DICTBASE}/${filen}"
-					fi
-					if [[ ! -f ${OOO_DICTBASE}/${filen} ]]; then
-						ln -s ${MYSPELL_BASE}/${filen} ${OOO_DICTBASE}/${filen} ||
-							die "Failed to create symlink from ${MYSPELL_BASE}/${filen} to ${OOO_DICTBASE}/${filen}"
-					else
-						has ${filen} ${alreadyexists} ||
-							alreadyexists="${alreadyexists} ${filen}"
-					fi
-				done
-			done < ${MYSPELL_BASE}/${dictlst}
-		fi
-		;;
-	direct)
-		write_warning_msg "eselect oodict does not manage files installed directly to ${OOO_DICTBASE}."
-		;;
-	*)
-		die "Unknown dictionary class ${dict}"
-		;;
-	esac
-}
-## }}}
-
-
-### update action
-
-## {{{ update stuff
-describe_update() {
-	echo "(Re)build OpenOffice.org dictionary configuration."
-}
-
-describe_update_parameters() {
-	echo "[<class>]"
-}
-
-describe_update_options() {
-	echo "class: type of dictionary (e.g. ${OODICT_CLASSES/ /, }) - omit to update everything"
-	oodict_describe_options
-}
-
-do_update() {
-	local dlang class dictlst classes
-	oodict_process_options $*
-	# <class> is an optional parameter
-	classes=$1
-	[[ -z ${classes} || "--" == ${classes:0:2} ]] &&
-		classes=${OODICT_CLASSES}
-	for class in ${classes}; do
-		case ${class} in
-		myspell)
-			dictlsts=$(ls ${MYSPELL_BASE}/${OOO_DICTLIST}.* 2> /dev/null)
-			for dictlst in ${dictlsts}; do
-				dlang=${dictlst/*.lst.}
-				do_set ${class}-${dlang}
-			done
-			;;
-		*)
-			die "Unknown dictionary class ${class}"
-			;;
-		esac
-	done
-}
-## }}}
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/modules-other/opengl.eselect b/modules-other/opengl.eselect
deleted file mode 100644
index 3f9388a..0000000
--- a/modules-other/opengl.eselect
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <dberkholz@gentoo.org>
-# Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-# Made into eselect module by Jeremy Huddleston <eradicator@gentoo.org>
-
-inherit multilib package-manager config
-
-# Eselect data
-DESCRIPTION="Manage the OpenGL implementation used by your system"
-MAINTAINER="x11-drivers@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-EBUILD_VERSION="1.0.6"
-
-# Our data
-ENV_FILE="${ROOT}/etc/env.d/03opengl"
-PREFIX="${ROOT}/usr"
-DST_PREFIX="${ROOT}/usr"
-USE_PROFILE_HEADERS="no"
-
-check_version() {
-	if has_version 'x11-base/xorg-x11'; then
-		if ! has_version '>=x11-base/xorg-x11-6.8.0-r4'; then
-			die -q "This version requires >=x11-base/xorg-x11-6.8.0-r4"
-		fi
-	fi
-}
-
-get_current_implementation() {
-	local ret
-	local ldpath=$(load_config "${ENV_FILE}" LDPATH)
-	local opengl_profile=$(load_config "${ENV_FILE}" OPENGL_PROFILE)
-
-	if [[ -n ${opengl_profile} ]] ; then
-		ret="${opengl_profile}"
-	elif [[ -n ${ldpath} ]] ; then
-		ret="${ldpath%%:*}"
-		ret="${ret##*opengl/}"
-		ret="${ret%/lib*}"
-	fi
-
-	echo ${ret}
-}
-
-get_implementations() {
-	local ret dir
-	for x in $(list_libdirs) ; do
-		[[ ${ROOT} != / ]] && x=${x//${ROOT}}
-		for dir in "${PREFIX}/${x}"/opengl/* ; do
-			[[ -d ${dir} && $(basename "${dir}") != "global" ]] || continue
-			has $(basename "${dir}") ${ret} && continue
-			ret=${ret:+${ret} }$(basename "${dir}")
-		done
-	done
-
-	echo ${ret}
-}
-
-setup_lib_symlinks() {
-	local profile_libdir=${1}
-	local libdir=${2}
-	local file
-	local rootfile
-
-	mkdir -p "${libdir}" || die "Failed to create ${libdir}"
-
-	pushd "${libdir}" &> /dev/null
-		# First remove old symlinks
-		for file in libGL{,core}.{a,so,la} ; do
-			rm -f "${file}" || die -q "Failed to delete ${file}"
-		done
-
-		# Note that we don't do .so*, just .so on purpose.  The
-		# loader knows to look in the profile dir, and the
-		# linked just needs the .so
-		for file in ${profile_libdir}/libGL{,core}.{so,a,la}; do
-			if [[ ${ROOT} != / ]] ; then
-				rootfile="${file//${ROOT}}"
-			else
-				rootfile="${file}"
-			fi
-			[[ -f ${file} ]] || continue
-			if [[ -f $(basename "${file}") ]] ; then
-				rm -f "$(basename "${file}")" || die -q "Failed to delete ${libdir}/$(basename "${file}")"
-			fi
-
-			# Fix libtool archives (#48297)
-			if [[ ${file%.la} != ${file} ]] ; then
-				sed "s:${profile_libdir}:${libdir}:g" "${file}" > "$(basename "${file}")" || die -q "Failed to create ${libdir}/$(basename "${file}")"
-			else
-				ln -s "${rootfile}" || die -q "Failed to create ${libdir}/$(basename "${file}")"
-			fi
-		done
-	popd &> /dev/null
-}
-
-set_new_implementation() {
-	local gl_implem=${1}
-	local avail_implems=$(get_implementations)
-
-	check_version
-
-	# Set a sane umask... bug #83115
-	umask 022
-
-	if ! has ${gl_implem} ${avail_implems}; then
-		die -q "Invalid profile selected."
-	fi
-
-	echo -n "Switching to ${gl_implem} OpenGL interface..."
-		if [[ -f ${ENV_FILE} ]] ; then
-			rm -f "${ENV_FILE}" || die -q "Failed to remove ${ENV_FILE}"
-		fi
-
-		local libdir
-		for libdir in $(list_libdirs); do
-			[[ ${ROOT} != / ]] && libdir=${libdir//${ROOT}}
-
-			# First make sure we have an opengl directory and this is a real lib dir, not a symlink
-			[[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue
-
-			# Fallback on xorg-x11 if we don't have this implementation for this libdir.
-			local gl_local
-			if [[ ! -d ${PREFIX}/${libdir}/opengl/"${gl_implem}" ]] ; then
-				gl_local="xorg-x11"
-			else
-				gl_local="${gl_implem}"
-			fi
-
-			setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib" "${DST_PREFIX}/${libdir}"
-
-			if [[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls ]] ; then
-				setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls" "${DST_PREFIX}/${libdir}/tls"
-			fi
-
-			local moduledir
-			if [[ -e ${DST_PREFIX}/${libdir}/xorg/modules ]] ; then
-				moduledir="xorg/modules"
-			else
-				moduledir="modules"
-			fi
-
-			if [[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/extensions ]] ; then
-				mkdir -p "${DST_PREFIX}/${libdir}/${moduledir}/extensions" || die "Failed to create ${DST_PREFIX}/${libdir}/${moduledir}/extensions"
-				pushd "${DST_PREFIX}/${libdir}/${moduledir}/extensions" &> /dev/null
-					# First remove old symlinks
-					for file in lib{wfb,glx}.{a,so,la}; do
-						rm -f "${file}" || die -q "Failed to delete ${DST_PREFIX}/${libdir}/${moduledir}/extensions/${file}"
-					done
-
-					for file in ${PREFIX}/${libdir}/opengl/${gl_local}/extensions/*.{so,a,la}; do
-						[[ -f ${file} ]] || continue
-						if [[ -f $(basename "${file}") ]] ; then
-							rm -f "$(basename "${file}")" || die -q "Failed to delete ${DST_PREFIX}/${libdir}/${moduledir}/extensions/$(basename "${file}")"
-						fi
-
-						# Fix libtool archives (#48297)
-						if [[ ${file%.la} != ${file} ]] ; then
-							sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${libdir}:g" "${file}" > "$(basename "${file}")" || die -q "Failed to create ${DST_PREFIX}/${libdir}/${moduledir}/extensions/$(basename "${file}")"
-						else
-							ln -s "${file}" || die -q "Failed to create ${libdir}/$(basename "${file}")"
-						fi
-					done
-				popd &> /dev/null
-			fi
-
-			# Setup the includes
-			mkdir -p "${DST_PREFIX}/include/GL" || die "Failed to create ${DST_PREFIX}/include/GL"
-			pushd "${DST_PREFIX}/include/GL" &> /dev/null
-				for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
-					# IMPORTANT
-					# It is preferable currently to use the standard glext.h file
-					# however if an OpenGL provider must use a self produced glext.h
-					# then it should be installed to ${gl_implem}/include and the user
-					# can add the --impl-headers option to select it.
-
-					if [[ "${USE_PROFILE_HEADERS}" == "yes" ]] ; then
-						# Check the profile first.
-						if [[ -e ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} ]] ; then
-							if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-								rm -f "${file}" || die -q "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-							fi
-
-							ln -s ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} || die -q "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-							continue
-						fi
-					fi
-
-					if [[ -e ${PREFIX}/${libdir}/opengl/global/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || die -q "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/global/include/${file} || die -q "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					elif [[ -e ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || die -q "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/${gl_implem}/include/${file} || die -q "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					elif [[ -e ${PREFIX}/${libdir}/opengl/xorg-x11/include/${file} ]] ; then
-						if [[ -f ${file} || ( -L ${file} && ! -e ${file} ) ]] ; then
-							rm -f "${file}" || die -q "Failed to delete ${DST_PREFIX}/include/GL/$(basename "${file}")"
-						fi
-
-						ln -s ${PREFIX}/${libdir}/opengl/xorg-x11/include/${file} || die -q "Failed to create ${DST_PREFIX}/include/GL/$(basename "${file}")"
-					fi
-				done
-			popd &> /dev/null
-
-			# Setup the $LDPATH
-			ldpath="${ldpath:+${ldpath}:}${PREFIX}/${libdir}/opengl/${gl_local}/lib"
-
-		done
-
-		store_config ${ENV_FILE} LDPATH "${ldpath}"
-		store_config ${ENV_FILE} OPENGL_PROFILE "${gl_implem}"
-
-		do_action env update &> /dev/null
-
-	echo " done"
-}
-
-### show action ###
-describe_show() {
-	echo "Print the current OpenGL implementation."
-}
-
-do_show() {
-	local current=$(get_current_implementation)
-	if [[ -n ${current} ]] ; then
-		echo ${current}
-		return 0
-	else
-		echo "(none)"
-		return 2
-	fi
-}
-
-### list action ###
-describe_list() {
-	echo "List the available OpenGL implementations."
-}
-
-do_list() {
-	targets=( $(get_implementations) )
-	write_list_start "Available OpenGL implementations:"
-	if [[ -n ${targets[@]} ]] ; then
-		local i
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			[[ ${targets[${i}]} == $(get_current_implementation) ]] \
-				&& targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-describe_set() {
-	echo "Select the OpenGL implementation."
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "<target> : The profile to activate"
-	echo "--use-old : If an implementation is already set, use that one instead"
-	echo "--prefix=<val> : Set the source prefix (default: /usr)"
-	echo "--dst-prefix=<val> : Set the destination prefix (default: /usr)"
-	echo "--impl-headers : Override global headers with ones provided by this profile"
-#	write_list_start "Extra options for 'set' action:"
-#	write_kv_list_entry "<target>" "The profile to activate."
-#	write_kv_list_entry "--use-old" "If an implementation is already set, use that one."
-#	write_kv_list_entry "--prefix=<val>" "Set the source prefix (default: /usr)"
-#	write_kv_list_entry "--dst-prefix=<val>" "Set the destination prefix (default: /usr)"
-#	write_kv_list_entry "--impl-headers" "Use headers provided by this implementation to"
-#	write_kv_list_entry "" "override golbal ones provided by opengl-update."
-#	write_kv_list_entry "" "This was default in <opengl-update-2.2"
-}
-
-do_set() {
-	local action="error"
-	local current=$(get_current_implementation)
-	local available=$(get_implementations)
-	local new
-
-	while [[ ${#@} -gt 0 ]] ; do
-		local opt=${1}
-		shift
-		case ${opt} in
-			--use-old)
-				if [[ -n ${current} ]] && has ${current} ${available}; then
-					action="old-implementation"
-				fi
-			;;
-			--prefix=*)
-				PREFIX=${ROOT}${opt#*=}
-				available=$(get_implementations)
-			;;
-			--dst-prefix=*)
-				DST_PREFIX=${ROOT}${opt#*=}
-			;;
-			--impl-headers)
-				USE_PROFILE_HEADERS="yes"
-			;;
-			*)
-				if [[ ${action} != "old-implementation" ]] ; then
-					action="set-implementation"
-				fi
-
-				if is_number ${opt} ; then
-					targets=( $(get_implementations) )
-					new=${targets[$(( ${opt} - 1 ))]}
-					if [[ -z ${new} ]] ; then
-						die -q "Unrecognized option: ${opt}"
-					fi
-				elif has ${opt} ${available}; then
-					new="${opt}"
-				else
-					die -q "Unrecognized option: ${opt}"
-				fi
-			;;
-		esac
-	done
-
-	case ${action} in
-		old-implementation)
-			set_new_implementation ${current}
-			return $?
-		;;
-		set-implementation)
-			if [[ -n ${new} ]] ; then
-				set_new_implementation ${new}
-				return $?
-			else
-				die -q "Please specify an implementation to set"
-			fi
-		;;
-		*)
-			die -q "Invalid usage of set action."
-		;;
-	esac
-}
diff --git a/modules-other/oracle.eselect b/modules-other/oracle.eselect
deleted file mode 100644
index 83b30d8..0000000
--- a/modules-other/oracle.eselect
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit config
-
-DESCRIPTION="Manage the /usr/bin/sqlplus symlink"
-MAINTAINER="dertobi123@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-ORACLE_ENVFILE="${ROOT}/etc/env.d/50oracle-instantclient-basic"
-
-# find a list of sqlplus symlink targets
-find_targets() {
-	for f in ${ROOT}/usr/lib/oracle/* ; do
-		[[ -d "${ROOT}/${f}" ]] && echo $(basename ${f} )
-	done
-}
-
-# try to remove the sqlplus symlink
-remove_symlink() {
-	rm -f "${ROOT}/usr/bin/sqlplus"
-}
-
-# set the sqlplus symlink
-set_symlink() {
-	local target=${1}
-
-	if is_number "${target}" ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	[[ -z ${target} ]] \
-		&& die -q "Target \"${1}\" doesn't appear to be valid!"
-	if [[ -f "${ROOT}/usr/lib/oracle/${target}/client/bin/sqlplus" ]] ; then
-		pushd "${ROOT}/usr/bin" 1>/dev/null
-		ln -s "../lib/oracle/${target}/client/bin/sqlplus" "sqlplus"
-		popd 1>/dev/null
-		store_config ${ORACLE_ENVFILE} ORACLE_HOME "/usr/lib/oracle/${target}/client"
-		store_config ${ORACLE_ENVFILE} LDPATH "/usr/lib/oracle/${target}/client/lib"
-		store_config ${ORACLE_ENVFILE} C_INCLUDE_PATH "/usr/lib/oracle/${target}/client/include"
-	else
-		die -q "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current sqlplus symlink"
-}
-
-do_show() {
-	write_list_start "Current sqlplus symlink:"
-	if [[ -L "${ROOT}/usr/bin/sqlplus" ]] ; then
-		write_kv_list_entry "$(canonicalise ${ROOT}/usr/bin/sqlplus )" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available sqlplus symlink targets"
-}
-
-do_list() {
-	local -a targets=( $(find_targets ) )
-	local target symlink
-
-	write_list_start "Available sqlplus symlink targets:"
-	if [[ -n ${targets[@]} ]] ; then
-		local i
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			symlink=$(canonicalise ${ROOT}/usr/bin/sqlplus )
-			target=$(canonicalise "${ROOT}"/usr/lib/oracle/${targets[${i}]}/client/bin/sqlplus )
-			[[ ${symlink} == ${target} ]] \
-				&& targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new sqlplus symlink target"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-	[[ -z ${1} ]] \
-		&& die -q "You didn't tell me what to set the symlink to"
-
-	local target=${1}
-	if is_number "${target}" ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -z ${target} ]] ; then
-			die -q "Target \"${1}\" doesn't appear to be valid!"
-	fi
-
-	if [[ -L "${ROOT}/usr/bin/sqlplus" ]] ; then
-		# existing symlink
-		if ! remove_symlink ; then
-			die -q "Couldn't remove existing symlink"
-		elif ! set_symlink "${1}" ; then
-			die -q "Couldn't set a new symlink"
-		fi
-	elif [[ -e "${ROOT}/usr/bin/sqlplus" ]] ; then
-		# we have something strange
-		die -q "Sorry, ${ROOT}/usr/bin/sqlplus confuses me"
-	else
-		set_symlink "${1}" || die -q "Couldn't set a new symlink"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/package-manager.eselect b/modules-other/package-manager.eselect
deleted file mode 100644
index 6364023..0000000
--- a/modules-other/package-manager.eselect
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EDITOR_VAR="PACKAGE_MANAGER"
-EDITOR_ENVFILE="/etc/env.d/50package-manager"
-EDITOR_LIST="portage:/usr/bin/emerge
-	paludis:/usr/bin/paludis
-	pkgcore:/usr/bin/pmerge"
-
-inherit editor-variable
-
-DESCRIPTION="Manage the ${EDITOR_VAR} environment variable"
-MAINTAINER="ulm@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}")
diff --git a/modules-other/tbirddict.eselect b/modules-other/tbirddict.eselect
deleted file mode 100644
index b568d6f..0000000
--- a/modules-other/tbirddict.eselect
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage the configuration of dictionaries for Mozilla Thunderbird."
-MAINTAINER="kevquinn@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# TODO
-# 1) implement eselect tbirddict unset direct-<lang>
-# 2) make eselect tbirddict unset myspell-<lang> abort cleanly if not installed from
-# myspell
-
-# Supports myspell(hunspell) dictionaries; designed to be extensible to
-# manage other classes of dictionaries should they become applicable
-# to Mozilla Thunderbird.
-
-# Base directory where Mozilla Thunderbird stores its dictionary information.
-# The --base option can be set to override this; for example in the -bin package
-# which uses /opt/thunderbird or multilib which uses
-# /usr/$(get_libdir)/thunderbird.
-TBIRDDICT_DICTBASE="/usr/lib/mozilla-thunderbird/components/myspell"
-MYSPELL_DICTLIST_BASE="dictionary.lst"
-
-DICT_CLASSES="myspell"
-
-MYSPELL_BASE="/usr/share/myspell"
-
-# return suffixes for dictionary type; spelling dictionary,
-# hyphenation dictionary and thesaurus.
-tbirddict_get_myspell_suffixes() {
-	case $1 in
-		DICT) echo ".aff .dic" ;;
-		HYPH) echo ".dic" ;;
-		THES) echo ".dat .idx" ;;
-	esac
-}
-
-# display a heading (indented 4 spaces) and a wrapped list of
-# language codes (indented 6 spaces)
-tbirddict_display_langs() {
-	local count lang
-	echo "    $1:"
-	shift
-	if [[ $1 == "" ]]; then
-		echo "      (none)"
-	else
-		count=0
-		for lang in $*; do
-			[[ ${count} == 0 ]] && printf "     "
-			printf " %s" ${lang}
-			((count = count+1))
-			[[ ${count} == 22 ]] && printf "\n" && count=0
-		done
-		[[ ${count} == 0 ]] || printf "\n"
-	fi
-}
-
-# Format of dictionary.lst files is from OpenOffice.org standard
-# dictionary.lst file:
-
-# List of All Dictionaries to be Loaded by OpenOffice
-# ---------------------------------------------------
-# Each Entry in the list have the following space delimited fields
-#
-# Field 0: Entry Type "DICT" - spellchecking dictionary
-#                     "HYPH" - hyphenation dictionary
-#                     "THES" - thesaurus files
-#
-# Field 1: Language code from Locale "en" or "de" or "pt" ...
-#
-# Field 2: Country Code from Locale "US" or "GB" or "PT"
-#
-# Field 3: Root name of file(s) "en_US" or "hyph_de" or "th_en_US"
-#          (do not add extensions to the name)
-
-tbirddict_describe_options() {
-	echo "--basedir <libdir>: Thunderbird installation directory, e.g. /opt/thunderbird or /usr/lib/thunderbird"
-}
-
-# Process options
-# Notes:
-# 1) this dies if it sees an option it doesn't understand.
-# 2) Copy and consume (shift) parameters before calling this, otherwise it
-#    considers extra parameters as potential options.
-tbirddict_process_options() {
-	while [[ -n $1 && "--" != ${1:0:2} ]]; do
-		shift
-	done
-	while [[ "--" == ${1:0:2} ]]; do
-		if [[ "--basedir" == $1 ]]; then
-			shift
-			TBIRDDICT_DICTBASE="$1/components/myspell"
-			shift
-		elif [[ "--" == $1 ]]; then
-			break
-		else
-			die -q "Unknown parameter ${1}"
-		fi
-	done
-}
-
-
-### show action
-
-## {{{ show stuff
-describe_show() {
-	echo "Show which dictionaries are configured for use with Mozilla
-	Thunderbird."
-}
-
-describe_show_options() {
-	tbirddict_describe_options
-}
-
-do_show() {
-	local lang myspell_sources listn suffix
-	tbirddict_process_options $*
-	write_list_start "Mozilla Thunderbird configured dictionaries"
-	if [[ ! -d ${TBIRDDICT_DICTBASE} ]]; then
-		echo "  (none)"
-		return
-	fi
-	listn=1
-	lang=""
-	myspell_sources=""
-	direct_sources=""
-	for dic in ${TBIRDDICT_DICTBASE}/*.dic; do
-		lang=$(basename ${dic})
-		lang=${lang/-*}
-		lang=${lang/.*}
-		if [[ -h ${dic} ]]; then
-			src=$(canonicalise ${dic})
-			if [[ ${src/${MYSPELL_BASE}} != ${src} ]]; then
-				has ${lang} ${myspell_sources} ||
-					myspell_sources="${myspell_sources} ${lang}"
-			else
-				write_warning_msg "unrecognised link to ${src} ignored"
-			fi
-		else
-			has ${lang} ${direct_sources} ||
-				direct_sources="${direct_sources} ${lang}"
-		fi
-	done
-	if [[ -n ${myspell_sources} ]]; then
-		write_numbered_list_entry ${listn} "myspell"
-		tbirddict_display_langs "Configured language codes from ${MYSPELL_BASE}" ${myspell_sources}
-		(( listn = ${listn} + 1 ))
-	fi
-	if [[ -n ${direct_sources} ]]; then
-		write_numbered_list_entry ${listn} "direct"
-		tbirddict_display_langs "Language codes installed directly in ${TBIRDDICT_DICTBASE}" ${direct_sources}
-		(( listn = ${listn} + 1 ))
-	fi
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-## }}}
-
-
-### list action
-
-## {{{ list stuff
-describe_list() {
-	echo "List the dictionaries that can be configured for use with OpenOffice."
-}
-
-do_list() {
-	local known_langs dict dictlist listn
-	write_list_start "Installed dictionary sources that can be set:"
-	listn=1
-	# myspell dictionary source
-	dictlist=$(ls ${MYSPELL_BASE}/${MYSPELL_DICTLIST_BASE}.* 2> /dev/null)
-	if [[ -n ${dictlist} ]]; then
-		write_numbered_list_entry ${listn} "myspell"
-		known_langs=""
-		for dict in ${MYSPELL_BASE}/${MYSPELL_DICTLIST_BASE}.*; do
-			known_langs="${known_langs} ${dict/${MYSPELL_BASE}\/${MYSPELL_DICTLIST_BASE}.}"
-		done
-		tbirddict_display_langs "Installed language codes" ${known_langs}
-		(( listn = ${listn} + 1 ))
-	fi
-	# show none if no sources found
-	[[ ${listn} == "1" ]] && echo "  (none)"
-}
-## }}}
-
-
-### unset action
-
-## {{{ unset stuff
-describe_unset() {
-	echo "Unconfigure a dictionary from use with Mozilla Thunderbird."
-}
-
-describe_unset_parameters() {
-	echo "<dictionary>"
-}
-
-describe_unset_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	tbirddict_describe_options
-}
-
-do_unset() {
-	local dict dlang dclass suffix filen dictlst entry fields
-	tbirddict_process_options $*
-	# Check thunderbird dictionary area exists
-	[[ -d ${TBIRDDICT_DICTBASE} ]] || return
-	dict=$1
-	dlang=${dict/*-}
-	dclass=${dict/-*}
-	dictlst="${MYSPELL_DICTLIST_BASE}.${dlang}"
-	case ${dclass} in
-	myspell)
-		# Remove softlinks and entries in dictionary.lst - uses
-		# dictionary.<lang>.lst from /usr/share/myspell
-		if [[ -f ${MYSPELL_BASE}/${dictlst} ]]; then
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				[[ ${fields[3]} == "" ]] && continue
-				[[ ${fields[0]} == "DICT" ]] || continue
-				mozfilen=${fields[3]/_/-}
-				# If remove relevant symlinks
-				for suffix in $(tbirddict_get_myspell_suffixes DICT); do
-					filen="${mozfilen}${suffix}"
-					[[ -f ${TBIRDDICT_DICTBASE}/${filen} ]] &&
-					if [[ -h ${TBIRDDICT_DICTBASE}/${filen} ]]; then
-						rm -f ${TBIRDDICT_DICTBASE}/${filen} ||
-						die "Failed to remove ${TBIRDDICT_DICTBASE}/${filen}"
-					else
-						has ${filen} ${notmyfiles} ||
-							notmyfiles="${notmyfiles} ${filen}"
-					fi
-				done
-			done < ${MYSPELL_BASE}/${dictlst}
-		else
-			write_warning_msg "source ${dict} is not installed; nothing changed"
-		fi
-		;;
-	direct)
-		write_warning_msg \
-			"eselect tbirddict does not manage files installed directly to " \
-			"${TBIRDDICT_DICTBASE}.  Remove them manually."
-		;;
-	*)
-		die "Unknown dictionary class ${dclass}"
-		;;
-	esac
-}
-## }}}
-
-### set action
-
-## {{{ set stuff
-describe_set() {
-	echo "Configure a dictionary for use with Mozilla Thunderbird."
-}
-
-describe_set_parameters() {
-	echo "<dictionary>"
-}
-
-describe_set_options() {
-	echo "dictionary: <class>-<lang> e.g. myspell-en"
-	tbirddict_describe_options
-}
-
-do_set() {
-	local dict dlang dclass filen dictlst entry fields suffix
-	tbirddict_process_options $*
-	dict=$1
-	dlang=${dict/*-}
-	dclass=${dict/-*}
-	dictlst="${MYSPELL_DICTLIST_BASE}.${dlang}"
-	alreadyexists=""
-	case ${dclass} in
-	myspell)
-		# Set new entries & links
-		[[ -f ${MYSPELL_BASE}/${dictlst} ]] ||
-			die "Dictionary ${dict} not found in ${MYSPELL_BASE}"
-		# Check for already existing files
-		while read entry; do
-			fields=(${entry})
-			[[ ${fields[0]:0:1} == "#" ]] && continue
-			[[ ${fields[0]} == "DICT" ]] || continue
-			mozfilen=${fields[3]/_/-}
-			for suffix in $(tbirddict_get_myspell_suffixes ${fields[0]}); do
-				filen="${mozfilen}${suffix}"
-				if [[ ! -h ${TBIRDDICT_DICTBASE}/${filen} ]] &&
-				   [[ -f ${TBIRDDICT_DICTBASE}/${filen} ]]; then
-					has ${filen} ${alreadyexists} ||
-						alreadyexists="${alreadyexists} ${filen}"
-				fi
-			done
-		done < ${MYSPELL_BASE}/${dictlst}
-		if [[ -n ${alreadyexists} ]]; then
-			write_warning_msg \
-				"Files${alreadyexists} in ${TBIRDDICT_DICTBASE} already exist." \
-				"Remove them manually and re-run eselect tbirddict to put them" \
-				"under eselect management."
-		else
-			# Clear out any existing entry
-			do_unset ${dict}
-			while read entry; do
-				fields=(${entry})
-				[[ ${fields[0]:0:1} == "#" ]] && continue
-				[[ ${fields[0]} == "DICT" ]] || continue
-				mozfilen=${fields[3]/_/-}
-				for suffix in $(tbirddict_get_myspell_suffixes DICT); do
-					filen="${mozfilen}${suffix}"
-					if [[ -h ${TBIRDDICT_DICTBASE}/${filen} ]]; then
-						rm -f ${TBIRDDICT_DICTBASE}/${filen} ||
-							die "Failed to remove ${TBIRDDICT_DICTBASE}/${filen}"
-					fi
-					if [[ ! -f ${TBIRDDICT_DICTBASE}/${filen} ]]; then
-						ln -s ${MYSPELL_BASE}/${fields[3]}${suffix} ${TBIRDDICT_DICTBASE}/${filen} ||
-							die "Failed to create symlink from ${MYSPELL_BASE}/${filen} to ${TBIRDDICT_DICTBASE}/${filen}"
-					else
-						has ${filen} ${alreadyexists} ||
-							alreadyexists="${alreadyexists} ${filen}"
-					fi
-				done
-			done < ${MYSPELL_BASE}/${dictlst}
-		fi
-		;;
-	direct)
-		write_warning_msg "eselect tbirddict does not manage files installed directly to ${TBIRDDICT_DICTBASE}."
-		;;
-	*)
-		die "Unknown dictionary class ${dict}"
-		;;
-	esac
-}
-## }}}
-
-
-### update action
-
-## {{{ update stuff
-describe_update() {
-	echo "(Re)build Mozilla Thunderbird dictionary configuration."
-}
-
-describe_update_parameters() {
-	echo "[<class>]"
-}
-
-describe_update_options() {
-	echo "class: type of dictionary (e.g. ${DICT_CLASSES/ /, }) - omit to update everything"
-	tbirddict_describe_options
-}
-
-do_update() {
-	local dlang class dictlst classes
-	tbirddict_process_options $*
-	# <class> is an optional parameter
-	classes=$1
-	[[ -z ${classes} || "--" == ${classes:0:2} ]] &&
-		classes=${DICT_CLASSES}
-	for class in ${classes}; do
-		case ${class} in
-		myspell)
-			dictlsts=$(ls ${MYSPELL_BASE}/${MYSPELL_DICTLIST_BASE}.* 2> /dev/null)
-			for dictlst in ${dictlsts}; do
-				dlang=${dictlst/*.lst.}
-				do_set ${class}-${dlang}
-			done
-			;;
-		*)
-			die "Unknown dictionary class ${class}"
-			;;
-		esac
-	done
-}
-## }}}
-
-# vim: ts=4 sw=4 noet fdm=marker
diff --git a/modules-other/timidity.eselect b/modules-other/timidity.eselect
deleted file mode 100644
index 2220c26..0000000
--- a/modules-other/timidity.eselect
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Select default system patchset for TiMidity++"
-MAINTAINER="flameeyes@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-TIMIDITYDIR="${ROOT}/usr/share/timidity"
-
-# find a list of patchsets symlink targets, best first
-find_targets() {
-	for f in \
-			"${TIMIDITYDIR}/eawpatches" \
-			"${TIMIDITYDIR}/shompatches" \
-			"${TIMIDITYDIR}/freepats" \
-		; do
-		if [[ -d ${f} ]] ; then
-			echo $(basename ${f} )
-		fi
-	done
-}
-
-destination() {
-	if [[ ${global} == "yes" ]]; then
-		echo "${TIMIDITYDIR}/current"
-	else
-		# Ensure the presence of ~/.timidity
-		mkdir -p "${HOME}/.timidity"
-		echo "${HOME}/.timidity/current"
-	fi
-}
-
-# try to remove the symlink to the current patchset
-remove_symlink() {
-	rm -f $(destination) &>/dev/null
-}
-
-# set the patchset symlink
-set_symlink() {
-	target=${1}
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -d "${TIMIDITYDIR}/${target}" ]] ; then
-		remove_symlink
-		ln -s "${TIMIDITYDIR}/${target}" $(destination) || \
-			die "Couldn't set ${target} symlink"
-	else
-		die -q  "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current TiMidity++ patchset"
-}
-
-describe_show_options() {
-	echo "--global : Change the global patchset instead of the user's patchset"
-}
-
-do_show() {
-	local global
-	while [[ -n "${@}" ]]; do
-		case "${1}" in
-			--global)
-				global=yes; shift ;;
-			--*)
-				die -q "Usage error, invalid option ${1}" ;;
-			*)
-				die -q "Too many parameters" ;;
-		esac
-	done
-
-	write_list_start "Current TiMidity++ patchset:"
-	if [[ -L "$(destination)" ]] ; then
-		write_kv_list_entry "$(basename $(canonicalise $(destination) ) )" ""
-	elif [[ -e "$(destination)" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available TiMidity++ patchsets"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets ) )
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			if [[ ${targets[${i}]} == $(basename $(canonicalise $(destination) ) ) ]]; then
-				targets[${i}]="${targets[${i}]} $(highlight '*' )"
-			fi
-		done
-		write_list_start "Available TiMidity++ patchsets:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new TiMidity++ patchset"
-}
-
-describe_set_options() {
-	echo "--global : Change the global patchset instead of the user's patchset"
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	local global
-	while [[ -n "${@}" ]]; do
-		case "${1}" in
-			--global)
-				global=yes; shift ;;
-			--*)
-				die -q "Usage error, invalid option ${1}" ;;
-			*)
-				break ;;
-		esac
-	done
-
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a provider name"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "$(destination)" ]] ; then
-		if ! remove_symlink ; then
-			die -q "Can't remove existing provider"
-		elif ! set_symlink "${1}" ; then
-			die -q "Can't set new provider"
-		fi
-
-	elif [[ -e "$(destination)" ]] ; then
-		die -q "Sorry, $(destination) confuses me"
-
-	else
-		set_symlink "${1}" || die -q "Can't set a new provider"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the TiMidity++ patchset"
-}
-
-describe_update_options() {
-	echo "--global : Change the global patchset instead of the user's patchset"
-	echo "--if-unset : Do not override existing implementation"
-}
-
-do_update() {
-	local ifunset="no"
-	local global
-	while [[ -n "${@}" ]]; do
-		case "${1}" in
-			--global)
-				global=yes; shift ;;
-			--if-unset)
-				ifunset=yes; shift ;;
-			--*)
-				die -q "Usage error, invalid option ${1}" ;;
-			*)
-				break ;;
-		esac
-	done
-
-	if [[ -L "$(destination)" ]] ; then
-		[[ ${ifunset} == "yes" ]] && return
-		remove_symlink || die -q "Can't remove existing link"
-	fi
-	if [[ -e "$(destination)" ]] ; then
-		die -q "Can't set a new provider"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlink 1 || die -q "Can't set a new provider"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/vi.eselect b/modules-other/vi.eselect
deleted file mode 100644
index 95e1794..0000000
--- a/modules-other/vi.eselect
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/vi implementations"
-MAINTAINER="pioto@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of vi symlink targets, best first
-find_targets() {
-	local f
-	for f in \
-			"${ROOT}"/usr/bin/vim \
-			"${ROOT}"/usr/bin/nvi \
-			"${ROOT}"/usr/bin/elvis \
-			"${ROOT}"/usr/bin/vile \
-			"${ROOT}"/usr/bin/gvim \
-			"${ROOT}"/usr/bin/xvile \
-			"${ROOT}"/bin/busybox \
-		; do
-		if [[ -f "${f}" ]] ; then
-			echo $(basename "${f}" )
-		fi
-	done
-}
-
-# try to remove the vi, ex, view and man vi symlinks
-remove_symlinks() {
-	rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \
-	rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null
-}
-
-# set a man page symlink
-set_man_symlink() {
-	local target="${1}" link_name="${2}" x extension
-
-	for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do
-		if [[ -e /usr/share/man/man1/${target}${x} ]] ; then
-			extension="${x}"
-			break
-		fi
-	done
-
-	if [[ -z "${extension}" ]] ; then
-		echo "Couldn't find a man page for ${target}; skipping." 1>&2
-		return 1
-	fi
-
-	ln -s "${target}${extension}" \
-		"${ROOT}/usr/share/man/man1/${link_name}${extension}"
-}
-
-# set the vi, ex, view, and man vi symlinks
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	local dir
-	if [[ ${target} == "busybox" ]]; then
-		dir="${ROOT}/bin"
-	else
-		dir="${ROOT}/usr/bin"
-	fi
-
-	if [[ -f "${dir}/${target}" ]] ; then
-		remove_symlinks
-
-		# it's okay if these fail
-		set_man_symlink "${target}" "vi"
-		set_man_symlink "${target}" "ex"
-		set_man_symlink "${target}" "view"
-
-		# it's not okay if these fail
-		ln -s "${dir}/${target}" "${ROOT}/usr/bin/vi" || \
-			die "Couldn't set ${target} /usr/bin/vi symlink"
-		ln -s "${dir}/${target}" "${ROOT}/usr/bin/ex" || \
-			die "Couldn't set ${target} /usr/bin/ex symlink"
-		ln -s "${dir}/${target}" "${ROOT}/usr/bin/view" || \
-			die "Couldn't set ${target} /usr/bin/view symlink"
-	else
-		die -q  "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current vi implementation"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current vi implementation:"
-	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
-		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" ""
-	elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available vi implementations"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets ) )
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			[[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/vi ) ) ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_list_start "Available vi implementations:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new vi implementation provider"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a provider name"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing provider"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new provider"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
-		die -q "Sorry, ${ROOT}/usr/bin/vi confuses me"
-
-	else
-		set_symlinks "${1}" || die -q "Can't set a new provider"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the vi provider"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing link"
-	fi
-	if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
-		die -q "Can't set a new provider"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new provider"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/whois.eselect b/modules-other/whois.eselect
deleted file mode 100644
index 0b70353..0000000
--- a/modules-other/whois.eselect
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage /usr/bin/whois implementations"
-MAINTAINER="drizzt@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-# find a list of whois symlink targets, best first
-find_targets() {
-	local f
-	for f in \
-			"${ROOT}"/usr/bin/bsdwhois \
-			"${ROOT}"/usr/bin/jwhois \
-			"${ROOT}"/usr/bin/bwwhois \
-			"${ROOT}"/usr/bin/gwhois \
-			"${ROOT}"/usr/bin/mdwhois \
-		; do
-		if [[ -f "${f}" ]] ; then
-			echo $(basename "${f}")
-		fi
-	done
-}
-
-# try to remove the whois symlinks
-remove_symlinks() {
-	rm -f "${ROOT}/usr/bin/whois" &>/dev/null
-	rm -f "${ROOT}/usr/share/man/man1/whois.1"{,.gz,.bz2}
-}
-
-# set a man page symlink
-set_man_symlink() {
-	local target="${1}" link_name="${2}" x extension
-
-	for x in ".1" ".1.bz2" ".1.gz" ; do
-		if [[ -e /usr/share/man/man1/"${target}${x}" ]] ; then
-			extension="${x}"
-			break
-		fi
-	done
-
-	if [[ -z "${extension}" ]] ; then
-		echo "Couldn't find a man page for ${target}; skipping." 1>&2
-		return 1
-	fi
-
-	ln -s "${target}${extension}" \
-		"${ROOT}/usr/share/man/man1/${link_name}${extension}"
-}
-
-# set the whois
-set_symlinks() {
-	local target="${1}" targets
-	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
-		targets=( $(find_targets ) )
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-	if [[ -f "${ROOT}/usr/bin/${target}" ]] ; then
-		remove_symlinks
-
-		ln -s "${ROOT}/usr/bin/${target}" "${ROOT}/usr/bin/whois" || \
-			die "Couldn't set ${target} /usr/bin/whois symlink"
-
-		set_man_symlink "${target}" "whois"
-	else
-		die -q  "Target \"${1}\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current whois implementation"
-}
-
-do_show() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	write_list_start "Current whois implementation:"
-	if [[ -L "${ROOT}/usr/bin/whois" ]] ; then
-		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/whois ) )" ""
-	elif [[ -e "${ROOT}/usr/bin/whois" ]] ; then
-		write_kv_list_entry "(not a symlink)" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available whois implementations"
-}
-
-do_list() {
-	[[ -z "${@}" ]] || die -q "Too many parameters"
-
-	local i targets
-	targets=( $(find_targets ) )
-	if [[ -n ${targets[@]} ]] ; then
-		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-			[[ ${targets[${i}]} == $(basename $(canonicalise ${ROOT}/usr/bin/whois ) ) ]] && \
-				targets[${i}]="${targets[${i}]} $(highlight '*' )"
-		done
-		write_list_start "Available whois implementations:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new whois implementation provider"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	if [[ -z "${1}" ]] ; then
-		die -q "You didn't give me a provider name"
-
-	elif [[ -n "${2}" ]] ; then
-		die -q "Too many parameters"
-
-	elif [[ -L "${ROOT}/usr/bin/whois" ]] ; then
-		if ! remove_symlinks ; then
-			die -q "Can't remove existing provider"
-		elif ! set_symlinks "${1}" ; then
-			die -q "Can't set new provider"
-		fi
-
-	elif [[ -e "${ROOT}/usr/bin/whois" ]] ; then
-		die -q "Sorry, ${ROOT}/usr/bin/whois confuses me"
-
-	else
-		set_symlinks "${1}" || die -q "Can't set a new provider"
-	fi
-}
-
-### update action ###
-
-describe_update() {
-	echo "Automatically update the whois provider"
-}
-
-describe_update_options() {
-	echo "--if-unset : Do not override existing implementation"
-}
-
-do_update() {
-	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
-		die -q "Usage error"
-
-	if [[ -L "${ROOT}/usr/bin/whois" ]] ; then
-		[[ ${1} == "--if-unset" ]] && return
-		remove_symlinks || die -q "Can't remove existing link"
-	fi
-	if [[ -e "${ROOT}/usr/bin/whois" ]] ; then
-		die -q "Can't set a new provider"
-	elif ! [[ -z $(find_targets ) ]] ; then
-		set_symlinks 1 || die -q "Can't set a new provider"
-	fi
-}
-
-# vim: set ft=eselect :
diff --git a/modules-other/wxwidgets.eselect b/modules-other/wxwidgets.eselect
deleted file mode 100644
index 2be0a65..0000000
--- a/modules-other/wxwidgets.eselect
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-wxwidgets/files/wxwidgets.eselect-0.8,v 1.2 2008/02/08 01:08:07 dirtyepic Exp $
-
-inherit config
-
-DESCRIPTION="Manage the system default wxWidgets profile."
-MAINTAINER="dirtyepic@gentoo.org"
-VERSION=0.8
-
-WXCONFFILE=/var/lib/wxwidgets/current
-WXCONFDIR=/usr/lib/wx/config
-
-find_targets() {
-	local conf
-	for conf in ${WXCONFDIR}/*; do
-		[[ -f ${conf} && -x ${conf} ]] && basename ${conf}
-	done
-}
-
-set_config() {
-	local target="${1}" targets
-
-	# selected by number
-	if is_number "${target}"; then
-		targets=( $(find_targets) )
-		[[ ${1} -ge 1 && ${1} -le ${#targets[@]} ]] \
-			|| die -q "Number out of range: ${1}"
-		target=${targets[$(( ${target} - 1 ))]}
-	fi
-
-	if [[ ${target} == "none" ]]; then
-		# none is a special case
-		:
-	else
-		[[ ! -f ${WXCONFDIR}/${target} ]] && \
-			die -q "\"${1}\" doesn't appear to be a valid profile name"
-	fi
-
-	echo
-	echo "Setting wxWidgets profile to ${target}"
-	echo
-	store_config ${WXCONFFILE} WXCONFIG ${target}
-
-	if [[ ! ${target} == "none" ]]; then
-		# expose the slot number of the selected target for various uses
-		local wxslot
-		OIFS=${IFS}
-		IFS=-
-		set -- ${target}
-		wxslot=${4}
-		IFS=${OIFS}
-	fi
-
-	# symlink bakefile presets to current slot (Bug #209150)
-	local f
-	pushd /usr/share/bakefile/presets/ &> /dev/null
-	for f in .bkl _unix.bkl _win32.bkl; do
-		if [[ -e wx${f} || -L wx${f} ]]; then
-			rm -f wx${f} || die -q "Error removing wx${f}"
-		fi
-		if [[ ! ${target} == "none" ]]; then
-			ln -sf wx${wxslot/./}${f} wx${f} \
-				|| die -q "Error symlinking wx${wxslot/./}${f}"
-		fi
-	done
-	popd &> /dev/null
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the currently selected profile"
-}
-
-do_show() {
-	[[ ${#@} -gt 0 ]] && die -q "Too many parameters"
-
-	write_list_start "Current wxWidgets profile:"
-	if [[ -e ${WXCONFFILE} ]]; then
-		write_kv_list_entry "$(load_config ${WXCONFFILE} WXCONFIG)" ""
-	else
-		write_kv_list_entry "(none)" ""
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available profiles"
-}
-
-do_list() {
-	local i targets
-	# targets is an array containing names of available configs
-	targets=( $(find_targets) )
-
-	if [[ -n ${targets[@]} ]]; then
-		for (( i = 0; i < ${#targets[@]}; i++ )); do
-			if [[ -e ${WXCONFFILE} ]]; then
-				# highlight current version
-				[[ ${targets[${i}]} == $(load_config ${WXCONFFILE} WXCONFIG) ]] \
-					&& targets[${i}]="$(highlight ${targets[${i}]}) *"
-			fi
-		done
-		write_list_start "Available wxWidgets profiles:"
-		write_numbered_list "${targets[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set the system wxWidgets profile"
-}
-
-describe_set_options() {
-	echo "target: profile name or number (gotten from 'list')"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-do_set() {
-	[[ ! ${#@} -eq 1 ]] \
-		&& die -q "You must specify a profile name or number"
-
-	[[ -w "${ROOT}"/var/lib ]] \
-		|| die -q "You need proper write permissions.  Please run as root."
-
-	set_config "${1}"
-}
-
-describe_update() {
-	echo "Check current profile and update it if invalid (internal use only)"
-}
-
-do_update() {
-	[[ ! -e ${WXCONFFILE} ]] && do_set none
-
-	currconf=$(load_config ${WXCONFFILE} WXCONFIG)
-
-	# if current config is "none" leave it alone
-	[[ ${currconf} == none ]] && return 0
-
-	# if current config is valid leave it alone
-	[[ -e ${WXCONFDIR}/${currconf} ]] && return 0
-
-	# split the config string into components
-	OIFS=${IFS}
-	IFS=-
-	set -- ${currconf}
-	IFS=${OIFS}
-
-	declare -a wxtoolkit wxchar wxdebug wxver
-
-	# put selected components into the first element of the array
-	wxtoolkit=(${1})
-	wxchar=(${2})
-	wxdebug=(${3})
-	wxver=(${4})
-
-	# put available components into next element(s) of array
-	local component toolkit char debug ver element opt
-
-	for component in toolkit char debug ver; do
-		element=1
-		case ${component} in
-			toolkit)
-				for opt in base gtk2; do
-					if [[ ${opt} == ${wxtoolkit[0]} ]]; then
-						continue
-					else
-						wxtoolkit[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			char)
-				for opt in ansi unicode; do
-					if [[ ${opt} == ${wxchar[0]} ]]; then
-						continue
-					else
-						wxchar[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			debug)
-				for opt in release debug; do
-					if [[ ${opt} == ${wxdebug[0]} ]]; then
-						continue
-					else
-						wxdebug[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-
-			ver)
-				for opt in 2.10 2.8 2.6; do
-					if [[ ${opt} == ${wxver[0]} ]]; then
-						continue
-					else
-						wxver[${element}]=${opt}
-						(( element++ ))
-					fi
-				done
-				;;
-		esac
-	done
-
-	# Now we iterate through the installed wx-configs and find the closest match
-	# ( debug > char > toolkit > ver )
-
-	local d c t v checkconf foundconf
-
-	for (( v = 0 ; v < ${#wxver[@]} ; v++ )); do
-		for (( t = 0 ; t < ${#wxtoolkit[@]} ; t++ )); do
-			for (( c = 0 ; c < ${#wxchar[@]} ; c++ )); do
-				for (( d = 0 ; d < ${#wxdebug[@]} ; d++ )); do
-					checkconf="${wxtoolkit[$t]}-${wxchar[$c]}-${wxdebug[$d]}-${wxver[$v]}"
-					[[ -e ${WXCONFDIR}/${checkconf} ]] || continue
-					foundconf=${checkconf}
-					break 4
-				done
-			done
-		done
-	done
-
-	[[ -z ${foundconf} ]] && foundconf="none"
-
-	echo
-	write_warning_msg "Your currently selected wxWidgets profile:	( ${currconf} )"
-	write_warning_msg "is no longer available."
-	write_warning_msg
-	write_warning_msg "The closest matching profile:	( ${foundconf} )"
-	write_warning_msg "will be activated in its place."
-
-	do_set ${foundconf}
-}
diff --git a/modules-other/xvmc.eselect b/modules-other/xvmc.eselect
deleted file mode 100644
index 53b6f97..0000000
--- a/modules-other/xvmc.eselect
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Manage the XvMC implementation used by your system"
-MAINTAINER="cardoe@gentoo.org"
-SVN_DATE='$Date$'
-VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-XVMCLIBS=(
-"libXvMCNVIDIA_dynamic.so.1"
-"libXvMC.so.1"
-"libviaXvMC.so.1"
-"libchromeXvMC.so.1"
-"libviaXvMCPro.so.1"
-"libchromeXvMCPro.so.1"
-"libI810XvMC.so.1"
-"libAMDXvBA.so.1" )
-XVMCPRETTY=(
-"nvidia"
-"xorg-x11"
-"via"
-"openchrome"
-"via-pro"
-"openchrome-pro"
-"intel"
-"ati" )
-
-get_implementation_indices() {
-	local ret n
-	for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
-		[[ -e "${ROOT}/usr/lib/${XVMCLIBS[n]}" ]] && ret+=($n)
-	done
-
-	echo ${ret[@]}
-}
-
-get_current_implementation_index() {
-	local n
-	if [[ -f "${ROOT}/etc/X11/XvMCConfig" ]]; then
-		local current=$(< "${ROOT}/etc/X11/XvMCConfig")
-		for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
-			if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
-				echo "${n}"
-				return
-			fi
-		done
-	fi
-
-	echo "-1"
-}
-
-set_new_implementation() {
-	echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
-	touch "${ROOT}/etc/X11/XvMCConfig" 2&>1 > /dev/null
-	if [[ $? -eq 0 ]]; then
-		echo "${XVMCLIBS[$1]}" > "${ROOT}/etc/X11/XvMCConfig"
-		chmod 644 "${ROOT}/etc/X11/XvMCConfig"
-		chown 0:0 "${ROOT}/etc/X11/XvMCConfig"
-		echo " done"
-	else
-		echo " failed!"
-		echo "Insufficient privileges"
-	fi
-}
-
-### list action
-
-## {{{ list stuff
-describe_list() {
-	echo "List Available XvMC implementations"
-}
-
-do_list() {
-	local output n
-	local avail=( $(get_implementation_indices) )
-	local current=$(get_current_implementation_index)
-	write_list_start "Available XvMC implementations  ( $(highlight '*') is current ):"
-
-	if (( ${#avail[@]} )) ; then
-		for n in "${avail[@]}" ; do
-			output[n]="${XVMCPRETTY[n]}"
-			[[ ${current} -eq ${n} ]] && \
-				output[n]+=" $(highlight '*')"
-		done
-		write_numbered_list "${output[@]}"
-	else
-		write_kv_list_entry "(none found)" ""
-	fi
-
-	return 0
-}
-## }}}
-
-### show action
-
-## {{{ show stuff
-describe_show() {
-	echo "Print the current XvMC implementation."
-}
-
-do_show() {
-	local current=$(get_current_implementation_index)
-	write_list_start "Current XvMC implementation:"
-
-	if [[ ${current} -ne -1 ]]; then
-		echo "${XVMCPRETTY[current]}"
-		return 0
-	else
-		echo "(none)"
-		return 2
-	fi
-}
-## }}}
-
-### set action
-
-## {{{ set stuff
-describe_set() {
-	echo "Select the XvMC implementation"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "<target> : XvMC implementation to activate"
-	echo "--use-old : If an implementation is already set, use that one instead"
-}
-
-do_set() {
-	local current=$(get_current_implementation_index)
-	local avail=( $(get_implementation_indices) )
-	local n new action
-
-	while [[ ${#@} -gt 0 ]]; do
-		local opt=${1}
-		shift
-		case ${opt} in
-			--use-old)
-				if [[ ${current} -gt -1 ]]; then
-					(( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation"
-				fi
-				;;
-			*)
-				[[ -z ${action} ]] && action="set-implementation"
-
-				if is_number ${opt} ; then
-					new=${avail[opt - 1]}
-					if [[ -z ${new} ]]; then
-						die -q "Unrecognized option: ${opt}"
-					fi
-				elif has ${opt} ${XVMCPRETTY[@]}; then
-					for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do
-						[[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n}
-					done
-				else
-					die -q "Unrecognized option: ${opt}"
-				fi
-				;;
-		esac
-	done
-
-	case ${action} in
-		old-implementation)
-			set_new_implementation ${current}
-			return $?
-		;;
-		set-implementation)
-			if [[ -n ${new} ]]; then
-				set_new_implementation ${new}
-				return $?
-			else
-				die -q "Please specify an implementation to set"
-			fi
-		;;
-		*)
-			die -q "Invalid usage of set action."
-	esac
-}
-
-# vim: ts=4 sw=4 noet fdm=marker