gentoo resync : 14.07.2018

14 files changed, 1090 insertions, 0 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
new file mode 100644
index 000000000000..76b547cb5f3f
--- /dev/null
+++ b/app-editors/xemacs/Manifest
@@ -0,0 +1,16 @@
+AUX README.Gentoo 1426 BLAKE2B 00dbdbd388a01ad8288ac99eeab1d59dcdfd2309a43ef30008f5ac35fcd93855409c03c801f5c0b48455414e489f7f7c603d73efc6c618e820e8ff4fc7d67ed4 SHA512 0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1
+AUX xemacs-21.4.19-db.patch 3157 BLAKE2B f5615179665395f36df25eedd51c1f351aaefa8afe21506ec3f096c661c1ad00602b9128de6556220835bfca1769a6a45036df6fc6970be06590008621d01fac SHA512 b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be
+AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb7cabf05b5957cafb95c890e9fd4e106c20de97edac0ea7959053eb5cd20a26698713670b3957b097e101e818207 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
+AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
+AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
+AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
+AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
+AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
+AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
+DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
+DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
+DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
+EBUILD xemacs-21.4.24-r1.ebuild 6734 BLAKE2B eb95f30b81f5d1305ab90089fe4feccce6b1b541949195d44c44e55b9631cc780768ecffc89b6228c540cd132e8ed2495dbe852aa264cf1080753e82553cde51 SHA512 e1bc6158ba44b478434b92a9470944a176161f57229a3fac99e15b91aa88ce1f0473eecc0cc6eb5f222ea75cde962157b9d23b4b64489ee95c1b8404eea0d052
+EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
+EBUILD xemacs-21.5.34-r4.ebuild 7227 BLAKE2B c9e14730c039248883a8147e1deaa07d1a2937069823d1493072955bf362c4849c583b0d4b0a5d3914feb8f86ee34371b934ba5305396e12b193aad7c27df840 SHA512 89428a0b8e3ea66ef0e8418cf5fffa9ccbab351bfac48abc9c6ce479b7c88bd42dd90c1a1728a10d6dc42d7afcbbbb01bef95882e4251d56bcdce15ca1de1f62
+MISC metadata.xml 616 BLAKE2B e54bf1e7e4860e0de6e017e5456ebfbb392b33e8f768928f051f75b3e1c3431cdfeee8c4da5b8618b623585127cf2a5b2990f42d7b68dfe930db7c1bd15c09b3 SHA512 8c6e5e61099adf6af109681bf6ce31408ff468dec60403155e5998574dfd095b77156d669e8f54b09bfee5ba71346f4657e15b7d8c4cc34511696a5e97370522
diff --git a/app-editors/xemacs/files/README.Gentoo b/app-editors/xemacs/files/README.Gentoo
new file mode 100644
index 000000000000..abb71cc90988
--- /dev/null
+++ b/app-editors/xemacs/files/README.Gentoo
@@ -0,0 +1,45 @@
+README.Gentoo
+-------------
+
+This is a quick tutorial on how to configure the XEmacs package user
+interface (package-ui). After you configure package-ui, you will be
+able to download and install XEmacs packages and dependencies while in
+XEmacs. For the complete documentation, see
+/usr/share/doc/xemacs-21.4.*/README.packages.gz
+
+Once XEmacs is emerged onto a Gentoo Linux system, you will only have
+the following elisp modules installed: xemacs-base, efs and
+(optionally if you had mule in USE) mule-base. This guide will show
+how to use package-ui to download and install your own preference in
+elisp modules to ~/.xemacs/xemacs-packages.
+
+First, start XEmacs and load the package-ui elisp module.
+
+  M-x load-library RET package-ui RET
+
+The first thing to set is the download site (package-ui installs via
+network).
+
+  M-x customize-variable RET package-get-remote RET
+
+Insert a new value, then:
+
+  Choice: Remote
+  Host: ibiblio.org
+  Directory: /pub/packages/editors/xemacs/packages/
+
+Make sure you set and save the change. Note, other host/directories
+are possible. The the documentation for package-ui for more
+information. Hint: ibiblio.org is *fast*.
+
+Then set the location package-ui should install to:
+
+  M-x customize-variable RET pui-package-install-dest-dir RET
+
+  Directory: ~/.xemacs/xemacs-packages
+
+Make sure you set and save the change.
+
+At this point you can install your modules:
+
+  M-x pui-list-packages
diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
new file mode 100644
index 000000000000..cf87d60e628a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.19-db.patch
@@ -0,0 +1,84 @@
+This patch fixes several database-related problems.
+
+dbm_open has been moved into gdbm_compat, so we check for that and include it.
+
+ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check
+there, given that we don't support normal dbm installations, and we
+patch database.c as well. Not portable beyond Gentoo, but will work
+for us.
+
+The checks for Berkeley DB only took into account up to version
+3. Added checks to deal with several versions 4 as well.
+
+--- xemacs-21.4.19/configure.in	2005-12-24 01:48:14.000000000 +0100
++++ xemacs-21.4.19-db/configure.in	2006-06-11 22:43:52.000000000 +0200
+@@ -4502,7 +4502,7 @@
+ 
+ dnl Check for ndbm.h, required for either kind of DBM support.
+ if test "$with_database_gdbm $with_database_dbm" != "no no"; then
+-  AC_CHECK_HEADER(ndbm.h, [:], [
++  AC_CHECK_HEADER(gdbm/ndbm.h, [:], [
+     test "$with_database_gdbm" = "yes" -o \
+          "$with_database_dbm"  = "yes" && \
+       XE_DIE("Required DBM support cannot be provided.")
+@@ -4513,10 +4513,13 @@
+ if test "$with_database_gdbm" != "no"; then
+   AC_CHECK_LIB(gdbm, dbm_open, [
+    with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
++	AC_CHECK_LIB(gdbm_compat, dbm_open, [
++	with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+    if test "$with_database_gdbm" = "yes"; then
+      XE_DIE("Required GNU DBM support cannot be provided.")
+    fi
+-   with_database_gdbm=no])
++   with_database_gdbm=no], -lgdbm)
++  ])
+ fi
+ 
+ dnl Check for DBM support in libc and libdbm.
+@@ -4614,11 +4617,30 @@
+ #if DB_VERSION_MAJOR > 2
+ yes
+ #endif
+-], [AC_MSG_RESULT(3); dbfunc=db_create],[
+-    AC_MSG_RESULT(2); dbfunc=db_open])],[
+-    AC_MSG_RESULT(1); dbfunc=dbopen])
++], [AC_EGREP_CPP(yes,
++[#include <$db_h_file>
++#if DB_VERSION_MAJOR > 3
++yes
++#endif
++], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
++    AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
++    AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
++    AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
+     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
+-    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
++    AC_CHECK_LIB(db, db_create_4002,  with_database_berkdb=yes need_libdb=yes)])
++  fi
++
++  dnl Berk db 4.1 decorates public functions with version information
++  if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then
++    rm -f $tempcname
++    echo "#include <$db_h_file>" > $tempcname
++    echo "configure___ dbfunc=db_create" >> $tempcname
++    define(TAB, [       ])dnl
++    eval `$CPP -Isrc $tempcname \
++        | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"`
++    rm -f $tempcname
++    AC_MSG_WARN("db_create is really $dbfunc")
++    AC_CHECK_LIB(db, $dbfunc,  have_database_berkdb=yes need_libdb=yes)
+   fi
+ 
+   if test "$with_database_berkdb" = "yes"; then
+--- xemacs-21.4.19/src/database.c	2005-12-24 01:52:35.000000000 +0100
++++ xemacs-21.4.19-db/src/database.c	2006-06-13 21:00:01.000000000 +0200
+@@ -82,7 +82,7 @@
+ #endif /* HAVE_BERKELEY_DB */
+ 
+ #ifdef HAVE_DBM
+-#include <ndbm.h>
++#include <gdbm/ndbm.h>
+ Lisp_Object Qdbm;
+ #endif /* HAVE_DBM */
+ 
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
new file mode 100644
index 000000000000..494fc51c3b88
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
@@ -0,0 +1,32 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in	Sun Mar 13 13:48:24 2016 +0100
+@@ -1939,6 +1939,8 @@
+     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
+     dnl Yuck, bad compares have been worth at least 3 crashes!
+     CFLAGS="$CFLAGS -Wsign-compare"
++    dnl Use old gnu inline semantics until we fix the source
++    CFLAGS="$CFLAGS -fgnu89-inline"
+     dnl XEmacs is known not to be strict-aliasing-safe.
+     case "`gcc -v --help 2>&1`" in
+       *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
+diff -r e2da872593c0 src/lisp.h
+--- a/src/lisp.h	Tue Mar 24 22:15:53 2015 -0400
++++ b/src/lisp.h	Sun Mar 13 13:48:24 2016 +0100
+@@ -193,6 +193,8 @@
+ # endif /* GNUC */
+ #endif
+ 
++#ifndef _GCC_MAX_ALIGN_T
++#define _GCC_MAX_ALIGN_T
+ /* No type has a greater alignment requirement than max_align_t.
+    (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -202,6 +204,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ #ifndef ALIGNOF
+ # if defined (__GNUC__) && (__GNUC__ >= 2)
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
new file mode 100644
index 000000000000..62d26ccc053c
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
@@ -0,0 +1,28 @@
+Don't define deprecated glibc symbol
+
+Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
+that xmkmf thinks are needed to compile X programs.
+
+diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
+--- a/configure.in	Sat Feb 11 01:24:06 2017 +0100
++++ b/configure.in	Sat Feb 11 01:59:40 2017 +0100
+@@ -2868,10 +2868,15 @@
+ 	  *     ) val=1 ;;
+ 	esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+-	  if test "$val" = "1"
+-	    then AC_DEFINE_UNQUOTED($sym)
+-	    else AC_DEFINE_UNQUOTED($sym,$val)
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
++ 	  if test "$val" = "1"
++ 	    then AC_DEFINE_UNQUOTED($sym)
++ 	    else AC_DEFINE_UNQUOTED($sym,$val)
+ 	  fi
+ 	fi  ;;
+       esac
diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
new file mode 100644
index 000000000000..19b8984db2d0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
@@ -0,0 +1,12 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in	Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in	Mon Apr 17 10:13:05 2017 +0200
+@@ -4449,7 +4449,7 @@
+     AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
+     AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
+     XE_ADD_OBJS(terminfo.o)
+-    XE_PREPEND(-lncurses, LIBS)
++    XE_PREPEND($(pkg-config ncurses --libs), LIBS)
+ 
+     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+       dnl Try again, and check for the bogus ncurses/ include bug.
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
new file mode 100644
index 000000000000..025a390f3335
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+ 
+ /* ------------------------ alignment definitions ------------------- */
+ 
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++    (!defined (__cplusplus) || __cplusplus < 201103L)
+ /* No type has a greater alignment requirement than max_align_t.
+    (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1165,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+    that data of this type must begin at a memory address which is a
+@@ -1170,7 +1173,11 @@
+    as the type itself. */
+ 
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#  define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++#  define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ #  define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)
+
+
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
new file mode 100644
index 000000000000..b611b15fd8b1
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch
@@ -0,0 +1,32 @@
+diff -r f412e9f093d4 configure
+--- a/configure	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure	Sun Jan 29 19:32:47 2017 +0100
+@@ -13507,7 +13507,10 @@
+ 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
+ 	  *     ) val=1 ;;
+ 	esac
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then cat >>confdefs.h <<_ACEOF
+ #define $sym 1
+diff -r f412e9f093d4 configure.ac
+--- a/configure.ac	Wed Jan 25 00:47:06 2017 +0000
++++ b/configure.ac	Sun Jan 29 19:32:47 2017 +0100
+@@ -3136,7 +3136,12 @@
+ 	  *     ) val=1 ;;
+ 	esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++	if grep "^#define $sym " confdefs.h >/dev/null          || \
++           test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++           test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++        then :; else
+ 	  if test "$val" = "1"
+ 	    then AC_DEFINE_UNQUOTED($sym)
+ 	    else AC_DEFINE_UNQUOTED($sym,$val)
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
new file mode 100644
index 000000000000..a08eda3c8a83
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch
@@ -0,0 +1,13 @@
+diff -r 6355de501637 configure
+--- a/configure	Thu Jan 23 15:03:16 2014 +0000
++++ b/configure	Fri Jan 31 23:55:12 2014 +0100
+@@ -19699,7 +19699,8 @@
+     extra_objs="$extra_objs terminfo.o" &&  if test "$verbose" = "yes"; then
+    echo "    xemacs will be linked with \"terminfo.o\""
+  fi
+-    LIBS="-lncurses $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"-lncurses\" to \$LIBS"; fi
++    ncurses_libs=$(pkg-config ncurses --libs)
++    LIBS="$ncurses_libs $LIBS" &&  if test "$verbose" = "yes"; then echo "    Prepending \"$ncurses_libs\" to \$LIBS"; fi
+ 
+     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+                         save_c_switch_site="$c_switch_site"
diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop
new file mode 100644
index 000000000000..93f14a731f2b
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs.desktop
@@ -0,0 +1,33 @@
+[Desktop Entry]
+Name=XEmacs Text Editor
+Name[bg]=редактор XEmacs
+Name[ca]=Editor XEmacs
+Name[cs]=Editor XEmacs
+Name[da]=XEmacs tekstredigerer
+Name[de]=XEmacs Texteditor
+Name[eo]=La redaktilo XEmakso
+Name[es]=Emacs para X
+Name[et]=Emacs X'i kasutajaliidesega
+Name[fi]=XEmacs editori
+Name[fr]=Éditeur XEmacs
+Name[hu]=XEmacs szövegszerkesztő
+Name[is]=XEmacs-ritill
+Name[it]=Emacs per X
+Name[ja]=XEmacs テキスト・エディター
+Name[mk]=Софистицираниот XEmacs уредувач
+Name[no]=XEmacs-tekstredigerer
+Name[pt]=Editor XEmacs
+Name[ro]=Editorul XEmacs
+Name[ru]=Редактор XEmacs
+Name[sk]=Editor XEmacs
+Name[sl]=Urejevalnik XEmacs
+Name[uk]=Редактор XEmacs
+GenericName=Text Editor
+Comment=Edit text
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=xemacs %f
+Icon=xemacs
+Type=Application
+Terminal=false
+Categories=Utility;TextEditor;
+StartupWMClass=Emacs
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
new file mode 100644
index 000000000000..435eda5f8675
--- /dev/null
+++ b/app-editors/xemacs/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="athena">Chooses the MIT Athena widget set</flag>
+    <flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
+      drag-n-drop library</flag>
+    <flag name="eolconv">Support detection and translation of newline
+      conventions</flag>
+    <flag name="pop">Support POP for mail retrieval</flag>
+    <flag name="xim">Enable X11 XiM input method</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
new file mode 100644
index 000000000000..475f8682263c
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
+
+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 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[berkdb] )
+	>=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}
+	>=sys-apps/texinfo-5"
+
+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() {
+	# see bug 58350, 102540 and 143580
+	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+	# see bug 576512
+	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+	epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+	# see bug 615544
+	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.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=""
+
+	# Can't build with pie. See bug #75028
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	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
+
+	# Enabling modules will cause segfaults outside the XEmacs build directory
+	use ia64  && myconf="${myconf} --without-modules"
+
+	einfo "${myconf}"
+
+	# see bug 576512
+	append-cflags -fgnu89-inline
+
+	# 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-system-malloc \
+		--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
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
new file mode 100644
index 000000000000..08d08cdd1233
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
+
+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 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}
+	>=sys-apps/texinfo-5"
+
+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() {
+	# see bug 58350, 102540 and 143580
+	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+	# see bug 576512
+	epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+	# see bug 615544
+	epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.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=""
+
+	# Can't build with pie. See bug #75028
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	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
+
+	# 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}"
+
+	# see bug 576512
+	append-cflags -std=gnu89
+
+	# 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-system-malloc \
+		--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
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
new file mode 100644
index 000000000000..9747f72b358e
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib xdg-utils
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft 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-4:= !!<sys-libs/db-4 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
+	>=sys-libs/zlib-1.1.4
+	!libressl? ( >=dev-libs/openssl-0.9.6:0 )
+	libressl? ( dev-libs/libressl )
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	alsa? ( media-libs/alsa-lib )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0[xft=] )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d )
+	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
+	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 )
+	freewnn? ( app-i18n/freewnn )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	default_src_unpack
+
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	epatch "${FILESDIR}/${P}-gcc5.patch"
+	epatch "${FILESDIR}/${P}-glibc-macro.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
+}
+
+src_configure() {
+	local myconf=""
+
+	# bug #639642
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	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 or use Xaw3d ; 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 )"
+		myconf="${myconf} $(use_with png )"
+		myconf="${myconf} $(use_with jpeg )"
+		myconf="${myconf} $(use_with xface )"
+
+		use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--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 )"
+		myconf="${myconf} $(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"
+	use alsa && soundconf="${soundconf},alsa"
+
+	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
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--with-system-malloc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs \
+		|| die "configuration failed"
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		libdir="${D}"/usr/$(get_libdir) \
+		datadir="${D}"/usr/share \
+		install || die
+
+	# 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 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 CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+
+	einfo "If you are upgrading from XEmacs 21.4 you should note the following"
+	einfo "incompatibilities:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}