[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/

[Mats Lidell]

commit:     13b62d718ed4593bc8cff1d7da0d75cad678c0eb
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 16:14:33 2017 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 16:15:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b62d71

app-editors/xemacs: Remove xemacs-21.4.22-r4.ebuild and patches

xemacs-21.4.24.ebuild has been stable for a long time.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-editors/xemacs/Manifest                        |   1 -
 app-editors/xemacs/files/xemacs-21.4.19-texi.patch |  33 --
 .../xemacs/files/xemacs-21.4.21-vcdiff.patch       |  19 -
 .../files/xemacs-21.4.22-deprecated-ldap.patch     |  18 -
 .../xemacs/files/xemacs-21.4.22-large-images.patch | 122 ------
 .../xemacs/files/xemacs-21.4.22-libpng15.patch     |  66 ----
 .../xemacs/files/xemacs-21.4.22-texinfo-5.patch    | 437 ---------------------
 app-editors/xemacs/xemacs-21.4.22-r4.ebuild        | 257 ------------
 8 files changed, 953 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 810f075dcc5..793589c7309 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,3 @@
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
-DIST xemacs-21.4.22.tar.gz 8357931 BLAKE2B 257a624f2709a883d1b5c54939b332af0ba4a993faab1c5766dd18a6a0ca0ec8d26fbc44911e234c3131b73b22da132f5e09f0593dcfdf973c6c9e62e71d0b58 SHA512 7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a

diff --git a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
deleted file mode 100644
index f53eb3dafd3..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: emodules.texi
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/man/emodules.texi,v
-retrieving revision 1.2.2.2
-diff -u -B -r1.2.2.2 emodules.texi
---- man/emodules.texi	2002/08/20 11:35:22	1.2.2.2
-+++ man/emodules.texi	2006/12/09 14:21:22
-@@ -3,6 +3,9 @@
- @c %**start of header
- @setfilename ../info/emodules.info
- @settitle Extending Emacs using C Modules
-+@direntry
-+* Emodules: (emodules).      XEmacs dynamically loadable module support.
-+@end direntry
- @c %**end of header
- 
- @c
-Index: external-widget.texi
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/man/external-widget.texi,v
-retrieving revision 1.3.2.1
-diff -u -B -r1.3.2.1 external-widget.texi
---- man/external-widget.texi	2002/04/30 16:06:06	1.3.2.1
-+++ man/external-widget.texi	2006/12/09 14:21:22
-@@ -4,7 +4,7 @@
- @ifinfo
- @dircategory XEmacs Editor
- @direntry
--* External Widget: (external-widget) External Client Widget.
-+* External Widget: (external-widget). External Client Widget.
- @end direntry
- @end ifinfo
- 

diff --git a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
deleted file mode 100644
index 105eb549eb6..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib-src/vcdiff.~1~	1996-12-18 23:42:33.000000000 +0100
-+++ lib-src/vcdiff	2008-04-09 08:20:36.000000000 +0200
-@@ -79,14 +79,14 @@
- 	case $f in
- 	s.* | */s.*)
- 		if
--			rev1=/tmp/geta$$
-+			rev1=`mktemp /tmp/geta.XXXXXXXX`
- 			get -s -p -k $sid1 "$f" > $rev1 &&
- 			case $sid2 in
- 			'')
- 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
- 				;;
- 			*)
--				rev2=/tmp/getb$$
-+				rev2=`mktemp /tmp/getb.XXXXXXXX`
- 				get -s -p -k $sid2 "$f" > $rev2
- 				workfile=$rev2
- 			esac

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch b/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
deleted file mode 100644
index aceae530bcb..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to include depracated LDAP symbols, specifically
-ldap_open. Without the proper prototype the call will almost surely
-lead to crashes on 64-bit arches otherwise. Thanks to hwoareng for the
-initial bug report.
-
-Not reported upstream since bug tracker is down.
-
---- src/eldap.h.~1~	2001-04-12 20:23:36.000000000 +0200
-+++ src/eldap.h	2010-09-28 19:53:34.148472315 +0200
-@@ -21,6 +21,8 @@
- #ifndef INCLUDED_eldap_h_
- #define INCLUDED_eldap_h_
- 
-+#define LDAP_DEPRECATED 1
-+
- #include <lber.h>
- #include <ldap.h>
- 

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch b/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
deleted file mode 100644
index a03af3ccfa3..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-PATCH 21.4
-
-Here is the 21.4 version of the previous patch.  The lisp.h hunk is a
-little ugly.  Recommendations on how to deal with the absence of
-UINT_64_T in 21.4 are welcome.
-
-Index: src/glyphs-eimage.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-eimage.c,v
-retrieving revision 1.9.2.5
-diff -d -u -r1.9.2.5 glyphs-eimage.c
---- src/glyphs-eimage.c	2007/08/20 19:52:28	1.9.2.5
-+++ src/glyphs-eimage.c	2009/07/01 22:36:04
-@@ -407,6 +407,7 @@
-    */
-
-   {
-+    UINT_64_BIT pixels_sq;
-     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
-     /* Step 4: set parameters for decompression.   */
-
-@@ -429,7 +430,10 @@
-     jpeg_start_decompress (&cinfo);
-
-     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
--
-+    pixels_sq =
-+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
-+    if (pixels_sq > ((size_t) -1) / 3)
-+      signal_image_error ("JPEG image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*) xmalloc (cinfo.output_width * cinfo.output_height * 3);
-     if (!unwind.eimage)
-       signal_image_error("Unable to allocate enough memory for image", instantiator);
-@@ -671,6 +675,7 @@
-   {
-     ColorMapObject *cmo = unwind.giffile->SColorMap;
-     int i, j, row, pass, interlace, slice;
-+    UINT_64_BIT pixels_sq;
-     unsigned char *eip;
-     /* interlaced gifs have rows in this order:
-        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
-@@ -679,6 +684,9 @@
-
-     height = unwind.giffile->SHeight;
-     width = unwind.giffile->SWidth;
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
-+      signal_image_error ("GIF image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*)
-       xmalloc (width * height * 3 * unwind.giffile->ImageCount);
-     if (!unwind.eimage)
-@@ -937,11 +945,15 @@
-   {
-     int y;
-     unsigned char **row_pointers;
-+    UINT_64_BIT pixels_sq;
-     height = info_ptr->height;
-     width = info_ptr->width;
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / 3)
-+      signal_image_error ("PNG image too large to instantiate", instantiator);
-
-     /* Wow, allocate all the memory.  Truly, exciting. */
--    unwind.eimage = xnew_array_and_zero (unsigned char, width * height * 3);
-+    unwind.eimage = xnew_array_and_zero (unsigned char, pixels_sq * 3);
-     /* libpng expects that the image buffer passed in contains a
-        picture to draw on top of if the png has any transparencies.
-        This could be a good place to pass that in... */
-@@ -994,7 +1006,7 @@
-       png_set_expand (png_ptr);
-     /* send grayscale images to RGB too */
-     if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-       png_set_gray_to_rgb (png_ptr);
-     /* we can't handle alpha values */
-     if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-@@ -1268,6 +1280,7 @@
-
-     uint32 *raster;
-     unsigned char *ep;
-+    UINT_64_BIT pixels_sq;
-
-     assert (!NILP (data));
-
-@@ -1290,12 +1303,15 @@
-
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
--    unwind.eimage = (unsigned char *) xmalloc (width * height * 3);
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq >= 1 << 29)
-+      signal_image_error ("TIFF image too large to instantiate", instantiator);
-+    unwind.eimage = (unsigned char *) xmalloc (pixels_sq * 3);
-
-     /* #### This is little more than proof-of-concept/function testing.
-        It needs to be reimplemented via scanline reads for both memory
-        compactness. */
--    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
-+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
-     if (raster != NULL)
-       {
- 	int i,j;
-Index: src/lisp.h
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
-retrieving revision 1.45.2.10
-diff -d -u -r1.45.2.10 lisp.h
---- src/lisp.h	2005/02/01 03:55:02	1.45.2.10
-+++ src/lisp.h	2009/07/01 22:36:05
-@@ -265,6 +265,11 @@
- /*#define REGISTER register*/
- /*#endif*/
-
-+#if SIZEOF_LONG == 8
-+#define UINT_64_BIT unsigned long
-+#elif SIZEOF_LONG_LONG == 8
-+#define UINT_64_BIT unsigned long long
-+#endif
-
- /* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
-    In particular, it must be large enough to contain a pointer.

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
deleted file mode 100644
index 0143e375d74..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur xemacs-21.4.22.orig/src/glyphs-eimage.c xemacs-21.4.22/src/glyphs-eimage.c
---- xemacs-21.4.22.orig/src/glyphs-eimage.c	2011-09-26 19:44:57.889720996 +0300
-+++ xemacs-21.4.22/src/glyphs-eimage.c	2011-09-26 19:48:07.026226254 +0300
-@@ -946,8 +946,8 @@
-     int y;
-     unsigned char **row_pointers;
-     UINT_64_BIT pixels_sq;
--    height = info_ptr->height;
--    width = info_ptr->width;
-+    height = png_get_image_height(png_ptr, info_ptr);
-+    width = png_get_image_width(png_ptr, info_ptr);
-     pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-     if (pixels_sq > ((size_t) -1) / 3)
-       signal_image_error ("PNG image too large to instantiate", instantiator);
-@@ -1002,22 +1002,22 @@
-     /* Now that we're using EImage, ask for 8bit RGB triples for any type
-        of image*/
-     /* convert palette images to full RGB */
--    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
-       png_set_expand (png_ptr);
-     /* send grayscale images to RGB too */
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
-+	png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
-       png_set_gray_to_rgb (png_ptr);
-     /* we can't handle alpha values */
--    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
-       png_set_strip_alpha (png_ptr);
-     /* tell libpng to strip 16 bit depth files down to 8 bits */
--    if (info_ptr->bit_depth == 16)
-+    if (png_get_bit_depth(png_ptr, info_ptr) == 16)
-       png_set_strip_16 (png_ptr);
-     /* if the image is < 8 bits, pad it out */
--    if (info_ptr->bit_depth < 8)
-+    if (png_get_bit_depth(png_ptr, info_ptr) < 8)
-       {
--	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
- 	  png_set_expand (png_ptr);
- 	else
- 	  png_set_packing (png_ptr);
-@@ -1036,16 +1036,18 @@
-      */
-     {
-       int i;
-+      png_textp text;
-+      int num_text;
- 
--      for (i = 0 ; i < info_ptr->num_text ; i++)
-+      for (i = 0 ; i < num_text ; i++)
- 	{
- 	  /* How paranoid do I have to be about no trailing NULLs, and
- 	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
- 	     string somewhere? */
- 
- 	  warn_when_safe (Qpng, Qinfo, "%s - %s",
--			  info_ptr->text[i].key,
--			  info_ptr->text[i].text);
-+			  text[i].key,
-+			  text[i].text);
- 	}
-     }
- #endif

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch b/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
deleted file mode 100644
index 05dda3974a6..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
+++ /dev/null
@@ -1,437 +0,0 @@
---- xemacs-21.4.22-orig/man/custom.texi
-+++ xemacs-21.4.22/man/custom.texi
-@@ -60,7 +60,7 @@
- 
- @node Declaring Groups, Declaring Variables, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Groups
-+@chapter Declaring Groups
- 
- Use @code{defgroup} to declare new customization groups.
- 
-@@ -92,7 +92,7 @@
- 
- @node Declaring Variables, Declaring Faces, Declaring Groups, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Variables
-+@chapter Declaring Variables
- 
- Use @code{defcustom} to declare user editable variables.
- 
-@@ -176,7 +176,7 @@
- 
- @node Declaring Faces, Usage for Package Authors, Declaring Variables, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Faces
-+@chapter Declaring Faces
- 
- Faces are declared with @code{defface}.
- 
-@@ -228,7 +228,7 @@
- 
- @node Usage for Package Authors, Utilities, Declaring Faces, Top
- @comment  node-name,  next,  previous,  up
--@section Usage for Package Authors
-+@chapter Usage for Package Authors
- 
- The recommended usage for the author of a typical emacs lisp package is
- to create one group identifying the package, and make all user options
-@@ -244,7 +244,7 @@
- 
- @node  Utilities, The Init File, Usage for Package Authors, Top
- @comment  node-name,  next,  previous,  up
--@section Utilities
-+@chapter Utilities
- 
- These utilities can come in handy when adding customization support.
- 
-@@ -276,7 +276,7 @@
- 
- @node The Init File, Wishlist, Utilities, Top
- @comment  node-name,  next,  previous,  up
--@section The Init File
-+@chapter The Init File
- 
- Customizations are saved to the file specified by @code{custom-file}, as
- calls to @code{custom-set-variables} and @code{custom-set-faces}.
-@@ -299,7 +299,7 @@
- 
- @node Wishlist,  , The Init File, Top
- @comment  node-name,  next,  previous,  up
--@section Wishlist
-+@chapter Wishlist
- 
- @itemize @bullet
- @item
---- xemacs-21.4.22-orig/man/info.texi
-+++ xemacs-21.4.22/man/info.texi
-@@ -543,6 +543,10 @@
- @c If a menu appears at the end of this node, remove it.
- @c It is an accident of the menu updating command.
- 
-+@menu
-+* Help-Cross::
-+@end menu
-+
- @node Help-Cross,  ,  , Help-Adv
- @subsection The node reached by the cross reference in Info
- 
---- xemacs-21.4.22-orig/man/lispref/edebug-inc.texi
-+++ xemacs-21.4.22/man/lispref/edebug-inc.texi
-@@ -1103,7 +1103,7 @@
- Here is a table of the possibilities for @var{specification} and how each
- directs processing of arguments.
- 
--@table @bullet
-+@table @asis
- 
- @item @code{t}
- All arguments are instrumented for evaluation.
---- xemacs-21.4.22-orig/man/lispref/packaging.texi
-+++ xemacs-21.4.22/man/lispref/packaging.texi
-@@ -600,7 +600,7 @@
- Does most of the work.  Builds the elcs, infos at a minimum.
- @end table
- 
--@subsection The targets that most people would be interested in would be:
-+@section The targets that most people would be interested in would be:
- 
- @itemize @bullet
- @item @code{all}
---- xemacs-21.4.22-orig/man/term.texi
-+++ xemacs-21.4.22/man/term.texi
-@@ -4,7 +4,7 @@
- 
- @titlepage
- @sp 6
--@center @titlefont(Notes about Emacs TERM Mode)
-+@center @titlefont{Notes about Emacs TERM Mode}
- @end titlepage
- 
- @ifinfo
---- xemacs-21.4.22-orig/man/widget.texi
-+++ xemacs-21.4.22/man/widget.texi
-@@ -38,7 +38,7 @@
- 
- @node  Introduction, User Interface, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Introduction
-+@chapter Introduction
- 
- Most graphical user interface toolkits, such as Motif and XView, provide
- a number of standard user interface controls (sometimes known as
-@@ -129,7 +129,7 @@
- 
- @node User Interface, Programming Example, Introduction, Top
- @comment  node-name,  next,  previous,  up
--@section User Interface
-+@chapter User Interface
- 
- A form consists of read only text for documentation and some fields,
- where each of the fields contains two parts, a tag and a value.  The
-@@ -175,7 +175,7 @@
- a form, namely editing the editable text fields and activating the
- buttons.
- 
--@subsection Editable Text Fields
-+@section Editable Text Fields
- 
- In the example, the value for the @samp{Name} is most likely displayed
- in an editable text field, and so are values for each of the members of
-@@ -194,7 +194,7 @@
- Face used for other editing fields.
- @end deffn
- 
--@subsection Buttons
-+@section Buttons
- 
- Some portions of the buffer have an associated @dfn{action}, which can
- be @dfn{invoked} by a standard key or mouse command.  These portions
-@@ -259,7 +259,7 @@
- Face used for buttons when the mouse pointer is above it.
- @end defopt
- 
--@subsection Navigation
-+@section Navigation
- 
- You can use all the normal Emacs commands to move around in a form
- buffer, plus you will have these additional commands:
-@@ -277,7 +277,7 @@
- 
- @node Programming Example, Setting Up the Buffer, User Interface, Top
- @comment  node-name,  next,  previous,  up
--@section Programming Example
-+@chapter Programming Example
- 
- Here is the code to implement the user interface example (see @ref{User
- Interface}).
-@@ -369,7 +369,7 @@
- 
- @node Setting Up the Buffer, Basic Types, Programming Example, Top
- @comment  node-name,  next,  previous,  up
--@section Setting Up the Buffer
-+@chapter Setting Up the Buffer
- 
- Widgets are created with @code{widget-create}, which returns a
- @dfn{widget} object.  This object can be queried and manipulated by
-@@ -422,7 +422,7 @@
- 
- @node Basic Types, Sexp Types, Setting Up the Buffer, Top
- @comment  node-name,  next,  previous,  up
--@section Basic Types
-+@chapter Basic Types
- 
- The syntax of a type specification is given below:
- 
-@@ -635,7 +635,7 @@
- 
- @node link, url-link, Basic Types, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{link} Widget
-+@section The @code{link} Widget
- 
- Syntax:
- 
-@@ -659,7 +659,7 @@
- 
- @node url-link, info-link, link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{url-link} Widget
-+@section The @code{url-link} Widget
- 
- Syntax:
- 
-@@ -672,7 +672,7 @@
- 
- @node info-link, push-button, url-link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{info-link} Widget
-+@section The @code{info-link} Widget
- 
- Syntax:
- 
-@@ -685,7 +685,7 @@
- 
- @node  push-button, editable-field, info-link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{push-button} Widget
-+@section The @code{push-button} Widget
- 
- Syntax:
- 
-@@ -709,7 +709,7 @@
- 
- @node editable-field, text, push-button, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{editable-field} Widget
-+@section The @code{editable-field} Widget
- 
- Syntax:
- 
-@@ -753,7 +753,7 @@
- 
- @node text, menu-choice, editable-field, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{text} Widget
-+@section The @code{text} Widget
- 
- This is just like @code{editable-field}, but intended for multiline text
- fields.  The default @code{:keymap} is @code{widget-text-keymap}, which
-@@ -761,7 +761,7 @@
- 
- @node menu-choice, radio-button-choice, text, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{menu-choice} Widget
-+@section The @code{menu-choice} Widget
- 
- Syntax:
- 
-@@ -796,7 +796,7 @@
- 
- @node radio-button-choice, item, menu-choice, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{radio-button-choice} Widget
-+@section The @code{radio-button-choice} Widget
- 
- Syntax:
- 
-@@ -856,7 +856,7 @@
- 
- @node item, choice-item, radio-button-choice, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{item} Widget
-+@section The @code{item} Widget
- 
- Syntax:
- 
-@@ -870,7 +870,7 @@
- 
- @node choice-item, toggle, item, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{choice-item} Widget
-+@section The @code{choice-item} Widget
- 
- Syntax:
- 
-@@ -886,7 +886,7 @@
- 
- @node toggle, checkbox, choice-item, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{toggle} Widget
-+@section The @code{toggle} Widget
- 
- Syntax:
- 
-@@ -914,7 +914,7 @@
- 
- @node checkbox, checklist, toggle, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{checkbox} Widget
-+@section The @code{checkbox} Widget
- 
- The widget has two possible states, `selected' and `unselected', which
- corresponds to a @code{t} or @code{nil} value.
-@@ -927,7 +927,7 @@
- 
- @node checklist, editable-list, checkbox, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{checklist} Widget
-+@section The @code{checklist} Widget
- 
- Syntax:
- 
-@@ -978,7 +978,7 @@
- 
- @node editable-list, group, checklist, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{editable-list} Widget
-+@section The @code{editable-list} Widget
- 
- Syntax:
- 
-@@ -1030,7 +1030,7 @@
- 
- @node group,  , editable-list, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{group} Widget
-+@section The @code{group} Widget
- 
- This widget simply groups other widgets together.
- 
-@@ -1044,7 +1044,7 @@
- 
- @node Sexp Types, Widget Properties, Basic Types, Top
- @comment
--@section Sexp Types
-+@chapter Sexp Types
- 
- A number of widgets for editing s-expressions (lisp types) are also
- available.  These basically fall in the following categories.
-@@ -1058,7 +1058,7 @@
- 
- @node constants, generic, Sexp Types, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection The Constant Widgets.
-+@section The Constant Widgets.
- 
- The @code{const} widget can contain any lisp expression, but the user is
- prohibited from editing it, which is mainly useful as a component of one
-@@ -1094,7 +1094,7 @@
- 
- @node generic, atoms, constants, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Generic Sexp Widget.
-+@section Generic Sexp Widget.
- 
- The @code{sexp} widget can contain any lisp expression, and allows the
- user to edit it inline in the buffer.
-@@ -1115,7 +1115,7 @@
- 
- @node atoms, composite, generic, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Atomic Sexp Widgets.
-+@section Atomic Sexp Widgets.
- 
- The atoms are s-expressions that does not consist of other
- s-expressions.  A string is an atom, while a list is a composite type.
-@@ -1192,7 +1192,7 @@
- 
- @node composite,  , atoms, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Composite Sexp Widgets.
-+@section Composite Sexp Widgets.
- 
- The syntax for the composite are
- 
-@@ -1265,7 +1265,7 @@
- 
- @node Widget Properties, Defining New Widgets, Sexp Types, Top
- @comment  node-name,  next,  previous,  up
--@section Properties
-+@chapter Properties
- 
- You can examine or set the value of a widget by using the widget object
- that was returned by @code{widget-create}.
-@@ -1353,7 +1353,7 @@
- 
- @node Defining New Widgets, Widget Browser, Widget Properties, Top
- @comment  node-name,  next,  previous,  up
--@section Defining New Widgets
-+@chapter Defining New Widgets
- 
- You can define specialized widgets with @code{define-widget}.  It allows
- you to create a shorthand for more complex widgets.  This includes
-@@ -1565,7 +1565,7 @@
- 
- @node Widget Browser, Widget Minor Mode, Defining New Widgets, Top
- @comment  node-name,  next,  previous,  up
--@section Widget Browser
-+@chapter Widget Browser
- 
- There is a separate package to browse widgets.  This is intended to help
- programmers who want to examine the content of a widget.  The browser
-@@ -1589,7 +1589,7 @@
- 
- @node  Widget Minor Mode, Utilities, Widget Browser, Top
- @comment  node-name,  next,  previous,  up
--@section Widget Minor Mode
-+@chapter Widget Minor Mode
- 
- There is a minor mode for manipulating widgets in major modes that
- doesn't provide any support for widgets themselves.  This is mostly
-@@ -1606,7 +1606,7 @@
- 
- @node  Utilities, Widget Wishlist, Widget Minor Mode, Top
- @comment  node-name,  next,  previous,  up
--@section Utilities.
-+@chapter Utilities.
- 
- @defun widget-prompt-value widget prompt [ value unbound ]
- Prompt for a value matching @var{widget}, using @var{prompt}.@*
-@@ -1621,7 +1621,7 @@
- 
- @node Widget Wishlist, Widget Internals, Utilities, Top
- @comment  node-name,  next,  previous,  up
--@section Wishlist
-+@chapter Wishlist
- 
- @itemize @bullet
- @item 
-@@ -1693,7 +1693,7 @@
- @end itemize
- 
- @node Widget Internals, , Widget Wishlist, Top
--@section Internals
-+@chapter Internals
- 
- This (very brief!) section provides a few notes on the internal
- structure and implementation of Emacs widgets.  Avoid relying on this
-@@ -1701,7 +1701,7 @@
- To the extent that it actually describes APIs, the information will be
- moved to appropriate sections of the manual in due course.
- 
--@subsection The @dfn{Widget} and @dfn{Type} Structures
-+@section The @dfn{Widget} and @dfn{Type} Structures
- 
- Widgets and types are currently both implemented as lists.
- 

diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
deleted file mode 100644
index 5c1ab8b2827..00000000000
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
-
-EAPI="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="highly customizable open source text editor and application development system"
-HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
-
-X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.6:0
-	>=media-libs/audiofile-0.2.3
-	gpm? ( >=sys-libs/gpm-1.19.6 )
-	postgres? ( dev-db/postgresql:= )
-	ldap? ( net-nds/openldap )
-	nas? ( media-libs/nas )
-	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
-	neXt? ( x11-libs/neXtaw )
-	xface? ( media-libs/compface )
-	tiff? ( media-libs/tiff:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	jpeg? ( virtual/jpeg:0 )
-	canna? ( app-i18n/canna )
-	!amd64? ( freewnn? ( app-i18n/freewnn ) )
-	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}"
-
-PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
-
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-
-	# Security bug #216880
-	epatch "${FILESDIR}"/xemacs-21.4.21-vcdiff.patch
-
-	# Security bug #275397
-	epatch "${FILESDIR}"/${P}-large-images.patch
-
-	# Make sure to include deprecated LDAP symbols to avoid runtime
-	# crashes.
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-
-	# Fix compilation with libpng 1.5, bug 384461
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	# Add texinfo-5.1 compatibility
-	epatch "${FILESDIR}"/${P}-texinfo-5.patch
-
-	# Some binaries and man pages are installed under suffixed names
-	# to avoid collions with their GNU Emacs counterparts (see below).
-	# Fix internal filename references.
-	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
-
-	# Run autoconf. XEmacs tries to be smart by providing a stub
-	# configure.ac file for autoconf 2.59 but this throws our
-	# autotools eclass so it must be removed first.
-	rm "${S}"/configure.ac || die
-	eautoconf
-
-	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_configure() {
-	local myconf=""
-
-	if use X; then
-
-		myconf="${myconf} --with-widgets=athena"
-		myconf="${myconf} --with-dialogs=athena"
-		myconf="${myconf} --with-menubars=lucid"
-		myconf="${myconf} --with-scrollbars=lucid"
-		if use motif ; then
-			myconf="--with-widgets=motif"
-			myconf="${myconf} --with-dialogs=motif"
-			myconf="${myconf} --with-scrollbars=motif"
-			myconf="${myconf} --with-menubars=lucid"
-		fi
-		if use athena ; then
-			myconf="--with-scrollbars=athena"
-		fi
-
-		if use Xaw3d; then
-			myconf="${myconf} --with-athena=3d"
-		elif use neXt; then
-			myconf="${myconf} --with-athena=next"
-		else
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		myconf="${myconf} --without-database"
-	fi
-
-	# fixes #21264, this should be fixed in 21.4.21 and has been fixed
-	# in 21.5 for sure. Now that 21.4.21 is out there is no real
-	# evidence that this indeed got fixed, so keep these exceptions
-	# for now.
-	use alpha && myconf="${myconf} --with-system-malloc"
-	use ppc64 && myconf="${myconf} --with-system-malloc"
-	use ia64  && myconf="${myconf} --with-system-malloc"
-
-	# Enabling modules will cause segfaults outside the XEmacs build directory
-	use ia64  && myconf="${myconf} --without-modules"
-
-	# fixes #552044, deprecation warnings fools header detection in configure
-	myconf="${myconf} --cppflags=-Wno-cpp"
-
-	einfo "${myconf}"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
-	done
-
-	# rename man pages
-	for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-}