From 70a91e76c6f19ec75c3596eeb7dcc6afbf4f9ea1 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Sun, 16 Aug 2020 15:24:39 +0200
Subject: [PATCH] emacs: update to 27.1

---
 components/editor/emacs/Makefile                      |   24 ++
 components/editor/emacs/gnu-emacs-x11.p5m             |    1 
 /dev/null                                             |   28 --
 components/editor/emacs/gnu-emacs-no-x11.p5m          |    1 
 components/editor/emacs/pkg5                          |    2 
 components/editor/emacs/gnu-emacs-lisp.p5m            |   67 ++++--
 components/editor/emacs/gnu-emacs-gtk.p5m             |    1 
 components/editor/emacs/README                        |  123 ++++++++++-
 components/editor/emacs/manifests/sample-manifest.p5m |  192 ++++++++++--------
 components/editor/emacs/gnu-emacs.p5m                 |  113 +++++-----
 components/editor/emacs/patches/01-find.patch         |   34 ++
 11 files changed, 369 insertions(+), 217 deletions(-)

diff --git a/components/editor/emacs/Makefile b/components/editor/emacs/Makefile
index 5a97294..3e7713c 100644
--- a/components/editor/emacs/Makefile
+++ b/components/editor/emacs/Makefile
@@ -20,20 +20,20 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2019, Michal Nowak
+# Copyright (c) 2020, Andreas Wacknitz
 #
 
-BUILD_BITS=		32
+BUILD_BITS=			32
 
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		emacs
-COMPONENT_VERSION=	26.3
-COMPONENT_REVISION=	4
+COMPONENT_VERSION=	27.1
 COMPONENT_PROJECT_URL=	https://www.gnu.org/software/emacs/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485
+	sha256:4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/emacs/$(COMPONENT_ARCHIVE)
 
 TEST_TARGET=		$(NO_TESTS)
@@ -108,6 +108,7 @@
 # facilitates the use of 'gmake sample-manifest'.
 PBIN=		$(PROTO_DIR)/usr/bin
 PETC=		$(PROTO_DIR)/usr/share/emacs/$(COMPONENT_VERSION)/etc
+PPDMP=		$(PROTO_DIR)/usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)
 PGBIN=		$(PROTO_DIR)/usr/gnu/bin
 PGSHAREMAN1=	$(PROTO_DIR)/usr/gnu/share/man/man1
 PSHAREMAN1=	$(PROTO_DIR)/usr/share/man/man1
@@ -122,6 +123,10 @@
 		$(PBIN)/emacs-gtk ;
 COMPONENT_POST_INSTALL_ACTION += \
 	$(LN) $(PBIN)/emacs-gtk $(PBIN)/emacs-gtk-$(COMPONENT_VERSION) ;
+# Each emacs variant needs its own dump file:
+COMPONENT_POST_INSTALL_ACTION += \
+	$(CP) $(BUILD_DIR)/$(MACH32)-gtk/src/emacs.pdmp \
+		$(PPDMP)/emacs-gtk.pdmp ;
 
 # Non-X11 binaries
 COMPONENT_POST_INSTALL_ACTION += \
@@ -129,6 +134,10 @@
 		$(PBIN)/emacs-nox ;
 COMPONENT_POST_INSTALL_ACTION += \
 	$(LN) $(PBIN)/emacs-nox $(PBIN)/emacs-nox-$(COMPONENT_VERSION) ;
+# Each emacs variant needs its own dump file:
+COMPONENT_POST_INSTALL_ACTION += \
+	$(CP) $(BUILD_DIR)/$(MACH32)-nox/src/emacs.pdmp \
+		$(PPDMP)/emacs-nox.pdmp ;
 
 # X11 (Athena) binaries
 COMPONENT_POST_INSTALL_ACTION += \
@@ -136,6 +145,10 @@
 		$(PBIN)/emacs-x ;
 COMPONENT_POST_INSTALL_ACTION += \
 	$(LN) $(PBIN)/emacs-x $(PBIN)/emacs-x-$(COMPONENT_VERSION) ;
+# Each emacs variant needs its own dump file:
+COMPONENT_POST_INSTALL_ACTION += \
+	$(CP) $(BUILD_DIR)/$(MACH32)-x/src/emacs.pdmp \
+		$(PPDMP)/emacs-x.pdmp ;
 
 # Emacs shell script that picks the right variant at runtime
 COMPONENT_POST_INSTALL_ACTION += $(CP) augment/emacs $(PBIN) ;
@@ -189,17 +202,20 @@
 
 # Auto-generated dependencies
 REQUIRED_PACKAGES += SUNWcs
+#REQUIRED_PACKAGES += editor/gnu-emacs
 REQUIRED_PACKAGES += file/gnu-findutils
 REQUIRED_PACKAGES += image/library/libjpeg8-turbo
 REQUIRED_PACKAGES += image/library/libpng16
 REQUIRED_PACKAGES += image/library/librsvg
 REQUIRED_PACKAGES += image/library/libtiff
+REQUIRED_PACKAGES += library/c++/harfbuzz
 REQUIRED_PACKAGES += library/desktop/cairo
 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
 REQUIRED_PACKAGES += library/desktop/gtk3
 REQUIRED_PACKAGES += library/desktop/pango
 REQUIRED_PACKAGES += library/glib2
 REQUIRED_PACKAGES += library/gnutls-3
+REQUIRED_PACKAGES += library/jansson
 REQUIRED_PACKAGES += library/lcms2
 REQUIRED_PACKAGES += library/libxml2
 REQUIRED_PACKAGES += library/ncurses
diff --git a/components/editor/emacs/README b/components/editor/emacs/README
index c1d1556..ca0e283 100644
--- a/components/editor/emacs/README
+++ b/components/editor/emacs/README
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
 #
 
 NAME:             emacs
-VERSION:          24.5
+VERSION:          26.3
 DESCRIPTION:      GNU Emacs editor
 LICENSE:          GPLv3
 BUGTRAQ:          solaris/utility/emacs
@@ -34,16 +34,42 @@
 information needed to understand how this component is put together.
 
 
-- We patch the following changes to the emacs sources:
+- We patch the following changes into the emacs sources:
 
 	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.
 
+	    In recent releases, we find that the find-program variable
+	    is repeated in other autogenerated files (ldefs.boot.el,
+	    loaddefs.el), and that these copies must also be adjusted.
+	    The safest policy is to do a brute force search of the entire
+	    source tree for defvar of find-program, and to fix them all.
+
+	gnutls.patch
+	    Add the cert bundle path for Solaris and Solaris-derived
+	    systems. This allows gnutls to find public keys.
+
+- If you patch configure.ac, as we did with emacs 24.5 for 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 COMPONENT_PREP_ACTION for jpeg6b looked like:
+
+  # We patch the configure.ac file. Get the new configure generated during prep.
+  COMPONENT_PREP_ACTION = (cd $(@D) ; aclocal -I m4; autoconf )
+
+  It went just after the include lines, above VARIANTS
+
+
 - The emacs distribution used to have a subdirectory, src/s, which
   contained per-platform header files. We would apply the following
-  patches:
+  patches. Please note that the contact information given in the comment
+  in the first patch is no longer valid. Current information is found in
+  the README file in the top level directory of this workspace:
 
     sol2-6.h: Enable the use of the native Solaris dldump()
 
@@ -83,8 +109,8 @@
          /* There have problems reported with mmap at least on Solaris 2.6
             and 2.7.  For simplicity, let's not use mmap for anything >= 2.5.
 
-  These are both handled by default by the configure process, and in fact,
-  comments from the header file appear to have been carried over. With every
+  These are now both handled by default by the configure process, and in fact,
+  comments from the header files appear to have been carried over. With every
   update, we must verify that these settings stick and remain enabled.
 
     System Malloc:
@@ -130,6 +156,46 @@
   versions are quite stable from release to release, so this isn't a large
   burden.
 
+- By default, emacs will find and use the Image Magick image manipulation
+  library. The problem with this for Solaris is that the IM library APIs
+  are not committed, and change from release to release, as opposed to the
+  command line interfaces which are stable. Any update to IM causes breakage
+  in emacs that takes 2 builds to resolve. At the same time, IM is not central
+  to emacs use, and so, we choose to explicitly disable it with the
+  --without-imagemagick config option. This can be revisited if we find that
+  common emacs use suffers without it, or if IM stabilizes their library APIs.
+
+- 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 "$@"
+                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
@@ -138,12 +204,33 @@
     # cost/benefit decision not to pursue it at this time
     COMPILER =      gcc
 
-  With emacs 24.3, I removed this, and find that studio now builds
-  emacs without issue. This is something that should be reverified
-  with each update.
+  With emacs 24.3, I removed this, and found that studio now builds
+  emacs without issue.
 
-- Remember to update REQUIRED_PACKAGES when updating to a new version,
-  as dependencies can change. Instructions are on the Userland website.
+  With emacs 25.2, the studio compilers on sparc produce broken behavior
+  at the -xO4 optimization level.
+
+      26552153 emacs on sparc does not wrap long line
+      26558067 emacs loses mouse cursor on sparc
+
+  This can be mitigated by changing to -xO2. However, we don't know what
+  the real issue is, and therefore, do not fully know if that's sufficient.
+  Therefore, we're back to using gcc.
+
+- When updating to a new version, remember to ensure that the REQUIRED_PACKAGES
+  lines in the Makefile are updated to match. Instructions can be found in the
+  doc directory at the top of the userland workspace. Basically:
+
+	% gmake REQUIRED_PACKAGES
+
+  and then edit the Makefile to incorporate the added lines into what's
+  there, and remove any no longer needed things.
+
+- Emacs is configured to use GnuTLS 3 rather than version 2. Version 3 used
+  to require gnutls-3, but has been moved to the default gnutls. The gnutls-3
+  line remains during the transition period, and can be removed soon.
+
+    REQUIRED_PACKAGES += library/gnutls-3
 
 - We deliver the following packages:
 
@@ -168,9 +255,13 @@
   In turn, gnu-emacs requires at least one of the packages supplying an
   emacs binary to be installed.
 
-- We do not ship any suid/sgid binaries for obvious security reasons.
+- Emacs things we don't deliver:
 
-  We do not install the files under /var/games/emacs. The reason for
-  this is that we do not install update-game-score as setuid, and
-  therefore the game files are not usable. This the same decision made
-  by Debian, among others.
+    x) We do not ship any suid/sgid binaries for obvious security reasons.
+
+    x) We do not install the files under /var/games/emacs. The reason for
+       this is that we do not install update-game-score as setuid, and
+       therefore the game files are not usable. This the same decision made
+       by Debian, among others.
+
+    x) usr/lib/systemd/user/emacs.service: Without systemd, it's not useful.
diff --git a/components/editor/emacs/gnu-emacs-gtk.p5m b/components/editor/emacs/gnu-emacs-gtk.p5m
index 678847f..f4263a7 100644
--- a/components/editor/emacs/gnu-emacs-gtk.p5m
+++ b/components/editor/emacs/gnu-emacs-gtk.p5m
@@ -37,6 +37,7 @@
 file path=usr/bin/emacs-gtk
 hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
 file path=usr/share/man/man1/emacs-gtk.1
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-gtk.pdmp mode=555
 license emacs.license license=GPLv3
 
 
diff --git a/components/editor/emacs/gnu-emacs-lisp.p5m b/components/editor/emacs/gnu-emacs-lisp.p5m
index b1a76b6..756ad96 100644
--- a/components/editor/emacs/gnu-emacs-lisp.p5m
+++ b/components/editor/emacs/gnu-emacs-lisp.p5m
@@ -120,6 +120,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/diary-lib.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/holidays.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/icalendar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/iso8601.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/lunar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/parse-time.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/solar.el.gz
@@ -304,6 +305,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dired.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dirtrack.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/disp-table.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-fill-column-indicator.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-line-numbers.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dnd.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/doc-view.el.gz
@@ -325,6 +327,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/autoload.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/avl-tree.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backquote.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backtrace.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/benchmark.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/bindat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-opt.el.gz
@@ -342,7 +345,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-preloaded.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-print.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-seq.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/copyright.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/crm.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cursor-sensor.el.gz
@@ -366,6 +368,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ert-x.el.gz
 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/faceup.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/float-sup.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generator.el.gz
@@ -401,6 +404,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-unsafep.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/testcover.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/text-property-search.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/thunk.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/timer-list.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/timer.el.gz
@@ -504,6 +508,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/fileloop.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
@@ -652,7 +657,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/compface.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/exif.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/gravatar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/image-converter.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/imenu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/indent.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/info-look.el.gz
@@ -694,6 +701,7 @@
 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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/json.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jsonrpc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kermit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kmacro.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/burmese.el.gz
@@ -721,6 +729,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/lao-util.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/lao.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/misc-lang.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/pinyin.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/romanian.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/sinhala.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/slovak.el.gz
@@ -782,6 +791,7 @@
 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/sami.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
@@ -939,17 +949,19 @@
 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/starttls.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-archive.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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-ftp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-integration.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-rclone.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sh.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sudoedit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/trampver.el.gz
@@ -986,6 +998,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/bruce.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/cl.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
@@ -995,6 +1008,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/gs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/gulp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/html2text.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/info-edit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/landmark.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.el.gz
@@ -1004,11 +1018,11 @@
 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/mantemp.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/patcomp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-mode.el.gz
@@ -1022,16 +1036,18 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/rcompile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/s-region.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/starttls.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tls.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/url-ns.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-arch.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-J.el.gz
@@ -1049,6 +1065,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-dot.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ebnf.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-emacs-lisp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eshell.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eval.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-exp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-forth.el.gz
@@ -1060,7 +1077,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-io.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-java.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-js.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-keys.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-latex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ledger.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lilypond.el.gz
@@ -1094,11 +1110,22 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-tangle.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-vala.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bbdb.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bibtex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-docview.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eshell.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eww.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-gnus.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-info.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-irc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-mhe.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-rmail.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-w3m.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol.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-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-bibtex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach-git.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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-colview.el.gz
@@ -1106,37 +1133,32 @@
 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-docview.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-duration.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-eww.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-gnus.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-goto.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-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-keys.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lint.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-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-mhe.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-num.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-rmail.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-tempo.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-w3m.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
@@ -1190,10 +1212,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/printing.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/proced.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/profiler.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-mode.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-prj.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-stmt.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-xref.el.gz
 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
@@ -1232,6 +1250,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/etags.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/executable.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/f90.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-cc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-proc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/fortran.el.gz
@@ -1252,7 +1271,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ld-script.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/m4-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mantemp.el.gz
 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
@@ -1308,6 +1326,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/shell.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/simple.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/skeleton.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/so-long.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/sort.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/soundex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/speedbar.el.gz
@@ -1316,6 +1335,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/subr.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/svg.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/t-mouse.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-bar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-line.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tabify.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/talk.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tar-mode.el.gz
@@ -1393,6 +1414,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/two-column.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/underline.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thingatpt.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thread.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thumbs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/time-stamp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/time.el.gz
@@ -1428,7 +1450,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-misc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-news.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-nfs.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-ns.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-parse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-privacy.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-proxy.el.gz
diff --git a/components/editor/emacs/gnu-emacs-no-x11.p5m b/components/editor/emacs/gnu-emacs-no-x11.p5m
index 43576fd..1de0a46 100644
--- a/components/editor/emacs/gnu-emacs-no-x11.p5m
+++ b/components/editor/emacs/gnu-emacs-no-x11.p5m
@@ -37,6 +37,7 @@
 file path=usr/bin/emacs-nox
 hardlink path=usr/bin/emacs-nox-$(COMPONENT_VERSION) target=emacs-nox
 file path=usr/share/man/man1/emacs-nox.1
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-nox.pdmp mode=555
 license emacs.license license=GPLv3
 
 
diff --git a/components/editor/emacs/gnu-emacs-x11.p5m b/components/editor/emacs/gnu-emacs-x11.p5m
index 0ae0ee5..c7ffead 100644
--- a/components/editor/emacs/gnu-emacs-x11.p5m
+++ b/components/editor/emacs/gnu-emacs-x11.p5m
@@ -37,6 +37,7 @@
 file path=usr/bin/emacs-x
 hardlink path=usr/bin/emacs-x-$(COMPONENT_VERSION) target=emacs-x
 file path=usr/share/man/man1/emacs-x.1
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-x.pdmp mode=555
 license emacs.license license=GPLv3
 
 
diff --git a/components/editor/emacs/gnu-emacs.p5m b/components/editor/emacs/gnu-emacs.p5m
index df3e93e..6a8e0ed 100644
--- a/components/editor/emacs/gnu-emacs.p5m
+++ b/components/editor/emacs/gnu-emacs.p5m
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2019, Michal Nowak
+# Copyright (c) 2020, Andreas Wacknitz
 #
 
 set name=pkg.fmri \
@@ -43,14 +44,13 @@
 file path=usr/gnu/share/man/man1/ctags.1
 file path=usr/gnu/share/man/man1/etags.1
 file path=usr/include/emacs-module.h
+#file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs.pdmp mode=555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/hexl mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/movemail mode=0555
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/profile mode=0555
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/rcs2log 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/COPYING
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEBUG
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEVEL.HUMOR
@@ -59,16 +59,11 @@
 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
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/FTP
-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/HISTORY
 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/MH-E-NEWS
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MORE.STUFF
 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
@@ -79,16 +74,14 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.23
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.24
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.25
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.26
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEXTSTEP
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NXML-NEWS
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ORDERS
 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/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/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
@@ -524,6 +517,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs22.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs23.png
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs.ico
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs23.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
@@ -735,10 +729,16 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/sort-row-ascending.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/spell.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/spell.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.bmp
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/close.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/left-arrow.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/new.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/right-arrow.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/close.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/close.xpm
@@ -801,52 +801,30 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/publicsuffix.txt.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/Makefile
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/README
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/calccard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/calccard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-dired-ref.pdf
 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
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/dired-ref.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/dired-ref.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/emacsver.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-dired-ref.pdf
 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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-logo.pdf
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/orgcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/orgcard.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pdflayout.sty
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pl-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pl-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pt-br-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pt-br-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/ru-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/ru-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-dired-ref.pdf
 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
@@ -911,6 +889,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/getset-cpp.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/java.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/make.srt
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/proj-test.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/template.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/test.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/texi.srt
@@ -1044,6 +1023,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/hol-loaddefs.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/holidays.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/icalendar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/iso8601.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/lunar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/parse-time.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/solar.elc
@@ -1233,6 +1213,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dired.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dirtrack.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/disp-table.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-fill-column-indicator.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-line-numbers.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dnd.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/doc-view.elc
@@ -1254,6 +1235,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/autoload.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/avl-tree.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backquote.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backtrace.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/benchmark.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/bindat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/byte-opt.elc
@@ -1272,7 +1254,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-preloaded.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-print.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-seq.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/copyright.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/crm.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cursor-sensor.elc
@@ -1297,6 +1278,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ert-x.elc
 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/faceup.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/find-func.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/float-sup.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/generator.elc
@@ -1332,6 +1314,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-ses.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-unsafep.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/testcover.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/text-property-search.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/thunk.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/timer-list.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/timer.elc
@@ -1381,6 +1364,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-join.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-lang.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-list.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-loaddefs.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-log.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-match.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-menu.elc
@@ -1436,6 +1420,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/fileloop.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
@@ -1588,7 +1573,9 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/compface.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/exif.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/gravatar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/image-converter.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/imenu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/indent.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/info-look.elc
@@ -1647,6 +1634,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-cmpr-hook.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-compr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/json.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jsonrpc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kermit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kmacro.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/burmese.elc
@@ -1674,6 +1662,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/lao-util.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/lao.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/misc-lang.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/pinyin.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/romanian.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/sinhala.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/slovak.elc
@@ -1737,6 +1726,7 @@
 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/sami.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
@@ -1900,18 +1890,20 @@
 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/starttls.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-archive.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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-ftp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-integration.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-loaddefs.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-rclone.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sh.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sudoedit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/trampver.elc
@@ -1948,6 +1940,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/bruce.elc
 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/cl.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
@@ -1956,6 +1949,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/fast-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/gulp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/html2text.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/info-edit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/landmark.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lazy-lock.elc
@@ -1965,12 +1959,12 @@
 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/mantemp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/meese.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/messcompat.el
 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.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/pc-mode.elc
@@ -1984,16 +1978,18 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/rcompile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/s-region.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/starttls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tls.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/url-ns.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-arch.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-J.elc
@@ -2011,6 +2007,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-dot.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ebnf.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-emacs-lisp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eshell.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eval.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-exp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-forth.elc
@@ -2022,7 +2019,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-io.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-java.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-js.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-keys.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-latex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ledger.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-lilypond.elc
@@ -2056,11 +2052,22 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-tangle.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-vala.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bbdb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bibtex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-docview.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eshell.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eww.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-gnus.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-info.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-irc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-mhe.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-rmail.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-w3m.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol.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-attach.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach-git.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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-colview.elc
@@ -2068,40 +2075,35 @@
 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-docview.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-duration.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-eww.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-gnus.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-goto.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.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-keys.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lint.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-macro.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.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-num.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-rmail.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-tempo.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-w3m.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
@@ -2155,10 +2157,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/printing.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/proced.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/profiler.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-prj.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-stmt.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-xref.elc
 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
@@ -2197,6 +2195,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/etags.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/executable.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/f90.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-cc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-proc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/fortran.elc
@@ -2217,7 +2216,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ld-script.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/m4-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mantemp.elc
 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
@@ -2274,6 +2272,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/shell.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/simple.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/skeleton.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/so-long.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/sort.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/soundex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/speedbar.elc
@@ -2283,6 +2282,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/subr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/svg.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/t-mouse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-bar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-line.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tabify.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/talk.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tar-mode.elc
@@ -2362,6 +2363,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/two-column.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/underline.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thingatpt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thread.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thumbs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/time-stamp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/time.elc
@@ -2397,7 +2399,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-misc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-news.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-nfs.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-ns.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-parse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-privacy.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-proxy.elc
@@ -2476,10 +2477,10 @@
 file path=usr/share/icons/hicolor/24x24/apps/emacs.png
 file path=usr/share/icons/hicolor/32x32/apps/emacs.png
 file path=usr/share/icons/hicolor/48x48/apps/emacs.png
+file path=usr/share/icons/hicolor/scalable/apps/emacs.ico
 file path=usr/share/icons/hicolor/scalable/apps/emacs.svg
 file path=usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 file path=usr/share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
-file path=usr/share/info/ada-mode.info
 file path=usr/share/info/auth.info
 file path=usr/share/info/autotype.info
 file path=usr/share/info/bovine.info
diff --git a/components/editor/emacs/manifests/sample-manifest.p5m b/components/editor/emacs/manifests/sample-manifest.p5m
index 5c20ae2..853e893 100644
--- a/components/editor/emacs/manifests/sample-manifest.p5m
+++ b/components/editor/emacs/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2018 <contributor>
+# Copyright 2020 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,10 +24,10 @@
 
 file path=usr/bin/ebrowse
 file path=usr/bin/emacs
-hardlink path=usr/bin/emacs-gtk target=emacs-gtk-$(COMPONENT_VERSION)
-file path=usr/bin/emacs-gtk-$(COMPONENT_VERSION)
-file path=usr/bin/emacs-nox
-hardlink path=usr/bin/emacs-nox-$(COMPONENT_VERSION) target=emacs-nox
+file path=usr/bin/emacs-gtk
+hardlink path=usr/bin/emacs-gtk-$(COMPONENT_VERSION) target=emacs-gtk
+hardlink path=usr/bin/emacs-nox target=emacs-nox-$(COMPONENT_VERSION)
+file path=usr/bin/emacs-nox-$(COMPONENT_VERSION)
 hardlink path=usr/bin/emacs-x target=emacs-x-$(COMPONENT_VERSION)
 file path=usr/bin/emacs-x-$(COMPONENT_VERSION)
 file path=usr/bin/emacsclient
@@ -36,15 +36,17 @@
 file path=usr/gnu/share/man/man1/ctags.1
 file path=usr/gnu/share/man/man1/etags.1
 file path=usr/include/emacs-module.h
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-gtk.pdmp
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-nox.pdmp
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs-x.pdmp
+file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/emacs.pdmp
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/hexl
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/movemail
-file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/profile
 file path=usr/lib/emacs/$(COMPONENT_VERSION)/$(GNU_TRIPLET)/rcs2log
 file path=usr/lib/systemd/user/emacs.service
 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/COPYING
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEBUG
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/DEVEL.HUMOR
@@ -53,16 +55,11 @@
 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
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/FTP
-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/HISTORY
 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/MH-E-NEWS
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/MORE.STUFF
 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
@@ -73,16 +70,14 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.23
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.24
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.25
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEWS.26
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NEXTSTEP
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/NXML-NEWS
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/ORDERS
 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/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/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
@@ -519,6 +514,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs22.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/48x48/apps/emacs23.png
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs.ico
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/apps/emacs23.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/icons/hicolor/scalable/mimetypes/emacs-document.svg
@@ -730,10 +726,16 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/sort-row-ascending.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/spell.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/spell.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.bmp
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.pbm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.svg
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/splash.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/README
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/close.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/left-arrow.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/new.xpm
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tabs/right-arrow.xpm
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/README
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/close.png
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/images/tree-widget/default/close.xpm
@@ -796,52 +798,30 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/publicsuffix.txt.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/Makefile
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/README
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/calccard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/calccard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/cs-dired-ref.pdf
 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
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/dired-ref.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/dired-ref.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/emacsver.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/fr-dired-ref.pdf
 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
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-logo.pdf
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/gnus-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/orgcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/orgcard.tex
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pdflayout.sty
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pl-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pl-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pt-br-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/pt-br-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/ru-refcard.pdf
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/ru-refcard.tex
-file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/refcards/sk-dired-ref.pdf
 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,6 +886,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/getset-cpp.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/java.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/make.srt
+file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/proj-test.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/template.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/test.srt
 file path=usr/share/emacs/$(COMPONENT_VERSION)/etc/srecode/texi.srt
@@ -1124,6 +1105,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/holidays.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/icalendar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/icalendar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/iso8601.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/iso8601.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/lunar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/lunar.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/calendar/parse-time.el.gz
@@ -1497,6 +1480,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dirtrack.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/disp-table.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/disp-table.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-fill-column-indicator.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-fill-column-indicator.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-line-numbers.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/display-line-numbers.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/dnd.el.gz
@@ -1539,6 +1524,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/avl-tree.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backquote.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backquote.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backtrace.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/backtrace.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/benchmark.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/benchmark.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/bindat.el.gz
@@ -1574,8 +1561,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-print.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-seq.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl-seq.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/cl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/copyright.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/copyright.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/crm.el.gz
@@ -1623,6 +1608,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ert.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ewoc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/ewoc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/faceup.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/faceup.elc
 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-func.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/float-sup.el.gz
@@ -1693,6 +1680,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/tcover-unsafep.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/testcover.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/testcover.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/text-property-search.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/text-property-search.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/thunk.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/thunk.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/emacs-lisp/timer-list.el.gz
@@ -1791,6 +1780,7 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-lang.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-list.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-list.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-loaddefs.el
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-log.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-log.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/erc/erc-match.el.gz
@@ -1900,6 +1890,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/ffap.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filecache.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/fileloop.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/fileloop.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filenotify.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/filenotify.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/files-x.el.gz
@@ -2200,8 +2192,12 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/compface.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/compface.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/exif.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/exif.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/gravatar.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/gravatar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/image-converter.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/image/image-converter.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/imenu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/imenu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/indent.el.gz
@@ -2303,6 +2299,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jka-compr.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/json.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/json.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jsonrpc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/jsonrpc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kermit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kermit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/kmacro.el.gz
@@ -2357,6 +2355,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/lao.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/misc-lang.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/misc-lang.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/pinyin.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/pinyin.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/romanian.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/romanian.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/language/sinhala.el.gz
@@ -2481,6 +2481,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/quick-cns.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/rfc1345.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/rfc1345.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sami.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sami.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sgml-input.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sgml-input.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/leim/quail/sisheng.el.gz
@@ -2801,14 +2803,12 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/soap-inspect.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/socks.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/socks.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/starttls.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/starttls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/telnet.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/telnet.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tls.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-adb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-adb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-archive.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-archive.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cache.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cache.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-cmds.el.gz
@@ -2819,11 +2819,17 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-ftp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-gvfs.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-integration.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-integration.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-loaddefs.el
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-rclone.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-rclone.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sh.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sh.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-smb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sudoedit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-sudoedit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp-uu.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/net/tramp.el.gz
@@ -2896,6 +2902,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cc-compat.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl-compat.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/cl.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/complete.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/complete.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/crisp.el.gz
@@ -2914,6 +2922,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/gulp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/html2text.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/html2text.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/info-edit.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/info-edit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/iswitchb.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/landmark.el.gz
@@ -2932,6 +2942,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/lucid.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mailpost.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mailpost.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mantemp.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/mantemp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/meese.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/meese.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/messcompat.el
@@ -2941,8 +2953,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-emacs-lock.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/old-whitespace.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/options.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/otodo-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/otodo-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/patcomp.el.gz
@@ -2969,16 +2979,22 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/s-region.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sregex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/starttls.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/starttls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/sup-mouse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/terminal.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tls.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tls.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-edt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-edt.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-extras.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-extras.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-mapper.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/tpu-mapper.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/url-ns.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/url-ns.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-arch.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vc-arch.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vi.el.gz
@@ -2987,8 +3003,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/vip.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ws-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/ws-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/xesam.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/xesam.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/yow.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/obsolete/yow.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-C.el.gz
@@ -3023,6 +3037,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ebnf.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-emacs-lisp.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-emacs-lisp.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eshell.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eshell.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eval.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-eval.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-exp.el.gz
@@ -3045,8 +3061,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-java.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-js.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-js.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-keys.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-keys.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-latex.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-latex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-ledger.el.gz
@@ -3113,16 +3127,38 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob-vala.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ob.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bbdb.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bbdb.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bibtex.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-bibtex.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-docview.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-docview.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eshell.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eshell.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eww.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-eww.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-gnus.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-gnus.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-info.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-info.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-irc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-irc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-mhe.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-mhe.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-rmail.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-rmail.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-w3m.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol-w3m.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ol.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-agenda.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-archive.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach-git.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach-git.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-attach.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bbdb.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-bibtex.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-capture.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-capture.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-clock.el.gz
@@ -3137,39 +3173,31 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-ctags.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-datetree.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docview.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-docview.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-duration.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-duration.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-element.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-element.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-entities.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-entities.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eshell.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eshell.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eww.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-eww.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-faces.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-feed.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-footnote.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-gnus.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-goto.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-goto.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-habit.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-id.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-indent.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-info.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-inlinetask.el.gz
 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.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-irc.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-keys.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-keys.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lint.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-lint.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-list.el.gz
@@ -3179,29 +3207,27 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macro.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-macs.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mhe.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mobile.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-mouse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-num.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-num.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-pcomplete.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-pcomplete.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-plot.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-protocol.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-rmail.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-src.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-table.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-tempo.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-tempo.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-timer.el.gz
 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-w3m.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org-w3m.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/org.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/org/ox-ascii.el.gz
@@ -3308,14 +3334,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/proced.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/profiler.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/profiler.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-mode.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-prj.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-prj.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-stmt.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-stmt.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-xref.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/ada-xref.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/antlr-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/antlr-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/asm-mode.el.gz
@@ -3392,6 +3410,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/executable.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/f90.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/f90.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-cc.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-cc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-proc.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake-proc.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/flymake.el.gz
@@ -3432,8 +3452,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/m4-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/make-mode.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mantemp.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mantemp.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/meta-mode.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/meta-mode.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/progmodes/mixal-mode.el.gz
@@ -3545,6 +3563,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/simple.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/skeleton.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/skeleton.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/so-long.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/so-long.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/sort.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/sort.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/soundex.el.gz
@@ -3562,6 +3582,10 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/svg.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/t-mouse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/t-mouse.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-bar.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-bar.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-line.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tab-line.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tabify.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/tabify.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/talk.el.gz
@@ -3718,6 +3742,8 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/textmodes/underline.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thingatpt.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thingatpt.elc
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thread.el.gz
+file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thread.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thumbs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/thumbs.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/time-stamp.el.gz
@@ -3788,8 +3814,6 @@
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-news.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-nfs.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-nfs.elc
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-ns.el.gz
-file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-ns.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-parse.el.gz
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-parse.elc
 file path=usr/share/emacs/$(COMPONENT_VERSION)/lisp/url/url-privacy.el.gz
@@ -3939,10 +3963,10 @@
 file path=usr/share/icons/hicolor/24x24/apps/emacs.png
 file path=usr/share/icons/hicolor/32x32/apps/emacs.png
 file path=usr/share/icons/hicolor/48x48/apps/emacs.png
+file path=usr/share/icons/hicolor/scalable/apps/emacs.ico
 file path=usr/share/icons/hicolor/scalable/apps/emacs.svg
 file path=usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 file path=usr/share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
-file path=usr/share/info/ada-mode.info
 file path=usr/share/info/auth.info
 file path=usr/share/info/autotype.info
 file path=usr/share/info/bovine.info
diff --git a/components/editor/emacs/patches/01-find.patch b/components/editor/emacs/patches/01-find.patch
index 88ef192..703bf8d 100644
--- a/components/editor/emacs/patches/01-find.patch
+++ b/components/editor/emacs/patches/01-find.patch
@@ -1,13 +1,35 @@
-# Ensure that emacs uses GNU find. See components/emacs/README.
-#
---- emacs-25.2/lisp/progmodes/grep.el.~1~	2017-02-03 13:25:44.000000000 +0300
-+++ emacs-25.2/lisp/progmodes/grep.el	2017-04-25 15:46:10.922261876 +0300
-@@ -416,7 +416,7 @@
+Ensure that emacs uses GNU find. See components/emacs/README.
+
+--- emacs-27.1/lisp/loaddefs.el.orig	2020-08-04 21:50:06.000000000 +0000
++++ emacs-27.1/lisp/loaddefs.el	2020-08-15 11:07:57.225527052 +0000
+@@ -15065,7 +15065,7 @@
+ The default grep program for `grep-command' and `grep-find-command'.
+ This variable's value takes effect when `grep-compute-defaults' is called.")
+ 
+-(defvar find-program (purecopy "find") "\
++(defvar find-program (purecopy "/usr/gnu/bin/find") "\
+ The default find program.
+ This is used by commands like `grep-find-command', `find-dired'
+ and others.")
+--- emacs-27.1/lisp/ldefs-boot.el.orig	2020-08-04 21:59:53.000000000 +0000
++++ emacs-27.1/lisp/ldefs-boot.el	2020-08-15 11:08:30.652017347 +0000
+@@ -15065,7 +15065,7 @@
+ The default grep program for `grep-command' and `grep-find-command'.
+ This variable's value takes effect when `grep-compute-defaults' is called.")
+ 
+-(defvar find-program (purecopy "find") "\
++(defvar find-program (purecopy "/usr/gnu/bin/find") "\
+ The default find program.
+ This is used by commands like `grep-find-command', `find-dired'
+ and others.")
+--- emacs-27.1/lisp/progmodes/grep.el.orig	2020-07-29 23:40:41.000000000 +0000
++++ emacs-27.1/lisp/progmodes/grep.el	2020-08-15 11:09:19.101533184 +0000
+@@ -501,7 +501,7 @@
  This variable's value takes effect when `grep-compute-defaults' is called.")
  
  ;;;###autoload
 -(defvar find-program (purecopy "find")
-+(defvar find-program (purecopy "/usr/bin/gnu/find")
++(defvar find-program (purecopy "/usr/gnu/bin/find")
    "The default find program.
  This is used by commands like `grep-find-command', `find-dired'
  and others.")
diff --git a/components/editor/emacs/patches/02-ca-certs-path.patch b/components/editor/emacs/patches/02-ca-certs-path.patch
deleted file mode 100644
index 0f25582..0000000
--- a/components/editor/emacs/patches/02-ca-certs-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 97cfb4f1e751a947105802d5c4b4f56c696ff75d Mon Sep 17 00:00:00 2001
-From: Michal Nowak <mnowak@startmail.com>
-Date: Mon, 28 Oct 2019 15:38:34 +0100
-Subject: Add cert bundle path for OpenIndiana
-
-* lisp/net/gnutls.el (gnutls-trustfiles): Add cert bundle path for
-OpenIndiana (bug#37960).
-
-Copyright-paperwork-exempt: yes
----
- lisp/net/gnutls.el | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
-index ae15b3a..9b13ada 100644
---- a/lisp/net/gnutls.el
-+++ b/lisp/net/gnutls.el
-@@ -111,6 +111,7 @@ Security'."
-     "/usr/ssl/certs/ca-bundle.crt"           ; Cygwin
-     "/usr/local/share/certs/ca-root-nss.crt" ; FreeBSD
-     "/etc/ssl/cert.pem"                      ; macOS
-+    "/etc/certs/ca-certificates.crt"         ; OpenIndiana
-     )
-   "List of CA bundle location filenames or a function returning said list.
- If a file path contains glob wildcards, they will be expanded.
--- 
-cgit v1.0-41-gc330
-
diff --git a/components/editor/emacs/pkg5 b/components/editor/emacs/pkg5
index 8cb8e63..5e7eb31 100644
--- a/components/editor/emacs/pkg5
+++ b/components/editor/emacs/pkg5
@@ -6,12 +6,14 @@
         "image/library/libpng16",
         "image/library/librsvg",
         "image/library/libtiff",
+        "library/c++/harfbuzz",
         "library/desktop/cairo",
         "library/desktop/gdk-pixbuf",
         "library/desktop/gtk3",
         "library/desktop/pango",
         "library/glib2",
         "library/gnutls-3",
+        "library/jansson",
         "library/lcms2",
         "library/libxml2",
         "library/ncurses",

--
Gitblit v1.9.3