21481648 update GNU Emacs to 24.5
authorAli Bahrami <Ali.Bahrami@Oracle.COM>
Tue, 18 Aug 2015 12:04:09 -0600
changeset 4791 fb9a6b5ef98f
parent 4790 9a8e24279fc0
child 4792 969312f27025
21481648 update GNU Emacs to 24.5
components/emacs/Makefile
components/emacs/README
components/emacs/augment/emacs
components/emacs/augment/man/man1/emacs-gtk.1
components/emacs/augment/man/man1/emacs-nox.1
components/emacs/augment/man/man1/emacs-x.1
components/emacs/gnu-emacs-gtk.p5m
components/emacs/gnu-emacs-lisp.p5m
components/emacs/gnu-emacs-no-x11.p5m
components/emacs/gnu-emacs-x11.p5m
components/emacs/gnu-emacs.p5m
components/emacs/patches/calc-forms.patch
components/emacs/patches/face_for_font.patch
components/emacs/patches/find.patch
components/emacs/patches/gtkutil.patch
components/emacs/patches/jpeg6b_config.patch
make-rules/shared-macros.mk
--- a/components/emacs/Makefile	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/Makefile	Tue Aug 18 12:04:09 2015 -0600
@@ -23,22 +23,25 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		emacs
-COMPONENT_VERSION=	24.3
+COMPONENT_VERSION=	24.5
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/emacs/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
+    sha256:2737a6622fb2d9982e9c47fb6f2fb297bda42674e09db40fc9bcc0db4297c3b6
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/emacs/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/emacs
 
-TPNO=			15684
+TPNO=			23457
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-# we build three different variants of emacs for our users. As Solaris
+# We patch the configure.ac file. Get the new configure generated during prep.
+COMPONENT_PREP_ACTION = (cd $(@D) ; aclocal -I m4; autoconf )
+
+# We build three different variants of emacs for our users. As Solaris
 # always has a 64-bit kernel, and 64-bit emacs can handle larger files,
 # we only build and deliver 64-bit binaries.
 VARIANTS =	nox x gtk
@@ -61,7 +64,10 @@
 LD_MAP_NOEXDATA.sparc=
 
 # Uncomment this for debugging only. It configures emacs to run from the
-# local proto instead of from its final installed location.
+# local proto instead of from its final installed location. This is useful
+# for initial bringup of new emacs versions, but can only be used up through
+# the 'gmake build' stage.
+#
 #CONFIGURE_PREFIX =	$(PROTO_DIR)/usr
 
 # The configure script runs the pkg-config command. Since we're building
@@ -70,16 +76,26 @@
 
 # configure options common to all variants of emacs that we want to build.
 CONFIGURE_OPTIONS +=	CC="$(CC) -m64"
-CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)  --with-compress-info=no
+CONFIGURE_OPTIONS +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS +=	--datarootdir=$(CONFIGURE_PREFIX)/share
 CONFIGURE_OPTIONS +=	--libexecdir=$(CONFIGURE_PREFIX)/lib
 CONFIGURE_OPTIONS +=	--with-gif=no
 CONFIGURE_OPTIONS +=	ac_cv_sys_long_file_names=yes
 
-# ASLR should remain disabled for emacs (the default). ASLR undermines
-# emacs's dumping code, which requires every execution to have the same
-# mappings. Since emacs is not network facing, or run with elevated
-# privileges, this is not a security concern.
+# Disable gsettings and dbus. gsettings causes numerous startup errors
+# of the form
+#    (process:25309): GLib-GIO-CRITICAL **: file gsettingsschema.c:
+#	line 416: assertion 'source != NULL' failed
+# without providing much benefit on Solaris. dbus does not offer sufficient
+# utility for Solaris to be worth the negative interactions with ssh, where
+# the session blocks on exit due to dbus holding an open port.
+# 
+CONFIGURE_OPTIONS +=	--without-gsettings --without-dbus
+
+# ASLR should remain disabled for emacs. ASLR undermines emacs's dumping
+# code, which requires every execution to have the same mappings. Since
+# emacs is not network facing, or run with elevated privileges, this is
+# not a security concern.
 ASLR_MODE = $(ASLR_DISABLE)
 
 # variant specific configure options
@@ -103,8 +119,8 @@
 PSHAREMAN1=	$(PROTO_DIR)/usr/share/man/man1
 PVAR=		$(PROTO_DIR)/var
 
-# Remove existing emacs executable from usr/bin, so that we can replace
-# it with our script.
+# Remove existing emacs executable from usr/bin. We install the binaries
+# under their variant names. /usr/bin/emacs ends up as an IPS mediated link.
 COMPONENT_POST_INSTALL_ACTION += $(RM) $(PBIN)/emacs $(PBIN)/emacs-* ;
 
 # GTK binaries
@@ -128,10 +144,6 @@
 COMPONENT_POST_INSTALL_ACTION += \
 	$(LN) $(PBIN)/emacs-x $(PBIN)/emacs-x-$(COMPONENT_VERSION) ;
 
-# Emacs shell script that picks the right variant at runtime
-COMPONENT_POST_INSTALL_ACTION += $(CP) augment/emacs $(PBIN) ;
-COMPONENT_POST_INSTALL_ACTION += $(CHMOD) +x $(PBIN)/emacs ;
-
 # ctags and etags go in /usr/gnu/bin instead of /usr/bin. At this time,
 # etags could arguably go into /usr/bin, but we'd like to preserve the
 # ability to replace the standard Solaris /usr/bin/ctags, along with
@@ -146,14 +158,7 @@
 # by Debian, among others.
 COMPONENT_POST_INSTALL_ACTION += $(RM) -r $(PVAR) ;
 
-# The file usr/share/emacs/23.1/etc/DOC-23.1.2 gets installed instead of
-# DOC-23.1.1. Remove and replace.
-COMPONENT_POST_INSTALL_ACTION += $(RM) $(PETC)/DOC-$(COMPONENT_VERSION).2 ;
-COMPONENT_POST_INSTALL_ACTION += \
-	$(CP) $(BUILD_DIR)/$(MACH64)-x/etc/DOC-$(COMPONENT_VERSION).1 \
-		$(PETC)/DOC-$(COMPONENT_VERSION).1 ;
-
-# Provide manpages for the emacs variants, which are our creation, refering
+# Provide manpages for the emacs variants, which are our creation, referring
 # the reader to the main emacs(1) manpage.
 COMPONENT_POST_INSTALL_ACTION += \
 	$(CP) augment/man/man1/emacs-gtk.1 $(PSHAREMAN1)/emacs-gtk.1 ;
@@ -168,11 +173,22 @@
 COMPONENT_POST_INSTALL_ACTION += \
 	$(CP) $(COMPONENT_SRC)/doc/man/etags.1 $(PGSHAREMAN1)/etags.1 ;
 
-# Throw away usr/share/info/dir. This file is the topmost node of the Info
-# hierarchy. Emacs builds it, as presumably do all GNU packages, but on
-# Solaris, it is delivered by system/prerequisite/gnu.
-COMPONENT_POST_INSTALL_ACTION += $(RM) $(PROTO_DIR)/usr/share/info/dir ;
+# Throw away usr/share/info/dir and usr/share/info/info.info. These files
+# live at the topmost node of the Info hierarchy. Emacs builds them, as
+# presumably do all GNU packages, but on Solaris, they are delivered by
+# pkg:/text/texinfo.
+COMPONENT_POST_INSTALL_ACTION += $(RM) \
+	$(PROTO_DIR)/usr/share/info/dir \
+	$(PROTO_DIR)/usr/share/info/info.info ;
 
+# By default, emacs is configured to compress lisp files, manpages, and info
+# files. The option to disable that (--without-compress-install) has no
+# granularity --- it's all or nothing. For Solaris, we want to compress lisp
+# sources, but not the others. It's simplest to let everything be compressed.
+# and then explicitly decompress the manpages and info files.
+COMPONENT_POST_INSTALL_ACTION += $(GUNZIP) \
+	$(PROTO_DIR)/usr/share/info/*.gz \
+	$(PROTO_DIR)/usr/share/man/man1/*.gz ;
 
 # common targets
 configure:	$(CONFIGURE_64)
@@ -181,6 +197,8 @@
 
 install:	$(BUILD_64) $(BUILD_DIR)/$(MACH64)-x/.installed 
 
+# The upstream emacs distribution does not have tests to be run
+# from this target.
 test:		$(NO_TESTS)
 
 system-test:    $(NO_TESTS)
@@ -202,20 +220,22 @@
 REQUIRED_PACKAGES += library/gnutls
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/zlib
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/fontconfig
 REQUIRED_PACKAGES += system/library/freetype-2
-REQUIRED_PACKAGES += system/library/libdbus
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/libice
 REQUIRED_PACKAGES += x11/library/libsm
 REQUIRED_PACKAGES += x11/library/libx11
 REQUIRED_PACKAGES += x11/library/libxft
+REQUIRED_PACKAGES += x11/library/libxinerama
 REQUIRED_PACKAGES += x11/library/libxmu
 REQUIRED_PACKAGES += x11/library/libxpm
+REQUIRED_PACKAGES += x11/library/libxrandr
 REQUIRED_PACKAGES += x11/library/libxrender
 REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
 REQUIRED_PACKAGES += x11/library/toolkit/libxt
--- a/components/emacs/README	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/README	Tue Aug 18 12:04:09 2015 -0600
@@ -22,7 +22,7 @@
 #
 
 NAME:             emacs
-VERSION:          24.3
+VERSION:          24.5
 DESCRIPTION:      GNU Emacs editor
 LICENSE:          GPLv3
 BUGTRAQ:          solaris/utility/emacs
@@ -43,30 +43,31 @@
 	    2014. It will be in version 25.1. We should be able to drop
 	    this patch when we upgrade to, or past, that release.
 
-	face_for_font.patch
-	    xdisp.c has a call to face_for_font(), a function that is
-	    only present when window system support is included, which is
-	    not the case for emacs-nox. This patch ifdefs the offending
-	    call away.
-
 	find.patch
 	    The rgrep function uses the GNU-specific -path option to the
 	    find command. Change the default value for the find-program
 	    variable in grep.el to use GNU find.
 
-	gtkutil.patch
-	    This fixes a bug in emacs 24.3 in which a message like the
-	    following is emitted to stderr on startup if emacs was started
-	    with a specified geometry:
+	jpeg6b_config.patch
+	    There is a bug in configure that causes it to believe that
+	    libjpeg on Solaris is not version 6b, and then to reject it:
+
+		bug#20332: 24.5; With jpeg-6b configure says
+			"WARNING: libjpeg found, bu
+		https://lists.gnu.org/archive/html/bug-gnu-emacs/
+		        2015-04/msg00424.html
 
-	    (emacs:4090): Gtk-WARNING **: gtk_window_parse_geometry() called
-	    on a window with no visible children; the window should be set up
-	    before gtk_window_parse_geometry() is called.
+	    This is the patch applied by Paul Eggert to the top of the
+	    emacs tree on 15 April 2015. We should be able to drop it in
+	    the next emacs update.
 
-	    This was fixed upstream: 
-
-	        https://bugzilla.redhat.com/show_bug.cgi?id=929353
-		http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/111078
+- If you patch configure.ac, as with jpeg6b_config.patch, then you need
+  a COMPONENT_PREP_ACTION definition in the Makefile in order to get the
+  configure script generated during the 'prep' phase. This must issue the
+  same commands that would otherwise be generated by the emacs Makefile.
+  To get those commands, comment out COMPONENT_PREP_ACTION, and do a
+  'gmake clobber; gmake build', capturing the output, and then look for
+  'autoconf' in the output.
 
 - The emacs distribution used to have a subdirectory, src/s, which
   contained per-platform header files. We would apply the following
@@ -159,6 +160,37 @@
   versions are quite stable from release to release, so this isn't a large
   burden.
 
+- With multiple emacs binaries, there is a need for a generic /usr/bin/emacs
+  to exist, which will by default run the "best" version of emacs installed
+  on the system. Older versions of Emacs for Solaris, dating back to the 
+  original integration into OpenSolaris, used a shell script that contained
+  this logic:
+
+        for EXE in emacs-gtk emacs-x emacs-nox; do
+                if [ -f /usr/bin/$EXE ]; then
+                        exec /usr/bin/$EXE "[email protected]"
+                fi
+        done
+
+  With the update to Emacs 24.5, we have dropped that script, and /usr/bin/emacs
+  is now an IPS mediated link. The admin can therefore use 'pkg set-mediator'
+  to establish their preference. The mediator names are the same as those of
+  the emacs binaries (emacs-gtk, emacs-x, emacs-nox). By default, the mediated
+  link will give the same order as before (gtk, x, nox). The means by which
+  this is achieved needs some explanation. The mediated options are by default
+  sorted in the order:
+
+      priority, version, implementation-order, implementation
+
+  Where "implementation" is sorted lexically. Lexical sorting puts emacs-gtk
+  first, which is what we want, but it puts emacs-nox ahead of emacs-x. I
+  played with setting the version or implementation-order values to achieve
+  the desired sorting. This works, but as these are not real Emacs versions, 
+  the output from 'pkg mediator' is confusing. Instead, we set the priority 
+  of emacs-gtk and emacs-x to "vendor", and leave the priority of emacs-nox
+  unspecified. Hence, emacs-gtk trumps emacs-x based on lexical sorting, and
+  both of them trump emacs-nox based on priority.
+
 - In the past, we built emacs with gcc. The Makefile contained:
 
     # This code is built with gcc. The primary reason for this is that the
--- a/components/emacs/augment/emacs	Tue Aug 18 08:28:37 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-
-# GNU emacs is delivered to Solaris as a core package (pkg:/editor/gnu-emacs)
-# that contains a complete emacs environment, minus the actual emacs
-# binaries. There are multiple binaries, which are optionally
-# installed from separate packages:
-#
-#	emacs-gtk (pkg:/editor/gnu-emacs/gnu-emacs-gtk)
-#		X11 support, using the GTK toolkit.
-#
-#	emacs-x (pkg:/editor/gnu-emacs/gnu-emacs-x11)
-#		X11 support, using the Athena (Xaw) toolkit.
-#
-#	emacs-nox (pkg:/editor/gnu-emacs/gnu-emacs-x11)
-#		Pure tty emacs, without any X Window support.
-#		emacs-nox can run on a system minimized to not include
-#		the X11 libraries.
-#
-# This script is installed as /usr/bin/emacs. It examines the
-# emacs binaries on the system, and runs the "best" version available.
-#
-for EXE in emacs-gtk emacs-x emacs-nox; do
-	if [ -f /usr/bin/$EXE ]; then
-		exec /usr/bin/$EXE "[email protected]"
-	fi
-done
-
-# If we get here, the system has pkg:/editor/gnu-emacs installed without
-# one of the packages that deliver the executables. That's not supposed to
-# happen, because the packages specify dependencies to prevent it, but
-# if it does, issue an appropriate message.
-#
-echo "$0: no emacs binaries available. Install software package pkg:/editor/gnu-emacs/gnu-emacs-gtk, pkg:/editor/gnu-emacs/gnu-emacs-x11, or pkg:/editor/gnu-emacs/gnu-emacs-x11" 1>&2
-
-exit 1
--- a/components/emacs/augment/man/man1/emacs-gtk.1	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/augment/man/man1/emacs-gtk.1	Tue Aug 18 12:04:09 2015 -0600
@@ -1,6 +1,6 @@
-.\" Copyright (C) 2008-2013  Free Software Foundation, Inc.
+.\" Copyright (C) 2008-2015  Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
-.TH b2m 1 "24 Sep 2013" "GNU Tools" "GNU Tools"
+.TH b2m 1 "1 July 2015" "GNU Tools" "GNU Tools"
 .de BP
 .sp
 .ti -.2i
@@ -32,7 +32,7 @@
 Copyright
 .if t \(co
 .if n (C)
-1995, 1999-2013 Free Software Foundation, Inc.
+1995, 1999-2015 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
--- a/components/emacs/augment/man/man1/emacs-nox.1	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/augment/man/man1/emacs-nox.1	Tue Aug 18 12:04:09 2015 -0600
@@ -1,6 +1,6 @@
-.\" Copyright (C) 2008-2013  Free Software Foundation, Inc.
+.\" Copyright (C) 2008-2015  Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
-.TH b2m 1 "24 Sep 2013" "GNU Tools" "GNU Tools"
+.TH b2m 1 "1 July 2015" "GNU Tools" "GNU Tools"
 .de BP
 .sp
 .ti -.2i
@@ -32,7 +32,7 @@
 Copyright
 .if t \(co
 .if n (C)
-1995, 1999-2013 Free Software Foundation, Inc.
+1995, 1999-2015 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
--- a/components/emacs/augment/man/man1/emacs-x.1	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/augment/man/man1/emacs-x.1	Tue Aug 18 12:04:09 2015 -0600
@@ -1,6 +1,6 @@
-.\" Copyright (C) 2008-2013  Free Software Foundation, Inc.
+.\" Copyright (C) 2008-2015  Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
-.TH b2m 1 "24 Sep 2013" "GNU Tools" "GNU Tools"
+.TH b2m 1 "1 July 2015" "GNU Tools" "GNU Tools"
 .de BP
 .sp
 .ti -.2i
@@ -32,7 +32,7 @@
 Copyright
 .if t \(co
 .if n (C)
-1995, 1999-2013 Free Software Foundation, Inc.
+1995, 1999-2015 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
--- a/components/emacs/gnu-emacs-gtk.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs-gtk.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -34,6 +34,10 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
+# Mediated symlink for usr/bin/emacs, to run "best" version
+link path=usr/bin/emacs target=emacs-gtk mediator=emacs \
+    mediator-implementation=emacs-gtk mediator-priority=vendor
+
 
 file path=usr/bin/emacs-gtk
 hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
@@ -45,5 +49,5 @@
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacsclient \
     pkg.debug.reason=usr/bin/emacs-gtk
--- a/components/emacs/gnu-emacs-lisp.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs-lisp.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -36,66 +36,6 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic/ja-dic.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/4Corner.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ARRAY30.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CCDOSPY.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CTLau-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CTLau.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ECDICT.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ETZY.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/PY-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/PY.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/Punct-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/Punct.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/QJ-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/QJ.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/SW.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/TONEPY.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ZIRANMA.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ZOZY.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/arabic.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/croatian.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/cyril-jis.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/cyrillic.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/czech.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ethiopic.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/georgian.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/greek.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hangul.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja-jis.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja3.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hebrew.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/indian.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ipa-praat.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ipa.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/japanese.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/lao.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-alt.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-ltx.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-post.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-pre.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/lrt.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/persian.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/py-punct.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/pypunct-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/quick-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/quick-cns.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/rfc1345.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/sgml-input.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/sisheng.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/slovak.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/symbol-ksc.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/thai.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tibetan.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tsang-b5.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tsang-cns.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/uni-input.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/viqr.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/vntelex.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/vnvni.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/welsh.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/abbrev.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/align.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/allout-widgets.el.gz
@@ -371,6 +311,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/echistory.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/edmacro.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ehelp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/elec-pair.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/electric.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/elide-head.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/advice.el.gz
@@ -402,6 +343,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easymenu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/edebug.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-base.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-core.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-custom.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-datadebug.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-opt.el.gz
@@ -414,7 +356,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ert.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ewoc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/find-func.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/find-gc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/float-sup.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generic.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/gulp.el.gz
@@ -425,6 +366,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/macroexp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/map-ynp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/nadvice.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/package-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/package.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/pcase.el.gz
@@ -436,6 +378,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/rx.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/shadow.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/smie.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/subr-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/syntax.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tabulated-list.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.el.gz
@@ -447,7 +390,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/unsafep.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/warnings.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lock.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/crisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-base.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-gmrk.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-rect.el.gz
@@ -457,11 +399,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/edt-vt100.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/edt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/keypad.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-edt.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-extras.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-mapper.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/vi.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/vip.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-cmd.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-ex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-init.el.gz
@@ -470,7 +407,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-mous.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-util.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/ws-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/env.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/epa-dired.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/epa-file.el.gz
@@ -528,6 +464,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-script.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-smart.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-term.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-tramp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-unix.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-xtra.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/esh-arg.el.gz
@@ -548,6 +485,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/faces.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ffap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filenotify.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filesets.el.gz
@@ -565,6 +503,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/forms.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/frame.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/frameset.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/fringe.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/generic-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/auth-source.el.gz
@@ -594,6 +533,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-gravatar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-group.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-html.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-icalendar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-int.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-kill.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-logic.el.gz
@@ -684,8 +624,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/rfc2231.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/rtree.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/score-mode.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/shr-color.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/shr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve-manage.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve.el.gz
@@ -755,7 +693,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/utf-7.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearch.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearchb.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/iswitchb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jit-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-cmpr-hook.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-compr.el.gz
@@ -800,10 +737,69 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/utf-8-lang.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/viet-util.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/vietnamese.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/ja-dic/ja-dic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/4Corner.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ARRAY30.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CCDOSPY.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CTLau-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CTLau.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ECDICT.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ETZY.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/PY-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/PY.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/Punct-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/Punct.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/QJ-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/QJ.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/SW.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/TONEPY.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ZIRANMA.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ZOZY.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/arabic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/croatian.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/cyril-jis.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/cyrillic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/czech.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ethiopic.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/georgian.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/greek.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hangul.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja-jis.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja3.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hebrew.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/indian.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ipa-praat.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ipa.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/japanese.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/lao.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-alt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-ltx.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-post.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-pre.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/lrt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/persian.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/py-punct.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/pypunct-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/quick-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/quick-cns.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/rfc1345.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sgml-input.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sisheng.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/slovak.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/symbol-ksc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/thai.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tibetan.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tsang-b5.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tsang-cns.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/uni-input.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/viqr.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/vntelex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/vnvni.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/welsh.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/linum.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/loadhist.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/locate.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/longlines.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/lpr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ls-lisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/macros.el.gz
@@ -893,6 +889,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-ldap.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-mab.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-ph.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eww.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/gnutls.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/goto-addr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-def.el.gz
@@ -912,19 +909,21 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ntlm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/quickurl.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rcirc.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rcompile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rlogin.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-cram.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-digest.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-ntlm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/secrets.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/shr-color.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/shr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/snmp-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/soap-client.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/soap-inspect.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/socks.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/telnet.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tls.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-adb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cache.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cmds.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-compat.el.gz
@@ -937,7 +936,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/trampver.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/webjump.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/xesam.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/zeroconf.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/newcomment.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/notifications.el.gz
@@ -969,24 +967,30 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/abbrevlist.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/assoc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/awk-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cc-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/complete.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/crisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cust-print.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/erc-hecomplete.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/fast-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-acc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-insert.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-swed.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ledit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/levents.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lmenu.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/longlines.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lucid.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mailpost.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/meese.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mouse-sel.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-emacs-lock.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/otodo-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-select.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg-def.el.gz
@@ -995,14 +999,25 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg-pgp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg-pgp5.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/rcompile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/resume.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/s-region.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/scribe.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/spell.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/swedish.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sym-comp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-edt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-extras.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-mapper.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-mcvs.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vi.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vip.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ws-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/xesam.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/yow.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-C.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-R.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-asymptote.el.gz
@@ -1010,6 +1025,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-calc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-clojure.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-comint.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-core.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-css.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ditaa.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-dot.el.gz
@@ -1028,6 +1044,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lilypond.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lob.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-makefile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-matlab.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-maxima.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-mscgen.el.gz
@@ -1053,10 +1070,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ascii.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-beamer.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-capture.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-clock.el.gz
@@ -1065,54 +1080,47 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-crypt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ctags.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docbook.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docview.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-element.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-entities.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eshell.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp-blocks.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-freemind.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-html.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-icalendar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-inlinetask.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-irc.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-jsinfo.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-latex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-list.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lparse.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mac-message.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macro.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mew.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mks.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-odt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-pcomplete.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-publish.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-remember.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-special-blocks.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-taskjuggler.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-timer.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-vm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-w3m.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-wl.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-xoxo.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-ascii.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-beamer.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-html.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-icalendar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-latex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-man.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-md.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-odt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-org.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-publish.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-texinfo.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/outline.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/paren.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/password-cache.el.gz
@@ -1121,6 +1129,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-linux.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-rpm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-unix.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-x.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcomplete.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/5x5.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/animate.el.gz
@@ -1139,7 +1148,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/hanoi.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/landmark.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/life.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/meese.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/morse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/mpuz.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/pong.el.gz
@@ -1148,7 +1156,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/spook.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/studly.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/tetris.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/yow.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/zone.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/printing.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/proced.el.gz
@@ -1160,13 +1167,13 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/antlr-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/asm-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/autoconf.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/bat-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/bug-reference.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cap-words.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-align.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-awk.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-bytecomp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-cmds.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-defs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-engine.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-fonts.el.gz
@@ -1183,7 +1190,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cpp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cwarn.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/dcl-mode.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/delphi.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-abn.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-bnf.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-dtd.el.gz
@@ -1219,10 +1225,11 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/meta-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mixal-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/modula2.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave-inf.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave-mod.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/opascal.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/pascal.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/perl-mode.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/prog-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/prolog.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ps-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/python.el.gz
@@ -1293,7 +1300,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/rxvt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/screen.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/sun.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/sup-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/tty-colors.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/tvi970.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/vt100.el.gz
@@ -1312,7 +1318,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/wyse50.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/x-win.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/xterm.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/terminal.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/artist.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/bib-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/bibtex-style.el.gz
@@ -1469,5 +1474,5 @@
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacsclient \
     pkg.debug.reason=usr/share/emacs/$(COMPONENT_VERSION)/lisp/abbrev.el.gz
--- a/components/emacs/gnu-emacs-no-x11.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -34,6 +34,10 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
+# Mediated symlink for usr/bin/emacs, to run "best" version
+link path=usr/bin/emacs target=emacs-nox mediator=emacs \
+    mediator-implementation=emacs-nox
+
 
 file path=usr/bin/emacs-nox
 hardlink path=usr/bin/emacs-nox-$(COMPONENT_VERSION) target=emacs-nox
@@ -45,5 +49,5 @@
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
-    pkg.debug.reason=usr/bin/emacs-gtk
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacsclient \
+    pkg.debug.reason=usr/bin/emacs-nox
--- a/components/emacs/gnu-emacs-x11.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -34,6 +34,10 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
+# Mediated symlink for usr/bin/emacs, to run "best" version
+link path=usr/bin/emacs target=emacs-x mediator=emacs \
+    mediator-implementation=emacs-x mediator-priority=vendor
+
 
 file path=usr/bin/emacs-x
 hardlink path=usr/bin/emacs-x-$(COMPONENT_VERSION) target=emacs-x
@@ -45,5 +49,5 @@
 # pkgdepend find that relationship without hardwiring an fmri, specify
 # a dependency on a file known to always be present in the core package,
 # and allow pkgdepend to generate the fmri.
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacs \
-    pkg.debug.reason=usr/bin/emacs-gtk
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/emacsclient \
+    pkg.debug.reason=usr/bin/emacs-x
--- a/components/emacs/gnu-emacs.p5m	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/gnu-emacs.p5m	Tue Aug 18 12:04:09 2015 -0600
@@ -38,7 +38,6 @@
 
 
 file path=usr/bin/ebrowse
-file path=usr/bin/emacs
 file path=usr/bin/emacsclient
 file path=usr/bin/grep-changelog
 file path=usr/gnu/bin/ctags
@@ -54,14 +53,14 @@
     mode=0555
 file path=usr/share/applications/emacs.desktop
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/AUTHORS
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/CALC-NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/CENSORSHIP
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/CONTRIBUTE
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/COOKIES
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/COPYING
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEBUG
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEVEL.HUMOR
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DISTRIB
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DOC-$(COMPONENT_VERSION).1
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DOC
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ERC-NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ETAGS.EBNF
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ETAGS.README
@@ -69,14 +68,11 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/GNU
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/GNUS-NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/HELLO
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/INTERVIEW
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/JOKES
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/LINUX-GNU
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MACHINES
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MAILINGLISTS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MH-E-NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MORE.STUFF
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MOTIVATION
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.1-17
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.18
@@ -91,12 +87,10 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ORG-NEWS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/PROBLEMS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/README
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/SERVICE
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/TERMS
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/THE-GNU-PROJECT
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/TODO
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/WHY-FREE
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/celibacy.1
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets/8859-10.map
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets/8859-11.map
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets/8859-13.map
@@ -230,17 +224,15 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets/stdenc.map
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/charsets/symbol.map
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/compilation.txt
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/condom.1
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/copying.paper
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e/eterm-color
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/e/eterm-color.ti
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/echo.msg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/edt-user.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs-buffer.gdb
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.appdata.xml
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.desktop
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/emacs.icon
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/enriched.doc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/enriched.txt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/forms/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/forms/forms-d2.dat
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/forms/forms-d2.el
@@ -812,6 +804,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/org/OrgOdtContentTemplate.xml
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/org/OrgOdtStyles.xml
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/org/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/package-keyring.gpg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ps-prin0.ps
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ps-prin1.ps
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/publicsuffix.txt
@@ -823,6 +816,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-dired-ref.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-refcard.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-survival.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-survival.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/de-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/de-refcard.tex
@@ -833,6 +827,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-dired-ref.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-refcard.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-survival.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-survival.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-booklet.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-logo.eps
@@ -854,9 +849,13 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-dired-ref.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-refcard.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-survival.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-survival.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/survival.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/survival.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/vipcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/vipcard.tex
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/viperCard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/viperCard.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/rgb.txt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/schema/README
@@ -906,7 +905,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/schema/xhtml.rnc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/schema/xslt.rnc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ses-example.ses
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/sex.6
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/spook.lines
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/c.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/cpp.srt
@@ -927,6 +925,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/adwaita-theme.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/deeper-blue-theme.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/dichromacy-theme.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/leuven-theme.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/light-blue-theme.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/manoj-dark-theme.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/themes/misterioso-theme.el
@@ -961,67 +960,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/tutorials/TUTORIAL.translators
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/tutorials/TUTORIAL.zh
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/yow.lines
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic/ja-dic.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/leim-list.el
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/4Corner.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ARRAY30.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CCDOSPY.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CTLau-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/CTLau.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ECDICT.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ETZY.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/PY-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/PY.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/Punct-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/Punct.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/QJ-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/QJ.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/SW.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/TONEPY.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ZIRANMA.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ZOZY.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/arabic.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/croatian.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/cyril-jis.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/cyrillic.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/czech.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ethiopic.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/georgian.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/greek.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hangul.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja-jis.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hanja3.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/hebrew.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/indian.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ipa-praat.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/ipa.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/japanese.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/lao.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-alt.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-ltx.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-post.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/latin-pre.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/lrt.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/persian.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/py-punct.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/pypunct-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/quick-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/quick-cns.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/rfc1345.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/sgml-input.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/sisheng.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/slovak.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/symbol-ksc.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/thai.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tibetan.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tsang-b5.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/tsang-cns.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/uni-input.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/viqr.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/vntelex.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/vnvni.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail/welsh.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/COPYING
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/abbrev.elc
@@ -1042,8 +980,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/bs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/buff-menu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/button.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc/README
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc/README.prev
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc/calc-aent.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc/calc-alg.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calc/calc-arith.elc
@@ -1309,6 +1245,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/echistory.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/edmacro.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ehelp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/elec-pair.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/electric.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/elide-head.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/advice.elc
@@ -1341,6 +1278,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/easymenu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/edebug.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-base.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-core.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-custom.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-datadebug.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/eieio-opt.elc
@@ -1353,7 +1291,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ert.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ewoc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/find-func.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/find-gc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/float-sup.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generic.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/gulp.elc
@@ -1364,6 +1301,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/lisp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/macroexp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/map-ynp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/nadvice.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/package-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/package.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/pcase.elc
@@ -1375,6 +1313,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/rx.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/shadow.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/smie.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/subr-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/syntax.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tabulated-list.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.elc
@@ -1386,7 +1325,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/unsafep.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/warnings.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lock.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/crisp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-base.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-gmrk.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/cua-rect.elc
@@ -1396,11 +1334,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/edt-vt100.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/edt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/keypad.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-edt.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-extras.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/tpu-mapper.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/vi.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/vip.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-cmd.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-ex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-init.elc
@@ -1409,7 +1342,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-mous.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper-util.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/viper.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emulation/ws-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/env.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/epa-dired.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/epa-file.elc
@@ -1467,6 +1399,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-script.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-smart.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-term.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-tramp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-unix.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/em-xtra.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/eshell/esh-arg.elc
@@ -1488,6 +1421,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/faces.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ffap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filenotify.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filesets.elc
@@ -1506,6 +1440,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/format.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/forms.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/frame.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/frameset.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/fringe.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/generic-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/.dir-locals.el
@@ -1536,6 +1471,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-gravatar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-group.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-html.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-icalendar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-int.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-kill.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/gnus-logic.elc
@@ -1626,8 +1562,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/rfc2231.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/rtree.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/score-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/shr-color.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/shr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve-manage.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/gnus/sieve.elc
@@ -1699,6 +1633,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/titdic-cnv.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/ucs-normalize.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-bidi.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-brackets.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-category.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-combining.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/uni-comment.el
@@ -1715,7 +1650,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/international/utf-7.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearch.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/isearchb.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/iswitchb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jit-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-cmpr-hook.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-compr.elc
@@ -1761,12 +1695,72 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/viet-util.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/vietnamese.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ldefs-boot.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/ja-dic/ja-dic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/leim-list.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/4Corner.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ARRAY30.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CCDOSPY.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CTLau-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/CTLau.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ECDICT.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ETZY.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/PY-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/PY.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/Punct-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/Punct.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/QJ-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/QJ.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/SW.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/TONEPY.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ZIRANMA.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ZOZY.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/arabic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/croatian.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/cyril-jis.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/cyrillic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/czech.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ethiopic.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/georgian.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/greek.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hangul.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja-jis.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hanja3.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/hebrew.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/indian.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ipa-praat.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/ipa.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/japanese.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/lao.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-alt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-ltx.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-post.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/latin-pre.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/lrt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/persian.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/py-punct.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/pypunct-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/quick-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/quick-cns.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/rfc1345.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sgml-input.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sisheng.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/slovak.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/symbol-ksc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/thai.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tibetan.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tsang-b5.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/tsang-cns.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/uni-input.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/viqr.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/vntelex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/vnvni.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/welsh.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/linum.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/loaddefs.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/loadhist.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/loadup.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/locate.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/longlines.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/lpr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ls-lisp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/macros.elc
@@ -1861,6 +1855,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-ldap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-mab.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eudcb-ph.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/eww.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/gnutls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/goto-addr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/hmac-def.elc
@@ -1880,19 +1875,21 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/ntlm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/quickurl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rcirc.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rcompile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/rlogin.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-cram.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-digest.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl-ntlm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/sasl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/secrets.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/shr-color.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/shr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/snmp-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/soap-client.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/soap-inspect.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/socks.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/telnet.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tls.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-adb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cache.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cmds.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-compat.elc
@@ -1906,7 +1903,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/trampver.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/webjump.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/xesam.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/zeroconf.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/newcomment.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/notifications.elc
@@ -1939,25 +1935,31 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/assoc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/awk-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/bruce.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cc-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/complete.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/crisp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cust-print.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/erc-hecomplete.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/fast-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-acc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-insert.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iso-swed.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/keyswap.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ledit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/levents.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lmenu.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/longlines.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lucid.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mailpost.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/meese.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mouse-sel.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-emacs-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/otodo-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/patcomp.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-select.elc
@@ -1967,14 +1969,25 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg-pgp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg-pgp5.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pgg.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/rcompile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/resume.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/s-region.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/scribe.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/spell.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/swedish.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sym-comp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-edt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-extras.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-mapper.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-mcvs.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vi.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vip.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ws-mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/xesam.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/yow.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-C.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-R.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-asymptote.elc
@@ -1982,6 +1995,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-calc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-clojure.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-comint.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-core.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-css.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ditaa.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-dot.elc
@@ -2000,6 +2014,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lilypond.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lisp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lob.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-makefile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-matlab.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-maxima.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-mscgen.elc
@@ -2025,10 +2040,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ascii.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-beamer.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-capture.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-clock.elc
@@ -2037,57 +2050,50 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-crypt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ctags.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docbook.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docview.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-element.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-entities.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eshell.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp-blocks.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-exp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-freemind.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-html.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-icalendar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-inlinetask.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-install.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-irc.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-jsinfo.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-latex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-list.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-loaddefs.el
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lparse.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mac-message.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macro.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mew.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mks.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-odt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-pcomplete.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-publish.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-remember.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-special-blocks.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-taskjuggler.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-timer.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-version.el
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-vm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-w3m.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-wl.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-xoxo.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-ascii.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-beamer.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-html.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-icalendar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-latex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-man.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-md.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-odt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-org.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-publish.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-texinfo.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/outline.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/paren.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/password-cache.elc
@@ -2096,6 +2102,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-linux.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-rpm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-unix.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcmpl-x.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/pcomplete.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/5x5.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/animate.elc
@@ -2114,7 +2121,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/hanoi.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/landmark.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/life.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/meese.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/morse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/mpuz.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/pong.elc
@@ -2123,7 +2129,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/spook.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/studly.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/tetris.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/yow.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/play/zone.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/printing.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/proced.elc
@@ -2135,13 +2140,13 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/antlr-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/asm-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/autoconf.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/bat-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/bug-reference.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cap-words.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-align.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-awk.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-bytecomp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-cmds.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-defs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-engine.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cc-fonts.elc
@@ -2158,7 +2163,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cpp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/cwarn.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/dcl-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/delphi.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-abn.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-bnf.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ebnf-dtd.elc
@@ -2194,10 +2198,11 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/meta-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mixal-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/modula2.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave-inf.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave-mod.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/octave.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/opascal.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/pascal.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/perl-mode.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/prog-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/prolog.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ps-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/python.elc
@@ -2270,7 +2275,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/rxvt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/screen.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/sun.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/sup-mouse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/tty-colors.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/tvi970.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/vt100.elc
@@ -2289,7 +2293,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/wyse50.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/x-win.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/term/xterm.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/terminal.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/artist.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/bib-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/bibtex-style.elc
@@ -2473,16 +2476,19 @@
 file path=usr/share/info/ert.info
 file path=usr/share/info/eshell.info
 file path=usr/share/info/eudc.info
+file path=usr/share/info/eww.info
 file path=usr/share/info/flymake.info
 file path=usr/share/info/forms.info
 file path=usr/share/info/gnus.info
 file path=usr/share/info/htmlfontify.info
 file path=usr/share/info/idlwave.info
+file path=usr/share/info/ido.info
 file path=usr/share/info/mairix-el.info
 file path=usr/share/info/message.info
 file path=usr/share/info/mh-e.info
 file path=usr/share/info/newsticker.info
 file path=usr/share/info/nxml-mode.info
+file path=usr/share/info/octave-mode.info
 file path=usr/share/info/org.info
 file path=usr/share/info/pcl-cvs.info
 file path=usr/share/info/pgg.info
@@ -2497,6 +2503,7 @@
 file path=usr/share/info/smtpmail.info
 file path=usr/share/info/speedbar.info
 file path=usr/share/info/srecode.info
+file path=usr/share/info/todo-mode.info
 file path=usr/share/info/tramp.info
 file path=usr/share/info/url.info
 file path=usr/share/info/vip.info
--- a/components/emacs/patches/calc-forms.patch	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/patches/calc-forms.patch	Tue Aug 18 12:04:09 2015 -0600
@@ -2,9 +2,9 @@
 #    20270656 calc: sign change of hh.mm value puts Emacs into tight loop
 # See components/emacs/README.
 #
---- emacs-24.3.orig/lisp/calc/calc-forms.el	2013-01-01 13:37:17.000000000 -0700
-+++ emacs-24.3/lisp/calc/calc-forms.el	2015-01-02 14:57:36.824358166 -0700
[email protected]@ -271,7 +271,10 @@
+--- emacs-24.5.orig/lisp/calc/calc-forms.el	2015-04-02 01:23:06.000000000 -0600
++++ emacs-24.5/lisp/calc/calc-forms.el	2015-06-29 11:29:19.191046059 -0600
[email protected]@ -273,7 +273,10 @@
  	(m (math-normalize (nth 2 a)))
  	(s (let ((calc-internal-prec (max (- calc-internal-prec 4) 3)))
  	     (math-normalize (nth 3 a)))))
--- a/components/emacs/patches/face_for_font.patch	Tue Aug 18 08:28:37 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# Elide call to face_for_font() when window system support is not included.
-# See components/emacs/README.
-#
---- emacs-24.3.orig/src/xdisp.c	2013-02-24 12:21:16.000000000 -0700
-+++ emacs-24.3/src/xdisp.c	2013-09-24 10:45:08.854361844 -0600
[email protected]@ -6870,6 +6870,7 @@
- 	}
-     }
- 
-+#ifdef HAVE_WINDOW_SYSTEM
-   /* Adjust face id for a multibyte character.  There are no multibyte
-      character in unibyte text.  */
-   if ((it->what == IT_CHARACTER || it->what == IT_COMPOSITION)
[email protected]@ -6910,6 +6911,7 @@
- 	  it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
- 	}
-     }
-+#endif
- 
-  done:
-   /* Is this character the last one of a run of characters with
--- a/components/emacs/patches/find.patch	Tue Aug 18 08:28:37 2015 -0700
+++ b/components/emacs/patches/find.patch	Tue Aug 18 12:04:09 2015 -0600
@@ -1,14 +1,16 @@
 # Ensure that emacs uses GNU find. See components/emacs/README.
+#    16171813 emacs rgrep assumes gnu find in path; fails using
+#            GNU-specific options
 #
---- emacs-24.3.orig/lisp/progmodes/grep.el	2013-01-01 13:37:17.000000000 -0700
-+++ emacs-24.3/lisp/progmodes/grep.el	2013-09-23 14:41:27.331614612 -0600
[email protected]@ -419,7 +419,8 @@
+--- emacs-24.5.orig/lisp/progmodes/grep.el	2015-04-02 01:23:06.000000000 -0600
++++ emacs-24.5/lisp/progmodes/grep.el	2015-06-26 15:15:32.310280505 -0600
[email protected]@ -422,7 +422,8 @@
  This variable's value takes effect when `grep-compute-defaults' is called.")
  
  ;;;###autoload
 -(defvar find-program (purecopy "find")
 +;;Change from find to GNU find for Solaris, as emacs uses GNU-specific options
 +(defvar find-program (purecopy "/usr/gnu/bin/find")
-   "The default find program for `grep-find-command'.
- This variable's value takes effect when `grep-compute-defaults' is called.")
- 
+   "The default find program.
+ This is used by commands like `grep-find-command', `find-dired'
+ and others.")
--- a/components/emacs/patches/gtkutil.patch	Tue Aug 18 08:28:37 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-# Prevent incorrect Gtk warning at startup when a specific geometry is
-# explicitly specified. See components/emacs/README.
-#
---- emacs-24.3.orig/src/gtkutil.c	2013-01-12 12:29:19.000000000 -0700
-+++ emacs-24.3/src/gtkutil.c	2013-09-23 11:36:07.414160374 -0600
[email protected]@ -813,6 +813,14 @@
-     General functions for creating widgets, resizing, events, e.t.c.
-  ***********************************************************************/
- 
-+static void
-+my_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
-+                const gchar *msg, gpointer user_data)
-+{
-+  if (!strstr (msg, "visible children"))
-+    fprintf (stderr, "XX %s-WARNING **: %s\n", log_domain, msg);
-+}
-+
- /* Make a geometry string and pass that to GTK.  It seems this is the
-    only way to get geometry position right if the user explicitly
-    asked for a position when starting Emacs.
[email protected]@ -828,6 +836,7 @@
-       int top = f->top_pos;
-       int yneg = f->size_hint_flags & YNegative;
-       char geom_str[sizeof "=x--" + 4 * INT_STRLEN_BOUND (int)];
-+      guint id;
- 
-       if (xneg)
-         left = -left;
[email protected]@ -840,6 +849,10 @@
-                (xneg ? '-' : '+'), left,
-                (yneg ? '-' : '+'), top);
- 
-+      /* Silence warning about visible children.  */
-+      id = g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL
-+                              | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
-+
-       if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
-                                       geom_str))
-         fprintf (stderr, "Failed to parse: '%s'\n", geom_str);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/emacs/patches/jpeg6b_config.patch	Tue Aug 18 12:04:09 2015 -0600
@@ -0,0 +1,90 @@
+# Allow configure to properly determine that libjpeg on Solaris is
+# version 6b, and therefore usable. This patch comes from upstream:
+#    bug#20332: 24.5; With jpeg-6b configure says "WARNING: libjpeg found, bu
+    https://lists.gnu.org/archive/html/bug-gnu-emacs/2015-04/msg00424.html
+#
+--- emacs-24.5.orig/configure.ac	2015-04-02 01:23:06.000000000 -0600
++++ emacs-24.5/configure.ac	2015-06-26 16:13:16.059095909 -0600
[email protected]@ -3066,48 +3066,40 @@
+ ### mingw32 doesn't use -ljpeg, since it loads the library dynamically.
+ HAVE_JPEG=no
+ LIBJPEG=
+-if test "${opsys}" = "mingw32"; then
+-  if test "${with_jpeg}" != "no"; then
+-    dnl Checking for jpeglib.h can lose because of a redefinition of
+-    dnl HAVE_STDLIB_H.
+-    AC_CHECK_HEADER(jerror.h, HAVE_JPEG=yes, HAVE_JPEG=no)
+-  fi
+-  AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
+-  if test "${HAVE_JPEG}" = "yes"; then
+-    AC_DEFINE(HAVE_JPEG)
+-    AC_EGREP_CPP([version 6b or later],
+-	[#include <jpeglib.h>
+-	 #if JPEG_LIB_VERSION >= 62
+-	 version 6b or later
+-	 #endif
+-	],
+-        [AC_DEFINE(HAVE_JPEG)],
+-        [AC_MSG_WARN([libjpeg found, but not version 6b or later])
+-        HAVE_JPEG=no])
+-  fi
+-elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then
+-  if test "${with_jpeg}" != "no"; then
+-    dnl Checking for jpeglib.h can lose because of a redefinition of
+-    dnl  HAVE_STDLIB_H.
+-    AC_CHECK_HEADER(jerror.h,
+-      [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)])
+-  fi
+-
+-  AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl
+-  if test "${HAVE_JPEG}" = "yes"; then
+-    AC_DEFINE(HAVE_JPEG)
+-    AC_EGREP_CPP([version 6b or later],
+-	[#include <jpeglib.h>
+-	 #if JPEG_LIB_VERSION >= 62
+-	 version 6b or later
+-	 #endif
+-	],
+-	[AC_DEFINE(HAVE_JPEG)],
+-	[AC_MSG_WARN([libjpeg found, but not version 6b or later])
+-	HAVE_JPEG=no])
+-  fi
+-  if test "${HAVE_JPEG}" = "yes"; then
+-    LIBJPEG=-ljpeg
++if test "${with_jpeg}" != "no"; then
++  AC_CACHE_CHECK([for jpeglib 6b or later],
++    [emacs_cv_jpeglib],
++    [OLD_LIBS=$LIBS
++     for emacs_cv_jpeglib in yes -ljpeg no; do
++       case $emacs_cv_jpeglib in
++	 yes) ;;
++         no) break;;
++	 *) LIBS="$LIBS $emacs_cv_jpeglib";;
++       esac
++       AC_LINK_IFELSE(
++	 [AC_LANG_PROGRAM(
++	    [[#undef HAVE_STDLIB_H /* Avoid config.h/jpeglib.h collision.  */
++	      #include <stdio.h> /* jpeglib.h needs FILE and size_t.  */
++	      #include <jpeglib.h>
++	      #include <jerror.h>
++	      char verify[JPEG_LIB_VERSION < 62 ? -1 : 1];
++	      struct jpeg_decompress_struct cinfo;
++	    ]],
++	    [[
++	      jpeg_create_decompress (&cinfo);
++	      WARNMS (&cinfo, JWRN_JPEG_EOF);
++	      jpeg_destroy_decompress (&cinfo);
++	    ]])],
++	 [emacs_link_ok=yes],
++	 [emacs_link_ok=no])
++       LIBS=$OLD_LIBS
++       test $emacs_link_ok = yes && break
++     done])
++  if test "$emacs_cv_jpeglib" != no; then
++    HAVE_JPEG=yes
++    AC_DEFINE([HAVE_JPEG], 1,
++      [Define to 1 if you have the jpeg library (typically -ljpeg).])
++    test "$emacs_cv_jpeglib" != yes && LIBJPEG=$emacs_cv_jpeglib
+   fi
+ fi
+ AC_SUBST(LIBJPEG)
--- a/make-rules/shared-macros.mk	Tue Aug 18 08:28:37 2015 -0700
+++ b/make-rules/shared-macros.mk	Tue Aug 18 12:04:09 2015 -0600
@@ -33,7 +33,6 @@
 # The location of an external mirror of community source archives that we build
 # in this gate.  The external mirror is a replica of the internal mirror.
 EXTERNAL_ARCHIVE_MIRROR = 
-	
 
 # Default to looking for source archives on the internal mirror and the external
 # mirror before we hammer on the community source archive repositories.
@@ -565,6 +564,7 @@
 GSED =		/usr/gnu/bin/sed
 GDIFF =		/usr/gnu/bin/diff
 GSORT =		/usr/gnu/bin/sort
+GUNZIP =	/usr/bin/gunzip
 
 PKGREPO =	/usr/bin/pkgrepo
 PKGSEND =	/usr/bin/pkgsend