commit:     9b622f12cb5de1c03845a31dc06610f038e40a8a
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 15:55:08 2014 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 15:55:08 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=9b622f12

Move xemacs man page to man1. Remove old ebuilds.

Package-Manager: portage-2.2.14

---
 app-editors/xemacs/ChangeLog                       |   8 +
 app-editors/xemacs/Manifest                        |   2 -
 app-editors/xemacs/xemacs-21.5.32.ebuild           | 233 -------------------
 app-editors/xemacs/xemacs-21.5.33.ebuild           | 235 --------------------
 app-editors/xemacs/xemacs-21.5.34-r1.ebuild        | 237 --------------------
 app-editors/xemacs/xemacs-21.5.34-r2.ebuild        | 246 ---------------------
 ...-21.5.34-r3.ebuild => xemacs-21.5.34-r4.ebuild} |   5 +-
 app-editors/xemacs/xemacs-21.5.34.ebuild           | 235 --------------------
 8 files changed, 11 insertions(+), 1190 deletions(-)

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 5065d4e..c66a02b 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xemacs-21.5.34-r4 (26 Dec 2014)
+
+  26 Dec 2014; Mats Lidell <ma...@gentoo.org> -xemacs-21.5.32.ebuild,
+  -xemacs-21.5.33.ebuild, -xemacs-21.5.34.ebuild, -xemacs-21.5.34-r1.ebuild,
+  -xemacs-21.5.34-r2.ebuild, -xemacs-21.5.34-r3.ebuild,
+  +xemacs-21.5.34-r4.ebuild:
+  Move xemacs man page to man1. Remove old ebuilds.
+
 *xemacs-21.5.34-r3 (18 Apr 2014)
 
   18 Apr 2014; Mats Lidell <ma...@gentoo.org> :+xemacs-21.5.34-r3.ebuild,

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 2c23d4b..f3d8501 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,2 @@
 DIST NeXT_XEmacs.tar.gz 39571 SHA256 
35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 
611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 WHIRLPOOL 
d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
-DIST xemacs-21.5.32.tar.gz 15760224 SHA256 
5d7473fd4b9ca3278de44882ef004b0028e3ff130ed714831c885893a9cd5e7d SHA512 
2f938bedbd8ac4aea72042d4d96223edcbfee42d05b78b09e701896ebee2e2eff3f07dcf63cd0afc529afb20e45210ac7948fb8edfa211b1b81a2b38af5f1089
 WHIRLPOOL 
426894df830371ec858a44fce53cfa595aaf19b8881a41570180c8ad49809b8176274e998e060f2d62c630582ea3468127d85d56e5e604f058cd7a3b0121b69e
-DIST xemacs-21.5.33.tar.gz 15781151 SHA256 
448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 
75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151
 WHIRLPOOL 
29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 
33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 
b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 WHIRLPOOL 
733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209

diff --git a/app-editors/xemacs/xemacs-21.5.32.ebuild 
b/app-editors/xemacs/xemacs-21.5.32.ebuild
deleted file mode 100644
index d13578f..0000000
--- a/app-editors/xemacs/xemacs-21.5.32.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 
1.12 2012/10/24 18:58:39 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.
-
-EAPI=4
-
-export WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv 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"
-
-RDEPEND="
-       berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-       >=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-base )
-       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 )
-       png? ( >=media-libs/libpng-1.2 )
-       jpeg? ( virtual/jpeg )
-       canna? ( app-i18n/canna )
-       freewnn? ( app-i18n/freewnn )
-       >=sys-libs/ncurses-5.2"
-
-DEPEND="${RDEPEND}
-       >=app-admin/eselect-emacs-1.2"
-
-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/
-}
-
-src_configure() {
-       local myconf=""
-
-       if use X; then
-
-               myconf="${myconf} --with-widgets=athena"
-               myconf="${myconf} --with-dialogs=athena"
-               myconf="${myconf} --with-menubars=lucid"
-               myconf="${myconf} --with-scrollbars=lucid"
-               if use motif ; then
-                       myconf="--with-widgets=motif"
-                       myconf="${myconf} --with-dialogs=motif"
-                       myconf="${myconf} --with-scrollbars=motif"
-                       myconf="${myconf} --with-menubars=lucid"
-               fi
-               if use athena 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 \
-               --enable-option-checking=no \
-               --with-last-packages=/usr/lib/xemacs \
-               || die "configuration failed"
-}
-
-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 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 ; 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*
-
-       newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-       domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-
-       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
-}

diff --git a/app-editors/xemacs/xemacs-21.5.33.ebuild 
b/app-editors/xemacs/xemacs-21.5.33.ebuild
deleted file mode 100644
index e44113a..0000000
--- a/app-editors/xemacs/xemacs-21.5.33.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 
1.12 2012/10/24 18:58:39 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.
-
-EAPI=4
-
-export WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv 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"
-
-RDEPEND="
-       berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-       >=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-base )
-       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 )
-       png? ( >=media-libs/libpng-1.2 )
-       jpeg? ( virtual/jpeg )
-       canna? ( app-i18n/canna )
-       freewnn? ( app-i18n/freewnn )
-       >=sys-libs/ncurses-5.2"
-
-DEPEND="${RDEPEND}
-       >=app-admin/eselect-emacs-1.2"
-
-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
-}
-
-src_configure() {
-       local myconf=""
-
-       if use X; then
-
-               myconf="${myconf} --with-widgets=athena"
-               myconf="${myconf} --with-dialogs=athena"
-               myconf="${myconf} --with-menubars=lucid"
-               myconf="${myconf} --with-scrollbars=lucid"
-               if use motif ; then
-                       myconf="--with-widgets=motif"
-                       myconf="${myconf} --with-dialogs=motif"
-                       myconf="${myconf} --with-scrollbars=motif"
-                       myconf="${myconf} --with-menubars=lucid"
-               fi
-               if use athena 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 \
-               --enable-option-checking=no \
-               --with-last-packages=/usr/lib/xemacs \
-               || die "configuration failed"
-}
-
-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 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 ; 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*
-
-       newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-       domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-
-       einfo "*************************************************"
-       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
-}

diff --git a/app-editors/xemacs/xemacs-21.5.34-r1.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r1.ebuild
deleted file mode 100644
index 201145b..0000000
--- a/app-editors/xemacs/xemacs-21.5.34-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 
1.12 2012/10/24 18:58:39 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.
-
-EAPI=4
-
-export WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv 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"
-
-RDEPEND="
-       berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-       >=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-base )
-       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 )
-       png? ( >=media-libs/libpng-1.2 )
-       jpeg? ( virtual/jpeg )
-       canna? ( app-i18n/canna )
-       freewnn? ( app-i18n/freewnn )
-       >=sys-libs/ncurses-5.2"
-
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       >=app-admin/eselect-emacs-1.2"
-
-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"
-}
-
-src_configure() {
-       local myconf=""
-
-       if use X; then
-
-               myconf="${myconf} --with-widgets=athena"
-               myconf="${myconf} --with-dialogs=athena"
-               myconf="${myconf} --with-menubars=lucid"
-               myconf="${myconf} --with-scrollbars=lucid"
-               if use motif ; then
-                       myconf="--with-widgets=motif"
-                       myconf="${myconf} --with-dialogs=motif"
-                       myconf="${myconf} --with-scrollbars=motif"
-                       myconf="${myconf} --with-menubars=lucid"
-               fi
-               if use athena 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 \
-               --enable-option-checking=no \
-               --with-last-packages=/usr/lib/xemacs \
-               || die "configuration failed"
-}
-
-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 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 ; 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*
-
-       newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-       domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-
-       einfo "*************************************************"
-       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
-}

diff --git a/app-editors/xemacs/xemacs-21.5.34-r2.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r2.ebuild
deleted file mode 100644
index f376166..0000000
--- a/app-editors/xemacs/xemacs-21.5.34-r2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34-r2.ebuild,v 1.1 
2014/02/17 21:37:43 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.
-
-EAPI=4
-
-export WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv 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"
-
-RDEPEND="
-       berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-       >=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-base )
-       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 )
-       png? ( >=media-libs/libpng-1.2 )
-       jpeg? ( virtual/jpeg )
-       canna? ( app-i18n/canna )
-       freewnn? ( app-i18n/freewnn )
-       >=sys-libs/ncurses-5.2
-       >=app-admin/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"
-
-       # 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=""
-
-       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 \
-               --enable-option-checking=no \
-               --with-last-packages=/usr/lib/xemacs \
-               || die "configuration failed"
-}
-
-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 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 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
-
-       einfo "*************************************************"
-       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
-}

diff --git a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.5.34-r3.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 1ccbad0..defd2a4 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -6,9 +6,9 @@
 # want to use xemacs on a hardened profile then compile with the
 # -nopie flag in CFLAGS or help fix bug #75028.
 
-EAPI=4
+EAPI=5
 
-export WANT_AUTOCONF="2.5"
+WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
@@ -199,6 +199,7 @@ src_install() {
        for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
                mv "${D}"/usr/share/man/{${i},/man1/${i}-xemacs}.1 || die "mv 
${i}.1 failed"
        done
+       mv "${D}"/usr/share/man/{xemacs,/man1/xemacs}.1 || die "mv xemacs.1 
failed"
 
        # install base packages directories
        dodir /usr/lib/xemacs/xemacs-packages/

diff --git a/app-editors/xemacs/xemacs-21.5.34.ebuild 
b/app-editors/xemacs/xemacs-21.5.34.ebuild
deleted file mode 100644
index e44113a..0000000
--- a/app-editors/xemacs/xemacs-21.5.34.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 
1.12 2012/10/24 18:58:39 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.
-
-EAPI=4
-
-export WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv 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"
-
-RDEPEND="
-       berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 )
-       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] )
-       >=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-base )
-       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 )
-       png? ( >=media-libs/libpng-1.2 )
-       jpeg? ( virtual/jpeg )
-       canna? ( app-i18n/canna )
-       freewnn? ( app-i18n/freewnn )
-       >=sys-libs/ncurses-5.2"
-
-DEPEND="${RDEPEND}
-       >=app-admin/eselect-emacs-1.2"
-
-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
-}
-
-src_configure() {
-       local myconf=""
-
-       if use X; then
-
-               myconf="${myconf} --with-widgets=athena"
-               myconf="${myconf} --with-dialogs=athena"
-               myconf="${myconf} --with-menubars=lucid"
-               myconf="${myconf} --with-scrollbars=lucid"
-               if use motif ; then
-                       myconf="--with-widgets=motif"
-                       myconf="${myconf} --with-dialogs=motif"
-                       myconf="${myconf} --with-scrollbars=motif"
-                       myconf="${myconf} --with-menubars=lucid"
-               fi
-               if use athena 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 \
-               --enable-option-checking=no \
-               --with-last-packages=/usr/lib/xemacs \
-               || die "configuration failed"
-}
-
-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 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 ; 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*
-
-       newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-       domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-
-       einfo "*************************************************"
-       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
-}

Reply via email to