prepared for new eselect module, no more automagic dependencies, cleanups and straighter ebuild. Taken from Emacs Overlay

Package-Manager: portage-2.1.2.2

8 files changed, 781 insertions, 466 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index fa9ae34eabf2..1a8345eb2428 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,495 +1,264 @@
 # ChangeLog for app-editors/emacs-cvs
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.99 2007/04/11 20:46:15 tester Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.100 2007/04/16 18:41:03 opfer Exp $
+
+*emacs-cvs-23.0.0-r6 (16 Apr 2007)
+*emacs-cvs-22.0.9999-r10 (16 Apr 2007)
+
+  16 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/emacs-cvs-disable_alsa_detection.patch,
+  +emacs-cvs-22.0.9999-r10.ebuild, +emacs-cvs-23.0.0-r6.ebuild:
+  prepared for new eselect module, no more automagic dependencies, cleanups
+  and straighter ebuild. Taken from Emacs Overlay
+
+  14 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.97.ebuild, emacs-cvs-22.0.9999-r9.ebuild,
+  emacs-cvs-23.0.0-r5.ebuild:
+  Added x11-libs/libXaw to DEPEND. Fixes bug #174453, reported by Wulf Krueger
+  <philantrop@gentoo.org>. Don't install top-level ChangeLog.
+
+  12 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.97.ebuild, emacs-cvs-22.0.9999-r9.ebuild,
+  emacs-cvs-23.0.0-r5.ebuild:
+  Added some files to dodoc.
+
+  07 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  -emacs-cvs-22.0.96-r1.ebuild, emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-22.0.9999-r9.ebuild, emacs-cvs-23.0.0-r5.ebuild:
+  Include FDL-1.2 in LICENSE. Removed old version.
+
+  06 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96-r1.ebuild, emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-22.0.9999-r9.ebuild, emacs-cvs-23.0.0-r5.ebuild:
+  Fix whitespace in elisp sitefile.
 
-  11 Apr 2007; <tester@gentoo.org> emacs-cvs-23.0.0-r1.ebuild:
-  Commenting out non-working patch
-
-  04 Apr 2007; Fabian Groffen <grobian@gentoo.org> emacs-cvs-22.0.96.ebuild,
-  emacs-cvs-22.0.97.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
-  emacs-cvs-22.0.9999-r7.ebuild:
-  Dropped ppc-macos keywords, see you in prefix
-
-*emacs-cvs-22.0.9999-r7 (04 Apr 2007)
-*emacs-cvs-22.0.97 (04 Apr 2007)
+  04 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  -files/emacs-cvs-21.3.50-nofink.diff, emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-22.0.9999-r9.ebuild, emacs-cvs-23.0.0-r5.ebuild:
+  remove all occurences of aqua and ppc-macos as support for that will be
+  handled in Prefix overlay
 
   04 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.97.ebuild, +emacs-cvs-22.0.9999-r7.ebuild:
-  bumps to newer upstream CVS tags
+  -emacs-cvs-22.0.96.ebuild, +emacs-cvs-22.0.97.ebuild,
+  -emacs-cvs-22.0.9999-r8.ebuild, -emacs-cvs-23.0.0-r4.ebuild:
+  revision bump for newer pretest and clean up
+
+  01 Apr 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96-r1.ebuild:
+  Test for previous symlink and eselect the same slot (only for non-masked
+  version; people using hardmasked versions should know what they are doing).
+
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  +emacs-cvs-22.0.96-r1.ebuild, +emacs-cvs-22.0.9999-r9.ebuild,
+  +emacs-cvs-23.0.0-r5.ebuild:
+  RDEPEND on x11-misc/emacs-desktop.
+
+  30 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Info rebuild moved to separate function.
+
+  28 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Rebuild Info dir file in pkg_postrm, too.
+
+  28 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Rebuild Info dir file in pkg_postinst.
 
   26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.95-r1.ebuild, -emacs-cvs-22.0.9999-r5.ebuild:
-  clean up
-
-*emacs-cvs-22.0.9999-r6 (20 Mar 2007)
-*emacs-cvs-22.0.96 (20 Mar 2007)
-
-  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.96.ebuild, +emacs-cvs-22.0.9999-r6.ebuild:
-  version bump for 22.0.96 pretest
-
-  18 Mar 2007; Fabian Groffen <grobian@gentoo.org>
-  -files/emacs-cvs-21.3.50-nofink.diff,
-  +files/emacs-cvs-darwin-fsf-gcc.patch, +files/emacs-cvs-nofink.patch,
-  emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild,
-  emacs-cvs-23.0.0-r1.ebuild:
-  Dropped ppc-macos keyword, see you in prefix
-
-  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
-  request AUTOCONF 2.61 instead of latest. Fixes bug 170969, reported by
-  <lkml_ccc@yahoo.it>
+  emacs-cvs-22.0.9999-r8.ebuild:
+  readded the lost configuration line for USE=gtk
 
-  12 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.95-r1.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
-  remove the dir file in the correct place and also remove desktop entry for
-  live ebuild, fixes bug 170133
-
-  07 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  -files/40aspell-gentoo.el, emacs-cvs-22.0.95-r1.ebuild,
-  emacs-cvs-22.0.9999-r5.ebuild, emacs-cvs-23.0.0-r1.ebuild:
-  removed aspell activation, as Emacs detects that itself
+  26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  extending einfo output when GTK+ toolkit is chosen
 
-  07 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.95.ebuild, emacs-cvs-22.0.95-r1.ebuild,
-  -emacs-cvs-22.0.9999-r4.ebuild, emacs-cvs-22.0.9999-r5.ebuild:
-  corrected behaviour for copying subdirs.el and clean up
+  26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  added some echo commands to pretty-print the output
 
-*emacs-cvs-22.0.9999-r5 (04 Mar 2007)
-*emacs-cvs-22.0.95-r1 (04 Mar 2007)
+  26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  added some comments for the tricky lines
 
-  04 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.95-r1.ebuild, +emacs-cvs-22.0.9999-r5.ebuild:
-  make subdirs patch obsolete by some changes in the ebuild and straighten
-  behaviour for USE=gzip-el
+  26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  change variable name from MIN_VERSION to FULL_VERSION to emphasize its content
 
-  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.95.ebuild, emacs-cvs-22.0.9999-r4.ebuild,
-  emacs-cvs-23.0.0-r1.ebuild:
-  removed virtual/x11 from dependencies
+  26 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Don't quote wildcards.
 
-  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.94.ebuild, -emacs-cvs-22.0.9999-r3.ebuild:
+  26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.95-r3.ebuild, -emacs-cvs-22.0.9999-r7.ebuild,
+  -emacs-cvs-23.0.0-r3.ebuild:
   clean up
 
-*emacs-cvs-22.0.9999-r4 (02 Mar 2007)
-*emacs-cvs-22.0.95 (02 Mar 2007)
-
-  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.93-r2.ebuild, +emacs-cvs-22.0.95.ebuild,
-  -emacs-cvs-22.0.9999-r2.ebuild, +emacs-cvs-22.0.9999-r4.ebuild:
-  revision bump to new pretest versions
-
-  27 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.94.ebuild, emacs-cvs-22.0.9999-r3.ebuild:
-  removed a dot
-
-  26 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.94.ebuild:
-  corrected SLOT
-
-*emacs-cvs-22.0.9999-r3 (26 Feb 2007)
-*emacs-cvs-22.0.94 (26 Feb 2007)
-
-  26 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.94.ebuild, +emacs-cvs-22.0.9999-r3.ebuild:
-  if USE=gzip-el is not set, Emacs' build system will not compress el files
-  even if the gzip binary is found; 22.0.94: A new pretest version has been
-  released; 22.0.9999-r3: Fitted SLOT to the new pretest version
-
-  20 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  +files/emacs-cvs-blessmail-build.patch, emacs-cvs-22.0.93-r2.ebuild:
-  patch for handling a possible compilation error in special cases where Emacs
-  was called without disabling the start-up file (bug 166059). Everything
-  provided by Ulrich Mueller <ulm@kph.uni-mainz.de>
-
-  08 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  repair inclusion of motif; correct handling of USE flags; thanks to John R.
-  Graham <john_r_graham@mindspring.com> in bug 165663
-
-  06 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  made the definition of suffix variable more elegant (thanks to Ulrich
-  Müller <ulm@kph.uni-mainz.de>
-
-  04 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.93-r2.ebuild,
-  -emacs-cvs-22.0.9999-r1.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  add a check for uncompressed man pages and clean up
-
-  03 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  determine compression suffix correctly and finally
-
-  02 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  hopefully fix man page symlinks again, part II
-
-  02 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r2.ebuild, emacs-cvs-22.0.9999-r2.ebuild:
-  hopefully fix man page symlinks again
-
-*emacs-cvs-22.0.9999-r2 (02 Feb 2007)
-*emacs-cvs-22.0.93-r2 (02 Feb 2007)
-
-  02 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.93-r2.ebuild, +emacs-cvs-22.0.9999-r2.ebuild:
-  create symlinks for man pages, as reported by Ulrich Mueller
-  <ulm@kph.uni-mainz.de>
-  remove some tabs in IUSE
-  correct (hopefully) .desktop entry
-
-  02 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild:
-  supress error message of a file removal
-
-  01 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild:
-  correct usage of USE=gtk flag; reported by Christoph Lange <langec@web.de>
-  in bug 164857
-
-  01 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.92-r1.ebuild, -emacs-cvs-22.0.93.ebuild,
-  -emacs-cvs-22.0.9999.ebuild:
-  clean up
+  22 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Determine MIN_VERSION automatically.
 
-  01 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild:
-  finally fix the dir file compression
+  20 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Make version check in site-init file work.
 
-  31 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.93-r1.ebuild, emacs-cvs-22.0.9999-r1.ebuild:
-  fix (hack, we wait for the proper solution) for the compression of dir file,
-  see bug #162675, reported by Tassilo Horn <tassilo@member.fsf.org>
+  20 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  Use /usr/share/emacs/${MIN_VERSION} instead of /usr/share/emacs/${SLOT}.
 
-  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.9999-r1.ebuild:
-  remove all references to mudflap
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  adding a comment to die command
 
-  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.9999-r1.ebuild:
-  corrected working directory
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  SLOT behaviour should now work, part II
 
-*emacs-cvs-22.0.9999-r1 (30 Jan 2007)
-*emacs-cvs-22.0.93-r1 (30 Jan 2007)
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.96.ebuild, emacs-cvs-22.0.9999-r8.ebuild,
+  emacs-cvs-23.0.0-r4.ebuild:
+  SLOT behaviour should now work
 
-  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.93-r1.ebuild, +emacs-cvs-22.0.9999-r1.ebuild:
-  revision bump: more USE flags: alsa gnome better calling of configure
-  options slightly modified some output added a lot of quotes to prevent
-  directory names with spaces from breaking the emerge process .93-r1 does not
-  checkout a live CVS tag, but downloads a prepared snapshot based on the
-  ideas of ArYiX <aryixb@gmail.com> in bug #164164
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.96.ebuild, +emacs-cvs-22.0.9999-r8.ebuild,
+  +emacs-cvs-23.0.0-r4.ebuild:
+  version bump to 22.0.96 and newer slotting settings...let's test it
 
-  29 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.91.ebuild, -emacs-cvs-22.0.92.ebuild:
+  20 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.95-r2.ebuild, -emacs-cvs-22.0.9999-r6.ebuild,
+  -emacs-cvs-23.0.0-r2.ebuild:
   clean up
 
-  29 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-23.0.0-r1.ebuild:
-  also fix double compressed info files for this version
-
-*emacs-cvs-22.0.93 (26 Jan 2007)
-
-  26 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.93.ebuild, emacs-cvs-22.0.9999.ebuild:
-  added new tag ebuild, corrected slot for live ebuild
-
-*emacs-cvs-22.0.9999 (26 Jan 2007)
-*emacs-cvs-22.0.92-r1 (26 Jan 2007)
-
-  26 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.92-r1.ebuild, +emacs-cvs-22.0.9999.ebuild:
-  fixed double compression of info documentation, reported by Tassilo Horn
-  <tassilo@member.fsf.org> in bug #162675 added a live cvs ebuild, again
-
-  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.91.ebuild, emacs-cvs-22.0.92.ebuild,
-  emacs-cvs-23.0.0-r1.ebuild:
-  don't depend on portage
-
-  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  -files/xft-bgalpha.patch, -files/xft-invertcursor.patch,
-  -files/xft-xfaces-fixcrash.patch:
-  remove unecessary patches
-
-*emacs-cvs-22.0.92 (05 Jan 2007)
-
-  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-22.0.91.ebuild, +emacs-cvs-22.0.92.ebuild:
-  reflect branching from upstream CVS server correctly. Thanks to John R.
-  Graham <john_r_graham@mindspring.com>, who pointed out the correct solution
-  in bug #158730
-
-  05 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
-  -emacs-cvs-22.0.50-r1.ebuild, -emacs-cvs-22.0.50-r2.ebuild,
-  -emacs-cvs-22.0.50-r3.ebuild, -emacs-cvs-22.0.90.ebuild,
-  -emacs-cvs-23.0.0.ebuild:
-  punt old versions
-
-  02 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
-  +files/emacs-cvs-freebsd-sparc.patch, emacs-cvs-22.0.91.ebuild,
-  emacs-cvs-23.0.0-r1.ebuild:
-  Add patch to build on Gentoo/FreeBSD/SPARC64, see bug #159584. Add
-  ~sparc-fbsd keywords.
-
-  29 Dec 2006; <fauli@gentoo.org> emacs-cvs-22.0.91.ebuild:
-  changed SVN version to 22.0.92, as reported in bug #158730 by Graham Murray
-  <gmurray@webwayone.co.uk>
-
-  29 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
-  emacs-cvs-23.0.0-r1.ebuild:
-  Removed ~x86-fbsd keyword since it will not compile with the new
-  freebsd-contrib.
-
-  27 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emacs-cvs-23.0.0-r1.ebuild:
-  Add ~x86-fbsd keyword.
-
-*emacs-cvs-22.0.91 (20 Nov 2006)
-
-  20 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
-  +emacs-cvs-22.0.91.ebuild:
-  bump, to reflect upstream's changes, reported by Martin Schoenmakers
-  <aiviru@diamond-age.net> and Christer Ekholm <che@chrekh.se> in bug 155690
-
-*emacs-cvs-23.0.0-r1 (30 Oct 2006)
-
-  30 Oct 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  +files/emacs.desktop.in, emacs-cvs-22.0.90.ebuild,
-  +emacs-cvs-23.0.0-r1.ebuild:
-  Merge emacs-22 ebuild to emacs-23 ebuild; Correct desktop file slotting;
-  Resolves Bug #153174.
-
-*emacs-cvs-22.0.90 (28 Oct 2006)
-
-  28 Oct 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  +emacs-cvs-22.0.90.ebuild:
-  New upstream (pre-release version numbers).
-
-  23 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-22.0.50-r3.ebuild, emacs-cvs-23.0.0.ebuild:
-  New USE flag toolkit-scroll-bar added; Resolves Bug #83472.
-
-  21 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-22.0.50-r3.ebuild:
-  Note that emacs requires fonts in pkg_postinst.
-
-  18 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-22.0.50-r3.ebuild:
-  Support gzip-el USE flag which will compress the bundled Emacs Lisp source
-  files during installation.
-
-*emacs-cvs-22.0.50-r3 (07 Aug 2006)
-
-  07 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  +emacs-cvs-22.0.50-r3.ebuild:
-  Remove the (commented out) XFT support in favour of the emacs-unicode-2
-  branch support in the emacs-cvs-23.0.0 ebuild; Support the source USE flag
-  which would install the Emacs C source.
-
-  26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
-  emacs-cvs-22.0.50-r2.ebuild:
-  Add ~x86-fbsd keyword.
-
-  17 Jun 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-23.0.0.ebuild:
-  Support for XFT options; Resolves Bug #136922.
-
-  29 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-22.0.50-r2.ebuild:
-  Once more, disable the sandbox for src_compile; Resolves Bug #131505.
-
-  27 Apr 2006; Alec Warner <antarus@gentoo.org>
-  files/digest-emacs-cvs-22.0.50-r1, files/digest-emacs-cvs-22.0.50-r2,
-  files/digest-emacs-cvs-23.0.0, Manifest:
-  Fixing duff SHA256 digests: Bug # 131293
-
-  29 Mar 2006; Emanuele Giaquinta <exg@gentoo.org>
-  emacs-cvs-22.0.50-r2.ebuild:
-  Enable sandbox. Remove useless nls use flag.
-
-*emacs-cvs-22.0.50-r2 (17 Mar 2006)
-
-  17 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  +emacs-cvs-22.0.50-r2.ebuild:
-  Don't use --with-x-toolkit=athena in the Xaw3d case; Disable the sandbox for
-  src_compile() only.
-
-  06 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  files/emacs-subdirs-el-gentoo.diff:
-  Create new emacs-subdirs-el-gentoo.diff for latest CVS; Resolves Bug #124999.
-
-  26 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  -files/50emacs-22.0.50.envd, emacs-cvs-22.0.50-r1.ebuild,
-  emacs-cvs-23.0.0.ebuild:
-  Restore mistakenly removed ~arch keywords; Resolves Bug #124158; Generate
-  the /etc/env.d/50emacs-cvs-${SLOT} file from a here document rather than
-  maintaining one in ${FILESDIR}; Initial work toward supporting
-  find-function-C-source.
-
-  25 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  -emacs-cvs-22.0.50.ebuild:
-  Removing the last ebuild which contained stable keywords. This is usually
-  against policy, but since this is a live CVS ebuild and Bug #22225 has been
-  resolved this should be OK; Resolves Bug #83136.
-
-*emacs-cvs-22.0.50-r1 (09 Feb 2006)
-
-  09 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
-  +files/xft-bgalpha.patch, +files/xft-invertcursor.patch,
-  +files/xft-xfaces-fixcrash.patch, emacs-cvs-22.0.50.ebuild,
-  +emacs-cvs-22.0.50-r1.ebuild, emacs-cvs-23.0.0.ebuild:
-  Some unfinished experimental XFT support; Modular X dependencies.
-
-  18 Dec 2005; Brent Baude <ranger@gentoo.org> emacs-cvs-23.0.0.ebuild:
-  Marked ~ppc64 per bug 115361
-
-  17 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-22.0.50.ebuild,
-  emacs-cvs-23.0.0.ebuild:
-  Updated cvs server configuration. Thanks to joslwah@gmail.com; bug #115361.
-
-  03 May 2005; Mamoru KOMACHI <usata@gentoo.org>
-  files/emacs-22.0.50.desktop, files/emacs-23.0.0.desktop,
-  -files/emacs.desktop, emacs-cvs-22.0.50.ebuild, emacs-cvs-23.0.0.ebuild:
-  Install desktop entry to /usr/share/applications, under
-  Categories=Appliation;Development;. Thanks to Akos Ladanyi
-  <ladanyi@tmit.bme.hu>; bug #89757. Use giflib instead of libungif;
-  bug #85720.
+  19 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild,
+  emacs-cvs-23.0.0-r3.ebuild:
+  fix a whitespace problem in elog message
 
-  05 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> -emacs-cvs-21.3.50.ebuild,
-  emacs-cvs-22.0.50.ebuild, emacs-cvs-23.0.0.ebuild:
-  unset LDFLAGS; bug #77430.
+  19 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild,
+  emacs-cvs-23.0.0-r3.ebuild:
+  remove colliding files between slots, see bug 169033
 
-  05 Mar 2005; Joseph Jezak <josejx@gentoo.org> emacs-cvs-22.0.50.ebuild:
-  Marked ppc stable for bug #83136.
+  19 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r3.ebuild, emacs-cvs-22.0.9999-r7.ebuild,
+  emacs-cvs-23.0.0-r3.ebuild:
+  correct dependency on the latest eselect module version
 
-  26 Feb 2005; Jason Wever <weeve@gentoo.org> emacs-cvs-22.0.50.ebuild:
-  Stable on sparc wrt bug #83136.
+  19 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.0.95-r3.ebuild, +emacs-cvs-22.0.9999-r7.ebuild,
+  +emacs-cvs-23.0.0-r3.ebuild:
+  Don't install emacs executable twice; Suffix changed from .emacs- to -emacs-
+  for better compatibility with XEmacs.
 
-  26 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-22.0.50.ebuild,
-  emacs-cvs-23.0.0.ebuild:
-  Fixed nofink patch filename on ppc-macos.
+  18 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  removing a superfluos space
 
-  25 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-22.0.50.ebuild:
-  Marked stable on x86. See bug #83136.
-
-*emacs-cvs-23.0.0 (16 Feb 2005)
-
-  16 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
-  +files/50emacs-22.0.50.envd, +files/50emacs-23.0.0.envd,
-  -files/emacs-22.0.0.desktop, +files/emacs-23.0.0.desktop,
-  -emacs-cvs-22.0.0-r1.ebuild, -emacs-cvs-22.0.0.ebuild,
-  emacs-cvs-22.0.50.ebuild, +emacs-cvs-23.0.0.ebuild:
-  emacs-unicode-2 branch was tagged as 23.0.0
-
-*emacs-cvs-22.0.0-r1 (11 Feb 2005)
-
-  11 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
-  +files/emacs-22.0.0.desktop, +emacs-cvs-22.0.0-r1.ebuild:
-  More slot friendly.
-
-*emacs-cvs-22.0.50 (11 Feb 2005)
-
-  11 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
-  +files/emacs-22.0.50.desktop, +emacs-cvs-22.0.50.ebuild:
-  Version bumped. See bug #81551.
-
-  16 Dec 2004; Mamoru KOMACHI <usata@gentoo.org>
-  -emacs-cvs-21.3.50-r1.ebuild, emacs-cvs-21.3.50-r2.ebuild,
-  emacs-cvs-21.3.50.ebuild, emacs-cvs-22.0.0.ebuild:
-  Removed dependency to pexpect and gdbm; bug #74368.
-
-*emacs-cvs-21.3.50-r2 (25 Nov 2004)
-
-  25 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
-  +emacs-cvs-21.3.50-r2.ebuild:
-  Added aqua USE flag. Changed binary suffix to .emacs-${SLOT}; see bug #62991.
-
-  14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
-  +files/emacs-cvs-21.3.50-nofink.diff, emacs-cvs-21.3.50-r1.ebuild:
-  Added to ~ppc-macos. This closes bug #64352.
-
-  03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
-  +files/50emacs-21.3.50.envd, +files/emacs-21.3.50.desktop,
-  +files/emacs-subdirs-el-gentoo.diff, emacs-cvs-21.3.50-r1.ebuild,
-  emacs-cvs-21.3.50.ebuild:
-  Don't unset CFLAGS/CXXFLAGS; use strip-flags instead. More on SLOT support.
-
-*emacs-cvs-22.0.0 (02 Jul 2004)
-*emacs-cvs-21.3.50-r1 (02 Jul 2004)
-
-  02 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +emacs-cvs-21.3.50-r1.ebuild,
-  +emacs-cvs-22.0.0.ebuild:
-  Added emacs-unicode-2 branch, partial SLOT support.
-
-  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  sync IUSE (+gif, +jpeg, +png, +tiff, -gtk2)
-
-  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  emacs-cvs-21.3.50.ebuild:
-  don't use deprecated ? : use syntax
-
-  04 Jan 2004; Jeremy Maitin-Shepard <jbms@gentoo.org>
-  emacs-cvs-21.3.50.ebuild:
-  Changed ebuild to handle CVS SSH key checking.  Fixed dependencies and
-  made minor changes to USE-flag-handling code.
-
-  21 Nov 2003; MATSUU Takuto <matsuu@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  Marked ~amd64
-
-  23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  Defaults to use aspell if installed, see Bug #28527
-
-  21 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  Emacs can use either ispell or aspell, also suggested in Bug #28527
-
-  13 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  Added spell IUSE flag and DEPENDs on ispell iff USE="spell".
-  Thanks to Jos Romildo Malaquias <romildo@uber.com.br> for reporting
-  the bug in Bug #28527.
-
-  27 Jun 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  leave debugging symbols, unset CFLAGS, CPPFLAGS
-
-  04 Jun 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  back to stable keywords -- see bug 22225
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  correct hesiod inclusion
 
-*emacs-cvs-21.3.50 (22 Nov 2002)
+  16 Mar 2007; Ulrich Mueller <ulm@kph.uni-mainz.de>
+  emacs-cvs-22.0.95-r2.ebuild:
+  inherit alternatives no longer needed.
 
-  16 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  if gtk || gt2, then configure with gtk2 support (bug #18828)
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  added hesiod USE flag which pulls in support for a different gethost method;
+  make xpm support depending on xpm USE flag; emacs-22 CVS also gets a
+  straighter naming for the CVS checkout
 
-  01 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
-  revised libungif dep
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.0-r2.ebuild:
+  correct definition of ${S} so it can find its source files; pointed out by
+  Flameeyes on IRC
 
-  12 Mar 2003; Matthew Kennedy <mkennedy@gentoo.org>
-  emacs-cvs-21.3.50.ebuid :
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.0-r2.ebuild:
+  added ECVS_LOCALNAME to avoid checking out 22.0.9999 and 23.* in the same
+  distfiles directory
 
-  Added support for GTK+ 2. Added GNOME menu support.
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  removed commented out code, so the ebuilds look a bit lighter
 
-  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> emacs-cvs-21.3.50.ebuild :
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  and again fixing eselect
 
-  PROVIDE virtual/editor in addition to virtual/emacs
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  removed font dependencies for X as at least one is pulled in by the X
+  server; adjusted comment on fonts a bit to clarify
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  06 Dec 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  emacs-cvs-21.3.50.ebuild :
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  alsa should not depend on sound USE flag in RDEPEND
 
-  Back out of last ChangeLog entry as consensus on -core seems to be that
-  -cvs ebuilds should not be in the stable profiles. Added fix for info
-  documentation file names.
-	
-  02 Dev 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  emacs-cvs-21.3.50.ebuild :
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  request AUTOCONF 2.61 instead of latest. Fixes bug 170969, reported by
+  <lkml_ccc@yahoo.it>
 
-  Moved out of ~x86 into x86 (only for x86) by popular request. Reduced
-  dependency on ncurses to version 5.2 and added missing dev-util/cvs
-  dependency.
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  finally fix eselect call
 
-  22 Nov 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  emacs-cvs-21.3.50.ebuild, files/digest-emacs-cvs-21.3.50 :
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.0-r2.ebuild:
+  added xft to IUSE
 
-  Initial import.
+  16 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  removed order or DEPEND and RDEPEND, so values are correctly inserted
+
+  15 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.0-r2.ebuild:
+  correct value of SLOT
+
+  15 Mar 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
+  metadata.xml added; keywords reverted to ~x86 only
+
+  15 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/digest-emacs-cvs-22.0.95-r2, +files/digest-emacs-cvs-22.0.9999-r6,
+  +files/digest-emacs-cvs-23.0.0-r2, +Manifest:
+  adding Manifest and digests, so users can really use it
+
+  15 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.95-r2.ebuild, emacs-cvs-22.0.9999-r6.ebuild,
+  emacs-cvs-23.0.0-r2.ebuild:
+  correct Header
+
+  15 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/emacs-cvs-21.3.50-nofink.diff, +emacs-cvs-22.0.95-r2.ebuild,
+  +emacs-cvs-22.0.9999-r6.ebuild, +emacs-cvs-23.0.0-r2.ebuild,
+  +files/emacs-cvs-disable_alsa_detection.patch,
+  +files/emacs-cvs-freebsd-sparc.patch:
+  adding first revisions: sound USE flag, also activated when USE=alsa is
+  alone; nls, gnome USE flags not necessary; alsa autodetection only activated
+  when USE=alsa; Most things put in RDEPEND, as spell USE flag; removed
+  symlink handling for binaries and man pages, all handled by eselect module
+  (new dependency); removed env.d file, handled by eselect module
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index a02f5a0f9f30..f703d0ce05e0 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 SHA1 8451fb9088e819c0c996df5abd692fd91366bd68 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38
@@ -18,6 +21,10 @@ AUX emacs-cvs-darwin-fsf-gcc.patch 676 RMD160 9fb330b5c4217da4c4ecdce591eaa6b994
 MD5 1830e4946883da61575664230b40add0 files/emacs-cvs-darwin-fsf-gcc.patch 676
 RMD160 9fb330b5c4217da4c4ecdce591eaa6b994eb6bc8 files/emacs-cvs-darwin-fsf-gcc.patch 676
 SHA256 eeb156504c365704ffc5a2834331e1fc444d918b7db911e936c8b1b23783ec9a files/emacs-cvs-darwin-fsf-gcc.patch 676
+AUX emacs-cvs-disable_alsa_detection.patch 1606 RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 SHA1 420a2bf2414fb19e0ca98982f2be0aaf511350af SHA256 72192c7d87fa312c676baf99f9564b60c3961fd08b4124ae342a5616d4c52a4a
+MD5 c74e12e93c45c2276b6cf685f49f66aa files/emacs-cvs-disable_alsa_detection.patch 1606
+RMD160 9efec483c24d7a5e9e9514e4eb3df3ee1d0742e1 files/emacs-cvs-disable_alsa_detection.patch 1606
+SHA256 72192c7d87fa312c676baf99f9564b60c3961fd08b4124ae342a5616d4c52a4a files/emacs-cvs-disable_alsa_detection.patch 1606
 AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
@@ -34,7 +41,7 @@ AUX emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 SHA1 0e
 MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
-DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d
+DIST emacs-22.0.96.tar.gz 3866480 RMD160 c5c962c249f9042af0f36433efee023f02251c9a SHA1 d984c216df23a25c37a03807d5632dc28557580d SHA256 55d4c5f11fabebf9645469f6427d145dcae3d5a20eda827ba7319329c191ffbe
 DIST emacs-22.0.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b
 EBUILD emacs-cvs-22.0.96.ebuild 6643 RMD160 54c533ada26f62bca9788950f84652612c1ccd9c SHA1 264b7d44d33c829da6dc1043b7f35bf611cbb7e3 SHA256 5a7ea1b265eee7be16812f93e785b999a5661ab5a082ebe57650e911e99dbb33
 MD5 a623d23027c21407fae83d7fa07d4925 emacs-cvs-22.0.96.ebuild 6643
@@ -44,6 +51,10 @@ EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092c
 MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643
 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643
 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 emacs-cvs-22.0.97.ebuild 6643
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7684 RMD160 7ec0c144203a0f92f306282ddcb9402e7e1a837e SHA1 e6dcd52440112cf156f8c8844a2d33fd7a341dc3 SHA256 775143b02a512ea1e40cf8c8d94ee2e0ab0ccab63c52146a5800aabdf22127a8
+MD5 98d0997c24dc3669c9f9879d927ec5ca emacs-cvs-22.0.9999-r10.ebuild 7684
+RMD160 7ec0c144203a0f92f306282ddcb9402e7e1a837e emacs-cvs-22.0.9999-r10.ebuild 7684
+SHA256 775143b02a512ea1e40cf8c8d94ee2e0ab0ccab63c52146a5800aabdf22127a8 emacs-cvs-22.0.9999-r10.ebuild 7684
 EBUILD emacs-cvs-22.0.9999-r6.ebuild 6703 RMD160 eccd03778eb2ce894a84a413b02a16edc59d9ef0 SHA1 b39cc33ffb9617be0c5403fffb79ada49834d0f6 SHA256 17097b888b69739d5cf62e030e1439afa633f5352db5ab578d53dfcbfc7cca0a
 MD5 8621ff865a727f3ec1fd1d7b9dfcd11c emacs-cvs-22.0.9999-r6.ebuild 6703
 RMD160 eccd03778eb2ce894a84a413b02a16edc59d9ef0 emacs-cvs-22.0.9999-r6.ebuild 6703
@@ -56,20 +67,27 @@ EBUILD emacs-cvs-23.0.0-r1.ebuild 5772 RMD160 1db592d913958bf735dc481392a8521ffa
 MD5 eb38b95a554cbae3617e204bbb52ea1d emacs-cvs-23.0.0-r1.ebuild 5772
 RMD160 1db592d913958bf735dc481392a8521ffa4a98de emacs-cvs-23.0.0-r1.ebuild 5772
 SHA256 932b97d355c334bf4f5f27c16b6dc5b1dc041ddaf92a9aa8e8effe7aa4be40f3 emacs-cvs-23.0.0-r1.ebuild 5772
-MISC ChangeLog 19238 RMD160 4b8342ed2a6d1409b866b35592da601ce453aa50 SHA1 41428860ada08c35d7d85ea336bb2a1c308794be SHA256 0ed290c878f8c7a39c0523ad722020e1b243df825c06afd21bea21d865be84e8
-MD5 989bed73a0c5ab58396d4eb23c98bf79 ChangeLog 19238
-RMD160 4b8342ed2a6d1409b866b35592da601ce453aa50 ChangeLog 19238
-SHA256 0ed290c878f8c7a39c0523ad722020e1b243df825c06afd21bea21d865be84e8 ChangeLog 19238
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7921 RMD160 bd76b87a60c0db6bf4fab495139e8db5a9f7a3d2 SHA1 801cb313da200ad190d68e600fb912de889cce86 SHA256 8f4f518b4f61b4371fe052174d4d63214ba7763ecceb02d89a964a3cc327d7f7
+MD5 bccd4b6760ccc165854cdf5a9b359893 emacs-cvs-23.0.0-r6.ebuild 7921
+RMD160 bd76b87a60c0db6bf4fab495139e8db5a9f7a3d2 emacs-cvs-23.0.0-r6.ebuild 7921
+SHA256 8f4f518b4f61b4371fe052174d4d63214ba7763ecceb02d89a964a3cc327d7f7 emacs-cvs-23.0.0-r6.ebuild 7921
+MISC ChangeLog 10692 RMD160 26ac8959fa43e787011e60ae5c08a24cc4ae5027 SHA1 b0e7f16958eff4e38ad035ac2fa736fa15c245e9 SHA256 c6ef0a19d6b62ba2c63457f17bbfa2320b07616fb16c4a786328d484b4c39a0a
+MD5 a51924f4cdf212c32c6fd2db2f7ac4ae ChangeLog 10692
+RMD160 26ac8959fa43e787011e60ae5c08a24cc4ae5027 ChangeLog 10692
+SHA256 c6ef0a19d6b62ba2c63457f17bbfa2320b07616fb16c4a786328d484b4c39a0a ChangeLog 10692
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
-MD5 01d52a9a1e26b99e5687f6898db299ed files/digest-emacs-cvs-22.0.96 247
-RMD160 3a36a623e9a4eeebc76ce3315de31dc60f49457e files/digest-emacs-cvs-22.0.96 247
-SHA256 1319658529d77893d7ccf241ca85d5e8c0805818f9ec7a8f92b99fff821c92c1 files/digest-emacs-cvs-22.0.96 247
+MD5 c889eea77eb87ee8fcdcebdfa08fbfce files/digest-emacs-cvs-22.0.96 244
+RMD160 7e86d410450cce8043fd74ac264662197351aa1f files/digest-emacs-cvs-22.0.96 244
+SHA256 3a5cba926ca772b37e892eea2e3be4809bbf93addf31802bc02ccd34ca9c21e9 files/digest-emacs-cvs-22.0.96 244
 MD5 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247
 RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247
 SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r10 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r10 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r10 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r6 0
@@ -79,3 +97,13 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGI8NSNQqtfCuFneMRAjliAJ9f4br5FpG5NhTU1F2OU/ksaaZNgQCfbgRg
+QWhOwU0Rnduna5l5Bfa2Cdc=
+=jPOK
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
new file mode 100644
index 000000000000..53d1952ab9cd
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.1 2007/04/16 18:41:03 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+ECVS_LOCALNAME="emacs-22"
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit autotools cvs elisp-common eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+
+RESTRICT="${RESTRICT} nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? ( $X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+
+DEPEND="${RDEPEND}
+	X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) )
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22"
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~x86"
+S="${WORKDIR}/${ECVS_LOCALNAME}"
+
+src_unpack() {
+	cvs_src_unpack
+
+	cd "${S}"
+	# FULL_VERSION keeps the full version number, which is needed in order to
+	# determine some path information correctly for copy/move operations later on
+	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+	echo
+	einfo "Emacs version number is ${FULL_VERSION}"
+	echo
+
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and compresses
+		# el files.	 We don't want that so confuse it with a wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
+	# automagic check
+	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
+		# Emacs upstream thinks this should be standard policy on all
+		# distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with xpm)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		elif use lesstif; then
+			einfo "Configuring to build with lesstif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
+	# system (has been reported upstream)
+	use hesiod && myconf="${myconf} --with-hesiod"
+
+	econf \
+		--program-suffix=-emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake CC="$(tc-getCC) " bootstrap \
+		|| die "make bootstrap failed."
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	einfo "Fixing info documentation..."
+	dodir /usr/share/info/emacs-${SLOT}
+	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+	for i in "${D}"/usr/share/info/*
+	do
+		if [ "${i##*/}" != emacs-${SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	# move man pages to the correct place
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+X    (setq find-function-C-source-directory
+X	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	dodoc AUTHORS BUGS CONTRIBUTE MAINTAINERS README || die "dodoc failed"
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	if use X; then
+		elog "You need to install some fonts for Emacs. Under monolithic"
+		elog "XFree86/Xorg you typically had such fonts installed by default."
+		elog "With modular Xorg, you will have to perform this step yourself."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
+	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
+	elog "stable release"
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
new file mode 100644
index 000000000000..c540bf44acd6
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.1 2007/04/16 18:41:03 opfer Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_LOCALNAME="emacs-unicode"
+ECVS_BRANCH="emacs-unicode-2"
+
+WANT_AUTOCONF="2.61"
+WANT_AUTOMAKE="latest"
+
+inherit autotools cvs elisp-common eutils flag-o-matic
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-0.7-r1
+	sys-libs/zlib
+	hesiod? ( net-dns/hesiod )
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	alsa? ( media-sound/alsa-headers )
+	X? ( $X_DEPEND
+		x11-misc/emacs-desktop
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		tiff? ( media-libs/tiff )
+		png? ( media-libs/libpng )
+		xpm? ( x11-libs/libXpm )
+		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!motif? ( lesstif? ( x11-libs/lesstif ) ) )"
+
+DEPEND="${RDEPEND}
+	X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) )
+	gzip-el? ( app-arch/gzip )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="23"
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~x86"
+S="${WORKDIR}/${ECVS_LOCALNAME}"
+
+src_unpack() {
+	cvs_src_unpack
+
+	cd "${S}"
+	# FULL_VERSION keeps the full version number, which is needed in order to
+	# determine some path information correctly for copy/move operations later on
+	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+	echo
+	einfo "Emacs version number is ${FULL_VERSION}"
+	echo
+
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
+		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and compresses
+		# el files.	 We don't want that so confuse it with a wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in || die "unable to sed configure.in"
+	fi
+
+	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
+	# ALSA is detected and used even if not requested by the USE=alsa flag.	So remove the
+	# automagic check
+	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=""
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa, so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		# GTK+ is the default toolkit if USE=gtk is chosen with other possibilities.
+		# Emacs upstream thinks this should be standard policy on all
+		# distributions
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with xpm)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_enable xft font-backend)"
+		myconf="${myconf} $(use_with xft freetype)"
+		myconf="${myconf} $(use_with xft)"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			echo
+			einfo "Configuring to build with GTK support, disabling all other toolkits"
+			echo
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d(athena) support"
+			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		elif use motif; then
+			einfo "Configuring to build with motif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		elif use lesstif; then
+			einfo "Configuring to build with lesstif toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=motif"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build
+	# system (has been reported upstream)
+	use hesiod && myconf="${myconf} --with-hesiod"
+
+	econf \
+		--program-suffix=-emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake CC="$(tc-getCC) " bootstrap \
+		|| die "make bootstrap failed."
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	einfo "Fixing info documentation..."
+	dodir /usr/share/info/emacs-${SLOT}
+	mv "${D}"/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+	for i in "${D}"/usr/share/info/*
+	do
+		if [ "${i##*/}" != emacs-${SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	# move man pages to the correct place
+	einfo "Fixing manpages..."
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs/
+
+	if use source; then
+		insinto /usr/share/emacs/${FULL_VERSION}/src
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		sed 's/^X//' >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+X    (setq find-function-C-source-directory
+X	  "/usr/share/emacs/${FULL_VERSION}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	fi
+
+	dodoc AUTHORS BUGS CONTRIBUTE MAINTAINERS README README.unicode \
+		|| die "dodoc failed"
+}
+
+emacs-infodir-rebuild() {
+	# Depending on the Portage version, the Info dir file is compressed
+	# or removed. It is only rebuilt by Portage if our directory is in
+	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
+
+	local infodir=/usr/share/info/emacs-${SLOT} f
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f ${ROOT}${infodir}/dir{,.*}
+	for f in ${ROOT}${infodir}/*.info*; do
+		[[ ${f##*/} == *[0-9].info* ]] \
+			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
+	done
+	echo
+}
+
+pkg_postinst() {
+	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
+		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+
+	if use X; then
+		elog "You need to install some fonts for Emacs. Under monolithic"
+		elog "XFree86/Xorg you typically had such fonts installed by default."
+		elog "With modular Xorg, you will have to perform this step yourself."
+		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
+		elog "machine would satisfy basic Emacs requirements under X11."
+	fi
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through the Emacs eselect module"
+	elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the"
+	elog "stable release"
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update --if-unset
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96
index 4797c8cee129..d00618ea9a53 100644
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.96
@@ -1,3 +1,3 @@
-MD5 09fabcb5becb050acf1c88639330dac6 emacs-22.0.96.tar.gz 37846686
-RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c emacs-22.0.96.tar.gz 37846686
-SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d emacs-22.0.96.tar.gz 37846686
+MD5 a420e64a2f9af4efdde32417b14983af emacs-22.0.96.tar.gz 3866480
+RMD160 c5c962c249f9042af0f36433efee023f02251c9a emacs-22.0.96.tar.gz 3866480
+SHA256 55d4c5f11fabebf9645469f6427d145dcae3d5a20eda827ba7319329c191ffbe emacs-22.0.96.tar.gz 3866480
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.9999-r10
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r6 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r6
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch b/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch
new file mode 100644
index 000000000000..3ae58f95363d
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection.patch
@@ -0,0 +1,43 @@
+--- /tmp/configure.in	2007-03-13 11:09:44.000000000 +0100
++++ configure.in	2007-03-13 11:11:48.000000000 +0100
+@@ -1527,40 +1527,6 @@
+   # Emulation library used on NetBSD.
+   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
+   AC_SUBST(LIBSOUND)
+-
+-  ALSA_REQUIRED=1.0.0
+-  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+-  dnl Check if --with-pkg-config-prog has been given.
+-  if test "X${with_pkg_config_prog}" != X; then
+-    PKG_CONFIG="${with_pkg_config_prog}"
+-  fi
+-  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
+-  if test $HAVE_ALSA = yes; then
+-    SAVE_CFLAGS="$CFLAGS"
+-    SAVE_LDFLAGS="$LDFLAGS"
+-    CFLAGS="$ALSA_CFLAGS $CFLAGS"
+-    LDFLAGS="$ALSA_LIBS $LDFLAGS"
+-    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+-                    emacs_alsa_normal=yes,
+-	            emacs_alsa_normal=no)
+-    if test "$emacs_alsa_normal" != yes; then
+-      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+-                     [snd_lib_error_set_handler (0);],
+-                     emacs_alsa_subdir=yes,
+-	             emacs_alsa_subdir=no)
+-      if test "$emacs_alsa_subdir" != yes; then
+-        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
+-      fi
+-      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+-    fi
+-
+-    CFLAGS="$SAVE_CFLAGS"
+-    LDFLAGS="$SAVE_LDFLAGS"
+-    LIBSOUND="$LIBSOUND $ALSA_LIBS"
+-    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+-    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+-    AC_SUBST()
+-  fi
+   AC_SUBST(CFLAGS_SOUND)
+ fi
+