summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-12-29 11:49:12 +0000
committerUlrich Müller <ulm@gentoo.org>2007-12-29 11:49:12 +0000
commit6d7c95906143f770902935dd975d9541c39dd72c (patch)
treee61a68d3340aae6202bdc5a12310016495f91af7 /app-editors
parentEnable the warning about obsolete files. (diff)
downloademacs-6d7c95906143f770902935dd975d9541c39dd72c.tar.gz
emacs-6d7c95906143f770902935dd975d9541c39dd72c.tar.bz2
emacs-6d7c95906143f770902935dd975d9541c39dd72c.zip
Add admin files.
svn path=/xemacs-overlay/; revision=902
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog51
-rw-r--r--app-editors/emacs/Manifest12
-rw-r--r--app-editors/emacs/emacs-22.1-r3.ebuild259
-rw-r--r--app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch150
-rw-r--r--app-editors/emacs/files/emacs-22.1-backup-buffer.patch14
-rw-r--r--app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch42
-rw-r--r--app-editors/emacs/files/emacs-22.1-format-int.patch79
-rw-r--r--app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch13
-rw-r--r--app-editors/emacs/files/emacs-22.1-hack-local-variables.patch13
-rw-r--r--app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch20
-rw-r--r--app-editors/emacs/files/emacs-22.1-xembed.patch377
-rw-r--r--app-editors/emacs/metadata.xml5
-rw-r--r--app-editors/ermacs/ChangeLog11
-rw-r--r--app-editors/ermacs/Manifest5
-rw-r--r--app-editors/ermacs/ermacs-20070104.ebuild57
-rw-r--r--app-editors/ermacs/files/ermacs-20070104-gcc4.patch18
-rw-r--r--app-editors/ermacs/metadata.xml5
-rw-r--r--app-editors/xemacs/ChangeLog7
-rw-r--r--app-editors/xemacs/Manifest11
-rw-r--r--app-editors/xemacs/files/font-lock-warning-face.patch19
-rw-r--r--app-editors/xemacs/files/gdbm-and-db.patch37
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.28-int-format.patch43
-rw-r--r--app-editors/xemacs/files/xemacs.desktop34
-rw-r--r--app-editors/xemacs/xemacs-21.5.28-r1.ebuild254
-rw-r--r--app-editors/xemacs/xemacs-21.5.28.ebuild251
25 files changed, 0 insertions, 1787 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
deleted file mode 100644
index 046c7c7..0000000
--- a/app-editors/emacs/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-# ChangeLog for app-editors/emacs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 29 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild:
- Sync with Portage: Include net-libs/liblockfile in dependencies.
-
- 15 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r3.ebuild:
- Sync with Portage. Remove duplicate local declaration in pkg_postinst.
- Disable the sandbox in src_compile as late as possible.
-
- 02 Dec 2007; Christian Faulhammer <opfer@gentoo.org> emacs-22.1-r3.ebuild:
- sync with Portage: make some variables local and add quotes
-
- 01 Dec 2007; Christian Faulhammer <opfer@gentoo.org> emacs-22.1-r3.ebuild:
- Sync with Portage: Rename site-file from 00 -> 10 for USE=source
-
- 27 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
- +files/emacs-22.1-format-int.patch, -emacs-22.1-r2.ebuild,
- +emacs-22.1-r3.ebuild:
- Sync with Portage.
-
- 22 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r2.ebuild:
- Fix alsa dependency, thanks Flameeyes for pointing this out.
-
- 07 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
- +files/emacs-22.1-hack-local-variables.patch, -emacs-22.1-r1.ebuild,
- +emacs-22.1-r2.ebuild:
- Sync with Portage, fixing bug #197958.
-
- 10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
- Don't PROVIDE=virtual/editor as it is a new-style virtual now.
-
- 26 Sep 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
- Sync with Portage: Change WANT_AUTOCONF to 2.5, add some keywords.
-
- 25 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
- No need to recompile if we have bootstrapped before.
-
- 25 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
- +files/emacs-22.1-backup-buffer.patch, emacs-22.1-r1.ebuild:
- sync with Portage
-
- 14 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
- +files/emacs-22.1-Xaw3d-headers.patch,
- +files/emacs-22.1-disable_alsa_detection.patch,
- +files/emacs-22.1-freebsd-sparc.patch,
- +files/emacs-22.1-oldxmenu-qa.patch, +files/emacs-22.1-xembed.patch,
- +metadata.xml, +emacs-22.1.ebuild:
- XEmbed support, see bug #185064.
-
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 90c66ef..0000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
-AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 SHA1 0302df9678f2cc59c89da8bf47130810e08bfbbf SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b
-AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
-AUX emacs-22.1-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
-AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
-AUX emacs-22.1-hack-local-variables.patch 561 RMD160 248f09898369161dcd0e3148c7fcb4c9de5b3bc5 SHA1 02018dc2b66f829c83aeeadca240e282a695b9a1 SHA256 d3e2ec4d4b2788a5a6d91669bfc9dcb3dc7ff1f80195d42e5ae751fa4e26b9fb
-AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590
-AUX emacs-22.1-xembed.patch 12136 RMD160 96bf6095e8b6af78f7a5289820bde3a7043e74d8 SHA1 570faf7fa854624ea8f00df38a59c9b83f673f00 SHA256 ba41d8bf8830c657565c9ecc506d662f0eb45043e5aa2ea374031ba3185011f7
-DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
-EBUILD emacs-22.1-r3.ebuild 7908 RMD160 dab29c843ebb75aba9d23a52040b3f99d607ff43 SHA1 0675fb5f5f906a5ed2ffb633c5fb19fa2c4cd66a SHA256 84e2be5c6b8a6baffa578ac85d7c97c969d64362fd7ee6cca94cfee3b37e48b0
-MISC ChangeLog 2075 RMD160 da9b054af2bbf79f94c9fdd1bdfa0caee0ef2450 SHA1 3c0bed58c746fff05337a5a0d2b3b6f01fa8bb11 SHA256 9461b25197796403987563fdf9fe318007c046aad77e75894a9b67c2d2ef3e0c
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/emacs/emacs-22.1-r3.ebuild b/app-editors/emacs/emacs-22.1-r3.ebuild
deleted file mode 100644
index 0642de1..0000000
--- a/app-editors/emacs/emacs-22.1-r3.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="latest"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xembed xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="!<app-editors/emacs-cvs-22.1
- sys-libs/ncurses
- >=app-admin/eselect-emacs-0.7-r1
- sys-libs/zlib
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- spell? ( || ( app-text/ispell app-text/aspell ) )
- alsa? ( media-libs/alsa-lib )
- X? (
- $X_DEPEND
- x11-misc/emacs-desktop
- gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg )
- tiff? ( media-libs/tiff )
- png? ( media-libs/libpng )
- xpm? ( x11-libs/libXpm )
- gtk? ( =x11-libs/gtk+-2* )
- !gtk? (
- Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? (
- motif? ( virtual/motif )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- gzip-el? ( app-arch/gzip )"
-
-# FULL_VERSION keeps the full version number, which is needed in order to
-# determine some path information correctly for copy/move operations later on
-FULL_VERSION="${PV}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
- -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
- "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
- if ! use gzip-el; then
- # Emacs' build system automatically detects the gzip binary and
- # compresses el files. We don't want that so confuse it with a
- # wrong binary name
- sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
- || die "unable to sed configure.in"
- fi
-
- epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
- epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
- epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
- epatch "${FILESDIR}/${P}-backup-buffer.patch"
- epatch "${FILESDIR}/${P}-hack-local-variables.patch"
- epatch "${FILESDIR}/${P}-format-int.patch"
- # ALSA is detected and used even if not requested by the USE=alsa flag.
- # So remove the automagic check
- use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
- # XEmbed support, see #185064
- use xembed && epatch "${FILESDIR}/${P}-xembed.patch"
-
- eautoreconf
-}
-
-src_compile() {
- ALLOWED_FLAGS=""
- strip-flags
- unset LDFLAGS
- if use hppa; then # bug #193703
- replace-flags -O[2-9] -O
- else
- replace-flags -O[3-9] -O2
- fi
- sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
- local myconf
-
- if use alsa && ! use sound; then
- echo
- einfo "Although sound USE flag is disabled you chose to have alsa,"
- einfo "so sound is switched on anyway."
- echo
- myconf="${myconf} --with-sound"
- else
- myconf="${myconf} $(use_with sound)"
- fi
-
- if use X; then
- myconf="${myconf} --with-x"
- myconf="${myconf} $(use_with toolkit-scroll-bars)"
- myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
- myconf="${myconf} $(use_with gif) $(use_with png)"
- myconf="${myconf} $(use_with xpm)"
-
- # GTK+ is the default toolkit if USE=gtk is chosen with other
- # possibilities. Emacs upstream thinks this should be standard
- # policy on all distributions
- if use gtk; then
- echo
- einfo "Configuring to build with GTK support, disabling all other toolkits"
- echo
- myconf="${myconf} --with-x-toolkit=gtk"
- elif use Xaw3d; then
- einfo "Configuring to build with Xaw3d(athena) support"
- myconf="${myconf} --with-x-toolkit=athena"
- myconf="${myconf} --without-gtk"
- elif use motif; then
- einfo "Configuring to build with motif toolkit support"
- myconf="${myconf} --with-x-toolkit=motif"
- myconf="${myconf} --without-gtk"
- else
- einfo "Configuring to build with no toolkit"
- myconf="${myconf} --with-x-toolkit=no"
- myconf="${myconf} --without-gtk"
- fi
- else
- myconf="${myconf} --without-x"
- fi
-
- myconf="${myconf} $(use_with hesiod)"
-
- econf \
- --program-suffix=-emacs-${SLOT} \
- --infodir=/usr/share/info/emacs-${SLOT} \
- --without-carbon \
- ${myconf} || die "econf emacs failed"
-
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
-
- emake CC="$(tc-getCC)" $(useq xembed && echo bootstrap) \
- || die "emake failed"
-
- if ! use xembed; then
- einfo "Recompiling patched lisp files..."
- (cd lisp; emake recompile) || die "emake recompile failed"
- (cd src; emake versionclean)
- emake CC="$(tc-getCC)" || die "emake failed"
- fi
-}
-
-src_install () {
- local i m
-
- emake install DESTDIR="${D}" || die "make install failed"
-
- rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
- || die "removing duplicate emacs executable failed"
- mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
- || die "moving Emacs executable failed"
-
- # move info documentation to the correct place
- einfo "Fixing info documentation ..."
- for i in "${D}"/usr/share/info/emacs-${SLOT}/*; do
- mv "${i}" "${i}.info" || die "mv info failed"
- done
-
- # move man pages to the correct place
- einfo "Fixing manpages ..."
- for m in "${D}"/usr/share/man/man1/* ; do
- mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv man failed"
- done
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
- rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
- keepdir /var/lib/games/emacs/
-
- if use source; then
- insinto /usr/share/emacs/${FULL_VERSION}/src
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.[ch]
- sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF
-
- ;;; ${PN}-${SLOT} site-lisp configuration
-
- (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- X (setq find-function-C-source-directory
- X "/usr/share/emacs/${FULL_VERSION}/src"))
- EOF
- elisp-site-file-install 10${PN}-${SLOT}-gentoo.el
- fi
-
- dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
- # Depending on the Portage version, the Info dir file is compressed
- # or removed. It is only rebuilt by Portage if our directory is in
- # INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
- local infodir=/usr/share/info/emacs-${SLOT} f
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} == *[0-9].info* ]] \
- || install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- echo
-}
-
-pkg_postinst() {
- test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
- cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
- local f
- for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
- test -e "${f}" || touch "${f}"
- done
-
- elisp-site-regen
- emacs-infodir-rebuild
-
- if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
- # transition from pre-eselect revision
- eselect emacs set emacs-${SLOT}
- else
- eselect emacs update --if-unset
- fi
-
- if use X; then
- elog "You need to install some fonts for Emacs. Under monolithic"
- elog "XFree86/Xorg you typically had such fonts installed by default."
- elog "With modular Xorg, you will have to perform this step yourself."
- elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
- elog "machine would satisfy basic Emacs requirements under X11."
- fi
-
- echo
- elog "You can set the version to be started by /usr/bin/emacs through"
- elog "the Emacs eselect module, which also redirects man and info pages."
- elog "Therefore, several Emacs versions can be installed at the same time."
- elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
- elisp-site-regen
- emacs-infodir-rebuild
- eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
deleted file mode 100644
index 8b4f332..0000000
--- a/app-editors/emacs/files/emacs-22.1-Xaw3d-headers.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- emacs-22.1-orig/src/xfns.c 2007-06-02 06:00:11.000000000 +0200
-+++ emacs-22.1/src/xfns.c 2007-07-01 17:19:35.000000000 +0200
-@@ -72,8 +72,13 @@
- #include <X11/Shell.h>
-
- #ifndef USE_MOTIF
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Label.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_MOTIF */
-
- #ifdef USG
---- emacs-22.1-orig/src/xmenu.c 2007-05-14 16:56:31.000000000 +0200
-+++ emacs-22.1/src/xmenu.c 2007-07-01 17:19:35.000000000 +0200
-@@ -82,7 +82,11 @@
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
- #ifdef USE_LUCID
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #endif /* USE_LUCID */
- #include "../lwlib/lwlib.h"
- #else /* not USE_X_TOOLKIT */
---- emacs-22.1-orig/lwlib/lwlib.c 2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib.c 2007-07-01 17:19:35.000000000 +0200
-@@ -48,7 +48,11 @@
- #endif /* not USE_MOTIF && USE_LUCID */
- #endif
- #if defined (USE_XAW)
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Paned.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Paned.h>
-+#endif /* HAVE_XAW3D */
- #include "lwlib-Xaw.h"
- #endif
-
---- emacs-22.1-orig/lwlib/lwlib-Xaw.c 2007-04-20 15:27:29.000000000 +0200
-+++ emacs-22.1/lwlib/lwlib-Xaw.c 2007-07-01 17:19:35.000000000 +0200
-@@ -35,12 +35,21 @@
- #include <X11/CoreP.h>
- #include <X11/Shell.h>
-
-+#ifdef HAVE_XAW3D
-+#include <X11/Xaw3d/Scrollbar.h>
-+#include <X11/Xaw3d/Paned.h>
-+#include <X11/Xaw3d/Dialog.h>
-+#include <X11/Xaw3d/Form.h>
-+#include <X11/Xaw3d/Command.h>
-+#include <X11/Xaw3d/Label.h>
-+#else /* !HAVE_XAW3D */
- #include <X11/Xaw/Scrollbar.h>
- #include <X11/Xaw/Paned.h>
- #include <X11/Xaw/Dialog.h>
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/Command.h>
- #include <X11/Xaw/Label.h>
-+#endif /* HAVE_XAW3D */
-
- #include <X11/Xatom.h>
-
---- emacs-22.1-orig/configure.in 2007-05-25 14:43:29.000000000 +0200
-+++ emacs-22.1/configure.in 2007-07-01 17:19:35.000000000 +0200
-@@ -2205,29 +2205,45 @@
-
- dnl Do not put whitespace before the #include statements below.
- dnl Older compilers (eg sunos4 cc) choke on it.
-+HAVE_XAW3D=no
- if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
-- if test x"${HAVE_X11R5}" = xyes; then
-- AC_MSG_CHECKING(X11 version 5 with Xaw)
-- AC_CACHE_VAL(emacs_cv_x11_version_5_with_xaw,
-+ if test x"${HAVE_X11R5}" != xyes; then
-+ USE_X_TOOLKIT=none
-+ else
-+ AC_MSG_CHECKING(for xaw3d)
-+ AC_CACHE_VAL(emacs_cv_xaw3d,
- [AC_TRY_LINK([
- #include <X11/Intrinsic.h>
--#include <X11/Xaw/Simple.h>],
-+#include <X11/Xaw3d/Simple.h>],
- [],
-- emacs_cv_x11_version_5_with_xaw=yes,
-- emacs_cv_x11_version_5_with_xaw=no)])
-- if test $emacs_cv_x11_version_5_with_xaw = yes; then
-- AC_MSG_RESULT([5 or newer, with Xaw; use toolkit by default])
-+ emacs_cv_xaw3d=yes,
-+ emacs_cv_xaw3d=no)])
-+ if test $emacs_cv_xaw3d = yes; then
-+ AC_MSG_RESULT([yes; using Lucid toolkit])
- USE_X_TOOLKIT=LUCID
-+ HAVE_XAW3D=yes
-+ AC_DEFINE(HAVE_XAW3D, 1,
-+ [Define to 1 if you have the Xaw3d library (-lXaw3d).])
- else
-- if test x"${USE_X_TOOLKIT}" = xLUCID; then
-+ AC_MSG_RESULT(no)
-+ AC_MSG_CHECKING(for libXaw)
-+ AC_CACHE_VAL(emacs_cv_xaw,
-+ [AC_TRY_LINK([
-+#include <X11/Intrinsic.h>
-+#include <X11/Xaw/Simple.h>],
-+ [],
-+ emacs_cv_xaw=yes,
-+ emacs_cv_xaw=no)])
-+ if test $emacs_cv_xaw = yes; then
-+ AC_MSG_RESULT([yes; using Lucid toolkit])
-+ USE_X_TOOLKIT=LUCID
-+ elif test x"${USE_X_TOOLKIT}" = xLUCID; then
- AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
- else
-- AC_MSG_RESULT(before 5 or no Xaw; do not use toolkit by default)
-+ AC_MSG_RESULT([no; do not use toolkit by default])
- USE_X_TOOLKIT=none
- fi
- fi
-- else
-- USE_X_TOOLKIT=none
- fi
- fi
-
-@@ -2315,21 +2331,6 @@
- fi
- fi
-
--### Is -lXaw3d available?
--HAVE_XAW3D=no
--if test "${HAVE_X11}" = "yes"; then
-- if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then
-- dnl Fixme: determine what Scrollbar.h needs to avoid compilation
-- dnl errors from the test without the `-'.
-- AC_CHECK_HEADER(X11/Xaw3d/Scrollbar.h,
-- [AC_CHECK_LIB(Xaw3d, XawScrollbarSetThumb, HAVE_XAW3D=yes)], , -)
-- if test "${HAVE_XAW3D}" = "yes"; then
-- AC_DEFINE(HAVE_XAW3D, 1,
-- [Define to 1 if you have the Xaw3d library (-lXaw3d).])
-- fi
-- fi
--fi
--
- dnl Use toolkit scroll bars if configured for GTK or X toolkit and either
- dnl using Motif or Xaw3d is available, and unless
- dnl --with-toolkit-scroll-bars=no was specified.
diff --git a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
deleted file mode 100644
index 0e53cef..0000000
--- a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- emacs-22.1-orig/lisp/files.el 2007-05-25 14:43:31.000000000 +0200
-+++ emacs-22.1/lisp/files.el 2007-08-21 08:26:36.000000000 +0200
-@@ -3119,9 +3119,8 @@
- (set-default-file-modes ?\700)
- (while (condition-case ()
- (progn
-- (condition-case nil
-- (delete-file to-name)
-- (file-error nil))
-+ (and (file-exists-p to-name)
-+ (delete-file to-name))
- (copy-file from-name to-name nil t)
- nil)
- (file-already-exists t))
diff --git a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch b/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
deleted file mode 100644
index d4b630f..0000000
--- a/app-editors/emacs/files/emacs-22.1-disable_alsa_detection.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in 22 May 2007 15:54:32 -0000 1.448
-+++ configure.in 30 May 2007 13:19:39 -0000
-@@ -1590,39 +1590,6 @@
- # Emulation library used on NetBSD.
- AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
- AC_SUBST(LIBSOUND)
--
-- ALSA_REQUIRED=1.0.0
-- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
-- dnl Check if --with-pkg-config-prog has been given.
-- if test "X${with_pkg_config_prog}" != X; then
-- PKG_CONFIG="${with_pkg_config_prog}"
-- fi
-- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
-- if test $HAVE_ALSA = yes; then
-- SAVE_CFLAGS="$CFLAGS"
-- SAVE_LDFLAGS="$LDFLAGS"
-- CFLAGS="$ALSA_CFLAGS $CFLAGS"
-- LDFLAGS="$ALSA_LIBS $LDFLAGS"
-- AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
-- emacs_alsa_normal=yes,
-- emacs_alsa_normal=no)
-- if test "$emacs_alsa_normal" != yes; then
-- AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
-- [snd_lib_error_set_handler (0);],
-- emacs_alsa_subdir=yes,
-- emacs_alsa_subdir=no)
-- if test "$emacs_alsa_subdir" != yes; then
-- AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.])
-- fi
-- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
-- fi
--
-- CFLAGS="$SAVE_CFLAGS"
-- LDFLAGS="$SAVE_LDFLAGS"
-- LIBSOUND="$LIBSOUND $ALSA_LIBS"
-- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
-- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
-- fi
- AC_SUBST(CFLAGS_SOUND)
- fi
-
diff --git a/app-editors/emacs/files/emacs-22.1-format-int.patch b/app-editors/emacs/files/emacs-22.1-format-int.patch
deleted file mode 100644
index 851bcb9..0000000
--- a/app-editors/emacs/files/emacs-22.1-format-int.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-2007-11-15 Andreas Schwab <schwab@suse.de>
-
- * editfns.c (Fformat): Correctly format EMACS_INT values. Also
- take precision into account when formatting an integer.
-
---- src/editfns.c 8 Aug 2007 07:49:19 -0000 1.439.2.3
-+++ src/editfns.c 16 Nov 2007 00:18:55 -0000 1.439.2.8
-@@ -3543,8 +3543,10 @@ usage: (format STRING &rest OBJECTS) */
- precision[n+1] = 10 * precision[n+1] + *format - '0';
- }
-
-- if (format - this_format_start + 1 > longest_format)
-- longest_format = format - this_format_start + 1;
-+ /* Extra +1 for 'l' that we may need to insert into the
-+ format. */
-+ if (format - this_format_start + 2 > longest_format)
-+ longest_format = format - this_format_start + 2;
-
- if (format == end)
- error ("Format string ends in middle of format specifier");
-@@ -3605,7 +3607,7 @@ usage: (format STRING &rest OBJECTS) */
- && *format != 'i' && *format != 'X' && *format != 'c')
- error ("Invalid format operation %%%c", *format);
-
-- thissize = 30;
-+ thissize = 30 + (precision[n] > 0 ? precision[n] : 0);
- if (*format == 'c')
- {
- if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
-@@ -3803,23 +3805,35 @@ usage: (format STRING &rest OBJECTS) */
- format - this_format_start);
- this_format[format - this_format_start] = 0;
-
-- if (INTEGERP (args[n]))
-+ if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
-+ sprintf (p, this_format, XFLOAT_DATA (args[n]));
-+ else
- {
-- if (format[-1] == 'd')
-- sprintf (p, this_format, XINT (args[n]));
-- /* Don't sign-extend for octal or hex printing. */
-+ if (sizeof (EMACS_INT) > sizeof (int))
-+ {
-+ /* Insert 'l' before format spec. */
-+ this_format[format - this_format_start]
-+ = this_format[format - this_format_start - 1];
-+ this_format[format - this_format_start - 1] = 'l';
-+ this_format[format - this_format_start + 1] = 0;
-+ }
-+
-+ if (INTEGERP (args[n]))
-+ {
-+ if (format[-1] == 'd')
-+ sprintf (p, this_format, XINT (args[n]));
-+ /* Don't sign-extend for octal or hex printing. */
-+ else
-+ sprintf (p, this_format, XUINT (args[n]));
-+ }
-+ else if (format[-1] == 'd')
-+ /* Maybe we should use "%1.0f" instead so it also works
-+ for values larger than MAXINT. */
-+ sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
- else
-- sprintf (p, this_format, XUINT (args[n]));
-+ /* Don't sign-extend for octal or hex printing. */
-+ sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
- }
-- else if (format[-1] == 'e' || format[-1] == 'f' || format[-1] == 'g')
-- sprintf (p, this_format, XFLOAT_DATA (args[n]));
-- else if (format[-1] == 'd')
-- /* Maybe we should use "%1.0f" instead so it also works
-- for values larger than MAXINT. */
-- sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
-- else
-- /* Don't sign-extend for octal or hex printing. */
-- sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
-
- if (p > buf
- && multibyte
diff --git a/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch b/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
deleted file mode 100644
index d5e0793..0000000
--- a/app-editors/emacs/files/emacs-22.1-freebsd-sparc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: emacs/src/alloc.c
-===================================================================
---- emacs.orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4522,7 +4522,7 @@ mark_stack ()
- /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
- needed on ia64 too. See mach_dep.c, where it also says inline
- assembler doesn't work with relevant proprietary compilers. */
--#ifdef sparc
-+#if defined(sparc) && !defined(__FreeBSD__)
- asm ("ta 3");
- #endif
-
diff --git a/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch b/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch
deleted file mode 100644
index ed73505..0000000
--- a/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lisp/files.el 13 Oct 2007 14:09:56 -0000 1.896.2.28
-+++ lisp/files.el 2 Nov 2007 11:02:12 -0000 1.896.2.29
-@@ -2764,8 +2764,8 @@
- ;; If caller wants only the safe variables,
- ;; install only them.
- (dolist (elt result)
-- (unless (or (memq (car elt) unsafe-vars)
-- (memq (car elt) risky-vars))
-+ (unless (or (member elt unsafe-vars)
-+ (member elt risky-vars))
- (hack-one-local-variable (car elt) (cdr elt))))
- ;; Query, except in the case where all are known safe
- ;; if the user wants no quuery in that case.
diff --git a/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch b/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
deleted file mode 100644
index 4c962c1..0000000
--- a/app-editors/emacs/files/emacs-22.1-oldxmenu-qa.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- emacs-22.1-orig/oldXMenu/ChgPane.c 2007-02-27 04:04:22.000000000 +0100
-+++ emacs-22.1/oldXMenu/ChgPane.c 2007-06-04 00:47:56.000000000 +0200
-@@ -13,6 +13,7 @@
- *
- */
-
-+#include <config.h>
- #include "XMenuInt.h"
-
- int
---- emacs-22.1-orig/oldXMenu/ChgSel.c 2007-02-27 04:04:22.000000000 +0100
-+++ emacs-22.1/oldXMenu/ChgSel.c 2007-06-04 00:47:42.000000000 +0200
-@@ -13,6 +13,7 @@
- *
- */
-
-+#include <config.h>
- #include "XMenuInt.h"
-
- int
diff --git a/app-editors/emacs/files/emacs-22.1-xembed.patch b/app-editors/emacs/files/emacs-22.1-xembed.patch
deleted file mode 100644
index b4fec7f..0000000
--- a/app-editors/emacs/files/emacs-22.1-xembed.patch
+++ /dev/null
@@ -1,377 +0,0 @@
-XEmbed support, patches by Timo Savola <timo.savola@iki.fi>
-http://timo.stc.cx/tmp/emacs/
-
-This combines the following patches:
-1. parent-id.patch
- Adds --parent-id command-line option
-2. parent-fix.patch
- Don't override the explicitly set parent window
-3. xembed.patch
- XEmbed protocol support for Xlib, X-toolkit and GTK versions
-4. xembed-xsetoffset.patch
- Don't attempt to move embedded X windows
-5. xembed-border.patch
- Fixes issues with the Xlib and X-toolkit versions by disabling border
- width option
-
-diff -Nur emacs-22.1-orig/lisp/startup.el emacs-22.1/lisp/startup.el
---- emacs-22.1-orig/lisp/startup.el 2007-05-14 16:56:29.000000000 +0200
-+++ emacs-22.1/lisp/startup.el 2007-07-14 03:13:43.000000000 +0200
-@@ -151,7 +151,8 @@
- ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
- ("--line-spacing" 1 x-handle-numeric-switch line-spacing)
- ("--border-color" 1 x-handle-switch border-color)
-- ("--smid" 1 x-handle-smid))
-+ ("--smid" 1 x-handle-smid)
-+ ("--parent-id" 1 x-handle-parent-id))
- "Alist of X Windows options.
- Each element has the form
- (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
-diff -Nur emacs-22.1-orig/lisp/term/x-win.el emacs-22.1/lisp/term/x-win.el
---- emacs-22.1-orig/lisp/term/x-win.el 2007-03-06 06:50:48.000000000 +0100
-+++ emacs-22.1/lisp/term/x-win.el 2007-07-14 03:13:43.000000000 +0200
-@@ -181,6 +181,15 @@
- (setq initial-frame-alist (cons (cons 'name x-resource-name)
- initial-frame-alist)))
-
-+;; Handle the --parent-id option.
-+(defun x-handle-parent-id (switch)
-+ (or (consp x-invocation-args)
-+ (error "%s: missing argument to `%s' option" (invocation-name) switch))
-+ (setq parent-id (string-to-number (car x-invocation-args))
-+ x-invocation-args (cdr x-invocation-args))
-+ (setq initial-frame-alist (cons (cons 'parent-id parent-id)
-+ initial-frame-alist)))
-+
- (defvar x-display-name nil
- "The name of the X display on which Emacs was started.
-
-diff -Nur emacs-22.1-orig/src/emacs.c emacs-22.1/src/emacs.c
---- emacs-22.1-orig/src/emacs.c 2007-04-22 05:45:41.000000000 +0200
-+++ emacs-22.1/src/emacs.c 2007-07-14 03:13:43.000000000 +0200
-@@ -325,6 +325,7 @@
- --title, -T TITLE title for initial Emacs frame\n\
- --vertical-scroll-bars, -vb enable vertical scroll bars\n\
- --xrm XRESOURCES set additional X resources\n\
-+--parent-id XID set parent window\n\
- --help display this help and exit\n\
- --version output version information and exit\n\
- \n"
-@@ -1835,6 +1836,7 @@
- { "-title", 0, 10, 1 },
- { "-name", "--name", 10, 1 },
- { "-xrm", "--xrm", 10, 1 },
-+ { "-parent-id", "--parent-id", 10, 1 },
- { "-r", "--reverse-video", 5, 0 },
- { "-rv", 0, 5, 0 },
- { "-reverse", 0, 5, 0 },
-diff -Nur emacs-22.1-orig/src/gtkutil.c emacs-22.1/src/gtkutil.c
---- emacs-22.1-orig/src/gtkutil.c 2007-05-14 16:56:31.000000000 +0200
-+++ emacs-22.1/src/gtkutil.c 2007-07-14 03:13:57.000000000 +0200
-@@ -769,7 +769,11 @@
-
- BLOCK_INPUT;
-
-- wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-+ if (FRAME_X_EMBEDDED_P (f))
-+ wtop = gtk_plug_new (f->output_data.x->parent_desc);
-+ else
-+ wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-+
- xg_set_screen (wtop, f);
-
- wvbox = gtk_vbox_new (FALSE, 0);
-diff -Nur emacs-22.1-orig/src/xfns.c emacs-22.1/src/xfns.c
---- emacs-22.1-orig/src/xfns.c 2007-07-14 03:11:59.000000000 +0200
-+++ emacs-22.1/src/xfns.c 2007-07-14 03:14:20.000000000 +0200
-@@ -2609,6 +2609,10 @@
- XtManageChild (pane_widget);
- XtRealizeWidget (shell_widget);
-
-+ if (FRAME_X_EMBEDDED_P (f))
-+ XReparentWindow (FRAME_X_DISPLAY (f), XtWindow (shell_widget),
-+ f->output_data.x->parent_desc, 0, 0);
-+
- FRAME_X_WINDOW (f) = XtWindow (frame_widget);
-
- validate_x_resource_name ();
-@@ -3267,8 +3271,10 @@
- xlwmenu_default_font = FRAME_FONT (f);
- #endif
-
-- x_default_parameter (f, parms, Qborder_width, make_number (2),
-- "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
-+ /* Frame contents get displaced if an embedded X window has a border. */
-+ if (! FRAME_X_EMBEDDED_P (f))
-+ x_default_parameter (f, parms, Qborder_width, make_number (2),
-+ "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
-
- /* This defaults to 1 in order to match xterm. We recognize either
- internalBorderWidth or internalBorder (which is what xterm calls
-@@ -3339,8 +3345,6 @@
- x_default_parameter (f, parms, Qfullscreen, Qnil,
- "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
-
-- f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
--
- /* Compute the size of the X window. */
- window_prompting = x_figure_window_size (f, parms, 1);
-
-diff -Nur emacs-22.1-orig/src/xterm.c emacs-22.1/src/xterm.c
---- emacs-22.1-orig/src/xterm.c 2007-05-25 14:43:35.000000000 +0200
-+++ emacs-22.1/src/xterm.c 2007-07-14 03:14:11.000000000 +0200
-@@ -3306,6 +3306,15 @@
- FOCUS_IMPLICIT : FOCUS_EXPLICIT),
- dpyinfo, frame, bufp);
- break;
-+
-+ case ClientMessage:
-+ if (event->xclient.message_type == dpyinfo->Xatom_XEMBED)
-+ {
-+ enum xembed_message msg = event->xclient.data.l[1];
-+ x_focus_changed ((msg == XEMBED_FOCUS_IN ? FocusIn : FocusOut),
-+ FOCUS_EXPLICIT, dpyinfo, frame, bufp);
-+ }
-+ break;
- }
- }
-
-@@ -5876,6 +5885,18 @@
- }
- #endif /* USE_TOOLKIT_SCROLL_BARS */
-
-+ /* XEmbed messages from the embedder (if any). */
-+ if (event.xclient.message_type
-+ == dpyinfo->Xatom_XEMBED)
-+ {
-+ enum xembed_message msg = event.xclient.data.l[1];
-+ if (msg == XEMBED_FOCUS_IN || msg == XEMBED_FOCUS_OUT)
-+ x_detect_focus_change (dpyinfo, &event, &inev.ie);
-+
-+ *finish = X_EVENT_GOTO_OUT;
-+ goto done;
-+ }
-+
- f = x_any_window_to_frame (dpyinfo, event.xclient.window);
- if (!f)
- goto OTHER;
-@@ -6796,6 +6817,10 @@
- else
- construct_mouse_click (&inev.ie, &event.xbutton, f);
- }
-+
-+ if (FRAME_X_EMBEDDED_P (f))
-+ xembed_send_message (f, event.xbutton.time,
-+ XEMBED_REQUEST_FOCUS, 0, 0, 0);
- }
- }
- else
-@@ -8889,6 +8914,51 @@
- x_lower_frame (f);
- }
-
-+/* XEmbed implementation. */
-+
-+void
-+xembed_set_info (f, flags)
-+ struct frame *f;
-+ enum xembed_info flags;
-+{
-+ Atom atom;
-+ unsigned long data[2];
-+
-+ atom = XInternAtom (FRAME_X_DISPLAY (f), "_XEMBED_INFO", False);
-+
-+ data[0] = XEMBED_VERSION;
-+ data[1] = flags;
-+
-+ XChangeProperty (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), atom, atom,
-+ 32, PropModeReplace, (unsigned char *) data, 2);
-+}
-+
-+void
-+xembed_send_message (f, time, message, detail, data1, data2)
-+ struct frame *f;
-+ Time time;
-+ enum xembed_message message;
-+ long detail;
-+ long data1;
-+ long data2;
-+{
-+ XEvent event;
-+
-+ event.xclient.type = ClientMessage;
-+ event.xclient.window = FRAME_X_OUTPUT (f)->parent_desc;
-+ event.xclient.message_type = FRAME_X_DISPLAY_INFO (f)->Xatom_XEMBED;
-+ event.xclient.format = 32;
-+ event.xclient.data.l[0] = time;
-+ event.xclient.data.l[1] = message;
-+ event.xclient.data.l[2] = detail;
-+ event.xclient.data.l[3] = data1;
-+ event.xclient.data.l[4] = data2;
-+
-+ XSendEvent (FRAME_X_DISPLAY (f), FRAME_X_OUTPUT (f)->parent_desc,
-+ False, NoEventMask, &event);
-+ XSync (FRAME_X_DISPLAY (f), False);
-+}
-+
- /* Change of visibility. */
-
- /* This tries to wait until the frame is really visible.
-@@ -8921,6 +8991,7 @@
- if we get to x_make_frame_visible a second time
- before the window gets really visible. */
- if (! FRAME_ICONIFIED_P (f)
-+ && ! FRAME_X_EMBEDDED_P (f)
- && ! f->output_data.x->asked_for_visible)
- x_set_offset (f, f->left_pos, f->top_pos, 0);
-
-@@ -8929,14 +9000,22 @@
- if (! EQ (Vx_no_window_manager, Qt))
- x_wm_set_window_state (f, NormalState);
- #ifdef USE_X_TOOLKIT
-- /* This was XtPopup, but that did nothing for an iconified frame. */
-- XtMapWidget (f->output_data.x->widget);
-+ if (FRAME_X_EMBEDDED_P (f))
-+ xembed_set_info (f, XEMBED_MAPPED);
-+ else
-+ {
-+ /* This was XtPopup, but that did nothing for an iconified frame. */
-+ XtMapWidget (f->output_data.x->widget);
-+ }
- #else /* not USE_X_TOOLKIT */
- #ifdef USE_GTK
- gtk_widget_show_all (FRAME_GTK_OUTER_WIDGET (f));
- gtk_window_deiconify (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)));
- #else
-- XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
-+ if (FRAME_X_EMBEDDED_P (f))
-+ xembed_set_info (f, XEMBED_MAPPED);
-+ else
-+ XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
- #endif /* not USE_GTK */
- #endif /* not USE_X_TOOLKIT */
- #if 0 /* This seems to bring back scroll bars in the wrong places
-@@ -8977,7 +9056,9 @@
- because the window manager may choose the position
- and we don't want to override it. */
-
-- if (! FRAME_VISIBLE_P (f) && ! FRAME_ICONIFIED_P (f)
-+ if (! FRAME_VISIBLE_P (f)
-+ && ! FRAME_ICONIFIED_P (f)
-+ && ! FRAME_X_EMBEDDED_P (f)
- && f->win_gravity == NorthWestGravity
- && previously_visible)
- {
-@@ -9088,6 +9169,10 @@
- if (FRAME_GTK_OUTER_WIDGET (f))
- gtk_widget_hide (FRAME_GTK_OUTER_WIDGET (f));
- else
-+#else
-+ if (FRAME_X_EMBEDDED_P (f))
-+ xembed_set_info (f, 0);
-+ else
- #endif
- {
- #ifdef HAVE_X11R4
-@@ -9218,7 +9303,9 @@
-
- /* Make sure the X server knows where the window should be positioned,
- in case the user deiconifies with the window manager. */
-- if (! FRAME_VISIBLE_P (f) && !FRAME_ICONIFIED_P (f))
-+ if (! FRAME_VISIBLE_P (f)
-+ && ! FRAME_ICONIFIED_P (f)
-+ && ! FRAME_X_EMBEDDED_P (f))
- x_set_offset (f, f->left_pos, f->top_pos, 0);
-
- /* Since we don't know which revision of X we're running, we'll use both
-@@ -10851,6 +10938,9 @@
- dpyinfo->Xatom_Scrollbar = XInternAtom (dpyinfo->display, "SCROLLBAR",
- False);
-
-+ dpyinfo->Xatom_XEMBED = XInternAtom (dpyinfo->display, "_XEMBED",
-+ False);
-+
- dpyinfo->cut_buffers_initialized = 0;
-
- dpyinfo->x_dnd_atoms_size = 8;
-diff -Nur emacs-22.1-orig/src/xterm.h emacs-22.1/src/xterm.h
---- emacs-22.1-orig/src/xterm.h 2007-01-21 05:18:14.000000000 +0100
-+++ emacs-22.1/src/xterm.h 2007-07-14 03:13:57.000000000 +0200
-@@ -327,6 +327,9 @@
- /* Atom used in toolkit scroll bar client messages. */
- Atom Xatom_Scrollbar;
-
-+ /* Atom used in XEmbed client messages. */
-+ Atom Xatom_XEMBED;
-+
- #ifdef MULTI_KBOARD
- struct kboard *kboard;
- #endif
-@@ -1101,6 +1104,66 @@
- extern int x_session_have_connection P_ ((void));
- #endif
-
-+/* XEmbed implementation. */
-+
-+#define XEMBED_VERSION 0
-+
-+enum xembed_info
-+ {
-+ XEMBED_MAPPED = 1 << 0
-+ };
-+
-+enum xembed_message
-+ {
-+ XEMBED_EMBEDDED_NOTIFY = 0,
-+ XEMBED_WINDOW_ACTIVATE = 1,
-+ XEMBED_WINDOW_DEACTIVATE = 2,
-+ XEMBED_REQUEST_FOCUS = 3,
-+ XEMBED_FOCUS_IN = 4,
-+ XEMBED_FOCUS_OUT = 5,
-+ XEMBED_FOCUS_NEXT = 6,
-+ XEMBED_FOCUS_PREV = 7,
-+
-+ XEMBED_MODALITY_ON = 10,
-+ XEMBED_MODALITY_OFF = 11,
-+ XEMBED_REGISTER_ACCELERATOR = 12,
-+ XEMBED_UNREGISTER_ACCELERATOR = 13,
-+ XEMBED_ACTIVATE_ACCELERATOR = 14
-+ };
-+
-+enum xembed_focus
-+ {
-+ XEMBED_FOCUS_CURRENT = 0,
-+ XEMBED_FOCUS_FIRST = 1,
-+ XEMBED_FOCUS_LAST = 2
-+ };
-+
-+enum xembed_modifier
-+ {
-+ XEMBED_MODIFIER_SHIFT = 1 << 0,
-+ XEMBED_MODIFIER_CONTROL = 1 << 1,
-+ XEMBED_MODIFIER_ALT = 1 << 2,
-+ XEMBED_MODIFIER_SUPER = 1 << 3,
-+ XEMBED_MODIFIER_HYPER = 1 << 4
-+ };
-+
-+enum xembed_accelerator
-+ {
-+ XEMBED_ACCELERATOR_OVERLOADED = 1 << 0
-+ };
-+
-+/* Defined in xterm.c */
-+
-+extern void xembed_set_info P_ ((struct frame *f, enum xembed_info flags));
-+extern void xembed_send_message P_ ((struct frame *f, Time time,
-+ enum xembed_message message,
-+ long detail, long data1, long data2));
-+
-+/* Is the frame embedded into another application? */
-+
-+#define FRAME_X_EMBEDDED_P(f) (FRAME_X_OUTPUT(f)->explicit_parent != 0)
-+
-+
- #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
- #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
-
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index bc306fe..0000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-editors/ermacs/ChangeLog b/app-editors/ermacs/ChangeLog
deleted file mode 100644
index 52e7fee..0000000
--- a/app-editors/ermacs/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for app-editors/ermacs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> ermacs-20070104.ebuild:
- Don't PROVIDE=virtual/editor as it is a new-style virtual now.
-
- 16 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
- +files/ermacs-20070104-gcc4.patch, +metadata.xml, +ermacs-20070104.ebuild:
- Initial import.
-
diff --git a/app-editors/ermacs/Manifest b/app-editors/ermacs/Manifest
deleted file mode 100644
index fa7353f..0000000
--- a/app-editors/ermacs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ermacs-20070104-gcc4.patch 558 RMD160 0314a9887c25d9c031c8ea532de3ddbf80929de8 SHA1 6fcb139556e13986431f74a86da48decfe30fbfa SHA256 d0993f100a0a08d74d7e7a3082f6ec6c97cd44cfd172ad6b3f807aa17946cd76
-DIST ermacs-20070104.tar.bz2 153018 RMD160 eb854c615d5b84af7bef5f400178f74734d7d525 SHA1 f3848a50280b4d9d403f2cca1f925f88b88c0cd5 SHA256 177b7a7e0a91bbcea413f7be27717833f434892869434f1451887d69d86a20dd
-EBUILD ermacs-20070104.ebuild 1358 RMD160 002caac7da6e4e39d2e45b39076dec9c02078547 SHA1 a6ea22e169a7f908e1f8152c51ea6601cb41136d SHA256 e8f96489ad587961ea64cff30351ba754ad8f0269579413c3f3ffcab5e8d7376
-MISC ChangeLog 399 RMD160 184052f37f6109f23afadcee7b9910225a24142d SHA1 86e24f10fe9dbed8b85cea0f522541f10a21e016 SHA256 434a4e66f5c8ba6e12b2afddebdea2aef4ac3317f87b5b03db56d51a8f097c5e
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/ermacs/ermacs-20070104.ebuild b/app-editors/ermacs/ermacs-20070104.ebuild
deleted file mode 100644
index e1528c4..0000000
--- a/app-editors/ermacs/ermacs-20070104.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib
-
-DESCRIPTION="An Emacs clone in Erlang"
-HOMEPAGE="http://fresh.homeunix.net/~luke/ermacs/"
-# snapshot of jungerl.cvs.sourceforge.net:/cvsroot/jungerl,
-# directories: bin, config, lib/ermacs, lib/msc, lib/slang, support
-SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-11.2.5
- >=sys-libs/slang-1.4.9-r2"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-gcc4.patch"
-}
-
-src_compile() {
- emake conf || die "emake conf failed"
- cd lib; emake ermacs || die "emake ermacs failed"
-}
-
-src_install() {
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-
- cd "${S}/lib"
- for dir in ermacs/ebin ermacs/mods/ebin msc/ebin slang/ebin slang/priv; do
- insinto ${ERL_LIBDIR}/${dir}
- doins -r ${dir}/.
- done
-
- sed 's/^X//' >"${T}/ermacs" <<-EOF
- #!/bin/sh
- erl -pa ${ERL_LIBDIR}/slang/ebin \\
- X -pa ${ERL_LIBDIR}/ermacs/ebin \\
- X -pa ${ERL_LIBDIR}/ermacs/mods/ebin \\
- X -pa ${ERL_LIBDIR}/msc/ebin \\
- X -noshell -s edit start \$*
- stty sane
- EOF
-
- dobin "${T}/ermacs"
-
- cd "${S}/lib/ermacs"
- dodoc ChangeLog README TODO doc/DESIGN doc/TOUR doc/TROUBLESHOOTING \
- || die "dodoc failed"
-}
diff --git a/app-editors/ermacs/files/ermacs-20070104-gcc4.patch b/app-editors/ermacs/files/ermacs-20070104-gcc4.patch
deleted file mode 100644
index 08c3946..0000000
--- a/app-editors/ermacs/files/ermacs-20070104-gcc4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ermacs-20070104-orig/lib/slang/c_src/slang_drv.c 2003-02-21 20:17:57.000000000 +0100
-+++ ermacs-20070104/lib/slang/c_src/slang_drv.c 2007-07-16 21:07:21.000000000 +0200
-@@ -1,4 +1,5 @@
--
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include "driver.h"
- #include <slang.h>
-@@ -598,7 +599,7 @@
- case SMG_READ_RAW: {
- x = get_int32(buf); buf+= 4;
- t1 = malloc((2*x) + 2 + 1);
-- y = SLsmg_read_raw((unsigned short*)t1 +1, x);
-+ y = SLsmg_read_raw((SLsmg_Char_Type *)t1 +1, x);
- t1[1] = 1;
- driver_output(port, t1, y+1);
- free(t1);
diff --git a/app-editors/ermacs/metadata.xml b/app-editors/ermacs/metadata.xml
deleted file mode 100644
index bc306fe..0000000
--- a/app-editors/ermacs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
deleted file mode 100644
index 9d72774..0000000
--- a/app-editors/xemacs/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for app-editors/xemacs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> xemacs-21.5.28.ebuild:
- Don't PROVIDE=virtual/editor as it is a new-style virtual now.
-
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
deleted file mode 100644
index d000bdd..0000000
--- a/app-editors/xemacs/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX font-lock-warning-face.patch 766 RMD160 54a1eb71872a97d10aadc30326fa600356eb821c SHA1 33a590b2f79291262e50b240f9ac518ae555020f SHA256 608eeb3e9b02519cc0373782c00cf7f42914abf93b05c2509490e3c00d4c987c
-AUX gdbm-and-db.patch 1425 RMD160 e0481823ea9d192a32737e71896a3ccde478db5c SHA1 60077800c56c49f8db1911bc5d787e9fb2bb4685 SHA256 bc2c38dfa7a4cc014d6e1776cb09c4219e40ba066fb29861264eb83642ed757e
-AUX xemacs-21.5.28-int-format.patch 1565 RMD160 6b731eef38d0bb7e87de80d00a1033dbe56d9f24 SHA1 64e75eae258512df9c50209a81f1635d47dc5e85 SHA256 0153f312f8ca4419289d6f40707714e4b94bd15fcdb5d8a608e3a81afd7acc5b
-AUX xemacs.desktop 1080 RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 SHA1 6a3a88ea334b510951a15efb126c4fb71a3b8c38 SHA256 a97f2b5f1b85fde16eaf6b00cd3889a0c2777a0e2c1d7d3d2814f752a976b060
-DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
-DIST xemacs-21.5.28.tar.gz 15310202 RMD160 a225a2da39c22dccbc5d14399d40dadecead5e11 SHA1 6de5f4b4cecac0480dd9ff50170a72f23f36dbac SHA256 588a3970ee44426975cd86026a932ed0e2cf47f597ebcf76d376bbd18638eae2
-EBUILD xemacs-21.5.28-r1.ebuild 6973 RMD160 01d46192a601bedf7a358a72d9176a8f785ec4ae SHA1 708d1301e560d4428ac3dce718484f7758e25925 SHA256 d83e7ae08c829dad9d678054173e43226aab09703de394acd59651eb21bcdeb8
-EBUILD xemacs-21.5.28.ebuild 6858 RMD160 6cf3d2f5ca70d593f55a4de018c1faa3f0f4813a SHA1 b134a6bba6d73a95c20c5563ab2df01a9e246097 SHA256 96436af9a6f93c44b72d1fbf0e1587c7f98615bdf3ec7db53099d6d2093f9b6a
-MISC ChangeLog 255 RMD160 f538272c219b40df5c377bf8b97bafa406af2b55 SHA1 02c4b7697327662b0306fe7e7825ce92f727e6f7 SHA256 03cc073660a1cb31ca0d0be6e3ba7733e115a41698fa24c39162930b4beda76e
-MISC xemacs-21.5.28-r1.ebuild.~1~ 6974 RMD160 496798d69490614662c6229457f26775384a893f SHA1 ff6de77b5def03a53466725b91dee16558db0386 SHA256 8e0d63588164c7a63788e0849bec252e328008fac9d708744b146ba67b58c45b
-MISC xemacs-21.5.28.ebuild.~1~ 6858 RMD160 6cf3d2f5ca70d593f55a4de018c1faa3f0f4813a SHA1 b134a6bba6d73a95c20c5563ab2df01a9e246097 SHA256 96436af9a6f93c44b72d1fbf0e1587c7f98615bdf3ec7db53099d6d2093f9b6a
diff --git a/app-editors/xemacs/files/font-lock-warning-face.patch b/app-editors/xemacs/files/font-lock-warning-face.patch
deleted file mode 100644
index 176bb39..0000000
--- a/app-editors/xemacs/files/font-lock-warning-face.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: font-lock.el
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-lock.el,v
-retrieving revision 1.31
-diff -u -B -r1.31 font-lock.el
---- lisp/font-lock.el 2006/11/01 23:14:33 1.31
-+++ lisp/font-lock.el 2007/06/23 07:14:17
-@@ -721,6 +721,11 @@
- It is present only for horrid FSF compatibility reasons.
- The corresponding face should be set using `edit-faces' or the
- `set-face-*' functions.")
-+(defvar font-lock-warning-face 'font-lock-warning-face
-+ "This variable should not be set.
-+It is present only for horrid FSF compatibility reasons.
-+The corresponding face should be set using `edit-faces' or the
-+`set-face-*' functions.")
-
- (defconst font-lock-face-list
- '(font-lock-comment-face
diff --git a/app-editors/xemacs/files/gdbm-and-db.patch b/app-editors/xemacs/files/gdbm-and-db.patch
deleted file mode 100644
index d3c5d5f..0000000
--- a/app-editors/xemacs/files/gdbm-and-db.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-XEmacs uses the legacy dbm mode from gdbm but does not take into
-account that this function may be in gdbm_compat instead of gdbm.
-
-The Berkely DB checks aren't correct for version 4 due to a minor
-thinko.
-
-Index: configure.ac
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
-retrieving revision 1.59
-diff -u -B -r1.59 configure.ac
---- configure.ac 2007/05/21 03:50:13 1.59
-+++ configure.ac 2007/06/24 08:44:04
-@@ -5391,10 +5391,13 @@
- if test "$enable_database_gdbm" != "no"; then
- AC_CHECK_LIB(gdbm, dbm_open, [
- enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [
-+ AC_CHECK_LIB(gdbm_compat, dbm_open, [
-+ enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
- if test "$enable_database_gdbm" = "yes"; then
- XE_DIE("Required GNU DBM support cannot be provided.")
- fi
-- enable_database_gdbm=no])
-+ enable_database_gdbm=no], -lgdbm)
-+ ])
- fi
-
- dnl Check for DBM support in libc and libdbm.
-@@ -5475,7 +5478,7 @@
- fi
-
- dnl Berk db 4.1 decorates public functions with version information
-- if test "$enable_database_berkdb" != "yes" -a "$dbver" = "4"; then
-+ if test "$enable_database_berkdb" = "yes" -a "$dbver" = "4"; then
- rm -f $tempcname
- echo "#include <$db_h_file>" > $tempcname
- echo "configure___ dbfunc=db_create" >> $tempcname
diff --git a/app-editors/xemacs/files/xemacs-21.5.28-int-format.patch b/app-editors/xemacs/files/xemacs-21.5.28-int-format.patch
deleted file mode 100644
index b4b1a47..0000000
--- a/app-editors/xemacs/files/xemacs-21.5.28-int-format.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-diff -r 33f6ee3a6e75 src/doprnt.c
---- a/src/doprnt.c Thu Sep 06 21:51:29 2007 +0000
-+++ b/src/doprnt.c Mon Nov 26 03:46:16 2007 +0100
-@@ -776,9 +776,21 @@ emacs_doprnt_1 (Lisp_Object stream, cons
- #endif /* HAVE_BIGFLOAT */
- else
- {
-- Ascbyte *text_to_print = alloca_array (char, 350);
-+ Ascbyte *text_to_print;
- Ascbyte constructed_spec[100];
- Ascbyte *p = constructed_spec;
-+ int alloca_sz = 350;
-+ int min = spec->minwidth, prec = spec->precision;
-+
-+ if (prec < 0)
-+ prec = 0;
-+ if (min < 0)
-+ min = 0;
-+
-+ if (32+min+prec > alloca_sz)
-+ alloca_sz = 32 + min + prec;
-+
-+ text_to_print = alloca_array(char, alloca_sz);
-
- /* Mostly reconstruct the spec and use sprintf() to
- format the string. */
-diff -r 33f6ee3a6e75 tests/automated/lisp-tests.el
---- a/tests/automated/lisp-tests.el Thu Sep 06 21:51:29 2007 +0000
-+++ b/tests/automated/lisp-tests.el Mon Nov 26 03:46:16 2007 +0100
-@@ -1279,6 +1279,10 @@
- (Assert (= (read (format "%d" most-negative-fixnum)) most-negative-fixnum))
- (Assert (= (read (format "%ld" most-negative-fixnum)) most-negative-fixnum))
-
-+;; These used to crash.
-+(Assert (eql (read (format "%f" 1.2e+302)) 1.2e+302))
-+(Assert (eql (read (format "%.1000d" 1)) 1))
-+
- ;;; "%u" is undocumented, and Emacs Lisp has no unsigned type.
- ;;; What to do if "%u" is used with a negative number?
- ;;; For non-bignum XEmacsen, the most reasonable thing seems to be to print an
-
-
diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop
deleted file mode 100644
index 54f23a2..0000000
--- a/app-editors/xemacs/files/xemacs.desktop
+++ /dev/null
@@ -1,34 +0,0 @@
-[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=Development;TextEditor;
-Encoding=UTF-8
-StartupWMClass=Emacs
diff --git a/app-editors/xemacs/xemacs-21.5.28-r1.ebuild b/app-editors/xemacs/xemacs-21.5.28-r1.ebuild
deleted file mode 100644
index 644a5ec..0000000
--- a/app-editors/xemacs/xemacs-21.5.28-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.20-r3.ebuild,v 1.4 2007/04/30 23:04:57 ulm Exp $
-
-# 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.
-
-export WANT_AUTOCONF="2.5"
-inherit autotools eutils flag-o-matic
-
-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-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv esd gif gpm pop postgres ldap 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"
-
-DEPEND="virtual/libc
- !virtual/xemacs
- berkdb? ( sys-libs/db )
- gdbm? ( >=sys-libs/gdbm-1.8.3 )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( >=dev-db/postgresql-7.2 )
- ldap? ( net-nds/openldap )
- alsa? ( media-libs/alsa-lib )
- esd? ( media-sound/esound )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/openmotif-2.1.30 )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/Xaw3d )
- xft? ( media-libs/freetype x11-libs/libXrender media-libs/fontconfig )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff )
- png? ( =media-libs/libpng-1.2* )
- jpeg? ( media-libs/jpeg )
- canna? ( app-i18n/canna )
- !amd64? ( freewnn? ( app-i18n/freewnn ) )
- >=sys-libs/ncurses-5.2
- >=app-admin/eselect-emacs-0.7-r1"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs"
-
-src_unpack() {
- unpack ${P}.tar.gz
- use neXt && unpack NeXT_XEmacs.tar.gz
-
- cd "${S}"
-
- # see bug 58350, 102540 and 143580
- epatch "${FILESDIR}"/gdbm-and-db.patch
-
- # Fix font-lock-warning-face not being exported, needed for
- # gentoo-syntax
- epatch "${FILESDIR}"/font-lock-warning-face.patch
-
- # Fix for crash and security issue in #200297, fix from upstream CVS
- epatch "${FILESDIR}"/${P}-int-format.patch
-
- eautoconf
-
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
- 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"
-
- use tiff && myconf="${myconf} --with-tiff" ||
- myconf="${myconf} --without-tiff"
- use png && myconf="${myconf} --with-png" ||
- myconf="${myconf} --without-png"
- use jpeg && myconf="${myconf} --with-jpeg" ||
- myconf="${myconf} --without-jpeg"
- use xface && myconf="${myconf} --with-xface" ||
- myconf="${myconf} --without-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
-
- use canna && myconf="${myconf} --with-canna" ||
- myconf="${myconf} --without-canna"
- use freewnn && myconf="${myconf} --with-wnn" ||
- myconf="${myconf} --without-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 esd && soundconf="${soundconf},esd"
- use alsa
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- if use gdbm ; then
- mydb="gdbm"
- # We have GDBM in a non-standard location
- append-flags "-I/usr/include/gdbm"
- fi
-
- 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.
- use alpha && myconf="${myconf} --with-system-malloc"
- use ppc64 && myconf="${myconf} --with-system-malloc"
- use ia64 && myconf="${myconf} --with-system-malloc"
-
- use debug && myconf="${myconf} --with-optimization=no --with-debug" ||
- myconf="${myconf} --with-optimizations=yes"
-
- # Don't use econf because it uses options which this configure
- # script does not understand (like --host).
- 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 \
- || die
-
- emake || die
-}
-
-src_install() {
- make prefix="${D}"/usr \
- mandir="${D}"/usr/share/man/man1 \
- infodir="${D}"/usr/share/info \
- libdir="${D}"/usr/lib \
- install gzip-el || 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 rcs-checkin ; do
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags; 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*
- dodoc "${FILESDIR}"/README.Gentoo
-
- insinto /usr/share/pixmaps
- newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- insinto /usr/share/applications
- doins "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update --if-unset
-}
-
-pkg_postrm() {
- eselect emacs update --if-unset
-}
diff --git a/app-editors/xemacs/xemacs-21.5.28.ebuild b/app-editors/xemacs/xemacs-21.5.28.ebuild
deleted file mode 100644
index a9d4404..0000000
--- a/app-editors/xemacs/xemacs-21.5.28.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.20-r3.ebuild,v 1.4 2007/04/30 23:04:57 ulm Exp $
-
-# 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.
-
-export WANT_AUTOCONF="2.5"
-inherit autotools eutils flag-o-matic
-
-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-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv esd gif gpm pop postgres ldap 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"
-
-DEPEND="virtual/libc
- !virtual/xemacs
- berkdb? ( sys-libs/db )
- gdbm? ( >=sys-libs/gdbm-1.8.3 )
- >=sys-libs/zlib-1.1.4
- >=dev-libs/openssl-0.9.6
- >=media-libs/audiofile-0.2.3
- gpm? ( >=sys-libs/gpm-1.19.6 )
- postgres? ( >=dev-db/postgresql-7.2 )
- ldap? ( net-nds/openldap )
- alsa? ( media-libs/alsa-lib )
- esd? ( media-sound/esound )
- nas? ( media-libs/nas )
- X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
- dnd? ( x11-libs/dnd )
- motif? ( >=x11-libs/openmotif-2.1.30 )
- athena? ( x11-libs/libXaw )
- Xaw3d? ( x11-libs/Xaw3d )
- xft? ( media-libs/freetype x11-libs/libXrender media-libs/fontconfig )
- neXt? ( x11-libs/neXtaw )
- xface? ( media-libs/compface )
- tiff? ( media-libs/tiff )
- png? ( =media-libs/libpng-1.2* )
- jpeg? ( media-libs/jpeg )
- canna? ( app-i18n/canna )
- !amd64? ( freewnn? ( app-i18n/freewnn ) )
- >=sys-libs/ncurses-5.2
- >=app-admin/eselect-emacs-0.7-r1"
-
-PDEPEND="app-xemacs/xemacs-base
- mule? ( app-xemacs/mule-base )"
-
-PROVIDE="virtual/xemacs"
-
-src_unpack() {
- unpack ${P}.tar.gz
- use neXt && unpack NeXT_XEmacs.tar.gz
-
- cd "${S}"
-
- # see bug 58350, 102540 and 143580
- epatch "${FILESDIR}"/gdbm-and-db.patch
-
- # Fix font-lock-warning-face not being exported, needed for
- # gentoo-syntax
- epatch "${FILESDIR}"/font-lock-warning-face.patch
-
- eautoconf
-
- use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
-}
-
-src_compile() {
- 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"
-
- use tiff && myconf="${myconf} --with-tiff" ||
- myconf="${myconf} --without-tiff"
- use png && myconf="${myconf} --with-png" ||
- myconf="${myconf} --without-png"
- use jpeg && myconf="${myconf} --with-jpeg" ||
- myconf="${myconf} --without-jpeg"
- use xface && myconf="${myconf} --with-xface" ||
- myconf="${myconf} --without-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
-
- use canna && myconf="${myconf} --with-canna" ||
- myconf="${myconf} --without-canna"
- use freewnn && myconf="${myconf} --with-wnn" ||
- myconf="${myconf} --without-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 esd && soundconf="${soundconf},esd"
- use alsa
-
- myconf="${myconf} --with-sound=${soundconf}"
-
- if use gdbm || use berkdb ; then
- if use gdbm ; then
- mydb="gdbm"
- # We have GDBM in a non-standard location
- append-flags "-I/usr/include/gdbm"
- fi
-
- 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.
- use alpha && myconf="${myconf} --with-system-malloc"
- use ppc64 && myconf="${myconf} --with-system-malloc"
- use ia64 && myconf="${myconf} --with-system-malloc"
-
- use debug && myconf="${myconf} --with-optimization=no --with-debug" ||
- myconf="${myconf} --with-optimizations=yes"
-
- # Don't use econf because it uses options which this configure
- # script does not understand (like --host).
- 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 \
- || die
-
- emake || die
-}
-
-src_install() {
- make prefix="${D}"/usr \
- mandir="${D}"/usr/share/man/man1 \
- infodir="${D}"/usr/share/info \
- libdir="${D}"/usr/lib \
- install gzip-el || 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 rcs-checkin ; do
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed"
- done
-
- # rename man pages
- for i in ctags etags; 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*
- dodoc "${FILESDIR}"/README.Gentoo
-
- insinto /usr/share/pixmaps
- newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
- insinto /usr/share/applications
- doins "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- eselect emacs update --if-unset
-}
-
-pkg_postrm() {
- eselect emacs update --if-unset
-}