Package move from app-editors/emacs-cvs to app-editors/emacs-vcs.

Package-Manager: portage-2.2_rc60/cvs/Linux i686

4 files changed, 1863 insertions, 0 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
new file mode 100644
index 000000000000..68e270749a92
--- /dev/null
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -0,0 +1,1217 @@
+# ChangeLog for app-editors/emacs-vcs
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.1 2009/12/27 18:48:45 ulm Exp $
+
+*emacs-vcs-23.1.9999-r2 (27 Dec 2009)
+*emacs-vcs-23.1.90-r1 (27 Dec 2009)
+
+  27 Dec 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-vcs-23.1.90-r1.ebuild,
+  +emacs-vcs-23.1.9999-r2.ebuild, +metadata.xml:
+  Package move from app-editors/emacs-cvs to app-editors/emacs-vcs; upstream
+  now use Bazaar as their VCS. Dropped alpha, arm, s390, sh, and sparc-fbsd
+  keywords for live ebuild because they are missing from dev-util/bzr.
+
+  15 Dec 2009; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.1.90.ebuild,
+  emacs-cvs-23.1.9999-r1.ebuild:
+  Change X11 to MIT in LICENSE.
+
+*emacs-cvs-23.1.90 (09 Dec 2009)
+
+  09 Dec 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.1.90.ebuild:
+  Pretest for Emacs 23.2.
+
+  17 Nov 2009; Ulrich Mueller <ulm@gentoo.org>
+  emacs-cvs-23.1.9999-r1.ebuild, metadata.xml:
+  Add gconf USE flag.
+
+  20 Aug 2009; Ulrich Mueller <ulm@gentoo.org>
+  emacs-cvs-23.1.9999-r1.ebuild:
+  Be more conservative when rearranging the INFOPATH in the site-init file,
+  in order to respect any local directories. Fixes bug 281979.
+
+*emacs-cvs-23.1.9999-r1 (30 Jul 2009)
+
+  30 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  -emacs-cvs-23.1.9999.ebuild, +emacs-cvs-23.1.9999-r1.ebuild:
+  revision bump for Emacs CVS HEAD so a proper executable is installed with
+  no conflicts with Emacs 23 release
+
+  30 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  -emacs-cvs-23.0.94.ebuild, -files/emacs-23.0.94-handle-xz-suffix.patch,
+  -emacs-cvs-23.0.95.ebuild, -emacs-cvs-23.0.96.ebuild,
+  -emacs-cvs-23.0.9999-r2.ebuild:
+  clean up
+
+  14 Jul 2009; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-23.0.92-sh.patch, -emacs-cvs-23.0.93.ebuild,
+  emacs-cvs-23.0.96.ebuild, emacs-cvs-23.0.9999-r2.ebuild,
+  emacs-cvs-23.1.9999.ebuild:
+  Bring postinst message in line with app-editors/emacs. Remove old.
+
+*emacs-cvs-23.0.96 (09 Jul 2009)
+
+  09 Jul 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.96.ebuild:
+  New (final?) pretest version.
+
+*emacs-cvs-23.1.9999 (21 Jun 2009)
+*emacs-cvs-23.0.9999-r2 (21 Jun 2009)
+
+  21 Jun 2009; Ulrich Mueller <ulm@gentoo.org>
+  -emacs-cvs-23.0.9999-r1.ebuild, +emacs-cvs-23.0.9999-r2.ebuild,
+  +emacs-cvs-23.1.9999.ebuild:
+  Upstream CVS has been branched for the 23.1 release. 23.0.9999-r2 is the
+  live ebuild for the EMACS_23_1_RC branch, 23.1.9999 for the trunk.
+
+*emacs-cvs-23.0.95 (19 Jun 2009)
+
+  19 Jun 2009; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-23.0.90.ebuild,
+  -emacs-cvs-23.0.91.ebuild, -emacs-cvs-23.0.92.ebuild,
+  +emacs-cvs-23.0.95.ebuild, emacs-cvs-23.0.9999-r1.ebuild:
+  New pretest version. Don't assign FULL_VERSION twice. Remove old.
+
+  07 Jun 2009; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.90.ebuild,
+  emacs-cvs-23.0.91.ebuild, emacs-cvs-23.0.92.ebuild,
+  emacs-cvs-23.0.93.ebuild, emacs-cvs-23.0.94.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  Add unicode to LICENSE, see upstream bug 3428.
+
+  28 May 2009; Christian Faulhammer <fauli@gentoo.org>
+  emacs-cvs-23.0.90.ebuild, emacs-cvs-23.0.91.ebuild,
+  emacs-cvs-23.0.92.ebuild, emacs-cvs-23.0.93.ebuild,
+  emacs-cvs-23.0.94.ebuild, emacs-cvs-23.0.9999-r1.ebuild:
+  Remove USE=spell from all ebuilds, we don't want such dependencies, see
+  bug 72850#c1
+
+  24 May 2009; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.94.ebuild:
+  Update SRC_URI, upstream tarball appeared.
+
+*emacs-cvs-23.0.94 (23 May 2009)
+
+  23 May 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.94.ebuild,
+  +files/emacs-23.0.94-handle-xz-suffix.patch:
+  New prerelease version. Made own tarball from xdelta file, since upstream
+  doesn't (yet?) provide a tarball for this version. Add patch to handle
+  xz-compressed files.
+
+*emacs-cvs-23.0.93 (01 May 2009)
+
+  01 May 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.93.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  New prerelease version from upstream. Remove "freetype" configure option.
+
+  05 Apr 2009; Raúl Porcel <armin76@gentoo.org> emacs-cvs-23.0.92.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  Add ~sh wrt #238712
+
+  04 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-23.0.92-sh.patch, emacs-cvs-23.0.92.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  Add __sh__ to the garbage collector conditional in gnu-linux.h. Turn off
+  optimisation on sh, in order to fix the build failure of bug 262359.
+
+*emacs-cvs-23.0.92 (31 Mar 2009)
+
+  31 Mar 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.92.ebuild:
+  New prerelease version from upstream.
+
+  26 Mar 2009; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.90.ebuild,
+  emacs-cvs-23.0.91.ebuild, emacs-cvs-23.0.9999-r1.ebuild:
+  Remove redundant WANT_AUTO{CONF,MAKE} settings.
+
+  12 Mar 2009; Ulrich Mueller <ulm@gentoo.org>
+  -emacs-cvs-23.0.60_pre20090125.ebuild, emacs-cvs-23.0.90.ebuild,
+  emacs-cvs-23.0.91.ebuild, -emacs-cvs-23.0.9999.ebuild,
+  emacs-cvs-23.0.9999-r1.ebuild:
+  Fix dependencies: package x11-misc/emacs-desktop was moved to
+  app-emacs/emacs-common-gentoo; aspell/ispell is not needed at build time.
+  No longer install subdirs.el since it is now part of emacs-common-gentoo.
+  Remove old.
+
+*emacs-cvs-23.0.91 (26 Feb 2009)
+
+  26 Feb 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.91.ebuild:
+  New prerelease version from upstream.
+
+  17 Feb 2009; Ulrich Mueller <ulm@gentoo.org>
+  emacs-cvs-23.0.60_pre20090125.ebuild, emacs-cvs-23.0.90.ebuild,
+  emacs-cvs-23.0.9999.ebuild, emacs-cvs-23.0.9999-r1.ebuild:
+  Prefer aspell over ispell, following upstream.
+
+*emacs-cvs-23.0.90 (02 Feb 2009)
+
+  02 Feb 2009; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-freebsd-sparc-1.patch,
+  -emacs-cvs-23.0.60_pre20081226.ebuild, +emacs-cvs-23.0.90.ebuild:
+  Pretest for Emacs 23.1. Remove old snapshot.
+
+*emacs-cvs-23.0.9999-r1 (25 Jan 2009)
+*emacs-cvs-23.0.60_pre20090125 (25 Jan 2009)
+
+  25 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
+  +emacs-cvs-23.0.60_pre20090125.ebuild, +emacs-cvs-23.0.9999-r1.ebuild:
+  New snapshot. Unified ebuild for live CVS, snapshot and pretest versions.
+  Change EAPI to 2 for SLOT dependencies and IUSE defaults.
+
+  23 Jan 2009; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Remove patch for sparc-fbsd since it was applied upstream, bug 159584.
+
+  05 Jan 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
+  drop local xft USE-flag description, as it's global now
+
+  04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
+  emacs-cvs-23.0.60_pre20081226.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Change virtual/xft dependency to x11-libs/libXft, bug 253771.
+
+  30 Dec 2008; Raúl Porcel <armin76@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Add ~arm/~s390 wrt #238712
+
+*emacs-cvs-23.0.60_pre20081226 (26 Dec 2008)
+
+  26 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
+  +emacs-cvs-23.0.60_pre20081226.ebuild:
+  Snapshot with precompiled elisp files, to ease testing on embedded archs.
+
+  17 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
+  files/emacs-cvs-freebsd-sparc-1.patch:
+  New patch for sparc-fbsd, bug 159584.
+
+  29 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Add site initialisation for Info, so that Emacs' dir is first in list;
+  this will also help to get the right documentation if Emacs is started
+  as emacs-${SLOT}. Rename site-init file to 20${PN}-${SLOT}-gentoo.el.
+
+  26 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Handle the FEATURES=noinfo case in emacs-infodir-rebuild; don't create a
+  spurious Info dir file when called with no files in postrm phase.
+
+  19 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Update LICENSE: Add as-is and X11 for oldXMenu and etc/rgb.txt,
+  respectively. Add W3C, see etc/schema/README. Update to FDL-1.3, following
+  upstream relicensing of the documentation.
+
+  23 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.9999.ebuild:
+  remove note about to be installed fonts
+
+  14 Sep 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.9999.ebuild:
+  Be less verbose, bug 237546.
+
+  06 Sep 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-Xaw3d-headers.patch, -emacs-cvs-22.2.9999.ebuild:
+  Remove dysfunctional ebuild for Emacs 22 branch.
+
+  05 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.2.90.ebuild, -emacs-cvs-22.2.91.ebuild,
+  -emacs-cvs-22.2.92.ebuild:
+  22.3 has been officially released, so kill pretest versions
+
+*emacs-cvs-22.2.92 (03 Sep 2008)
+
+  03 Sep 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.2.92.ebuild,
+  emacs-cvs-22.2.9999.ebuild:
+  New (presumably final) pretest version. Add blocker against pretest version
+  in app-editors/emacs.
+
+*emacs-cvs-22.2.91 (26 Aug 2008)
+
+  26 Aug 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.2.91.ebuild:
+  New pretest version.
+
+  20 Aug 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-freebsd-sparc.patch,
+  -emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Configure options "font-backend" and "carbon" are no longer supported.
+  Remove old snapshot.
+
+*emacs-cvs-22.2.90 (15 Aug 2008)
+
+  15 Aug 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.2.90.ebuild,
+  emacs-cvs-22.2.9999.ebuild:
+  Emacs 22.3 pretest. Update patch for sparc-fbsd also for Emacs 22 branch.
+
+  28 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Add USE flag description to metadata wrt GLEP 56.
+
+  09 Jul 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-freebsd-sparc-1.patch, emacs-cvs-23.0.9999.ebuild:
+  Update patch for sparc-fbsd, bug 231243.
+
+  04 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
+  emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Warn about inconsistent toolkit USE flags.
+
+  01 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
+  emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Cleanup after bootstrapping, to prevent dumping emacs again in src_install.
+  Depend on x11-libs/openmotif explicitely for USE=motif.
+
+  28 Mar 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.2.9999.ebuild,
+  emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild:
+  Add keepdir for site-lisp directory. Activate test for version number again.
+
+  26 Mar 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.1.91.ebuild,
+  -emacs-cvs-22.1.92.ebuild, emacs-cvs-22.2.9999.ebuild:
+  Remove pretest versions. Remove blocker on emacs-22.2.
+
+*emacs-cvs-23.0.9999 (26 Mar 2008)
+*emacs-cvs-22.2.9999 (26 Mar 2008)
+
+  26 Mar 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.1.9999.ebuild,
+  +emacs-cvs-22.2.9999.ebuild, -emacs-cvs-23.0.60-r2.ebuild,
+  +emacs-cvs-23.0.9999.ebuild:
+  Rename, to reflect upstream change of version number and to emphasise that
+  these are live CVS ebuilds.
+
+*emacs-cvs-22.1.92 (07 Mar 2008)
+
+  07 Mar 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.1.90.ebuild,
+  +emacs-cvs-22.1.92.ebuild:
+  New pretest. Remove old.
+
+  28 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.60-r2.ebuild:
+  Drop libotf USE flag; Upstream says that libotf without m17n-flt is useless.
+
+  21 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.60-r2.ebuild:
+  README.unicode does not need to be installed anymore, see bug 210950,
+  reported by Tassilo Horn <tassilo@member.fsf.org>
+
+  20 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.60-r2.ebuild:
+  Add support for usage of m17n-lib for text shaping.
+
+*emacs-cvs-22.1.91 (20 Feb 2008)
+
+  20 Feb 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.1.91.ebuild:
+  New Emacs 22.2 pretest version.
+
+  11 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.90.ebuild,
+  emacs-cvs-22.1.9999.ebuild, emacs-cvs-23.0.50_pre20080201.ebuild,
+  emacs-cvs-23.0.60-r2.ebuild:
+  Don't unset LDFLAGS, bug 77430.
+
+  09 Feb 2008; Jeroen Roovers <jer@gentoo.org>
+  emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.60-r2.ebuild:
+  Marked ~hppa too.
+
+  06 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.60-r2.ebuild:
+  Remove --with-gtk configure option, upstream dropped support for it.
+
+  02 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.90.ebuild,
+  emacs-cvs-22.1.9999.ebuild, emacs-cvs-23.0.50_pre20080201.ebuild,
+  emacs-cvs-23.0.60-r2.ebuild:
+  Remove empty Info directory after unmerge.
+
+*emacs-cvs-23.0.50_pre20080201 (01 Feb 2008)
+
+  01 Feb 2008; Ulrich Mueller <ulm@gentoo.org>
+  +emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.60-r2.ebuild:
+  Snapshot of CVS trunk, tagged "before-merge-unicode-to-trunk". Add libotf
+  local USE flag.
+
+*emacs-cvs-23.0.60-r2 (01 Feb 2008)
+
+  01 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-23.0.50-r1.ebuild, -emacs-cvs-23.0.60-r1.ebuild,
+  +emacs-cvs-23.0.60-r2.ebuild:
+  unicode-2 branch is merged to mainline, so reflect this in ebuilds
+
+  01 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.90.ebuild,
+  emacs-cvs-22.1.9999.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Change to new syntax of eselect-emacs.
+
+*emacs-cvs-22.1.9999 (31 Jan 2008)
+*emacs-cvs-22.1.90 (31 Jan 2008)
+
+  31 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.1.50-r2.ebuild,
+  +emacs-cvs-22.1.90.ebuild, +emacs-cvs-22.1.9999.ebuild:
+  Upstream snapshot, Emacs 22.2 pretest.
+
+  30 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+  emacs-cvs-23.0.50-r1.ebuild, emacs-cvs-23.0.60-r1.ebuild:
+  Add missing dependency on pkgconfig.
+
+  30 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-format-int.patch,
+  -files/emacs-cvs-hack-local-variables.patch,
+  -files/emacs-cvs-make-tramp-temp-file.patch,
+  -files/emacs-cvs-makeinfo-regexp.patch,
+  -files/emacs-cvs-no-x-compile.patch,
+  -emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  -emacs-cvs-23.0.0_p20070920-r1.ebuild:
+  Remove old CVS snapshots.
+
+  26 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-disable_alsa_detection-r1.patch,
+  emacs-cvs-22.1.50-r2.ebuild, emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  The ALSA disable patch failed (again) on the trunk. Replace it by sed magic.
+
+  10 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Remove desktop and icon files to avoid collisions between SLOTs and with
+  x11-misc/emacs-desktop. Thanks to Stelian Ionescu for pointing this out.
+
+  02 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+  emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Remove explicit zlib dependency.
+
+  28 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+  emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Include net-libs/liblockfile in dependencies, fixes bug #203624.
+
+  13 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.60-r1.ebuild:
+  add dbus support
+
+  02 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+  emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Declare some variables as local, add some quotes.
+
+  02 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.50-r1.ebuild:
+  make activation of dbus support possible
+
+  01 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+  emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  emacs-cvs-23.0.0_p20070920-r1.ebuild, emacs-cvs-23.0.50-r1.ebuild,
+  emacs-cvs-23.0.60-r1.ebuild:
+  Rename site-init file for USE=source.
+
+*emacs-cvs-23.0.0_p20070920-r1 (27 Nov 2007)
+*emacs-cvs-22.1.50_p20070829-r2 (27 Nov 2007)
+
+  27 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-format-int.patch, -emacs-cvs-22.1.50-r1.ebuild,
+  -emacs-cvs-22.1.50_p20070829-r1.ebuild,
+  +emacs-cvs-22.1.50_p20070829-r2.ebuild,
+  -emacs-cvs-23.0.0_p20070920.ebuild, +emacs-cvs-23.0.0_p20070920-r1.ebuild,
+  -emacs-cvs-23.0.50.ebuild, -emacs-cvs-23.0.60.ebuild:
+  Synchronize CVS snapshots with app-editors/emacs; fixes buffer overflow in
+  format function, CVE-2007-6109, security bug #200297. Remove old.
+
+*emacs-cvs-23.0.60-r1 (27 Nov 2007)
+*emacs-cvs-23.0.50-r1 (27 Nov 2007)
+*emacs-cvs-22.1.50-r2 (27 Nov 2007)
+
+  27 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  +emacs-cvs-22.1.50-r2.ebuild, +emacs-cvs-23.0.50-r1.ebuild,
+  +emacs-cvs-23.0.60-r1.ebuild:
+  rev-bump to force rebuild for users with more current codebase
+  due to security bug 200297
+
+  22 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild,
+  emacs-cvs-23.0.50.ebuild, emacs-cvs-23.0.60.ebuild:
+  Fix alsa dependency, thanks Flameeyes for pointing this out.
+
+  12 Nov 2007; Jeroen Roovers <jer@gentoo.org> emacs-cvs-22.1.50-r1.ebuild:
+  Marked ~hppa (bug #198668).
+
+  11 Nov 2007; Raúl Porcel <armin76@gentoo.org>
+  emacs-cvs-22.1.50-r1.ebuild, emacs-cvs-23.0.50.ebuild:
+  Add ~alpha/~ia64 wrt #198668
+
+  05 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild,
+  emacs-cvs-23.0.50.ebuild, emacs-cvs-23.0.60.ebuild:
+  New kerberos USE flag.
+
+  03 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-hack-local-variables.patch,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild:
+  Security fix for function hack-local-variables, CVE-2007-5795, bug #197958.
+
+  24 Oct 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild,
+  emacs-cvs-23.0.50.ebuild, emacs-cvs-23.0.60.ebuild:
+  Add standard comment to site-init file.
+
+  13 Oct 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-no-x-compile.patch, emacs-cvs-23.0.0_p20070920.ebuild:
+  Fix compilation failure with USE=-X.
+
+*emacs-cvs-23.0.60 (12 Oct 2007)
+
+  12 Oct 2007; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.60.ebuild:
+  Live CVS ebuild for unicode-2 branch.
+
+  12 Oct 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild,
+  emacs-cvs-23.0.50.ebuild:
+  Clarify wording of postinst message, thanks to hkbst for suggesting this.
+
+*emacs-cvs-23.0.0_p20070920 (12 Oct 2007)
+
+  12 Oct 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch,
+  +files/emacs-cvs-makeinfo-regexp.patch,
+  +emacs-cvs-23.0.0_p20070920.ebuild:
+  Snapshot of Emacs unicode-2 branch, before the multi-tty merge.
+
+  12 Oct 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-23.0.0-r7.ebuild:
+  Remove defunct ebuild for unicode-2 branch.
+
+  10 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.1.50-r1.ebuild, emacs-cvs-22.1.50_p20070829-r1.ebuild,
+  emacs-cvs-23.0.0-r7.ebuild, emacs-cvs-23.0.50.ebuild:
+  remove PROVIDE=virtual/editor as we have now a new-style virtual
+
+  09 Oct 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-22.1.50_p20070829-makeinfo-regexp.patch,
+  emacs-cvs-22.1.50_p20070829-r1.ebuild:
+  Fix makeinfo version regexp.
+
+*emacs-cvs-22.1.50_p20070829-r1 (06 Oct 2007)
+
+  06 Oct 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-make-tramp-temp-file.patch, emacs-cvs-22.1.50-r1.ebuild,
+  -emacs-cvs-22.1.50_p20070829.ebuild,
+  +emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0-r7.ebuild,
+  emacs-cvs-23.0.50.ebuild:
+  Fix tramp-make-tramp-temp-file vulnerability, bug #194713. Quote ${ROOT}.
+
+  18 Sep 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-22.1.50_p20070829.ebuild, emacs-cvs-23.0.0-r7.ebuild,
+  emacs-cvs-23.0.50.ebuild:
+  Change WANT_AUTOCONF to "latest" following a change in autotools.eclass.
+  Fixes bugs #192894 and #192923.
+
+  12 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.50.ebuild:
+  AUTHORS and CONTRIBUTE are installed by the Makefile, so no need to do a
+  separate dodoc
+
+  11 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-23.0.50.ebuild:
+  upstream changed location of two documentation files, adjust dodoc command;
+  fixes bug 192227, reported by Graham Murray <graham@gmurray.org.uk>
+
+  30 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-23.0.0-r7.ebuild, emacs-cvs-23.0.50.ebuild:
+  Remove non-existent file README.multi-tty from dodoc, fixes bug #190762.
+  Moved some comments.
+
+*emacs-cvs-22.1.50_p20070829 (29 Aug 2007)
+
+  29 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +emacs-cvs-22.1.50_p20070829.ebuild:
+  Snapshot before-merge-multi-tty-to-trunk, i.e. of the last Emacs 22 version
+  in the CVS trunk.
+
+*emacs-cvs-23.0.50 (29 Aug 2007)
+
+  29 Aug 2007; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-23.0.50.ebuild,
+  -emacs-cvs-23.0.51-r1.ebuild:
+  Upstream changed version number from 23.0.51 to 23.0.50, details in #190621.
+
+*emacs-cvs-23.0.51-r1 (29 Aug 2007)
+*emacs-cvs-23.0.0-r7 (29 Aug 2007)
+*emacs-cvs-22.1.50-r1 (29 Aug 2007)
+
+  29 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-Xaw3d-headers.patch, -emacs-cvs-22.1.50.ebuild,
+  +emacs-cvs-22.1.50-r1.ebuild, -emacs-cvs-23.0.0-r6.ebuild,
+  +emacs-cvs-23.0.0-r7.ebuild, +emacs-cvs-23.0.51-r1.ebuild:
+  Upstream merge of multi-tty branch; CVS head has now version 23.0.51. New
+  ebuild for EMACS_22_BASE branch; version 22.1.50.
+
+  25 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.1.50.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  add BSD license because of etags binary, which initial version has been
+    licensed thereunder
+
+  22 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.1.50.ebuild:
+  remove a spurious blank...and no thanks to ulm for spotting this
+
+  22 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.1.50.ebuild:
+  adding SVG support by USE=svg
+
+  21 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Check for change of upstream version number. Sync suffix handling. Generate
+  score files in pkg_postinst.
+
+  30 Jul 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.0-r6.ebuild:
+  Update licence info to GPL-3.
+
+  25 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.1.50.ebuild:
+  changed LICENSE to GPL-3
+
+  24 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-Xaw3d-headers.patch,
+  -files/emacs-cvs-disable_alsa_detection.patch, -emacs-cvs-22.0.990.ebuild:
+  Remove old version.
+
+  19 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Depend on virtual/motif and remove lesstif USE flag.
+
+  17 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.0-r6.ebuild:
+  Skip Xaw3d headers patch for unicode-2 branch, too. Fixes #182326.
+
+  15 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-temacs-prerequisite.patch, emacs-cvs-23.0.0-r6.ebuild:
+  Undo yesterday's change since today the patch is already applied upstream.
+
+  14 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-temacs-prerequisite.patch, emacs-cvs-23.0.0-r6.ebuild:
+  Fix "temacs: command not found" build problem.
+
+  14 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild:
+  Skip Xaw3d headers patch since it was applied upstream.
+
+  13 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs.desktop.in,
+  -files/emacs-cvs-nofink.patch, -files/emacs-subdirs-el-gentoo.diff,
+  emacs-cvs-22.1.50.ebuild, -emacs-cvs-23.0.0-r1.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Remove unnecessary gif/ungif patch. Configure now supports "use_with hesiod"
+  properly. Add support for gpm USE flag. Clean up.
+
+  12 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.97.ebuild:
+  Remove old version.
+
+  12 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  emacs-cvs-22.1.50.ebuild:
+  Add ~sparc-fbsd keyword.
+
+  06 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild:
+  Include check for change of upstream version number.
+
+  02 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.99.ebuild,
+  -emacs-cvs-22.0.9999-r10.ebuild:
+  Clean up, following release of Emacs 22.1.
+
+  01 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Specify --infodir for configure.
+
+  31 May 2007; Diego Pettenò <flameeyes@gentoo.org>
+  emacs-cvs-22.0.990.ebuild, emacs-cvs-22.1.50.ebuild:
+  Add ~x86-fbsd keyword.
+
+  31 May 2007; Diego Pettenò <flameeyes@gentoo.org>
+  emacs-cvs-23.0.0-r1.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Add ~x86-fbsd keywords to -r1 and -r6 as per bug #174891.
+
+  30 May 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-disable_alsa_detection-r1.patch,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Fix alsa detection patch.
+
+  29 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Fix logic for USE=-motif. Handle the case that no toolkit was specified
+  (i.e. -gtk -Xaw3d -motif). Variables in canonical order.
+
+  23 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Change RESTRICT="nostrip" to "strip" everywhere.
+
+*emacs-cvs-22.0.990 (17 May 2007)
+
+  17 May 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.98.ebuild,
+  +emacs-cvs-22.0.990.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-22.1.50.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Version bump; logic of toolkit USE flags fixed. Clean up old version.
+
+  15 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.99.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Don't provide virtual/emacs, it is a new-style virtual now.
+
+  15 May 2007; Tony Vroon <chainsaw@gentoo.org> emacs-cvs-22.0.99.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild:
+  Add ~ppc keywording, tested on a PowerBook 5,9 with GCC 4.1.2; as requested
+  by Opfer.
+
+  30 Apr 2007; Tony Vroon <chainsaw@gentoo.org> emacs-cvs-23.0.0-r6.ebuild:
+  Add ~ppc keywor. Tested on a PowerBook 5,9 with GCC 4.1.2
+
+  29 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.99.ebuild,
+  emacs-cvs-22.1.50.ebuild:
+  Synchronise keywords in newer versions.
+
+  28 Apr 2007; Markus Rothe <corsair@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Added ~ppc64; bug #174891
+
+*emacs-cvs-22.1.50 (26 Apr 2007)
+
+  26 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.99.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  +emacs-cvs-22.1.50.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  New live CVS ebuild for Emacs 22 trunk. Fixed parameter expansion for file
+  name of man pages.
+
+  25 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.97.ebuild,
+  emacs-cvs-23.0.0-r1.ebuild:
+  Change SLOT also in old ebuilds to reflect slotmove.
+
+  24 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.9999-r10.ebuild:
+  new branch has been opened, this is now reflected in the ebuild
+
+*emacs-cvs-22.0.99 (24 Apr 2007)
+
+  24 Apr 2007; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.0.99.ebuild:
+  Version bump.
+
+  20 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  -emacs-cvs-22.0.9999-r7.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Test for previous symlink and eselect the same SLOT, also for live CVS
+  ebuild. Added braces to variable name; split some long lines. Removed old
+  broken revision.
+
+  19 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-cvs-Xaw3d-headers.patch, emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Upstream patch for proper including of Xaw3d headers; removed build-time
+  dependency on x11-libs/libXaw; bug #174453.
+
+  18 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-23.0.0-r6.ebuild:
+  Duplicate "--with-x-toolkit=lucid" removed since "athena" and "lucid" are
+  just synonyms. Thanks to <aryixb@gmail.com> for pointing this out.
+
+  18 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Keyworded ~sparc wrt #174891
+
+  17 Apr 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.98.ebuild, emacs-cvs-22.0.9999-r10.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  keyworded ~amd64, bug 174891
+
+  17 Apr 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.98.ebuild,
+  emacs-cvs-22.0.9999-r10.ebuild:
+  Removed dodoc MAINTAINERS since the file is not in the snapshot.
+
+  17 Apr 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.96.ebuild,
+  -emacs-cvs-22.0.9999-r6.ebuild:
+  Old versions removed.
+
+*emacs-cvs-22.0.98 (17 Apr 2007)
+
+  17 Apr 2007; Ulrich Mueller <ulm@gentoo.org> +emacs-cvs-22.0.98.ebuild:
+  Taken from Emacs overlay: Prepare for new eselect module; new sound and
+  hesiod USE flags; dropped gnome USE flag; removed font dependencies for X;
+  suffix of emacs executable changed from .emacs- to -emacs- for better
+  compatibility with XEmacs; SLOT changed to 22. Request AUTOCONF 2.61 instead
+  of latest, fixes bug #170969. Remove colliding files between slots, fixes
+  bug #169033.
+
+  16 Apr 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs-22.0.50.desktop,
+  -files/emacs-23.0.0.desktop, -files/50emacs-23.0.0.envd,
+  -files/emacs-cvs-blessmail-build.patch,
+  -files/emacs-cvs-darwin-fsf-gcc.patch:
+  Clean up.
+
+*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
+
+  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>
+  +emacs-cvs-22.0.97.ebuild, +emacs-cvs-22.0.9999-r7.ebuild:
+  bumps to newer upstream CVS tags
+
+  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>
+
+  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
+
+  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
+
+*emacs-cvs-22.0.9999-r5 (04 Mar 2007)
+*emacs-cvs-22.0.95-r1 (04 Mar 2007)
+
+  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
+
+  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
+
+  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.94.ebuild, -emacs-cvs-22.0.9999-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
+
+*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
+
+  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
+
+  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>
+
+  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.9999-r1.ebuild:
+  remove all references to mudflap
+
+  30 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-cvs-22.0.9999-r1.ebuild:
+  corrected working directory
+
+*emacs-cvs-22.0.9999-r1 (30 Jan 2007)
+*emacs-cvs-22.0.93-r1 (30 Jan 2007)
+
+  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
+
+  29 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-cvs-22.0.91.ebuild, -emacs-cvs-22.0.92.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; Christian Faulhammer <opfer@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.
+
+  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.
+
+  05 Mar 2005; Joseph Jezak <josejx@gentoo.org> emacs-cvs-22.0.50.ebuild:
+  Marked ppc stable for bug #83136.
+
+  26 Feb 2005; Jason Wever <weeve@gentoo.org> emacs-cvs-22.0.50.ebuild:
+  Stable on sparc wrt bug #83136.
+
+  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.
+
+  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
+
+*emacs-cvs-21.3.50 (22 Nov 2002)
+
+  16 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
+  if gtk || gt2, then configure with gtk2 support (bug #18828)
+
+  01 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> emacs-cvs-21.3.50.ebuild:
+  revised libungif dep
+
+  12 Mar 2003; Matthew Kennedy <mkennedy@gentoo.org>
+  emacs-cvs-21.3.50.ebuid :
+  Added support for GTK+ 2. Added GNOME menu support.
+
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> emacs-cvs-21.3.50.ebuild :
+  PROVIDE virtual/editor in addition to virtual/emacs
+
+  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 :
+  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 :
+  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.
+
+  22 Nov 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  emacs-cvs-21.3.50.ebuild, files/digest-emacs-cvs-21.3.50 :
+  Initial import.
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.1.90-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.1.90-r1.ebuild
new file mode 100644
index 000000000000..9c4316dbb74f
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-23.1.90-r1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.90-r1.ebuild,v 1.1 2009/12/27 18:48:45 ulm Exp $
+
+EAPI=2
+
+inherit autotools elisp-common eutils flag-o-matic
+
+if [ "${PV##*.}" = "9999" ]; then
+	inherit bzr
+	EMACS_BRANCH="trunk"
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/"
+	EBZR_CACHE_DIR="emacs-${EMACS_BRANCH}"
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
+		ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+	# 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="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+RESTRICT="strip"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		png? ( media-libs/libpng )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	>=app-emacs/emacs-common-gentoo-1[X?]"
+
+EMACS_SUFFIX="emacs-${SLOT}-vcs"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+	if [ "${PV##*.}" = "9999" ]; then
+		FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+			| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+		[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+		echo
+		einfo "Emacs branch: ${EMACS_BRANCH}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+		echo
+	#else
+	#	EPATCH_SUFFIX=patch epatch
+	fi
+
+	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 alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	ALLOWED_FLAGS=""
+	strip-flags
+	#unset LDFLAGS
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	else
+		replace-flags -O[3-9] -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with gconf)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
+		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
+		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
+		myconf="${myconf} $(use_with xft)"
+
+		if use xft; then
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect because xft is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+
+		local f tk=
+		for f in gtk Xaw3d motif; do
+			use ${f} || continue
+			[ "${tk}" ] \
+				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+			tk="${tk}${tk:+ }${f}"
+		done
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	myconf="${myconf} $(use_with hesiod)"
+	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
+	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir=/usr/share/info/${EMACS_SUFFIX} \
+		${myconf} || die "econf emacs failed"
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	if [ "${PV##*.}" = "9999" ]; then
+		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+		# cleanup, otherwise emacs will be dumped again in src_install
+		(cd src; emake versionclean)
+	fi
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	local i m
+
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
+		mv "${i}" "${i}.info" || die "mv info failed"
+	done
+
+	# move man pages to the correct place
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.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 -rf "${D}"/usr/share/{applications,icons}
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs
+
+	local c=";;"
+	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]
+		c=""
+	fi
+
+	sed 's/^X//' >"${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	X  ${c}(setq find-function-C-source-directory
+	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${SITEFILE}" || die
+
+	dodoc README BUGS || 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_SUFFIX} f
+	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f "${ROOT}"${infodir}/dir{,.*}
+	for f in "${ROOT}"${infodir}/*.info*; do
+		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
+	done
+	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
+	echo
+}
+
+pkg_postinst() {
+	local f
+	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[ -e "${f}" ] || touch "${f}"
+	done
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module, which also redirects man and info pages."
+	elog "Therefore, several Emacs versions can be installed at the same time."
+	elog "\"man emacs.eselect\" for details."
+	echo
+	elog "If you upgrade from a previous major version of Emacs, then it is"
+	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
+	elog "all byte-compiled elisp files of the installed Emacs packages."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild
new file mode 100644
index 000000000000..88b33b0b2656
--- /dev/null
+++ b/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild,v 1.1 2009/12/27 18:48:45 ulm Exp $
+
+EAPI=2
+
+inherit autotools elisp-common eutils flag-o-matic
+
+if [ "${PV##*.}" = "9999" ]; then
+	inherit bzr
+	EMACS_BRANCH="trunk"
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/"
+	EBZR_CACHE_DIR="emacs-${EMACS_BRANCH}"
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
+		ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
+	# 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="${PV%%_*}"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
+SLOT="23"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+RESTRICT="strip"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib )
+		jpeg? ( media-libs/jpeg )
+		png? ( media-libs/libpng )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	>=app-emacs/emacs-common-gentoo-1[X?]"
+
+EMACS_SUFFIX="emacs-${SLOT}-vcs"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+pkg_setup() {
+	local cvsdir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/emacs"
+	if [ -d "${cvsdir}" ]; then
+		ewarn "GNU Emacs upstream has moved from CVS to Bazaar."
+		ewarn "Therefore, you may remove the old CVS directory:"
+		ewarn "rm -rf ${cvsdir}"
+	fi
+}
+
+src_prepare() {
+	if [ "${PV##*.}" = "9999" ]; then
+		FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
+			| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
+		[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
+		echo
+		einfo "Emacs branch: ${EMACS_BRANCH}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+		echo
+	#else
+	#	EPATCH_SUFFIX=patch epatch
+	fi
+
+	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 alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	ALLOWED_FLAGS=""
+	strip-flags
+	#unset LDFLAGS
+	if use sh; then
+		replace-flags -O[1-9] -O0		#262359
+	else
+		replace-flags -O[3-9] -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		echo
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		echo
+		myconf="${myconf} --with-sound"
+	else
+		myconf="${myconf} $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} $(use_with gconf)"
+		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
+		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
+		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
+		myconf="${myconf} $(use_with xft)"
+
+		if use xft; then
+			myconf="${myconf} $(use_with m17n-lib libotf)"
+			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
+		else
+			myconf="${myconf} --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect because xft is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+
+		local f tk=
+		for f in gtk Xaw3d motif; do
+			use ${f} || continue
+			[ "${tk}" ] \
+				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
+			tk="${tk}${tk:+ }${f}"
+		done
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	myconf="${myconf} $(use_with hesiod)"
+	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
+	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
+
+	econf \
+		--program-suffix=-${EMACS_SUFFIX} \
+		--infodir=/usr/share/info/${EMACS_SUFFIX} \
+		${myconf} || die "econf emacs failed"
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	if [ "${PV##*.}" = "9999" ]; then
+		emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
+		# cleanup, otherwise emacs will be dumped again in src_install
+		(cd src; emake versionclean)
+	fi
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	local i m
+
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving Emacs executable failed"
+
+	# move info documentation to the correct place
+	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
+		mv "${i}" "${i}.info" || die "mv info failed"
+	done
+
+	# move man pages to the correct place
+	for m in "${D}"/usr/share/man/man1/* ; do
+		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.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 -rf "${D}"/usr/share/{applications,icons}
+	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
+	keepdir /var/lib/games/emacs
+
+	local c=";;"
+	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]
+		c=""
+	fi
+
+	sed 's/^X//' >"${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	X  ${c}(setq find-function-C-source-directory
+	X  ${c}      "/usr/share/emacs/${FULL_VERSION}/src")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${SITEFILE}" || die
+
+	dodoc README BUGS || 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_SUFFIX} f
+	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
+	einfo "Regenerating Info directory index in ${infodir} ..."
+	rm -f "${ROOT}"${infodir}/dir{,.*}
+	for f in "${ROOT}"${infodir}/*.info*; do
+		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+			&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
+	done
+	rmdir "${ROOT}"${infodir} 2>/dev/null	# remove dir if it is empty
+	echo
+}
+
+pkg_postinst() {
+	local f
+	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
+		[ -e "${f}" ] || touch "${f}"
+	done
+
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+
+	echo
+	elog "You can set the version to be started by /usr/bin/emacs through"
+	elog "the Emacs eselect module, which also redirects man and info pages."
+	elog "Therefore, several Emacs versions can be installed at the same time."
+	elog "\"man emacs.eselect\" for details."
+	echo
+	elog "If you upgrade from a previous major version of Emacs, then it is"
+	elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
+	elog "all byte-compiled elisp files of the installed Emacs packages."
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	emacs-infodir-rebuild
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
new file mode 100644
index 000000000000..dd03412f4765
--- /dev/null
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>emacs</herd>
+<longdescription>
+  GNU Emacs is an extensible, customizable text editor - and more. At its core
+  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
+  with extensions to support text editing. The features of GNU Emacs include:
+   * Content-sensitive editing modes, including syntax coloring, for a wide
+     variety of file types including plain text, source code, and HTML.
+   * Complete built-in documentation, including a tutorial for new users.
+   * Support for many languages and their scripts, including all the European
+     "Latin" scripts, Russian, Greek, Japanese, Chinese, Korean, Thai,
+     Vietnamese, Lao, Ethiopian, and some Indian scripts.
+   * Highly customizable, using Emacs Lisp code or a graphical customization
+     interface.
+   * A large number of extensions that add other functionality, including a
+     project planner, mail and news reader, debugger interface, calendar, and
+     more. Many of these extensions are distributed with GNU Emacs; others are
+     available separately.
+</longdescription>
+<use>
+  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+    font name</flag>
+  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
+  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
+  <flag name='sound'>Enable sound</flag>
+  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+    preference to Emacs' own scrollbars</flag>
+</use>
+</pkgmetadata>